about summary refs log tree commit diff
path: root/pkgs/applications/misc/netsurf
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-08-25 14:57:11 +0200
committerVladimír Čunát <v@cunat.cz>2019-08-25 14:57:11 +0200
commit985d1ac425735963d396e1c09dd49ad111813649 (patch)
tree38a90f65d3bf5906ef020ef2c9482565325e850e /pkgs/applications/misc/netsurf
parentbc238b8df55bad9d8a436e120615cc5cfbbb78dc (diff)
parentf188bad6eaf26ebee19d02df03b1c6ae56c4d7f6 (diff)
downloadnixlib-985d1ac425735963d396e1c09dd49ad111813649.tar
nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.gz
nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.bz2
nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.lz
nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.xz
nixlib-985d1ac425735963d396e1c09dd49ad111813649.tar.zst
nixlib-985d1ac425735963d396e1c09dd49ad111813649.zip
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
Diffstat (limited to 'pkgs/applications/misc/netsurf')
-rw-r--r--pkgs/applications/misc/netsurf/buildsystem/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index 24377028ce7d..36d5a70735a7 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   pname = "netsurf-buildsystem";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz";
-    sha256 = "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw";
+    sha256 = "0ffdjwskxlnh8sk40qqfgksbb1nrdzfxsshrscra0p4nqpkj98z6";
   };
 
   makeFlags = [