nur-packages

commit 7dc44895c7e7c9665d138669835938ef949dae99
parent c3c94bea455bcf9a3390e748a3f501b2e5b30ae5
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Wed, 14 Sep 2022 10:05:58 +0300

Up

Diffstat:
M
pkgs/osm/smrender/default.nix
 | 
14
+++++++-------
M
pkgs/suckless/ffshot/default.nix
 | 
2
+-
M
pkgs/suckless/lchat/default.nix
 | 
6
+++---
M
pkgs/suckless/mage/default.nix
 | 
6
+++---
M
pkgs/suckless/makel/default.nix
 | 
2
+-
M
pkgs/suckless/nextvi/default.nix
 | 
6
+++---

6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/pkgs/osm/smrender/default.nix b/pkgs/osm/smrender/default.nix
@@ -1,16 +1,16 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, cairo, librsvg
 , Foundation, memstreamHook
-, testers, smrender
+, testers
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "smrender";
   version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "rahra";
     repo = "smrender";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-b9xuOPLxA9zZzIwWl+FTSW5XHgJ2sFoC578ZH6iwjaM=";
   };
 
@@ -20,15 +20,15 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.isDarwin [ Foundation memstreamHook ];
 
   passthru.tests.version = testers.testVersion {
-    package = smrender;
-    version = "V${version}";
+    package = finalAttrs.finalPackage;
+    version = "V${finalAttrs.version}";
   };
 
   meta = with lib; {
     description = "A powerful, flexible, and modular rule-based rendering engine for OSM data";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     license = licenses.gpl3Only;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/suckless/ffshot/default.nix b/pkgs/suckless/ffshot/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-lPHPwieotSgA6qF3EGDZk+lME0rqglOnEreYLk0/oUY=";
   };
 
-  buildInputs = [ xorg.libxcb xorg.xcbutilimage ];
+  buildInputs = with xorg; [ libxcb xcbutilimage ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/suckless/lchat/default.nix b/pkgs/suckless/lchat/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lchat";
-  version = "2022-01-26";
+  version = "2022-09-07";
 
   src = fetchFromGitHub {
     owner = "younix";
     repo = "lchat";
-    rev = "adcc7010548fdd11b1d80e1da1d9410c4d8e095b";
-    hash = "sha256-fiyempu1ay7TP0cCWzaAQBPMxljIVCJoYUHlZ37S1hA=";
+    rev = "fe93b05cea7431d7d240ae0d1d9842d288f66c4e";
+    hash = "sha256-XRekfeCRCtYzy5n0NrILWCZXW6Y68W48PretW+yCtD4=";
   };
 
   buildInputs = [ libutf ncurses ];
diff --git a/pkgs/suckless/mage/default.nix b/pkgs/suckless/mage/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mage";
-  version = "2022-07-12";
+  version = "2022-08-28";
 
   src = fetchFromGitHub {
     owner = "explosion-mental";
     repo = "mage";
-    rev = "6349749dc18deda13e4ac6b7ce0ade8ccb896512";
-    hash = "sha256-mLCK38Jm1vVVIYz/e+PJs0qAI3ojmcqmA1+ahiQ6Hk8=";
+    rev = "6632e9080af56a2c045fc9b008cabc06782e4e04";
+    hash = "sha256-7lCuwVB2MS9PkLRQc9XcunQGkOab46PYiSVQvJGMSng=";
   };
 
   configFile = lib.optionalString (conf!=null) (builtins.toFile "config.h" conf);
diff --git a/pkgs/suckless/makel/default.nix b/pkgs/suckless/makel/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "PREFIX=$(out)" ];
 
   installPhase = ''
-    install -Dm755 makel $out/bin/makel
+    install -Dm755 makel -t $out/bin
   '';
 
   meta = with lib; {
diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nextvi";
-  version = "2022-07-17";
+  version = "2022-09-05";
 
   src = fetchFromGitHub {
     owner = "kyx0r";
     repo = "nextvi";
-    rev = "7c9f5b609ae95cc85916366d1880ac2c91b31e84";
-    hash = "sha256-6MfX9oj7obr83+azPA1hmQzM6ACzqCOGCsZ3nfpzvEg=";
+    rev = "5ccc9f3a18be9d78a72a91c432ab3aac50c69647";
+    hash = "sha256-GqTN6kbBVksh1uXUTGs2unyl2GXlz+Vogqr0kLcIgGs=";
   };
 
   buildPhase = ''