diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
| commit | 56e87d10ec12e00eab5c4b5710e01ab50eec267f (patch) | |
| tree | baff33c3da97619d02441379b3f0f369da8f3d5a /nixpkgs/pkgs/tools/graphics/epstool | |
| parent | cc14c6e02d8424c1d446d248f71e08243181af8d (diff) | |
| parent | 3a2786eea085f040a66ecde1bc3ddc7099f6dbeb (diff) | |
| download | nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.gz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.bz2 nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.lz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.xz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.zst nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/tools/graphics/epstool')
| -rw-r--r-- | nixpkgs/pkgs/tools/graphics/epstool/default.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/graphics/epstool/gcc43.patch | 20 |
2 files changed, 3 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/tools/graphics/epstool/default.nix b/nixpkgs/pkgs/tools/graphics/epstool/default.nix index 6910f458a17d..cdb1f75cb2c3 100644 --- a/nixpkgs/pkgs/tools/graphics/epstool/default.nix +++ b/nixpkgs/pkgs/tools/graphics/epstool/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.08"; + version = "3.09"; pname = "epstool"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz"; - sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk"; + url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}.orig.tar.xz"; + hash = "sha256-HoUknRpE+UGLH5Wjrr2LB4TauOSd62QXrJuZbKCPYBE="; }; makeFlags = [ @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { make EPSTOOL_ROOT=$out install ''; - patches = [ ./gcc43.patch ]; - meta = with lib; { description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps"; homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; diff --git a/nixpkgs/pkgs/tools/graphics/epstool/gcc43.patch b/nixpkgs/pkgs/tools/graphics/epstool/gcc43.patch deleted file mode 100644 index 398ce08c5182..000000000000 --- a/nixpkgs/pkgs/tools/graphics/epstool/gcc43.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- epstool-3.08.orig/src/epstool.c 2005-06-10 04:41:00.000000000 -0500 -+++ epstool-3.08/src/epstool.c 2009-02-16 20:55:43.186140029 -0600 -@@ -2824,7 +2824,7 @@ - code = -1; - } - if ((code==0) && stdout_name && (hChildStdoutWr == -1)) { -- handle = open(stdout_name, O_WRONLY | O_CREAT); -+ handle = open(stdout_name, O_WRONLY | O_CREAT, 0644); - hChildStdoutWr = dup2(handle, 1); - if (handle != -1) - close(handle); -@@ -2832,7 +2832,7 @@ - code = -1; - } - if ((code==0) && stderr_name && (hChildStderrWr == -1)) { -- handle = open(stderr_name, O_WRONLY | O_CREAT); -+ handle = open(stderr_name, O_WRONLY | O_CREAT, 0644); - hChildStderrWr = dup2(handle, 2); - if (handle != -1) - close(handle); |