From fb792c2d262a0fc5896b97150fa9943621bff87b Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <heinrich@synyx.de>
Date: Sun, 1 Sep 2024 13:24:12 +0200
Subject: [PATCH] add eslint and licensedigger

---
 flake.lock | 40 +++-------------------------------------
 flake.nix  | 15 ++++++---------
 2 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/flake.lock b/flake.lock
index a424bd9..5e1073e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,21 +1,5 @@
 {
   "nodes": {
-    "eslint": {
-      "locked": {
-        "lastModified": 1724837771,
-        "narHash": "sha256-5j1sZjDSnrNqrVy7rR92tl5PByvKxc2NMSI7CMXk17g=",
-        "owner": "onny",
-        "repo": "nixpkgs",
-        "rev": "11f8b6c9852ccc560f63e659286e27ce3162bcb3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "onny",
-        "ref": "eslint",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "keycloak-realms": {
       "locked": {
         "lastModified": 1721562747,
@@ -32,22 +16,6 @@
         "type": "github"
       }
     },
-    "licensedigger": {
-      "locked": {
-        "lastModified": 1724834768,
-        "narHash": "sha256-VXI8rKoDiq+YQxUOt+AQ2NgS+BoneS/z2NVa0+EZztU=",
-        "owner": "onny",
-        "repo": "nixpkgs",
-        "rev": "711ae571d2d4f63dd3a02feefb97c4fecf6840a3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "onny",
-        "ref": "licensedigger",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixos-shell": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -83,11 +51,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1724830280,
-        "narHash": "sha256-+gOB/YVMvgUU9C46APzTN5BgN6zetHyQNzJ9e1FnEJo=",
+        "lastModified": 1725189734,
+        "narHash": "sha256-tkg9tgohtzIvuvb+DeryiWIKanxyYBWGQEvvsMHzT9U=",
         "owner": "onny",
         "repo": "nixpkgs",
-        "rev": "1ae627bb9595f0c761275d2755ec34a4d8709bc2",
+        "rev": "10f6fb34be099e8c8a1251a5cc65dbbff36bd9b1",
         "type": "github"
       },
       "original": {
@@ -99,9 +67,7 @@
     },
     "root": {
       "inputs": {
-        "eslint": "eslint",
         "keycloak-realms": "keycloak-realms",
-        "licensedigger": "licensedigger",
         "nixos-shell": "nixos-shell",
         "nixpkgs": "nixpkgs_2"
       }
diff --git a/flake.nix b/flake.nix
index 7ec7f1a..fd1330e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,6 @@
     nixpkgs.url = "github:onny/nixpkgs/hmr-enabler";
     nixos-shell.url = "github:Mic92/nixos-shell";
     keycloak-realms.url = "github:rorosen/nixpkgs/keycloak-realm-import";
-    # FIXME
-    licensedigger.url = "github:onny/nixpkgs/licensedigger";
-    eslint.url = "github:onny/nixpkgs/eslint";
   };
 
   outputs = { self, nixpkgs, nixos-shell, ... }@inputs: let
@@ -32,16 +29,16 @@
 
     devShells.x86_64-linux = {
       default = with pkgs; mkShell {
-        nativeBuildInputs = with nodePackages; [
-          php84Packages.composer
+        nativeBuildInputs = with php84Packages; [
+          composer
+          php-cs-fixer
           phpunit
           nodejs
-          rollup
+          nodePackages.rollup
           act
           npm-check-updates
-          # FIXME
-          inputs.licensedigger.legacyPackages.x86_64-linux.licensedigger
-          (inputs.eslint.legacyPackages.x86_64-linux.eslint.overrideAttrs (oldAttrs: rec {
+          licensedigger
+          (eslint.overrideAttrs (oldAttrs: rec {
             version = "8.57.0";
             src = fetchFromGitHub {
               owner = "eslint";