diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/shells/dash/default.nix | |
parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/shells/dash/default.nix')
-rw-r--r-- | nixpkgs/pkgs/shells/dash/default.nix | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/shells/dash/default.nix b/nixpkgs/pkgs/shells/dash/default.nix index f044c41b73d6..2a0d73145607 100644 --- a/nixpkgs/pkgs/shells/dash/default.nix +++ b/nixpkgs/pkgs/shells/dash/default.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, libedit }: +{ lib +, stdenv +, buildPackages +, autoreconfHook +, fetchurl +, fetchpatch +, libedit +}: stdenv.mkDerivation rec { pname = "dash"; - version = "0.5.11.2"; + version = "0.5.11.4"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; - sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; + sha256 = "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af"; }; 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"; + }) + + # aarch64-darwin fix from upstream; remove on next release + (fetchpatch { + url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=6f6d1f2da03468c0e131fdcbdcfa9771ffca2614"; + sha256 = "16iz2ylkyhpxqq411ns8pjk8rizh6afhavvsf052wvzsnmmlvfbw"; }) - ] ++ lib.optionals stdenv.isDarwin [ - # Temporary fix until a proper one is accepted upstream - ./0001-fix-dirent64-et-al-on-darwin.patch ]; + # configure.ac patched; remove on next release + nativeBuildInputs = [ autoreconfHook ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; buildInputs = [ libedit ]; configureFlags = [ "--with-libedit" ]; |