Replace nixFlakes -> nixUnstable
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, gnugrep, nixFlakes }:
|
||||
{ lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
# Substitute instead of wrapping because the resulting file is
|
||||
# getting sourced, not executed:
|
||||
postPatch = ''
|
||||
sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc
|
||||
sed -i "1a NIX_BIN_PREFIX=${nixUnstable}/bin/" direnvrc
|
||||
substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep"
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, nixFlakes
|
||||
, nixUnstable
|
||||
, nix-prefetch
|
||||
, nixpkgs-fmt
|
||||
, nixpkgs-review
|
||||
@@ -19,7 +19,7 @@ buildPythonApplication rec {
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ])
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ])
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, nixFlakes
|
||||
, nixUnstable
|
||||
, git
|
||||
}:
|
||||
|
||||
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ])
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable git ])
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
Reference in New Issue
Block a user