diff options
| author | taku0 <taku0@users.noreply.github.com> | 2021-03-03 19:35:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 19:35:16 +0900 |
| commit | 61706fc470d0838064f3453630468cefd685b090 (patch) | |
| tree | 034fc3d86eb6bc2c5e1ed5908057360645747636 /pkgs | |
| parent | c16de94bd9abead5459fafde0a249f434f8b6b04 (diff) | |
| parent | 17cc2e7543946262fc33929dc85feac3b66b46d0 (diff) | |
| download | nixpkgs-61706fc470d0838064f3453630468cefd685b090.tar nixpkgs-61706fc470d0838064f3453630468cefd685b090.tar.gz nixpkgs-61706fc470d0838064f3453630468cefd685b090.tar.bz2 nixpkgs-61706fc470d0838064f3453630468cefd685b090.tar.lz nixpkgs-61706fc470d0838064f3453630468cefd685b090.tar.xz nixpkgs-61706fc470d0838064f3453630468cefd685b090.tar.zst nixpkgs-61706fc470d0838064f3453630468cefd685b090.zip | |
Merge pull request #114853 from lourkeur/fix-string-escaping
nixos/kresd, nixos/dokuwiki, tests/fpm, build-bazel-package, libcutl: fix string escaping
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/build-bazel-package/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcutl/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 3be72bd22c3..988298ac72b 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -108,8 +108,8 @@ in stdenv.mkDerivation (fBuildAttrs // { rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker} ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""} rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker} - ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\@local_config_cc.marker}" else ""} - ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\@local_*.marker}" else ""} + ${if removeLocalConfigCc then "rm -rf $bazelOut/external/{local_config_cc,\\@local_config_cc.marker}" else ""} + ${if removeLocal then "rm -rf $bazelOut/external/{local_*,\\@local_*.marker}" else ""} # Clear markers find $bazelOut/external -name '@*\.marker' -exec sh -c 'echo > {}' \; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index 7a5c3984929..ed6aae0f308 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { license = licenses.mit; }; - majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]+)\.*" "${version}" ); + majmin = builtins.head ( builtins.match "([[:digit:]]\\.[[:digit:]]+).*" "${version}" ); src = fetchurl { url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2"; sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j"; |