diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-02-09 16:40:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 16:40:16 +0100 |
| commit | 3846896084f137764100035da198e31be47c26b1 (patch) | |
| tree | f5c49b2f051badb381ad913aa6c0ae40a7715fa7 /pkgs/applications/science | |
| parent | fa7445532900f2555435076c1e7dce0684daa01a (diff) | |
| parent | 531a48ebdb333b65f0de11c9622ade19f2962990 (diff) | |
| download | nixlib-3846896084f137764100035da198e31be47c26b1.tar nixlib-3846896084f137764100035da198e31be47c26b1.tar.gz nixlib-3846896084f137764100035da198e31be47c26b1.tar.bz2 nixlib-3846896084f137764100035da198e31be47c26b1.tar.lz nixlib-3846896084f137764100035da198e31be47c26b1.tar.xz nixlib-3846896084f137764100035da198e31be47c26b1.tar.zst nixlib-3846896084f137764100035da198e31be47c26b1.zip | |
Merge pull request #79293 from NixOS/staging-next
Staging next (with glibc 2.30)
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/pspp/default.nix | 13 |
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 3c263916a0eb..af338c74fd41 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; |