From 91f818b2be8ada0617e0f79c554d32fe93ac9dd8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 28 Sep 2020 03:24:38 -0300 Subject: [PATCH] Netsurf libnsutils: 0.0.5 -> 0.1.0 --- .../networking/browsers/netsurf/default.nix | 1 + .../browsers/netsurf/libnsutils.nix} | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/applications/{misc/netsurf/libnsutils/default.nix => networking/browsers/netsurf/libnsutils.nix} (60%) diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index 6c35be4c8da..861081077a8 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -6,5 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; { libnsgif = callPackage ./libnsgif.nix { }; libnslog = callPackage ./libnslog.nix { }; libnspsl = callPackage ./libnspsl.nix { }; + libnsutils = callPackage ./libnsutils.nix { }; libparserutils = callPackage ./libparserutils.nix { }; }) diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix similarity index 60% rename from pkgs/applications/misc/netsurf/libnsutils/default.nix rename to pkgs/applications/networking/browsers/netsurf/libnsutils.nix index 6d3a3d1f104..42c8b8b0621 100644 --- a/pkgs/applications/misc/netsurf/libnsutils/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -3,18 +3,17 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libnsutils"; - version = "0.0.5"; + version = "0.1.0"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf"; + sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA="; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ buildsystem]; + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -22,10 +21,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/projects/${libname}/"; description = "Generalised utility library for netsurf browser"; - license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + license = licenses.mit; + maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; platforms = platforms.linux; }; }