From a5f20bfd4af16193fa3d64f111c79097454f845a Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 16 Jun 2021 00:58:52 +0000 Subject: [PATCH] kyotocabinet: 1.2.76 -> 1.2.79 (#126836) Co-authored-by: Sandro --- .../libraries/kyotocabinet/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 4e8aa57d956..153892304e9 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "kyotocabinet-1.2.76"; + pname = "kyotocabinet"; + version = "1.2.79"; src = fetchurl { - url = "http://fallabs.com/kyotocabinet/pkg/${name}.tar.gz"; - sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1"; + url = "https://dbmx.net/kyotocabinet/pkg/kyotocabinet-${version}.tar.gz"; + sha256 = "079ymsahlrijswgwfr2la9yw5h57l752cprhp5dz31iamsj1vyv7"; }; prePatch = lib.optionalString stdenv.isDarwin '' @@ -24,18 +25,12 @@ stdenv.mkDerivation rec { --replace stdc++ c++ ''; - patches = [(fetchurl { - name = "gcc6.patch"; - url = "https://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; - sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23"; - })]; - buildInputs = [ zlib ]; meta = with lib; { - homepage = "http://fallabs.com/kyotocabinet"; + homepage = "https://dbmx.net/kyotocabinet"; description = "A library of routines for managing a database"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; }; }