diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-02-05 13:41:09 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-02-05 13:41:09 +0100 |
| commit | 48a997cd76c8f141938cf98f82a867d0cf88fec2 (patch) | |
| tree | 78469b48c8ca2451134c411b689902ed4d046414 /pkgs/applications/science | |
| parent | 15021db2fa441d7fa73538dd0e46e9d74731ace8 (diff) | |
| parent | 5ca088f1cc4216fe4a11a769ec5d55343a3f978a (diff) | |
| download | nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.gz nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.bz2 nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.lz nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.xz nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.tar.zst nixlib-48a997cd76c8f141938cf98f82a867d0cf88fec2.zip | |
Merge #66528: glibc: 2.27 -> 2.30 (into staging)
Includes update of stdenv bootstap tools (for three main platforms) and many package fixes with new glibc.
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; |