nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues 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 {
@ -9,7 +9,7 @@
rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468";
sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0=";
};
nix = nixFlakes;
nix = nixUnstable;
tests = {
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 {
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"
'';

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

@ -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 = ''

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

@ -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;