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

chore(3p/nixpkgs): Bump channels to 2021-06-05

Browse source 
Includes the following depot changes & fixes:

* stable moves to NixOS 21.05
* stable isn't used anymore (but we'll keep the mechanism)
* haskell overlay's `random` override is removed (YAY!)
* grfn/iso: Switch to regular kernel rather than
  latest kernel, as latest kernel is currently marked as broken due to zfs
* grfn/home: Use julia_16-bin temporarily
  julia 1.5 (current julia-stable, source built release in nixpkgs)
  doesn't pass its own test suite. Julia 1.6 doesn't have a source built
  package in nixpkgs yet, so julia_16-bin appears to be the only working
  julia derivation currently.
* tazjin/tverskoy: Use zfs unstable, as stable zfs doesn't work with the
  latest kernel

Co-Authored-By: Griffin Smith <grfn@gws.fyi>
Co-Authored-By: sterni <sternenseemann@systemli.org>
Change-Id: I6f2e3d9f75077e4755de6bde9104d44b584cbe4c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3174
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2021-06-02 22:32:41 +02:00 committed by tazjin
parent 4e90a38875
commit b4ae6893e4
5 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
third_party/nixpkgs/default.nix vendored
View file

@ -13,16 +13,16 @@ let
# nixos-unstable, and the current stable channel of the latest NixOS # nixos-unstable, and the current stable channel of the latest NixOS
# release. # release.
# Tracking nixos-unstable as of 2021-05-25. # Tracking nixpkgs-unstable as of 2021-06-05.
unstableHashes = { unstableHashes = {
commit = "900115a4f7fdd9189e7803ca781a65be663f2c89"; commit = "2a1c29ef4bacac06f9b677931027bf053952618c";
sha256 = "11551nawxjbgya8sq1p6ghkbws9qz9fbfq3wqawm3zh8ayr4l13j"; sha256 = "1gxkvp4bf222v23kpb7di8iay5gl2qyv5qwgmb10nzdr87avbcax";
}; };
# Tracking nixos-20.09 as of 2021-05-25. # Tracking nixos-21.05 as of 2021-06-02.
stableHashes = { stableHashes = {
commit = "ac60476ed94fd5424d9f3410c438825f793a8cbb"; commit = "eaba7870ffc3400eca4407baa24184b7fe337ec1";
sha256 = "1dlvpdsy5v09c7rj5f7xgakyj722yqr4415davjpcmrk4n5kw76v"; sha256 = "115disiz4b08iw46cidc7lm0advrxn5g2ldmlrxd53zf03skyb2w";
}; };
# import the nixos-unstable package set, or optionally use the # import the nixos-unstable package set, or optionally use the
@ -47,9 +47,7 @@ let
# Overlay for packages that should come from the stable channel # Overlay for packages that should come from the stable channel
# instead (e.g. because something is broken in unstable). # instead (e.g. because something is broken in unstable).
stableOverlay = self: super: { stableOverlay = self: super: {
inherit (stableNixpkgs) # nothing picked from stable currently
awscli # TODO(grfn): Move back to unstable once it is fixed
;
}; };
in import nixpkgsSrc { in import nixpkgsSrc {
config.allowUnfree = true; config.allowUnfree = true;

10
third_party/overlays/haskell/default.nix vendored
View file

@ -10,16 +10,6 @@ let
overrides = hsSelf: hsSuper: with super.haskell.lib; rec { overrides = hsSelf: hsSuper: with super.haskell.lib; rec {
generic-arbitrary = appendPatch hsSuper.generic-arbitrary generic-arbitrary = appendPatch hsSuper.generic-arbitrary
[ ./patches/generic-arbitrary-export-garbitrary.patch ]; [ ./patches/generic-arbitrary-export-garbitrary.patch ];
# check dependencies cause circular dependency on itself
# and thus an infinite recursion
random = dontCheck hsSuper.random_1_2_0;
# random <1.2
test-framework = doJailbreak hsSuper.test-framework;
hashable = doJailbreak hsSuper.hashable;
test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2;
pandoc = doJailbreak hsSuper.pandoc;
}; };
in { in {
haskellPackages = super.haskellPackages.override { haskellPackages = super.haskellPackages.override {

4
users/grfn/system/home/modules/development.nix
View file

@ -76,7 +76,9 @@ with lib;
nodePackages.prettier nodePackages.prettier
] ++ optionals (stdenv.isLinux) [ ] ++ optionals (stdenv.isLinux) [
julia-stable # TODO(grfn): replace with stable again once the current julia debacle
# is resolved upstream, see https://github.com/NixOS/nixpkgs/pull/121114
julia_16-bin
valgrind valgrind
]; ];

2
users/grfn/system/system/iso.nix
View file

@ -3,7 +3,7 @@
let let
configuration = { ... }: { configuration = { ... }: {
imports = [ imports = [
"${pkgs.path}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix" "${pkgs.path}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
"${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix"
]; ];

1
users/tazjin/nixos/tverskoy/default.nix
View file

@ -45,6 +45,7 @@ in lib.fix(self: {
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
zfs.enableUnstable = true;
}; };
fileSystems = { fileSystems = {