git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Don't require materialized spdx fixes #1515 (#1516)
7c26ef0Hamish Mackenzie
lib/spdx/licenses.nix+4−4
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -1,12 +1,12 @@
1pkgs:
1pkgs:
2with builtins; let
2with builtins; let
3− materialized = ../../materialized + "/spdx-${pkgs.evalPackages.spdx-license-list-data.version}";
3+ materialized' = ../../materialized + "/spdx-${pkgs.evalPackages.spdx-license-list-data.version}";
4 licensesJSON = fromJSON (replaceStrings
4 licensesJSON = fromJSON (replaceStrings
5 [ "\\u0026" "\\u0027" "\\u003d" ]
5 [ "\\u0026" "\\u0027" "\\u003d" ]
6 [ "&" "'" "=" ]
6 [ "&" "'" "=" ]
7− (readFile "${pkgs.evalPackages.haskell-nix.materialize (pkgs.lib.optionalAttrs (pathExists materialized) {
7+ (readFile "${pkgs.evalPackages.haskell-nix.materialize {
8− inherit materialized;
8+ materialized = if pathExists materialized' then materialized' else null;
9− }) (pkgs.evalPackages.runCommand "spdx-json" {} ''
9+ } (pkgs.evalPackages.runCommand "spdx-json" {} ''
10 mkdir $out
10 mkdir $out
11 cp ${pkgs.evalPackages.spdx-license-list-data.json or pkgs.evalPackages.spdx-license-list-data}/json/licenses.json $out
11 cp ${pkgs.evalPackages.spdx-license-list-data.json or pkgs.evalPackages.spdx-license-list-data}/json/licenses.json $out
12 '')
12 '')