diff options
| author | Emily <vcs@emily.moe> | 2021-09-14 04:18:32 +0100 |
|---|---|---|
| committer | Emily <vcs@emily.moe> | 2021-09-14 04:18:32 +0100 |
| commit | d9d051ecd9c8fa5d32644f41a695f4d95645a61d (patch) | |
| tree | 5ebd89daf46b1667bed9b718102989fdef85e3ea /pkgs/shells/dash | |
| parent | 83c4c7ea5b400ec19052d6aff08d1424bcd33504 (diff) | |
| download | nixpkgs-d9d051ecd9c8fa5d32644f41a695f4d95645a61d.tar nixpkgs-d9d051ecd9c8fa5d32644f41a695f4d95645a61d.tar.gz nixpkgs-d9d051ecd9c8fa5d32644f41a695f4d95645a61d.tar.bz2 nixpkgs-d9d051ecd9c8fa5d32644f41a695f4d95645a61d.tar.lz nixpkgs-d9d051ecd9c8fa5d32644f41a695f4d95645a61d.tar.xz nixpkgs-d9d051ecd9c8fa5d32644f41a695f4d95645a61d.tar.zst nixpkgs-d9d051ecd9c8fa5d32644f41a695f4d95645a61d.zip | |
dash: use fetchpatch
Diffstat (limited to 'pkgs/shells/dash')
| -rw-r--r-- | pkgs/shells/dash/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index f044c41b73d..fa954a4921c 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, libedit }: +{ lib +, stdenv +, buildPackages +, autoreconfHook +, fetchurl +, fetchpatch +, libedit +}: stdenv.mkDerivation rec { pname = "dash"; @@ -12,11 +19,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; patches = [ - (fetchurl { + (fetchpatch { # Dash executes code when noexec ("-n") is specified # https://www.openwall.com/lists/oss-security/2020/11/11/3 url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; - sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5"; + sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1"; }) ] ++ lib.optionals stdenv.isDarwin [ # Temporary fix until a proper one is accepted upstream |