diff options
| author | Domen Kožar <domen@dev.si> | 2023-01-06 20:20:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-06 20:20:58 +0000 |
| commit | 9f873b90fa9a40474b4a382d1e5cb016aa40ff67 (patch) | |
| tree | fab45f9ea65ba6d399e1637a9458959a855074ba /pkgs/development/haskell-modules | |
| parent | 647686f98a8c5957cfdf2e1a9f738a64d73f5c10 (diff) | |
| parent | c8739dd43c6cf4e7d0be7d23443003805b421474 (diff) | |
| download | nixlib-9f873b90fa9a40474b4a382d1e5cb016aa40ff67.tar nixlib-9f873b90fa9a40474b4a382d1e5cb016aa40ff67.tar.gz nixlib-9f873b90fa9a40474b4a382d1e5cb016aa40ff67.tar.bz2 nixlib-9f873b90fa9a40474b4a382d1e5cb016aa40ff67.tar.lz nixlib-9f873b90fa9a40474b4a382d1e5cb016aa40ff67.tar.xz nixlib-9f873b90fa9a40474b4a382d1e5cb016aa40ff67.tar.zst nixlib-9f873b90fa9a40474b4a382d1e5cb016aa40ff67.zip | |
Merge branch 'master' into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e9900acf0b41..f32d179d12c4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -852,17 +852,17 @@ self: super: builtins.intersectAttrs super { ]; cachix = super.cachix.override { - nix = pkgs.nixVersions.nix_2_9; + nix = pkgs.nixVersions.nix_2_10; fsnotify = super.fsnotify_0_4_1_0; hnix-store-core = super.hnix-store-core_0_6_1_0; }; - hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; }; + hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_10; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git ( - super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_9; } + super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_10; } ); - hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_9; }; + hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_10; }; # the testsuite fails because of not finding tsc without some help aeson-typescript = overrideCabal (drv: { |