Skip to content

Commit 087fed6

Browse files
committed
Avoid broken nixpkgs ghc 9.0.2 (use 9.6.4 when present)
1 parent 1487a69 commit 087fed6

File tree

17 files changed

+747
-9
lines changed

17 files changed

+747
-9
lines changed

lib/pkgconf-nixpkgs-map.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3158,8 +3158,8 @@ pkgs:
31583158
"libsodium" = [ "libsodium" ];
31593159
"libsolvext" = [ "libsolv" ];
31603160
"libsolv" = [ "libsolv" ];
3161-
"libsoup-2.4" = [ "libsoup" ];
3162-
"libsoup-gnome-2.4" = [ "libsoup" ];
3161+
"libsoup-2.4" = [ "libsoup_2_4" ];
3162+
"libsoup-gnome-2.4" = [ "libsoup_2_4" ];
31633163
"libsoup-3.0" = [ "libsoup_3" ];
31643164
"spatialaudio" = [ "libspatialaudio" ];
31653165
"libspatialindex" = [ "libspatialindex" ];
@@ -5255,8 +5255,8 @@ pkgs:
52555255
"tss2-tcti-pcap" = [ "tpm2-tss" ];
52565256
"tss2-tcti-swtpm" = [ "tpm2-tss" ];
52575257
"libtracecmd" = [ "trace-cmd" ];
5258-
"tracker-sparql-3.0" = [ "tracker" ];
5259-
"tracker-testutils-3.0" = [ "tracker" ];
5258+
"tracker-sparql-3.0" = [ "tinysparql" ];
5259+
"tracker-testutils-3.0" = [ "tinysparql" ];
52605260
"trafficserver" = [ "trafficserver" ];
52615261
"tre" = [ "tre" ];
52625262
"tree-sitter" = [ "tree-sitter" ];

materialized/alex-3.2.7.1/ghc964/.plan.nix/alex.nix

Lines changed: 141 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/alex-3.2.7.1/ghc964/default.nix

Lines changed: 101 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/alex-3.2.7.1/ghc964/plan.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/bootstrap/ghc964/hscolour/.plan.nix/hscolour.nix

Lines changed: 70 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)