From d1e5d5012fdad05935662ef47865ad956db4ed53 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 28 Sep 2020 03:10:13 -0300 Subject: [PATCH] Netsurf libnslog: 0.1.2 -> 0.1.3 --- .../networking/browsers/netsurf/default.nix | 1 + .../browsers/netsurf/libnslog.nix} | 17 +++++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) rename pkgs/applications/{misc/netsurf/libnslog/default.nix => networking/browsers/netsurf/libnslog.nix} (62%) diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index cc97ea658e4a..db55e4026575 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -4,5 +4,6 @@ lib.makeScope pkgs.newScope (self: with self; { buildsystem = callPackage ./buildsystem.nix { }; libnsbmp = callPackage ./libnsbmp.nix { }; libnsgif = callPackage ./libnsgif.nix { }; + libnslog = callPackage ./libnslog.nix { }; libparserutils = callPackage ./libparserutils.nix { }; }) diff --git a/pkgs/applications/misc/netsurf/libnslog/default.nix b/pkgs/applications/networking/browsers/netsurf/libnslog.nix similarity index 62% rename from pkgs/applications/misc/netsurf/libnslog/default.nix rename to pkgs/applications/networking/browsers/netsurf/libnslog.nix index 43b4622ab03a..12fdcff50bd3 100644 --- a/pkgs/applications/misc/netsurf/libnslog/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnslog.nix @@ -3,20 +3,17 @@ }: stdenv.mkDerivation rec { - - name = "netsurf-${libname}-${version}"; + pname = "netsurf-${libname}"; libname = "libnslog"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd"; + sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; }; nativeBuildInputs = [ pkgconfig bison flex ]; - buildInputs = [ - buildsystem - ]; + buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" @@ -24,10 +21,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "http://www.netsurf-browser.org/"; + homepage = "https://www.netsurf-browser.org/"; description = "NetSurf Parametric Logging Library"; - license = licenses.mit; - maintainers = [ maintainers.samueldr ]; + license = licenses.isc; + maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; platforms = platforms.linux; }; }