summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Martinet @ jormungand <asmadeus@codewreck.org>2021-12-26 03:49:31 +0100
committerDominique Martinet @ jormungand <asmadeus@codewreck.org>2021-12-26 03:52:00 +0100
commit4c865744eb0aa09bbbcff8fb775ef440cf47dfe4 (patch)
treea44dd412dc033b179b359002ed8968c907e87106
parent87df8af3a431da353a037e40ca9c35127a20f131 (diff)
pkgs: import lib instead of using stdenv.lib
doesn't work anymore with nixos update
-rw-r--r--pkgs/matrirc/default.nix4
-rw-r--r--pkgs/rbh-find/default.nix4
-rw-r--r--pkgs/rbh-sync/default.nix4
-rw-r--r--pkgs/robinhood-v3/default.nix4
-rw-r--r--pkgs/vaderetro/default.nix4
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/matrirc/default.nix b/pkgs/matrirc/default.nix
index 56827b5..0a5949d 100644
--- a/pkgs/matrirc/default.nix
+++ b/pkgs/matrirc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub,
+{ stdenv, lib, rustPlatform, fetchFromGitHub,
pkgconfig, openssl, cmake,
}:
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
# no check anyway, save some time
doCheck = false;
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Yet another irc to matrix gateway";
license = licenses.wtfpl;
maintainers = [ maintainers.asmadeus ];
diff --git a/pkgs/rbh-find/default.nix b/pkgs/rbh-find/default.nix
index 9d1a19b..e186d40 100644
--- a/pkgs/rbh-find/default.nix
+++ b/pkgs/rbh-find/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, robinhood }:
+{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig, robinhood }:
stdenv.mkDerivation rec {
pname = "rbh-find";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ "-Db_sanitize=address,undefined" ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Robinhood rbh-find utility";
homepage = "https://github.com/cea-hpc/rbh-find/";
license = licenses.lgpl3Plus;
diff --git a/pkgs/rbh-sync/default.nix b/pkgs/rbh-sync/default.nix
index 670188d..f9bb367 100644
--- a/pkgs/rbh-sync/default.nix
+++ b/pkgs/rbh-sync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, robinhood }:
+{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig, robinhood }:
stdenv.mkDerivation rec {
pname = "rbh-sync";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ "-Db_sanitize=address,undefined" ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Robinhood rbh-sync utility";
homepage = "https://github.com/cea-hpc/rbh-sync/";
license = licenses.lgpl3Plus;
diff --git a/pkgs/robinhood-v3/default.nix b/pkgs/robinhood-v3/default.nix
index af859fd..3742e29 100644
--- a/pkgs/robinhood-v3/default.nix
+++ b/pkgs/robinhood-v3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake, perl,
+{ stdenv, lib, fetchFromGitHub, pkgconfig, libtool, autoconf, automake, perl,
mariadb, glib, attr, jemalloc, openssl, libmysqlclient,
}:
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Filesystem manager";
homepage = https://github.com/cea-hpc/robinhood;
license = licenses.cecill-c;
diff --git a/pkgs/vaderetro/default.nix b/pkgs/vaderetro/default.nix
index e557b6d..89091a5 100644
--- a/pkgs/vaderetro/default.nix
+++ b/pkgs/vaderetro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, requireFile }:
+{ stdenv, lib, rustPlatform, requireFile }:
rustPlatform.buildRustPackage rec {
pname = "vaderetro";
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
# no check anyway, save some time
doCheck = false;
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A server I can't talk about";
license = licenses.wtfpl;
maintainers = [ maintainers.asmadeus ];