diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/default.nix | 12 | ||||
| -rw-r--r-- | third_party/gerrit_plugins/default.nix | 4 | ||||
| -rw-r--r-- | third_party/haskell_overlay/default.nix | 4 | ||||
| -rw-r--r-- | third_party/nixpkgs-exposed.nix | 3 |
4 files changed, 14 insertions, 9 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index 086e25ab857d..6d70fa072328 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -5,11 +5,11 @@ { ... }: let - # Tracking nixos-unstable as of 2020-11-21. - nixpkgsCommit = "a322b32e9d74fb476944ff6cfb55833dc69cfaaa"; + # Tracking nixos-unstable as of 2020-12-28. + nixpkgsCommit = "2f47650c2f28d87f86ab807b8a339c684d91ec56"; nixpkgsSrc = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/${nixpkgsCommit}.tar.gz"; - sha256 = "1r0mkiqxija75spnyksmh8x5j4smnrxv5f7768s81gsl570kls0l"; + sha256 = "17akl75x28rzq97gaad32flswdsp150nfsg7h909kda721zql71a"; }; nixpkgs = import nixpkgsSrc { config.allowUnfree = true; @@ -21,11 +21,11 @@ let ]; }; - # Tracking nixos-20.09 as of 2020-11-21. - stableCommit = "58f9c4c7d3a42c912362ca68577162e38ea8edfb"; + # Tracking nixos-20.09 as of 2020-12-28. + stableCommit = "0c81b9a4f170f734bd7e587a39e56470c59733e7"; stableNixpkgsSrc = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/${stableCommit}.tar.gz"; - sha256 = "1517dy07jf4zhzknqbgm617lgjxsn7a6k1vgq61c67f6h55qs5ij"; + sha256 = "1fl5ks6p78bamqanbk9xpy83jzzcdw2mdabrp59n33xv7jix1jzx"; }; stableNixpkgs = import stableNixpkgsSrc {}; diff --git a/third_party/gerrit_plugins/default.nix b/third_party/gerrit_plugins/default.nix index 1fb3377d3f0c..05dd9b8fd954 100644 --- a/third_party/gerrit_plugins/default.nix +++ b/third_party/gerrit_plugins/default.nix @@ -11,7 +11,7 @@ in src = pkgs.fetchgit { url = "https://gerrit.googlesource.com/plugins/owners"; rev = "17817c9e319073c03513f9d5177b6142b8fd567b"; - sha256 = "sha256:0gz9kqi32qnmhxc4r5fyrywfj3pfifiirk8l49f30m9rzhd9yrmy"; + sha256 = "sha256:1p089shybp50svckcq51d0hfisjvbggndmvmhh8pvzvi6w8n9d89"; deepClone = true; leaveDotGit = true; }; @@ -30,7 +30,7 @@ in src = pkgs.fetchgit { url = "https://gerrit.googlesource.com/plugins/checks"; rev = "ab49a63f5c159bda42d9ad1bdb9286bede6c5de4"; - sha256 = "sha256:1czsvdz50r2c53vyz65if5ddm3i32zxi448irj94hc1bxmygdqbc"; + sha256 = "sha256:1gy67ixjk91mvraww4iw69q7n03w719r3lrzv5xp5glxrzaf1mpf"; deepClone = true; leaveDotGit = true; }; diff --git a/third_party/haskell_overlay/default.nix b/third_party/haskell_overlay/default.nix index b996cd48c448..c1d257808549 100644 --- a/third_party/haskell_overlay/default.nix +++ b/third_party/haskell_overlay/default.nix @@ -50,6 +50,10 @@ self: super: with pkgs.haskell.lib; rec { sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh"; } {}); + # random <1.2 + test-framework = doJailbreak super.test-framework; + hashable = doJailbreak super.hashable; + random-source = overrideSrc super.random-source rec { src = pkgs.fetchzip { url = "mirror://hackage/random-source-${version}/random-source-${version}.tar.gz"; diff --git a/third_party/nixpkgs-exposed.nix b/third_party/nixpkgs-exposed.nix index d4eb212e5389..0a61ad89ee63 100644 --- a/third_party/nixpkgs-exposed.nix +++ b/third_party/nixpkgs-exposed.nix @@ -71,6 +71,7 @@ lib libredirect linuxPackages + linuxPackages_5_9 luajit lutris makeFontsConf @@ -158,7 +159,7 @@ mercurial perl perlPackages - utillinuxMinimal; + ; haskellPackages = (nixpkgs.haskellPackages.override { overrides = (import ./haskell_overlay { pkgs = nixpkgs; }); |