1010 let
1111 name' = sanitizeName name + "-src" ;
1212 in
13- if spec . builtin or true then
14- builtins_fetchurl { inherit ( spec ) url sha256 ; name = name' ; }
15- else
16- pkgs . fetchurl { inherit ( spec ) url sha256 ; name = name' ; } ;
13+ if spec . builtin or true then
14+ builtins_fetchurl { inherit ( spec ) url sha256 ; name = name' ; }
15+ else
16+ pkgs . fetchurl { inherit ( spec ) url sha256 ; name = name' ; } ;
1717
1818 fetch_tarball = pkgs : name : spec :
1919 let
2020 name' = sanitizeName name + "-src" ;
2121 in
22- if spec . builtin or true then
23- builtins_fetchTarball { name = name' ; inherit ( spec ) url sha256 ; }
24- else
25- pkgs . fetchzip { name = name' ; inherit ( spec ) url sha256 ; } ;
22+ if spec . builtin or true then
23+ builtins_fetchTarball { name = name' ; inherit ( spec ) url sha256 ; }
24+ else
25+ pkgs . fetchzip { name = name' ; inherit ( spec ) url sha256 ; } ;
2626
2727 fetch_git = name : spec :
2828 let
2929 ref =
30- if spec ? ref then spec . ref else
30+ spec . ref or (
3131 if spec ? branch then "refs/heads/${ spec . branch } " else
32- if spec ? tag then "refs/tags/${ spec . tag } " else
33- abort "In git source '${ name } ': Please specify `ref`, `tag` or `branch`!" ;
32+ if spec ? tag then "refs/tags/${ spec . tag } " else
33+ abort "In git source '${ name } ': Please specify `ref`, `tag` or `branch`!"
34+ ) ;
35+ submodules = spec . submodules or false ;
36+ submoduleArg =
37+ let
38+ nixSupportsSubmodules = builtins . compareVersions builtins . nixVersion "2.4" >= 0 ;
39+ emptyArgWithWarning =
40+ if submodules
41+ then
42+ builtins . trace
43+ (
44+ "The niv input \" ${ name } \" uses submodules "
45+ + "but your nix's (${ builtins . nixVersion } ) builtins.fetchGit "
46+ + "does not support them"
47+ )
48+ { }
49+ else { } ;
50+ in
51+ if nixSupportsSubmodules
52+ then { inherit submodules ; }
53+ else emptyArgWithWarning ;
3454 in
35- builtins . fetchGit { url = spec . repo ; inherit ( spec ) rev ; inherit ref ; } ;
55+ builtins . fetchGit
56+ ( { url = spec . repo ; inherit ( spec ) rev ; inherit ref ; } // submoduleArg ) ;
3657
3758 fetch_local = spec : spec . path ;
3859
6687 hasNixpkgsPath = builtins . any ( x : x . prefix == "nixpkgs" ) builtins . nixPath ;
6788 hasThisAsNixpkgsPath = <nixpkgs> == ./. ;
6889 in
69- if builtins . hasAttr "nixpkgs" sources
70- then sourcesNixpkgs
71- else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
72- import <nixpkgs> { }
73- else
74- abort
75- ''
76- Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
77- add a package called "nixpkgs" to your sources.json.
78- '' ;
90+ if builtins . hasAttr "nixpkgs" sources
91+ then sourcesNixpkgs
92+ else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
93+ import <nixpkgs> { }
94+ else
95+ abort
96+ ''
97+ Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
98+ add a package called "nixpkgs" to your sources.json.
99+ '' ;
79100
80101 # The actual fetching function.
81102 fetch = pkgs : name : spec :
95116 # the path directly as opposed to the fetched source.
96117 replace = name : drv :
97118 let
98- saneName = stringAsChars ( c : if isNull ( builtins . match "[a-zA-Z0-9]" c ) then "_" else c ) name ;
119+ saneName = stringAsChars ( c : if ( builtins . match "[a-zA-Z0-9]" c ) == null then "_" else c ) name ;
99120 ersatz = builtins . getEnv "NIV_OVERRIDE_${ saneName } " ;
100121 in
101- if ersatz == "" then drv else
102- # this turns the string into an actual Nix path (for both absolute and
103- # relative paths)
104- if builtins . substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins . getEnv "PWD" + "/${ ersatz } " ;
122+ if ersatz == "" then drv else
123+ # this turns the string into an actual Nix path (for both absolute and
124+ # relative paths)
125+ if builtins . substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins . getEnv "PWD" + "/${ ersatz } " ;
105126
106127 # Ports of functions for older nix versions
107128
112133 ) ;
113134
114135 # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
115- range = first : last : if first > last then [ ] else builtins . genList ( n : first + n ) ( last - first + 1 ) ;
136+ range = first : last : if first > last then [ ] else builtins . genList ( n : first + n ) ( last - first + 1 ) ;
116137
117138 # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
118139 stringToCharacters = s : map ( p : builtins . substring p 1 s ) ( range 0 ( builtins . stringLength s - 1 ) ) ;
@@ -123,43 +144,46 @@ let
123144 concatStrings = builtins . concatStringsSep "" ;
124145
125146 # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
126- optionalAttrs = cond : as : if cond then as else { } ;
147+ optionalAttrs = cond : as : if cond then as else { } ;
127148
128149 # fetchTarball version that is compatible between all the versions of Nix
129150 builtins_fetchTarball = { url , name ? null , sha256 } @attrs :
130151 let
131152 inherit ( builtins ) lessThan nixVersion fetchTarball ;
132153 in
133- if lessThan nixVersion "1.12" then
134- fetchTarball ( { inherit url ; } // ( optionalAttrs ( ! isNull name ) { inherit name ; } ) )
135- else
136- fetchTarball attrs ;
154+ if lessThan nixVersion "1.12" then
155+ fetchTarball ( { inherit url ; } // ( optionalAttrs ( name != null ) { inherit name ; } ) )
156+ else
157+ fetchTarball attrs ;
137158
138159 # fetchurl version that is compatible between all the versions of Nix
139160 builtins_fetchurl = { url , name ? null , sha256 } @attrs :
140161 let
141162 inherit ( builtins ) lessThan nixVersion fetchurl ;
142163 in
143- if lessThan nixVersion "1.12" then
144- fetchurl ( { inherit url ; } // ( optionalAttrs ( ! isNull name ) { inherit name ; } ) )
145- else
146- fetchurl attrs ;
164+ if lessThan nixVersion "1.12" then
165+ fetchurl ( { inherit url ; } // ( optionalAttrs ( name != null ) { inherit name ; } ) )
166+ else
167+ fetchurl attrs ;
147168
148169 # Create the final "sources" from the config
149170 mkSources = config :
150- mapAttrs (
151- name : spec :
152- if builtins . hasAttr "outPath" spec
153- then abort
154- "The values in sources.json should not have an 'outPath' attribute"
155- else
156- spec // { outPath = replace name ( fetch config . pkgs name spec ) ; }
157- ) config . sources ;
171+ mapAttrs
172+ (
173+ name : spec :
174+ if builtins . hasAttr "outPath" spec
175+ then
176+ abort
177+ "The values in sources.json should not have an 'outPath' attribute"
178+ else
179+ spec // { outPath = replace name ( fetch config . pkgs name spec ) ; }
180+ )
181+ config . sources ;
158182
159183 # The "config" used by the fetchers
160184 mkConfig =
161185 { sourcesFile ? if builtins . pathExists ./sources.json then ./sources.json else null
162- , sources ? if isNull sourcesFile then { } else builtins . fromJSON ( builtins . readFile sourcesFile )
186+ , sources ? if sourcesFile == null then { } else builtins . fromJSON ( builtins . readFile sourcesFile )
163187 , system ? builtins . currentSystem
164188 , pkgs ? mkPkgs sources system
165189 } : rec {
171195 } ;
172196
173197in
174- mkSources ( mkConfig { } ) // { __functor = _ : settings : mkSources ( mkConfig settings ) ; }
198+ mkSources ( mkConfig { } ) // { __functor = _ : settings : mkSources ( mkConfig settings ) ; }
0 commit comments