commit e69c0fccad138af5bb35c415fb25dd24c9ebf3ba parent 2fb58d8acd79a5ea7382c46f801bdd05f36493eb Author: Vincent Demeester <vincent@sbr.pm> Date: Tue, 6 Jul 2021 16:13:27 +0200 nix: stdenv and lib maintenance Signed-off-by: Vincent Demeester <vincent@sbr.pm> Diffstat:
15 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/nix/overlays/emacs/builder.nix b/nix/overlays/emacs/builder.nix @@ -1,4 +1,5 @@ { stdenv +, lib , emacs , name , src @@ -15,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ emacs ] ++ buildInputs; buildPhase = '' ${preBuild} - ARGS=$(find ${stdenv.lib.concatStrings (builtins.map (arg: arg + "/share/emacs/site-lisp ") buildInputs)} \ + ARGS=$(find ${lib.concatStrings (builtins.map (arg: arg + "/share/emacs/site-lisp ") buildInputs)} \ -type d -exec echo -L {} \;) mkdir $out export HOME=$out @@ -28,6 +29,6 @@ stdenv.mkDerivation { meta = { description = "Emacs projects from the Internet that just compile .el files"; homepage = http://www.emacswiki.org; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/nix/overlays/sbr.nix b/nix/overlays/sbr.nix @@ -7,10 +7,10 @@ rec { inherit (self) stdenv; }; vrsync = import ../packages/my/vrsync { - inherit (self) stdenv lib; + inherit (self) stdenv; }; vde-thinkpad = import ../packages/my/vde-thinkpad { - inherit (self) stdenv lib; + inherit (self) stdenv; }; bekind = super.callPackage ../../tools/bekind { }; diff --git a/nix/packages/crc/default.nix b/nix/packages/crc/default.nix @@ -37,7 +37,7 @@ rec { -X ${t}/machine/libvirt.MachineDriverCommand=${crc_driver_libvirt}/bin/machine-driver-libvirt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/code-ready/crc; description = "OpenShift 4.x cluster for testing and development purposes"; license = licenses.asl20; diff --git a/nix/packages/gnome/extensions/bluetooth-quick-connect/default.nix b/nix/packages/gnome/extensions/bluetooth-quick-connect/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -r * $out/share/gnome-shell/extensions/${uuid} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Allows paired Bluetooth devices to be connected and disconnected via the GNOME system menu, without need to enter the Settings app every time."; license = licenses.gpl3; maintainers = with maintainers; [ vdemeester ]; diff --git a/nix/packages/gnome/extensions/hide-top-bar/default.nix b/nix/packages/gnome/extensions/hide-top-bar/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp -r * $out/share/gnome-shell/extensions/${uuid} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Hide GNOME's top bar when it gets into your way."; license = licenses.gpl3; maintainers = with maintainers; [ vdemeester ]; diff --git a/nix/packages/gnome/extensions/nightthemeswitcher/default.nix b/nix/packages/gnome/extensions/nightthemeswitcher/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { unzip build/${uuid}.shell-extension.zip -d $out/share/gnome-shell/extensions/${uuid} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically toggle your light and dark GTK, GNOME Shell, icon and cursor themes variants, switch backgrounds and run custom commands at sunset and sunrise."; license = licenses.gpl3; maintainers = with maintainers; [ vdemeester ]; diff --git a/nix/packages/gnome/extensions/noannoyance/default.nix b/nix/packages/gnome/extensions/noannoyance/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -r * $out/share/gnome-shell/extensions/${uuid} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Disables the “Window Is Ready” notification and changes the policy of the window manager so that new windows are always focused."; license = licenses.gpl3; maintainers = with maintainers; [ vdemeester ]; diff --git a/nix/packages/gnome/extensions/shell/default.nix b/nix/packages/gnome/extensions/shell/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -r _build $out/share/gnome-shell/extensions/${uuid} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Pop Shell is a keyboard-driven layer for GNOME Shell which allows for quick and sensible navigation and management of windows."; license = licenses.gpl3; maintainers = with maintainers; [ vdemeester ]; diff --git a/nix/packages/ko/default.nix b/nix/packages/ko/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { # TestGoBuild{,Index} doesn't work because it assumes a .git doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/google/ko; description = "Build and deploy Go applications on Kubernetes"; license = licenses.asl20; diff --git a/nix/packages/kubernix/default.nix b/nix/packages/kubernix/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0xaf056x46c5561hypd85ni7bkijvz26kpwy5iiw19ijnlj1adw9"; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Single dependency Kubernetes clusters for local testing, experimenting and development"; homepage = https://github.com/saschagrunert/kubernix; license = with licenses; [ mit ]; diff --git a/nix/packages/my/vde-thinkpad/default.nix b/nix/packages/my/vde-thinkpad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib }: +{ stdenv }: stdenv.mkDerivation rec { name = "vde-thinkpad"; diff --git a/nix/packages/my/vrsync/default.nix b/nix/packages/my/vrsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib }: +{ stdenv }: stdenv.mkDerivation rec { name = "vrsync"; diff --git a/nix/packages/tkn-oci/default.nix b/nix/packages/tkn-oci/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp ${buildOci "${src}/oci"}/bin/oci $out/bin/tkn-oci ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/tektoncd/experimental; description = "Experimental tool to package tekton resources in oci image"; license = licenses.asl20; diff --git a/nix/packages/tkn/default.nix b/nix/packages/tkn/default.nix @@ -38,7 +38,7 @@ rec { mkdir -p $out/share/zsh/site-functions $out/bin/tkn completion zsh > $out/share/zsh/site-functions/_tkn ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/tektoncd/cli; description = "A CLI for interacting with Tekton!"; license = licenses.asl20; diff --git a/nix/packages/vscodeliveshare/default.nix b/nix/packages/vscodeliveshare/default.nix @@ -22,7 +22,7 @@ let url = "https://download.microsoft.com/download/9/3/E/93ED35C8-57B9-4D50-AE32-0330111B38E8/dotnet-runtime-${runtimeVersion}-linux-x64.tar.gz"; sha256 = "1g754mpwznmxlml5vnbxlm7v253al2m5jwzfvd7hj74f45yx8amf"; }; - rpath = stdenv.lib.makeLibraryPath [ utillinux openssl icu zlib curl lttng-ust libsecret libkrb5 gcc.cc.lib libunwind binutils.bintools_bin ]; + rpath = lib.makeLibraryPath [ utillinux openssl icu zlib curl lttng-ust libsecret libkrb5 gcc.cc.lib libunwind binutils.bintools_bin ]; in ( vscode-utils.buildVscodeMarketplaceExtension {