git.iko.soy/typeable/nixpkgs
on master help sign in
Replace nixFlakes -> nixUnstable
commit62ee635d533c45b781255cc01c784969237d3afb authorEelco Dolstra <edolstra@gmail.com> dateFri 21 May 2021, 15:23 (5 years ago) parent49c2208
4 files changed+8−8
pkgs/development/tools/misc/hydra/default.nix+2−2 pkgs/tools/misc/nix-direnv/default.nix+2−2 pkgs/tools/package-management/nix-update/default.nix+2−2 pkgs/tools/package-management/nixpkgs-review/default.nix+2−2
pkgs/development/tools/misc/hydra/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }:
1+{ fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }:
22
33{
44 hydra-unstable = callPackage ./common.nix {
@@ -9,7 +9,7 @@
99 rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468";
1010 sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0=";
1111 };
12− nix = nixFlakes;
12+ nix = nixUnstable;
1313
1414 tests = {
1515 basic = nixosTests.hydra.hydra-unstable;
pkgs/tools/misc/nix-direnv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, gnugrep, nixFlakes }:
1+{ lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }:
22
33stdenv.mkDerivation rec {
44 pname = "nix-direnv";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 # Substitute instead of wrapping because the resulting file is
1515 # getting sourced, not executed:
1616 postPatch = ''
17− sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc
17+ sed -i "1a NIX_BIN_PREFIX=${nixUnstable}/bin/" direnvrc
1818 substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep"
1919 '';
2020
pkgs/tools/package-management/nix-update/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib
22, buildPythonApplication
33, fetchFromGitHub
4−, nixFlakes
4+, nixUnstable
55, nix-prefetch
66, nixpkgs-fmt
77, nixpkgs-review
@@ -19,7 +19,7 @@ buildPythonApplication rec {
1919 };
2020
2121 makeWrapperArgs = [
22− "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ])
22+ "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ])
2323 ];
2424
2525 checkPhase = ''
pkgs/tools/package-management/nixpkgs-review/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib
22, python3
33, fetchFromGitHub
4−, nixFlakes
4+, nixUnstable
55, git
66}:
77
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
1717 };
1818
1919 makeWrapperArgs = [
20− "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ])
20+ "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable git ])
2121 ];
2222
2323 doCheck = false;