File tree Expand file tree Collapse file tree 2 files changed +32
-3
lines changed Expand file tree Collapse file tree 2 files changed +32
-3
lines changed Original file line number Diff line number Diff line change
1
+ pkgs : let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.2.1/" ; in {
2
+ aarch64-darwin = pkgs . fetchurl {
3
+ name = "aarch64-darwin-nix-tools-static" ;
4
+ url = "${ baseurl } aarch64-darwin-nix-tools-static.zip" ;
5
+ sha256 = "sha256-/N2CiakRQHIjLtBbdYfkDyhlHFss9ezWc9WW+HIUOwc=" ;
6
+ } ;
7
+ x86_64-darwin = pkgs . fetchurl {
8
+ name = "x86_64-darwin-nix-tools-static" ;
9
+ url = "${ baseurl } x86_64-darwin-nix-tools-static.zip" ;
10
+ sha256 = "sha256-1Xbxhw7LR6EooiagmRrHg7+UdxddD0RaKjvM75hwsJo=" ;
11
+ } ;
12
+ aarch64-linux = pkgs . fetchurl {
13
+ name = "aarch64-linux-nix-tools-static" ;
14
+ url = "${ baseurl } aarch64-linux-nix-tools-static.zip" ;
15
+ sha256 = "sha256-1OarDAiwYbet6ol3q2dZdnsWMHcniK4zznbGiDPMrO4=" ;
16
+ } ;
17
+ x86_64-linux = pkgs . fetchurl {
18
+ name = "x86_64-linux-nix-tools-static" ;
19
+ url = "${ baseurl } x86_64-linux-nix-tools-static.zip" ;
20
+ sha256 = "sha256-7xckkH+T9uu3fhtTOzqHZ1udNvPJAgkcrvDXEF16qJQ=" ;
21
+ } ;
22
+ }
Original file line number Diff line number Diff line change 28
28
# pointing back to the same static-nix-tools derivation. This allows
29
29
# downstram derivation to keep using `nix-tools.exes.make-install-plan`
30
30
# as shown above.
31
- static-nix-tools =
31
+ static-nix-tools' = pins :
32
32
let
33
33
# TODO replace once haskell-nix-examples nix-tools is in haskell.nix
34
- zipFile = ( import ../nix-tools-static.nix final ) . ${ final . system } ;
34
+ zipFile = ( import pins final ) . ${ final . system } ;
35
35
tarball = final . runCommand "nix-tools" {
36
36
nativeBuildInputs = [ final . unzip ] ;
37
37
} ''
44
44
# add the missing exes attributes to the tarball derivation
45
45
tarball // { exes = final . lib . genAttrs nix-tools-provided-exes ( _ : tarball ) ; } ;
46
46
47
+ static-nix-tools = static-nix-tools' ../nix-tools-static.nix ;
48
+ static-nix-tools-for-default-setup = static-nix-tools' ../nix-tools-static-for-default-setup.nix ;
49
+
47
50
# Version of nix-tools built with a pinned version of haskell.nix.
48
51
pinned-nix-tools-lib = ( import ( final . haskell-nix . sources . flake-compat ) {
49
52
pkgs = final ;
60
63
prev . haskell-nix // {
61
64
inherit ( nix-tools-pkgs ) nix-tools nix-tools-set ;
62
65
# either nix-tools from its overlay or from the tarball.
63
- nix-tools-unchecked = static-nix-tools ;
66
+ nix-tools-unchecked = static-nix-tools // {
67
+ exes = static-nix-tools . exes // {
68
+ inherit ( static-nix-tools-for-default-setup . exes ) default-setup default-setup-ghcjs ;
69
+ } ;
70
+ } ;
64
71
} ;
65
72
# For use building hadrian. This way updating anything that modifies the
66
73
# way hadrian is built will not cause a GHC rebuild.
You can’t perform that action at this time.
0 commit comments