feat: mechanism for patching nixpkgs

update
fix: netbird ports, currently broken
2024-11-03 21:34:38 +01:00 · 2024-11-03 21:33:48 +01:00 · 2024-11-03 21:32:46 +01:00
16 changed files with 219 additions and 167 deletions
--- a/config/services/netbird.nix
+++ b/config/services/netbird.nix
@ -3,9 +3,10 @@
  wireguard.elisabeth = {
    client.via = "elisabeth";
    firewallRuleForNode.elisabeth.allowedTCPPorts = [
-      80
-      3000
-      3001
+      80 # dashboard
+      3000 # management
+      8012 # signal
+      33080 # relay
    ];
  };

@ -28,12 +29,7 @@
    group = "netbird";
  };

-  networking.firewall.allowedTCPPorts = [
-    80
-    3000
-    3001
-  ];
-  networking.firewall.allowedUDPPorts = [ 3478 ];
+  networking.firewall.allowedUDPPorts = [ 3478 ]; # STUN/TURN server
  services.netbird = {
    server = {
      enable = true;
--- a/config/services/ollama.nix
+++ b/config/services/ollama.nix
@ -12,7 +12,7 @@
  services.open-webui = {
    host = "0.0.0.0";
    port = 3000;
-    #enable = true;
+    enable = true;
    environment = {
      ENV = "prod";
      OLLAMA_BASE_URL = "http://localhost:3001";
--- a/flake.lock
+++ b/flake.lock
@ -468,11 +468,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1727826117,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
        "type": "github"
      },
      "original": {
@ -532,11 +532,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727826117,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
        "type": "github"
      },
      "original": {
@ -709,11 +709,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729104314,
-        "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
+        "lastModified": 1730302582,
+        "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
+        "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
        "type": "github"
      },
      "original": {
@ -877,11 +877,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730016908,
-        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
+        "lastModified": 1730633670,
+        "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e83414058edd339148dc142a8437edb9450574c8",
+        "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
        "type": "github"
      },
      "original": {
@ -898,11 +898,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730016908,
-        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
+        "lastModified": 1730490306,
+        "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e83414058edd339148dc142a8437edb9450574c8",
+        "rev": "1743615b61c7285976f85b303a36cdf88a556503",
        "type": "github"
      },
      "original": {
@ -934,11 +934,11 @@
    },
    "impermanence": {
      "locked": {
-        "lastModified": 1729068498,
-        "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
+        "lastModified": 1730403150,
+        "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=",
        "owner": "nix-community",
        "repo": "impermanence",
-        "rev": "e337457502571b23e449bf42153d7faa10c0a562",
+        "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f",
        "type": "github"
      },
      "original": {
@ -1008,11 +1008,11 @@
        "nixpkgs-lib": "nixpkgs-lib_2"
      },
      "locked": {
-        "lastModified": 1730031145,
-        "narHash": "sha256-GZz0LGkeduajnF7zUuPu5evNyoOATcSsRZCkG1OqiwY=",
+        "lastModified": 1730486688,
+        "narHash": "sha256-s5yzGvmyHw3NNjHhR6Ll0sIfPxIqWVegg/Jm3Qw6y9I=",
        "owner": "nix-community",
        "repo": "lib-aggregate",
-        "rev": "7d235f23a84b54c39b1579b68b13e1ff83f5b1ad",
+        "rev": "dccba7ef61b0f146fbae24e1118e7b082f44d9a9",
        "type": "github"
      },
      "original": {
@ -1045,11 +1045,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1730296510,
-        "narHash": "sha256-ZiQPP6LE+SLKbS0UYNeDax08whSXlhZeniDzzLQGVEw=",
+        "lastModified": 1730499294,
+        "narHash": "sha256-RxV89z3TwhQT0Wue42aSPh3O7hXGbAFYHHNSnW9h6P8=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "6ff444ef6cfd5d2effb6c4f50da2ca6f20f2677f",
+        "rev": "93122446d6001f9789d05e565f73bebfa3f53b50",
        "type": "github"
      },
      "original": {
@ -1066,11 +1066,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729982130,
-        "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=",
+        "lastModified": 1730448474,
+        "narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "2eb472230a5400c81d9008014888b4bff23bcf44",
+        "rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e",
        "type": "github"
      },
      "original": {
@ -1087,11 +1087,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1728593025,
-        "narHash": "sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q=",
+        "lastModified": 1730389079,
+        "narHash": "sha256-g/CJ/KKe5MGsVx1oCBl0F9aCdcNSDeOw8H7e5QDGa2c=",
        "owner": "nix-community",
        "repo": "nix-eval-jobs",
-        "rev": "a3307ac4b38b6dae769f771c877a6f2c236ee238",
+        "rev": "7f9159a16584ee86eed077c8a73e845690b7d513",
        "type": "github"
      },
      "original": {
@ -1129,11 +1129,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729999765,
-        "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
+        "lastModified": 1730604744,
+        "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
+        "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318",
        "type": "github"
      },
      "original": {
@ -1189,11 +1189,11 @@
        "pre-commit-hooks": "pre-commit-hooks_3"
      },
      "locked": {
-        "lastModified": 1728505352,
-        "narHash": "sha256-rhiGjMfjMzayx9YJwWl53QXGWGrI9VgurB1eo7mGFm8=",
+        "lastModified": 1730662453,
+        "narHash": "sha256-gfHjVmhsbsp0O61RSBxtrg4xEsYwQ5BZwyQTwIfFl9s=",
        "owner": "oddlama",
        "repo": "nixos-extra-modules",
-        "rev": "4bcc7dd2a113a7bf71bcc4707f384ac2c34891d4",
+        "rev": "ba53e1a0becde25b0644fbf886234669c9b285e3",
        "type": "github"
      },
      "original": {
@ -1225,11 +1225,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1730161780,
-        "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=",
+        "lastModified": 1730537918,
+        "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8",
+        "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
        "type": "github"
      },
      "original": {
@ -1277,14 +1277,14 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1727825735,
-        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
+        "lastModified": 1730504152,
+        "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
      }
    },
    "nixpkgs-lib_2": {
@ -1392,11 +1392,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730301661,
-        "narHash": "sha256-P7hHXvHIcPwov/OVbqN/IFhlSkU1FdTdOfQKegpMiiM=",
+        "lastModified": 1730623166,
+        "narHash": "sha256-tMmZC3ge0ZfjSd3R3pAPnHIXytDOq+pv3aqxNN3KW14=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "f08bf4c00f80078666df0a77dd572342ccded463",
+        "rev": "6645be2446f5a3065a819677cdc0198fcb50339c",
        "type": "github"
      },
      "original": {
@ -1407,11 +1407,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1729880355,
-        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
+        "lastModified": 1730531603,
+        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
        "type": "github"
      },
      "original": {
@ -1468,11 +1468,11 @@
        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1730214386,
-        "narHash": "sha256-FNXiFunXR2DnNrjmA0ofLznTTHcEDJjNWvCQtQExtL0=",
+        "lastModified": 1730569492,
+        "narHash": "sha256-NByr7l7JetL9kIrdCOcRqBu+lAkruYXETp1DMiDHNQs=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "7d882356a486cf44b7fab842ac26885ecd985af3",
+        "rev": "6f210158b03b01a1fd44bf3968165e6da80635ce",
        "type": "github"
      },
      "original": {
@ -1491,11 +1491,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730044642,
-        "narHash": "sha256-DbyV9l3hkrSWcN34S6d9M4kAFss0gEHGtjqqMdG9eAs=",
+        "lastModified": 1730515563,
+        "narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "e373332c1f8237fc1263901745b0fe747228c8ba",
+        "rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e",
        "type": "github"
      },
      "original": {
@ -1723,11 +1723,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730261837,
-        "narHash": "sha256-syeN2dLFxJ9bhsG1YnwWpwMgCttBY1S60KUrqLIrmMo=",
+        "lastModified": 1730607408,
+        "narHash": "sha256-ae8GwT8uvakniK7izEPYypuBA0RHBmehVziIit3BxH0=",
        "owner": "Gerg-l",
        "repo": "spicetify-nix",
-        "rev": "1c482c8baffd494119b7f61735d35c62a0a22244",
+        "rev": "c29215e233ddd504d670d432095fbba7e541b880",
        "type": "github"
      },
      "original": {
@ -2011,11 +2011,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730025913,
-        "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=",
+        "lastModified": 1730321837,
+        "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a",
+        "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -122,6 +122,7 @@
        ./nix/devshell.nix
        ./nix/hosts.nix
        ./nix/pkgs.nix
+        ./nix/patch.nix
        nix-topology.flakeModule
      ];

--- a/hosts/elisabeth/guests.nix
+++ b/hosts/elisabeth/guests.nix
@ -153,7 +153,7 @@ in
              X-Frame-Options = "SAMEORIGIN";
            };
            "/signalexchange.SignalExchange/".extraConfig = ''
-              grpc_pass grpc://${ipOf "netbird"}:3001;
+              grpc_pass grpc://${ipOf "netbird"}:8012;
              grpc_read_timeout 1d;
              grpc_send_timeout 1d;
              grpc_socket_keepalive on;
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@ -20,6 +20,7 @@
        packages = with pkgs; [
          # Nix
          nil
+          wcurl # for fetch-prs

          # Misc
          shellcheck
--- a/nix/hosts.nix
+++ b/nix/hosts.nix
@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
  flake =
    { config, lib, ... }:
@ -20,12 +20,16 @@
          pkgs = config.pkgs.x86_64-linux;
          stateVersion = "24.05";
        in
-        inputs.nixpkgs.lib.nixosSystem {
+        (import "${self.nixpkgs-patched}/nixos/lib/eval-config.nix") {
+          system = null;
          specialArgs = {
            # Use the correct instance lib that has our overlays
            inherit (pkgs) lib;
            inherit (config) nodes;
-            inherit inputs minimal stateVersion;
+            inherit minimal stateVersion;
+            inputs = inputs // {
+              nixpkgs = self.nixpkgs-patched;
+            };
          };
          modules = [
            {
--- a/nix/patch.nix
+++ b/nix/patch.nix
@ -0,0 +1,25 @@
+{
+  inputs,
+  ...
+}:
+{
+  flake = {
+    nixpkgs-patched =
+      let
+        system = "x86_64-linux";
+        pkgs = import inputs.nixpkgs { inherit system; };
+      in
+      pkgs.stdenvNoCC.mkDerivation {
+        name = "Nixpkgs with patches from open PRs";
+        src = inputs.nixpkgs;
+        dontConfigure = true;
+        dontBuild = true;
+        doCheck = false;
+        dontFixup = true;
+        installPhase = ''
+          cp -r ./ $out
+        '';
+        patches = pkgs.lib.filesystem.listFilesRecursive ../patches;
+      };
+  };
+}
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
  imports = [
    (
@ -14,7 +14,7 @@
  perSystem =
    { pkgs, system, ... }:
    {
-      _module.args.pkgs = import inputs.nixpkgs {
+      _module.args.pkgs = import self.nixpkgs-patched {
        inherit system;
        config.allowUnfree = true;
        overlays = (import ../pkgs inputs) ++ [
--- a/patches/353230.diff
+++ b/patches/353230.diff
@ -0,0 +1,80 @@
+diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
+index 4392b3cb60121..a5b4d28b4a7dc 100644
+--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
+@@ -18,14 +18,14 @@ in
+ 
+ buildPythonPackage rec {
+   pname = "pyscard";
+-  version = "2.1.1";
+  version = "2.2.0";
+   pyproject = true;
+ 
+   src = fetchFromGitHub {
+     owner = "LudovicRousseau";
+     repo = "pyscard";
+     rev = "refs/tags/${version}";
+-    hash = "sha256-wlw2QL1vfhXba8ok/URcd9M+F7Sa+ZtekV1w5X24owE=";
+    hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0=";
+   };
+ 
+   build-system = [ setuptools ];
+@@ -37,36 +37,31 @@ buildPythonPackage rec {
+   nativeCheckInputs = [ pytestCheckHook ];
+ 
+   postPatch =
+-    if withApplePCSC then
+-      ''
+-        substituteInPlace smartcard/scard/winscarddll.c \
+-          --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \
+-                    "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
+-      ''
+-    else
+-      ''
+-        substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG"
+-        substituteInPlace smartcard/scard/winscarddll.c \
+-          --replace-fail "libpcsclite.so.1" \
+-                    "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
+-      '';
+    ''
+      substituteInPlace pyproject.toml \
+        --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]'
+    ''
+    + (
+      if withApplePCSC then
+        ''
+          substituteInPlace src/smartcard/scard/winscarddll.c \
+            --replace-fail "/System/Library/Frameworks/PCSC.framework/PCSC" \
+                      "${PCSC}/Library/Frameworks/PCSC.framework/PCSC"
+        ''
+      else
+        ''
+          substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG"
+          substituteInPlace src/smartcard/scard/winscarddll.c \
+            --replace-fail "libpcsclite.so.1" \
+                      "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"
+        ''
+    );
+ 
+-  preCheck = ''
+-    # remove src module, so tests use the installed module instead
+-    rm -r smartcard
+-  '';
+-
+-  disabledTests = [
+-    # AssertionError
+-    "test_hresult"
+-    "test_low_level"
+-  ];
+-
+-  meta = with lib; {
+  meta = {
+     description = "Smartcard library for python";
+     homepage = "https://pyscard.sourceforge.io/";
+     changelog = "https://github.com/LudovicRousseau/pyscard/releases/tag/${version}";
+-    license = licenses.lgpl21Plus;
+-    maintainers = with maintainers; [ layus ];
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ layus ];
+   };
+ }
--- a/patches/353272.diff
+++ b/patches/353272.diff
@ -0,0 +1,12 @@
+diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix
+index ca8f8366f7f6b..d23ec4af02ee4 100644
+--- a/pkgs/tools/archivers/7zz/default.nix
+++ b/pkgs/tools/archivers/7zz/default.nix
+@@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
+       "CXX=${stdenv.cc.targetPrefix}c++"
+     ]
+     ++ lib.optionals useUasm [ "MY_ASM=uasm" ]
+    ++ lib.optionals (!useUasm && stdenv.hostPlatform.isx86) [ "USE_ASM=" ]
+     # We need at minimum 10.13 here because of utimensat, however since
+     # we need a bump anyway, let's set the same minimum version as the one in
+     # aarch64-darwin so we don't need additional changes for it
--- a/pkgs/ccid.nix
+++ b/pkgs/ccid.nix
@ -1,85 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  flex,
-  gitUpdater,
-  libusb1,
-  meson,
-  ninja,
-  pcsclite,
-  perl,
-  pkg-config,
-  zlib,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ccid";
-  version = "1.6.1";
-
-  src = fetchurl {
-    url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.xz";
-    hash = "sha256-LsqPsH6P58DTna6sp7l81zxA7Ztyc4okrT3L38kY4eo=";
-  };
-
-  postPatch = ''
-    patchShebangs .
-    substituteInPlace meson.build --replace-fail \
-      "pcsc_dep.get_variable('usbdropdir')" \
-      "'$out/pcsc/drivers'"
-  '';
-
-  mesonFlags = [
-    (lib.mesonBool "serial" true)
-  ];
-
-  # error: call to undeclared function 'InterruptRead';
-  # ISO C99 and later do not support implicit function declarations
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-  };
-
-  nativeBuildInputs = [
-    flex
-    perl
-    pkg-config
-    meson
-    ninja
-  ];
-
-  buildInputs = [
-    libusb1
-    pcsclite
-    zlib
-  ];
-
-  postInstall = ''
-    install -Dm 0444 -t $out/lib/udev/rules.d ../src/92_pcscd_ccid.rules
-    substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \
-      --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
-  '';
-
-  # The resulting shared object ends up outside of the default paths which are
-  # usually getting stripped.
-  stripDebugList = [ "pcsc" ];
-
-  passthru.updateScript = gitUpdater {
-    url = "https://salsa.debian.org/rousseau/CCID.git";
-  };
-
-  installCheckPhase = ''
-    [ -f $out/etc/reader.conf.d/libccidtwin ]
-    [ -f $out/lib/udev/rules.d/92_pcscd_ccid.rules ]
-    [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist ]
-    [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Linux/libccid.so ]
-    [ -f $out/pcsc/drivers/serial/libccidtwin.so ]
-  '';
-
-  meta = with lib; {
-    description = "PC/SC driver for USB CCID smart card readers";
-    homepage = "https://ccid.apdu.fr/";
-    license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.anthonyroussel ];
-    platforms = platforms.unix;
-  };
-}
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -8,7 +8,6 @@ _inputs: [
    signal-to-blog = prev.callPackage ./signal-to-blog.nix { };
    minion = prev.callPackage ./minion.nix { };
    mongodb-bin = prev.callPackage ./mongodb-bin.nix { };
-    ccid = prev.callPackage ./ccid.nix { };
    awakened-poe-trade = prev.callPackage ./awakened-poe-trade.nix { };
    neovim-clean = prev.neovim-unwrapped.overrideAttrs (
      _neovimFinal: neovimPrev: {
@ -20,6 +19,7 @@ _inputs: [
          '';
      }
    );
+
    path-of-building = prev.path-of-building.overrideAttrs (old: {
      postFixup =
        (old.postFixup or "")
--- a/pkgs/minion.nix
+++ b/pkgs/minion.nix
@ -2,7 +2,7 @@
  stdenvNoCC,
  lib,
  fetchzip,
-  openjdk22,
+  openjdk21,
  makeDesktopItem,
  javaPackages,
  gsettings-desktop-schemas,
@ -10,13 +10,13 @@
 }:

 let
-  openjfx = javaPackages.openjfx22.override { withWebKit = true; };
-  jdk = openjdk22.override (
+  openjfx = javaPackages.openjfx21.override { withWebKit = true; };
+  jdk = openjdk21.override (
    prev:
    prev
    // {
      enableJavaFX = true;
-      inherit openjfx;
+      openjfx_jdk = openjfx;
    }
  );
 in
--- a/pkgs/scripts/fetch-prs.sh
+++ b/pkgs/scripts/fetch-prs.sh
@ -0,0 +1,17 @@
+# dependencies: wcurl
+PRS=("353272" "353230")
+
+if [ ! -f flake.nix ]; then
+	echo "Not in a flake top level"
+	exit 1
+fi
+
+mkdir -p patches
+echo "Removing old patches"
+rm patches/*.diff
+for t in "${PRS[@]}"; do
+	echo "Fetching PR #$t"
+	url="https://github.com/NixOS/nixpkgs/pull/$t"
+	echo "$url"
+	wcurl "$url.diff" --curl-options "--output-dir patches"
+done
--- a/users/patrick/patrick.nix
+++ b/users/patrick/patrick.nix
@ -36,6 +36,7 @@
      yt-dlp
      zathura
      zotero
+      bash-interactive
    ];
  };
  hm.programs.bat.enable = true;
Author	SHA1	Message	Date
Patrick	73ca68e68f	feat: mechanism for patching nixpkgs	2024-11-03 21:34:38 +01:00
Patrick	0225734af3	update	2024-11-03 21:33:48 +01:00
Patrick	6e658ab934	fix: netbird ports, currently broken	2024-11-03 21:32:46 +01:00