mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ops/nixos): Pin systems to stable channel

Browse source 
NixOS unstable has some software I want when building things, but it's
also broken.

This pins systems to the stable channel for now.
This commit is contained in:
Vincent Ambo 2020-05-22 20:46:38 +01:00
parent c25281820f
commit 56261f1c08
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ops/nixos/camden/default.nix
View file

@ -2,7 +2,7 @@
{ depot, pkgs, lib, ... }: { depot, pkgs, lib, ... }:
config: let config: let
nixpkgs = import depot.third_party.nixpkgsSrc { nixpkgs = import depot.third_party.stableNixpkgsSrc {
config.allowUnfree = true; config.allowUnfree = true;
}; };
in lib.fix(self: { in lib.fix(self: {

2
ops/nixos/nugget/default.nix
View file

@ -2,7 +2,7 @@
{ depot, lib, ... }: { depot, lib, ... }:
config: let config: let
nixpkgs = import depot.third_party.nixpkgsSrc { nixpkgs = import depot.third_party.stableNixpkgsSrc {
config.allowUnfree = true; config.allowUnfree = true;
}; };

6
third_party/default.nix vendored
View file

@ -19,8 +19,8 @@ let
# Tracking nixos-20.03 as of 2020-05-22 # Tracking nixos-20.03 as of 2020-05-22
stableCommit = "48723f48ab92381f0afd50143f38e45cf3080405"; stableCommit = "48723f48ab92381f0afd50143f38e45cf3080405";
stableNixpkgsSrc = fetchTarball { stableNixpkgsSrc = fetchTarball {
url = "https://github.com/NixOS/nixpkgs-channels/archive/${commit}.tar.gz"; url = "https://github.com/NixOS/nixpkgs-channels/archive/${stableCommit}.tar.gz";
sha256 = "0nkk492aa7pr0d30vv1aw192wc16wpa1j02925pldc09s9m9i0r3"; sha256 = "0h3b3l867j3ybdgimfn76lw7w6yjhszd5x02pq5827l659ihcf53";
}; };
stableNixpkgs = import stableNixpkgsSrc {}; stableNixpkgs = import stableNixpkgsSrc {};
@ -167,5 +167,5 @@ in exposed // {
}; };
# Make NixOS available # Make NixOS available
nixos = import "${nixpkgsSrc}/nixos"; nixos = import "${stableNixpkgsSrc}/nixos";
} }