nur-packages

commit 1ad1463f6f8072d204335511e2cec16664d81378
parent 05e4f86bf757c2b53021a41b3fc85d390c814d60
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sun,  4 Sep 2022 21:21:38 +0300

Up

Diffstat:
M
pkgs/applications/macpass/bin.nix
 | 
4
++--
M
pkgs/gemini/astronaut/default.nix
 | 
9
++++-----
M
pkgs/misc/imsg-compat/default.nix
 | 
6
++++--
M
pkgs/nakarte/nakarte/default.nix
 | 
14
++++++++++----
M
pkgs/suckless/imscript/default.nix
 | 
7
+++++--

5 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/pkgs/applications/macpass/bin.nix b/pkgs/applications/macpass/bin.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "MacPass-bin";
-  version = "0.7.12";
+  version = "0.8.1";
 
   src = fetchfromgh {
     owner = "MacPass";
     repo = "MacPass";
     name = "MacPass-${version}.zip";
-    sha256 = "1gikixbrz1pvyjspp62msdmhjdy1rfkx8jhy7rajjr8bzm8pzpmc";
+    hash = "sha256-LQ073JRbQsDB/nmx63Tllptfdo/8VqoobXPTSShzsXM=";
     inherit version;
   };
 
diff --git a/pkgs/gemini/astronaut/default.nix b/pkgs/gemini/astronaut/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromSourcehut, scdoc }:
+{ lib, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }:
 
 buildGoModule rec {
   pname = "astronaut";
@@ -11,7 +11,7 @@ buildGoModule rec {
     hash = "sha256-eiUStCM9rJB4O+LVWxih6untjTPynj9cHX2b8Gz9/nQ=";
   };
 
-  nativeBuildInputs = [ scdoc ];
+  nativeBuildInputs = [ scdoc installShellFiles ];
 
   vendorHash = "sha256-7SyawlfJ9toNVuFehGr5GQF6mNmS9E4kkNcqWllp8No=";
 
@@ -22,9 +22,8 @@ buildGoModule rec {
   '';
 
   postInstall = ''
-	install -Dm644 docs/astronaut.1 $out/share/man/man1/astronaut.1
-	install -Dm644 config/astronaut.conf $out/share/astronaut/astronaut.conf
-	install -Dm644 config/style.conf $out/share/astronaut/style.conf
+    installManPage docs/astronaut.1
+    install -Dm644 config/*.conf -t $out/share/astronaut
   '';
 
   meta = with lib; {
diff --git a/pkgs/misc/imsg-compat/default.nix b/pkgs/misc/imsg-compat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, validatePkgConfig }:
 
 stdenv.mkDerivation rec {
   pname = "imsg-compat";
@@ -13,9 +13,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace libimsg.pc.in \
-      --replace "@LIBDIR@" "lib"
+      --subst-var-by LIBDIR "lib"
   '';
 
+  nativeBuildInputs = [ validatePkgConfig ];
+
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
diff --git a/pkgs/nakarte/nakarte/default.nix b/pkgs/nakarte/nakarte/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, mkYarnPackage, fetchFromGitHub, secretsConfig ? null }:
 let
   pname = "nakarte";
-  version = "2021-07-17";
+  version = "2022-09-02";
 in
 mkYarnPackage {
   name = "${pname}-${version}";
@@ -9,8 +9,8 @@ mkYarnPackage {
   src = fetchFromGitHub {
     owner = "wladich";
     repo = "nakarte";
-    rev = "4163b36921d867f314de5351e079bd3d8ce6e444";
-    hash = "sha256-9klRyrnpdL0RJ8FupICbViG/oa3IFwqDcA6xoP9CvIs=";
+    rev = "c4392875048eeca01a50015f42d0a3d042b76989";
+    hash = "sha256-VcZ/Ga8C67rWqmdeqWMHOSIa8v80LCLEqMhnHyzY3Pg=";
   };
 
   postPatch =
@@ -19,7 +19,13 @@ mkYarnPackage {
     else
       "cp src/secrets.js{.template,}";
 
-  buildPhase = "yarn build";
+  buildPhase = ''
+    runHook preBuild
+
+    yarn build
+
+    runHook postBuild
+  '';
 
   installPhase = ''
     install -dm755 $out
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchFromSourcehut, libpng, libjpeg, libtiff, libwebp, fftwFloat, libX11, gsl }:
+{ lib, stdenv, fetchFromSourcehut, installShellFiles
+, libpng, libjpeg, libtiff, libwebp, fftwFloat, libX11, gsl }:
 
 stdenv.mkDerivation rec {
   pname = "imscript";
@@ -11,6 +12,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-8iU4dEwKHWXACLUSAzGP7ykeWmZBdkydiwUg8ip1bBQ=";
   };
 
+  nativeBuildInputs = [ installShellFiles ];
+
   buildInputs = [ libpng libjpeg libtiff libwebp fftwFloat libX11 gsl ];
 
   makeFlags = [ "DISABLE_HDF5=1" "full" ];
@@ -19,7 +22,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     install -Dm755 bin/* -t $out/bin
-    install -Dm644 doc/man/* -t $out/share/man/man1
+    installManPage doc/man/*
   '';
 
   meta = with lib; {