diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-08 18:01:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 18:01:37 +0000 |
| commit | a84ab6724a42158c8b1face3b63a4e375aa186c5 (patch) | |
| tree | b8b49577d341eb57f631d3b1e982a1fda54185fd /pkgs/build-support | |
| parent | 13bd2afb65ec7a9af80514d223086419d88a96ca (diff) | |
| parent | 31efc58eb070fb18b68a75ee2724172788c01b78 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/coq/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/mkshell/default.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 5f2b5e646b0bb..05f6e7762a077 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -57,7 +57,8 @@ let ] "") + optionalString (v == null) "-broken"; append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; prefix-name = foldl append-version "" namePrefix; - var-coqlib-install = (optionalString (versions.isGe "8.7" coq.coq-version) "COQMF_") + "COQLIB"; + var-coqlib-install = + (optionalString (versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev") "COQMF_") + "COQLIB"; useDune2 = args.useDune2 or (useDune2ifVersion fetched.version); in diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index f85a11394cb57..27ee7e3226241 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -16,7 +16,7 @@ let mergeInputs = name: (attrs.${name} or []) ++ - (lib.subtractLists inputsFrom (lib.catAttrs name inputsFrom)); + (lib.subtractLists inputsFrom (lib.flatten (lib.catAttrs name inputsFrom))); rest = builtins.removeAttrs attrs [ "packages" |