diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-19 09:13:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-19 09:13:54 +0000 |
| commit | 220273ccc689041667ab5ff55fe5b1e93689227a (patch) | |
| tree | d1c95664832920b476ab48ab5dd9ad09ec67d82d /nixpkgs/pkgs/test | |
| parent | 68bab940e926ec7ae7380947a78c581e6aadcd18 (diff) | |
| parent | 6e3ee8957637a60f5072e33d78e05c0f65c54366 (diff) | |
| download | nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.gz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.bz2 nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.lz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.xz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.zst nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.zip | |
Merge commit '6e3ee8957637a60f5072e33d78e05c0f65c54366'
Conflicts: nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
Diffstat (limited to 'nixpkgs/pkgs/test')
| -rw-r--r-- | nixpkgs/pkgs/test/make-wrapper/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/test/make-wrapper/default.nix b/nixpkgs/pkgs/test/make-wrapper/default.nix index 6e70945ee194..62ccd272adf4 100644 --- a/nixpkgs/pkgs/test/make-wrapper/default.nix +++ b/nixpkgs/pkgs/test/make-wrapper/default.nix @@ -64,6 +64,7 @@ runCommand "make-wrapper-test" (mkWrapperBinary { name = "test-run-and-set"; args = [ "--run" "export VAR=foo" "--set" "VAR" "bar" ]; }) (mkWrapperBinary { name = "test-args"; args = [ "--add-flags" "abc" ]; wrapped = wrappedBinaryArgs; }) (mkWrapperBinary { name = "test-prefix"; args = [ "--prefix" "VAR" ":" "abc" ]; }) + (mkWrapperBinary { name = "test-prefix-noglob"; args = [ "--prefix" "VAR" ":" "./*" ]; }) (mkWrapperBinary { name = "test-suffix"; args = [ "--suffix" "VAR" ":" "abc" ]; }) (mkWrapperBinary { name = "test-prefix-and-suffix"; args = [ "--prefix" "VAR" ":" "foo" "--suffix" "VAR" ":" "bar" ]; }) (mkWrapperBinary { name = "test-prefix-multi"; args = [ "--prefix" "VAR" ":" "abc:foo:foo" ]; }) @@ -112,6 +113,8 @@ runCommand "make-wrapper-test" # Only append the value once when given multiple times in a parameter # to makeWrapper + mkTest "test-prefix" "VAR=abc" + # --prefix doesn't expand globs + + mkTest "VAR=f?oo test-prefix-noglob" "VAR=./*:f?oo" # --suffix works |