fix: use standardized patch paths (#8)

flox · Nov 2, 2023 · 8fc0cae · 8fc0cae
1 parent 7ae43f9
commit 8fc0cae
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,10 +10,14 @@
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
 
+  # NOT pulled in as a flake to avoid circular locks
+  inputs.nix-patches.url = "github:flox/pkgdb/tomberek.bump-nix";
+  inputs.nix-patches.flake = false;
+
 
 # ---------------------------------------------------------------------------- #
 
-  outputs = { nixpkgs, ... }: let
+  outputs = { nixpkgs, nix-patches, ... }: let
 
 # ---------------------------------------------------------------------------- #
 
@@ -28,7 +32,15 @@
 
 # ---------------------------------------------------------------------------- #
 
-    overlays.deps        = final: prev: { /* N/A */ };
+    overlays.deps        = final: prev: {
+      # duplicating the nix overlay here, but pulling in the patches
+      nix = prev.nixVersions.nix_2_17.overrideAttrs (old: {
+        patches = old.patches or [] ++ [
+            (builtins.path {path = nix-patches + "/nix-patches/nix-9147.patch";})
+            (builtins.path {path = nix-patches + "/nix-patches/multiple-github-tokens.2.13.2.patch";})
+      ];
+      });
+    };
     overlays.parser-util = final: prev: {
       parser-util = final.callPackage ./pkg-fun.nix {};
     };

diff --git a/pkg-fun.nix b/pkg-fun.nix
@@ -7,14 +7,13 @@
 { stdenv
 , pkg-config
 , nlohmann_json
-, nixVersions
+, nix
 , boost
 , bats
 , gnused
 , jq
 }: let
 
-  nix = nixVersions.nix_2_15;
   batsWith =
     bats.withLibraries ( p: [p.bats-assert p.bats-file p.bats-support] );