File tree Expand file tree Collapse file tree 2 files changed +8
-20
lines changed Expand file tree Collapse file tree 2 files changed +8
-20
lines changed Original file line number Diff line number Diff line change 7
7
#
8
8
9
9
fetch_file = pkgs : name : spec :
10
- let
11
- name' = sanitizeName name + "-src" ;
12
- in
13
10
if spec . builtin or true then
14
- builtins_fetchurl { inherit ( spec ) url sha256 ; name = name' ; }
11
+ builtins_fetchurl { inherit ( spec ) url sha256 ; name = "source" ; }
15
12
else
16
- pkgs . fetchurl { inherit ( spec ) url sha256 ; name = name' ; } ;
13
+ pkgs . fetchurl { inherit ( spec ) url sha256 ; name = "source" ; } ;
17
14
18
15
fetch_tarball = pkgs : name : spec :
19
- let
20
- name' = sanitizeName name + "-src" ;
21
- in
22
16
if spec . builtin or true then
23
- builtins_fetchTarball { name = name' ; inherit ( spec ) url sha256 ; }
17
+ builtins_fetchTarball { name = "source" ; inherit ( spec ) url sha256 ; }
24
18
else
25
- pkgs . fetchzip { name = name' ; inherit ( spec ) url sha256 ; } ;
19
+ pkgs . fetchzip { name = "source" ; inherit ( spec ) url sha256 ; } ;
26
20
27
21
fetch_git = name : spec :
28
22
let
69
63
# Various helpers
70
64
#
71
65
72
- # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
73
- sanitizeName = name :
74
- (
75
- concatMapStrings ( s : if builtins . isList s then "-" else s )
76
- (
77
- builtins . split "[^[:alnum:]+._?=-]+"
78
- ( ( x : builtins . elemAt ( builtins . match "\\ .*(.*)" x ) 0 ) name )
79
- )
80
- ) ;
81
-
82
66
# The set of packages used when specs are fetched using non-builtins.
83
67
mkPkgs = sources : system :
84
68
let
Original file line number Diff line number Diff line change @@ -181,6 +181,8 @@ data SourcesNixVersion
181
181
| -- formatting fix
182
182
-- Apply statix suggestions
183
183
V28
184
+ | -- always use "source" for store path names
185
+ V29
184
186
deriving stock (Bounded , Enum , Eq )
185
187
186
188
-- | A user friendly version
@@ -214,6 +216,7 @@ sourcesVersionToText = \case
214
216
V26 -> " 26"
215
217
V27 -> " 27"
216
218
V28 -> " 28"
219
+ V29 -> " 29"
217
220
218
221
latestVersionMD5 :: T. Text
219
222
latestVersionMD5 = sourcesVersionToMD5 maxBound
@@ -254,6 +257,7 @@ sourcesVersionToMD5 = \case
254
257
V26 -> " 937bff93370a064c9000f13cec5867f9"
255
258
V27 -> " 8031ba9d8fbbc7401c800d0b84278ec8"
256
259
V28 -> " 26ed55356db7673935329210a4f8c4a5"
260
+ V29 -> " 77f9fbf2fe7c64e079862e53145a2af9"
257
261
258
262
-- | The MD5 sum of ./nix/sources.nix
259
263
sourcesNixMD5 :: IO T. Text
You can’t perform that action at this time.
0 commit comments