nur-packages

commit 2f8d8e157009b579c4d376db7a71f626950cb853
parent b7c08a9233006954596df11c50ae15aa8c93ceb3
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sun, 10 Oct 2021 00:51:56 +0300

Up

Diffstat:
M
modules/home-manager/programs/aerc.nix
 | 
2
+-
M
modules/home-manager/programs/goldendict.nix
 | 
2
+-
M
modules/home-manager/programs/gpxsee.nix
 | 
2
+-
M
modules/home-manager/programs/josm.nix
 | 
2
+-
M
modules/home-manager/programs/merkaartor.nix
 | 
2
+-
M
modules/home-manager/programs/nnn.nix
 | 
2
+-
M
modules/home-manager/programs/openorienteering-mapper.nix
 | 
2
+-
M
modules/home-manager/programs/qmapshack.nix
 | 
2
+-
M
modules/home-manager/programs/slack-term.nix
 | 
2
+-
M
pkgs/gemini/gmid/default.nix
 | 
4
++--
M
pkgs/misc/glauth/default.nix
 | 
6
+++++-
M
pkgs/misc/musig/default.nix
 | 
2
+-
M
pkgs/osm/imposm/default.nix
 | 
5
++++-

13 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/modules/home-manager/programs/aerc.nix b/modules/home-manager/programs/aerc.nix
@@ -40,7 +40,7 @@ in
     package = mkOption {
       type = types.package;
       default = pkgs.aerc;
-      defaultText = literalExample "pkgs.aerc";
+      defaultText = literalExpression "pkgs.aerc";
       description = "aerc package to install.";
     };
 
diff --git a/modules/home-manager/programs/goldendict.nix b/modules/home-manager/programs/goldendict.nix
@@ -12,7 +12,7 @@ in
 
     package = mkOption {
       default = pkgs.goldendict;
-      defaultText = literalExample "pkgs.goldendict";
+      defaultText = literalExpression "pkgs.goldendict";
       description = "GoldenDict package to install.";
       type = types.package;
     };
diff --git a/modules/home-manager/programs/gpxsee.nix b/modules/home-manager/programs/gpxsee.nix
@@ -25,7 +25,7 @@ in
 
     package = mkOption {
       default = pkgs.gpxsee;
-      defaultText = literalExample "pkgs.gpxsee";
+      defaultText = literalExpression "pkgs.gpxsee";
       example = "pkgs.nur.repos.sikmir.gpxsee-bin";
       description = "GPXSee package to install.";
       type = types.package;
diff --git a/modules/home-manager/programs/josm.nix b/modules/home-manager/programs/josm.nix
@@ -18,7 +18,7 @@ in
 
     package = mkOption {
       default = pkgs.josm;
-      defaultText = literalExample "pkgs.josm";
+      defaultText = literalExpression "pkgs.josm";
       description = "JOSM package to install.";
       type = types.package;
     };
diff --git a/modules/home-manager/programs/merkaartor.nix b/modules/home-manager/programs/merkaartor.nix
@@ -15,7 +15,7 @@ in
 
     package = mkOption {
       default = pkgs.merkaartor;
-      defaultText = literalExample "pkgs.merkaartor";
+      defaultText = literalExpression "pkgs.merkaartor";
       description = "Merkaartor package to install.";
       type = types.package;
     };
diff --git a/modules/home-manager/programs/nnn.nix b/modules/home-manager/programs/nnn.nix
@@ -14,7 +14,7 @@ in
 
     package = mkOption {
       default = pkgs.nnn;
-      defaultText = literalExample "pkgs.nnn";
+      defaultText = literalExpression "pkgs.nnn";
       description = "nnn package to install.";
       type = types.package;
     };
diff --git a/modules/home-manager/programs/openorienteering-mapper.nix b/modules/home-manager/programs/openorienteering-mapper.nix
@@ -15,7 +15,7 @@ in
 
     package = mkOption {
       default = pkgs.openorienteering-mapper;
-      defaultText = literalExample "pkgs.openorienteering-mapper";
+      defaultText = literalExpression "pkgs.openorienteering-mapper";
       example = "pkgs.nur.repos.sikmir.openorienteering-mapper-bin";
       description = "OpenOrienteering Mapper package to install.";
       type = types.package;
diff --git a/modules/home-manager/programs/qmapshack.nix b/modules/home-manager/programs/qmapshack.nix
@@ -15,7 +15,7 @@ in
 
     package = mkOption {
       default = pkgs.qmapshack;
-      defaultText = literalExample "pkgs.qmapshack";
+      defaultText = literalExpression "pkgs.qmapshack";
       example = "pkgs.nur.repos.sikmir.qmapshack-bin";
       description = "QMapShack package to install.";
       type = types.package;
diff --git a/modules/home-manager/programs/slack-term.nix b/modules/home-manager/programs/slack-term.nix
@@ -12,7 +12,7 @@ in
 
     package = mkOption {
       default = pkgs.slack-term;
-      defaultText = literalExample "pkgs.slack-term";
+      defaultText = literalExpression "pkgs.slack-term";
       description = "slack-term package to install.";
       type = types.package;
     };
diff --git a/pkgs/gemini/gmid/default.nix b/pkgs/gemini/gmid/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gmid";
-  version = "1.7.2";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "omar-polo";
     repo = pname;
     rev = version;
-    hash = "sha256-LmvpuPaLirUGKTQQIcCdLZI5lSi1CmoZaPbSM5Yyc+w=";
+    hash = "sha256-yjbuLlcacV/NQE4UgywczXDkkqHMoIsHhdHAus0zw/0=";
   };
 
   nativeBuildInputs = [ which yacc ];
diff --git a/pkgs/misc/glauth/default.nix b/pkgs/misc/glauth/default.nix
@@ -15,7 +15,11 @@ buildGoModule rec {
 
   nativeBuildInputs = [ go-bindata ];
 
-  buildFlagsArray = [ "-ldflags=-X main.LastGitTag=v${version} -X main.GitTagIsCommit=1" ];
+  ldflags = [
+    "-s -w"
+    "-X main.LastGitTag=v${version}"
+    "-X main.GitTagIsCommit=1"
+  ];
 
   preBuild = "go-bindata -pkg=assets -o=pkg/assets/bindata.go assets";
 
diff --git a/pkgs/misc/musig/default.nix b/pkgs/misc/musig/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   buildInputs = [ portaudio ];
 
-  buildFlagsArray = [ "-ldflags=-X main.VERSION=${version}" ];
+  ldflags = [ "-X main.VERSION=${version}" ];
 
   doInstallCheck = true;
 
diff --git a/pkgs/osm/imposm/default.nix b/pkgs/osm/imposm/default.nix
@@ -15,7 +15,10 @@ buildGoModule rec {
 
   buildInputs = [ leveldb geos ];
 
-  buildFlagsArray = [ "-ldflags=-s -w -X github.com/omniscale/imposm3.Version=${version}" ];
+  ldflags = [
+    "-s -w"
+    "-X github.com/omniscale/imposm3.Version=${version}"
+  ];
 
   # requires network access
   doCheck = false;