nur-packages

commit 02fbceae28488f952bd51cdb4fcaa3cb967b9c36
parent 614cbb70ce4caca9743c79b9967d897699ea0b20
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Tue,  9 Mar 2021 21:11:32 +0300

Up

Diffstat:
M
pkgs/applications/gpxsee/bin.nix
 | 
6
++++--
M
pkgs/applications/misc/klogg/bin.nix
 | 
12
++++++------
M
pkgs/applications/networking/qutebrowser/bin.nix
 | 
6
+++---
M
pkgs/garmin/basecamp/default.nix
 | 
4
++--
M
pkgs/gis/qgis/bin.nix
 | 
12
++++++------

5 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix
@@ -13,9 +13,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ undmg ];
 
+  sourceRoot = ".";
+
   installPhase = ''
-    mkdir -p $out/Applications/GPXSee.app
-    cp -r . $out/Applications/GPXSee.app
+    mkdir -p $out/Applications
+    cp -r *.app $out/Applications
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/klogg/bin.nix b/pkgs/applications/misc/klogg/bin.nix
@@ -16,10 +16,10 @@ let
     owner = "variar";
     repo = "klogg";
     version = "v${version}";
-    name = "klogg-${version}.0.808-${suffix}";
+    name = "klogg-${version}.0.813-${suffix}";
     sha256 = {
-      x86_64-linux = "00xsqhw7dbvnwksl8ll612vn2h604z95syfa75sfc8ha8dsnvcdh";
-      x86_64-darwin = "0ig39sqiamrlaf0chn81bbi6z0gy7q0nr8qgaxzzy9ny7j8svip6";
+      x86_64-linux = "1m0yl6bd6ahxqljqfjvd6p9nm4vyr4pyrr1qzm70nn2rn4vi4w83";
+      x86_64-darwin = "07iyg1i6n5ydg99q75wlbl1jh1n1cdjl3rbia2kx6y7dg80lx0d1";
     }.${system} or throwSystem;
   };
 
@@ -50,11 +50,11 @@ let
 
     nativeBuildInputs = [ undmg ];
 
-    sourceRoot = "klogg.app";
+    sourceRoot = ".";
 
     installPhase = ''
-      mkdir -p $out/Applications/klogg.app
-      cp -r . $out/Applications/klogg.app
+      mkdir -p $out/Applications
+      cp -r *.app $out/Applications
     '';
   };
 in
diff --git a/pkgs/applications/networking/qutebrowser/bin.nix b/pkgs/applications/networking/qutebrowser/bin.nix
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ undmg ];
 
-  sourceRoot = "qutebrowser.app";
+  sourceRoot = ".";
 
   installPhase = ''
-    mkdir -p $out/Applications/qutebrowser.app
-    cp -r . $out/Applications/qutebrowser.app
+    mkdir -p $out/Applications
+    cp -r *.app $out/Applications
   '';
 
   meta = with lib; {
diff --git a/pkgs/garmin/basecamp/default.nix b/pkgs/garmin/basecamp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "basecamp";
-  version = "4.8.10";
+  version = "4.8.11";
 
   src = fetchurl {
     url = "https://download.garmin.com/software/BaseCampforMac_${lib.replaceStrings [ "." ] [ "" ] version}.dmg";
-    sha256 = "09jrbix42a6aqv8vd4hcrvhfnj9y7l17xm7hdyc6p1nmb859y5ri";
+    sha256 = "1ql049xxb7021qssn55hj8f49bzhriia0yvcv5xs3vrya7ymmhgn";
   };
 
   preferLocalBuild = true;
diff --git a/pkgs/gis/qgis/bin.nix b/pkgs/gis/qgis/bin.nix
@@ -5,15 +5,15 @@ assert lib.assertOneOf "releaseType" releaseType [ "pr" "ltr" ];
 stdenv.mkDerivation rec {
   pname = "qgis-bin";
   version = {
-    pr = "3.16.4";
-    ltr = "3.10.14";
+    pr = "3.18.0";
+    ltr = "3.16.4";
   }.${releaseType};
 
   src = fetchurl {
     url = "https://qgis.org/downloads/macos/qgis-macos-${releaseType}.dmg";
     sha256 = {
       pr = "19xan98lzzmlbzs5m2filma1j6mybajzjf0vxhk3q0b7qwk77c2v";
-      ltr = "1wbikyqjsi19pi6ns9jqw9plbn5j5j0cyzd3davn2yf8vrp2b4lw";
+      ltr = "1k2d2lp925rnb3n6xm8drgrddrjyiyiadahi7bhlq4f3wmy5qfi8";
     }.${releaseType};
     name = "QGIS-macOS-${version}.dmg";
   };
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ undmg ];
 
-  sourceRoot = if releaseType == "pr" then "QGIS.app" else "QGIS${lib.substring 0 4 version}.app";
+  sourceRoot = ".";
 
   installPhase = ''
-    mkdir -p $out/Applications/QGIS.app
-    cp -r . $out/Applications/QGIS.app
+    mkdir -p $out/Applications
+    cp -r *.app $out/Applications
   '';
 
   meta = with lib; {