summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-01-30 15:19:44 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2020-01-30 15:19:44 +0100
commitabefd4f78a0af8bef6fe57b3348742db29ec2a1e (patch)
tree358324e9c40ec17573835cdd4f836a709bf0dc2a /pkgs
parent1203742766b1bf9f0eede2b44f8397cbda478c87 (diff)
downloadnixpkgs-abefd4f78a0af8bef6fe57b3348742db29ec2a1e.tar
nixpkgs-abefd4f78a0af8bef6fe57b3348742db29ec2a1e.tar.gz
nixpkgs-abefd4f78a0af8bef6fe57b3348742db29ec2a1e.tar.bz2
nixpkgs-abefd4f78a0af8bef6fe57b3348742db29ec2a1e.tar.lz
nixpkgs-abefd4f78a0af8bef6fe57b3348742db29ec2a1e.tar.xz
nixpkgs-abefd4f78a0af8bef6fe57b3348742db29ec2a1e.tar.zst
nixpkgs-abefd4f78a0af8bef6fe57b3348742db29ec2a1e.zip
pspp: 1.0.1 -> 1.2.0, fix build w/glibc-2.30
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/science/math/pspp/default.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix
index 3c263916a0e..af338c74fd4 100644
--- a/pkgs/applications/science/math/pspp/default.nix
+++ b/pkgs/applications/science/math/pspp/default.nix
@@ -1,20 +1,23 @@
 { stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
 , pkgconfig, gtksourceview, pango, gettext, dconf
 , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
+, texinfo, ssw
 }:
 
 stdenv.mkDerivation rec {
-  name = "pspp-1.0.1";
+  pname = "pspp";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "mirror://gnu/pspp/${name}.tar.gz";
-    sha256 = "1r8smr5057993h90nx0mdnff8nxw9x546zzh6qpy4h3xblp1la5s";
+    url = "mirror://gnu/pspp/${pname}-${version}.tar.gz";
+    sha256 = "07pp27zycrb5x927jwaj9r3q7hy915jh51xs85zxby6gfiwl63m5";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig texinfo ];
   buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl
     gtksourceview pango gettext
-    makeWrapper gsettings-desktop-schemas hicolor-icon-theme ];
+    makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw
+  ];
 
   doCheck = false;