movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #222002 from marsam/update-dash

Browse source
This commit is contained in:
Bernardo Meurer 2023-03-28 09:17:13 -03:00 • committed by GitHub
commit bd4e35e14a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pkgs/shells/dash/default.nix
View file

@ -1,10 +1,8 @@
{ lib { lib
, stdenv , stdenv
, buildPackages , buildPackages
, autoreconfHook
, pkg-config , pkg-config
, fetchurl , fetchurl
, fetchpatch
, libedit , libedit
, runCommand , runCommand
, dash , dash
@ -12,34 +10,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dash"; pname = "dash";
version = "0.5.11.5"; version = "0.5.12";
src = fetchurl { src = fetchurl {
url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
sha256 = "sha256-23eBEIkfeTeYXym/I0EP4cXWaVAnYPWE5U4OeynhI70="; sha256 = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo=";
}; };
hardeningDisable = [ "format" ];
patches = [
(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 = "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";
})
];
strictDeps = true; strictDeps = true;
# configure.ac patched; remove on next release
nativeBuildInputs = [ autoreconfHook ] nativeBuildInputs = lib.optionals stdenv.hostPlatform.isStatic [ pkg-config ];
++ lib.optionals stdenv.hostPlatform.isStatic [ pkg-config ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ libedit ]; buildInputs = [ libedit ];