From 62ee635d533c45b781255cc01c784969237d3afb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 May 2021 15:23:52 +0200 Subject: [PATCH] Replace nixFlakes -> nixUnstable --- pkgs/development/tools/misc/hydra/default.nix | 4 ++-- pkgs/tools/misc/nix-direnv/default.nix | 4 ++-- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 142322eb59d..a124b4a5c6e 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }: +{ fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }: { hydra-unstable = callPackage ./common.nix { @@ -9,7 +9,7 @@ rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468"; sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0="; }; - nix = nixFlakes; + nix = nixUnstable; tests = { basic = nixosTests.hydra.hydra-unstable; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 61078e7edfe..94ce54a2a9a 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -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" ''; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 296f3be49cc..c205550b267 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -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 = '' diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 2229e0c6a1d..3bfb89fe105 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -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;