From e8e0cb193e4296d834face2f2831d3df9e49e3b4 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 30 Aug 2017 10:01:32 +0200 Subject: [PATCH] pspp: 0.8.3 -> 1.0.1 --- .../science/math/{pssp => pspp}/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/applications/science/math/{pssp => pspp}/default.nix (75%) diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pspp/default.nix similarity index 75% rename from pkgs/applications/science/math/pssp/default.nix rename to pkgs/applications/science/math/pspp/default.nix index 02d24d601b1..e899548217f 100644 --- a/pkgs/applications/science/math/pssp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk2, gsl -, pkgconfig, gtksourceview, pango, gettext, libglade +{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl +, pkgconfig, gtksourceview, pango, gettext }: stdenv.mkDerivation rec { - name = "pspp-0.8.3"; + name = "pspp-1.0.1"; src = fetchurl { url = "mirror://gnu/pspp/${name}.tar.gz"; - sha256 = "0vri2pzvmm38qaihfvwlry30f40lcnps4blg59ixic4q20ldxf5d"; + sha256 = "1r8smr5057993h90nx0mdnff8nxw9x546zzh6qpy4h3xblp1la5s"; }; - buildInputs = [ libxml2 readline zlib perl cairo gtk2 gsl pkgconfig - gtksourceview pango gettext libglade ]; + buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl pkgconfig + gtksourceview pango gettext ]; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65e4976a1c5..467ffa891fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18415,8 +18415,8 @@ with pkgs; pcalc = callPackage ../applications/science/math/pcalc { }; - pspp = callPackage ../applications/science/math/pssp { - inherit (gnome2) libglade gtksourceview; + pspp = callPackage ../applications/science/math/pspp { + inherit (gnome3) gtksourceview; }; singular = callPackage ../applications/science/math/singular {};