diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/shells/dash/default.nix | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/shells/dash/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/shells/dash/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/shells/dash/default.nix b/nixpkgs/pkgs/shells/dash/default.nix index 030e5695b225..bc270daf09cf 100644 --- a/nixpkgs/pkgs/shells/dash/default.nix +++ b/nixpkgs/pkgs/shells/dash/default.nix @@ -1,17 +1,25 @@ { stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.11.2"; + pname = "dash"; + version = "0.5.11.2"; src = fetchurl { - url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; + url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; }; hardeningDisable = [ "format" ]; # Temporary fix until a proper one is accepted upstream - patches = stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + patches = [ + (fetchurl { + # 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"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; |