b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Replace nixFlakes -> nixUnstable

Browse source
This commit is contained in:
Eelco Dolstra 2021-05-21 15:23:52 +02:00
parent 49c22083b9
commit 62ee635d53
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/tools/misc/hydra/default.nix
View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }: { fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }:
{ {
hydra-unstable = callPackage ./common.nix { hydra-unstable = callPackage ./common.nix {
@ -9,7 +9,7 @@
rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468"; rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468";
sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0="; sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0=";
}; };
nix = nixFlakes; nix = nixUnstable;
tests = { tests = {
basic = nixosTests.hydra.hydra-unstable; basic = nixosTests.hydra.hydra-unstable;

4
pkgs/tools/misc/nix-direnv/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gnugrep, nixFlakes }: { lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nix-direnv"; pname = "nix-direnv";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# Substitute instead of wrapping because the resulting file is # Substitute instead of wrapping because the resulting file is
# getting sourced, not executed: # getting sourced, not executed:
postPatch = '' 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" substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep"
''; '';

4
pkgs/tools/package-management/nix-update/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, buildPythonApplication , buildPythonApplication
, fetchFromGitHub , fetchFromGitHub
, nixFlakes , nixUnstable
, nix-prefetch , nix-prefetch
, nixpkgs-fmt , nixpkgs-fmt
, nixpkgs-review , nixpkgs-review
@ -19,7 +19,7 @@ buildPythonApplication rec {
}; };
makeWrapperArgs = [ makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ]) "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ])
]; ];
checkPhase = '' checkPhase = ''

4
pkgs/tools/package-management/nixpkgs-review/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, python3 , python3
, fetchFromGitHub , fetchFromGitHub
, nixFlakes , nixUnstable
, git , git
}: }:
@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
}; };
makeWrapperArgs = [ makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ]) "--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable git ])
]; ];
doCheck = false; doCheck = false;