diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 13:18:04 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 13:18:04 +0100 |
commit | 5ca7a7d8825388ecb82043614ebcdeeb75e6f574 (patch) | |
tree | 1256fc94f300861713d7b5aa65f23e28b13a92ce /pkgs/development/libraries | |
parent | fb0da935095f6e7a194d1ec05c7355e8d47fed0c (diff) | |
parent | 6e02629a35ae64bbf56d06eb0ea38d9de1ed6e71 (diff) | |
download | nixpkgs-5ca7a7d8825388ecb82043614ebcdeeb75e6f574.tar nixpkgs-5ca7a7d8825388ecb82043614ebcdeeb75e6f574.tar.gz nixpkgs-5ca7a7d8825388ecb82043614ebcdeeb75e6f574.tar.bz2 nixpkgs-5ca7a7d8825388ecb82043614ebcdeeb75e6f574.tar.lz nixpkgs-5ca7a7d8825388ecb82043614ebcdeeb75e6f574.tar.xz nixpkgs-5ca7a7d8825388ecb82043614ebcdeeb75e6f574.tar.zst nixpkgs-5ca7a7d8825388ecb82043614ebcdeeb75e6f574.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries')
5 files changed, 32 insertions, 12 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 75897b036bf..b3e8ec2e178 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -63,6 +63,9 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch"; sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly"; }) + + # Remove gegl:simple / backend-file test that times out frequently + ./patches/no-simple-backend-file-test.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch new file mode 100644 index 00000000000..bf07572182b --- /dev/null +++ b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch @@ -0,0 +1,10 @@ +diff --git a/tests/simple/meson.build b/tests/simple/meson.build +index 2c735d80a..ae4d50f2a 100644 +--- a/tests/simple/meson.build ++++ b/tests/simple/meson.build +@@ -1,5 +1,4 @@ + testnames = [ +- 'backend-file', + 'buffer-cast', + 'buffer-changes', + 'buffer-extract', diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index b1a2524065a..4697f28bb9f 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -1,20 +1,25 @@ { stdenv , lib -, fetchurl +, fetchgit +, autoreconfHook , optimize ? false # impure hardware optimizations }: stdenv.mkDerivation rec { pname = "gf2x"; - version = "1.2"; # remember to also update the url + version = "1.3.0"; - src = fetchurl { - # find link to latest version (with file id) here: https://gforge.inria.fr/projects/gf2x/ - # Requested a predictable link: - # https://gforge.inria.fr/tracker/index.php?func=detail&aid=21704&group_id=1874&atid=6982 - url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-${version}.tar.gz"; - sha256 = "0d6vh1mxskvv3bxl6byp7gxxw3zzpkldrxnyajhnl05m0gx7yhk1"; + # upstream has plans to move to gitlab: + # https://github.com/NixOS/nixpkgs/pull/45299#issuecomment-564477936 + src = fetchgit { + url = "https://scm.gforge.inria.fr/anonscm/git/gf2x/gf2x.git"; + rev = "gf2x-${version}"; + sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id"; }; + nativeBuildInputs = [ + autoreconfHook + ]; + # no actual checks present yet (as of 1.2), but can't hurt trying # for an indirect test, run ntl's test suite doCheck = true; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index fd17267b615..0fa5c3a7db0 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.19.1"; + version = "0.19.3"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0cjscv68nnqivzba94xapx1c970j1jbdbm0h3g2ym9i0hgnyyhha"; + sha256 = "0fml6whdbfcwc8nfjhvrnidkscv6q2x988zf3alfjl2mdpw4jgd4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 10e59c5117c..699931b686b 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { pname = "ntl"; - version = "11.4.1"; + version = "11.4.2"; src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "03k2hb6yn49d1f9cdig2ci7h5ga0x3nb3li60hh19wdqzg28f1m3"; + sha256 = "11r3f37psdbjw926kf6bn5bp69aj88f5cchvv1xh2bhrcjdp4r1b"; }; buildInputs = [ @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { # Upstream contact: maintainer is victorshoup on GitHub. Alternatively the # email listed on the homepage. homepage = http://www.shoup.net/ntl/; + # also locally at "${src}/doc/tour-changes.html"; + changelog = "https://www.shoup.net/ntl/doc/tour-changes.html"; maintainers = with maintainers; [ timokau ]; license = licenses.gpl2Plus; platforms = platforms.all; |