diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-07-15 19:51:30 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-07-15 19:51:30 +0200 |
| commit | 3368e885d8ce16ff7de272114d773a9514760358 (patch) | |
| tree | 3ccecaad7c0d858a8b7fe75c9f4227f0d6a60b29 /pkgs/misc | |
| parent | 297f9c65abc0925857e021195bd07c4d99b642a5 (diff) | |
| parent | 4e5bdca6872861d66a6866bdd5fba435291ea883 (diff) | |
Merge #241951: staging-next 2023-07-06
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/beep/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/cups/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index fe04d28aa9de0..31fbb82cc3573 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}"]; + # causes redefinition of _FORTIFY_SOURCE + hardeningDisable = [ "fortify3" ]; + meta = with lib; { description = "The advanced PC speaker beeper"; homepage = "https://github.com/spkr-beep/beep"; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 7c809f0c964ce..99d56af97c3d0 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-mkBN5V90UlsKaFHfDP3r+hIVrsDnwve+a5sJtpFvsAA="; + sha256 = "sha256-WOlwzxlV4cyH0IR8MlJtnCzO4zXl8OOIKygxOLoOcmI="; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index ad1f3e8e1e44a..e66b44bad0cb9 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.01.1"; + version = "10.01.2"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; - hash = "sha512-2US+norvaNEXbWTEDbb6htVdDJ4wBH8hR8AoBqthz+msLLANTlshj/PFHMbtR87/4brE3Z1MwXYLeXTzDGwnNQ=="; + hash = "sha512-7iDw4S9VOj0EV45xoNRd7+vHERfOTcLBQEOYW/5zSK1/iy/pj8m09bk17LMuUNw0C+Z9bvWBkFQuxtD52h3jgA=="; }; patches = [ @@ -141,6 +141,7 @@ stdenv.mkDerivation rec { dylib_version = lib.versions.majorMinor version; preFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gs + install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gsx ''; # validate dynamic linkage @@ -149,6 +150,7 @@ stdenv.mkDerivation rec { runHook preInstallCheck $out/bin/gs --version + $out/bin/gsx --version pushd examples for f in *.{ps,eps,pdf}; do echo "Rendering $f" |