diff --git a/overlay/default.nix b/overlay/default.nix index 20c238f..bfc1ddb 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -134,7 +134,7 @@ in nullPkgs // { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_11.tools; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; - } // stdenv.lib.optionalAttrs + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; }); diff --git a/overlay/gnu-config/default.nix b/overlay/gnu-config/default.nix deleted file mode 100644 index 78b7034..0000000 --- a/overlay/gnu-config/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl }: - -let - rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79"; - - # Don't use fetchgit as this is needed during Aarch64 bootstrapping - configGuess = fetchurl { - url = - "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "sha256-TSLpYIDGSp1flqCBi2Sgg9IWDV5bcO+Hn2Menv3R6KU="; - }; - configSub = fetchurl { - url = - "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "sha256-DkCGDN/DE3phQ1GO/Ua5ZPPtp0Ya93PnW3yfSK8EV9s="; - }; -in stdenv.mkDerivation { - pname = "gnu-config"; - version = "2020-05-04"; - - buildCommand = '' - mkdir -p $out - cp ${configGuess} $out/config.guess - cp ${configSub} $out/config.sub - ''; - - meta = with stdenv.lib; { - description = "Attempt to guess a canonical system name"; - homepage = "https://savannah.gnu.org/projects/config"; - license = licenses.gpl3; - # In addition to GPLv3: - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that - # program. - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.all; - }; -} diff --git a/overlay/solo5-tools/default.nix b/overlay/solo5-tools/default.nix index 4f8757b..a68e48d 100644 --- a/overlay/solo5-tools/default.nix +++ b/overlay/solo5-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl }: +{ lib, stdenv, buildPackages, fetchurl }: # WARNING: recursive make ahead @@ -16,7 +16,7 @@ in stdenv.mkDerivation { configurePhase = "sh configure.sh --only-tools"; installPhase = "make install-tools DESTDIR=$out"; - meta = with stdenv.lib; { + meta = with lib; { description = "Sandboxed execution environment."; homepage = "https://github.com/solo5/solo5"; license = licenses.isc; diff --git a/packages/NOVA/default.nix b/packages/NOVA/default.nix index 483b4b7..8a169a0 100644 --- a/packages/NOVA/default.nix +++ b/packages/NOVA/default.nix @@ -1,6 +1,4 @@ - - -{ stdenv, buildPackages, fetchFromGitHub }: +{ lib, stdenv, buildPackages, fetchFromGitHub }: let ARCH = if stdenv.isx86_32 then @@ -32,7 +30,7 @@ else preInstall = "export INS_DIR=$out"; - meta = with stdenv.lib; + meta = with lib; src.meta // { description = "Microhypervisor"; homepage = "http://hypervisor.org/"; diff --git a/packages/block_router/default.nix b/packages/block_router/default.nix index 6f7bc26..352cd6e 100644 --- a/packages/block_router/default.nix +++ b/packages/block_router/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, tup }: +{ lib, stdenv, fetchgit, tup }: stdenv.mkDerivation rec { pname = "block_router"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm755 {.,$out}/block_router"; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.agpl3; maintainers = [ maintainers.ehmry ]; }; diff --git a/packages/genodelabs/toolchain.nix b/packages/genodelabs/toolchain.nix index 6d3ce5a..1e5ad65 100644 --- a/packages/genodelabs/toolchain.nix +++ b/packages/genodelabs/toolchain.nix @@ -6,7 +6,7 @@ # have not been publicly verified by Genode Labs. # -{ stdenv, fetchurl, ncurses5, expat, makeWrapper, wrapCC }: +{ lib, stdenv, fetchurl, ncurses5, expat, makeWrapper, wrapCC }: let cc = stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ let dontStrip = true; dontPatchELF = true; - libPath = stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc expat ncurses5 ]; + libPath = lib.makeLibraryPath [ "$out" stdenv.cc.cc expat ncurses5 ]; unpackPhase = '' mkdir $out diff --git a/packages/nic_bus/default.nix b/packages/nic_bus/default.nix index 46700aa..e1f7c9e 100644 --- a/packages/nic_bus/default.nix +++ b/packages/nic_bus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, tup }: +{ lib, stdenv, fetchgit, tup }: stdenv.mkDerivation rec { pname = "nic_bus"; version = "2.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm755 {.,$out}/${pname}"; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.agpl3; maintainers = [ maintainers.ehmry ]; }; diff --git a/packages/rtc-dummy/default.nix b/packages/rtc-dummy/default.nix index 4e0aa0a..91b385f 100644 --- a/packages/rtc-dummy/default.nix +++ b/packages/rtc-dummy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, tup }: +{ lib, stdenv, fetchgit, tup }: stdenv.mkDerivation rec { pname = "rtc_dummy"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm755 ./rtc-dummy $out/rtc_drv"; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.agpl3; maintainers = [ maintainers.ehmry ]; }; diff --git a/packages/show_input/default.nix b/packages/show_input/default.nix index e521056..9967dee 100644 --- a/packages/show_input/default.nix +++ b/packages/show_input/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, tup }: +{ lib, stdenv, fetchgit, tup }: stdenv.mkDerivation rec { pname = "show_input"; version = "0.2.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm755 {.,$out}/${pname}"; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.agpl3; maintainers = [ maintainers.ehmry ]; }; diff --git a/packages/solo5/default.nix b/packages/solo5/default.nix index b621189..59fc5d6 100644 --- a/packages/solo5/default.nix +++ b/packages/solo5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, solo5-tools }: +{ lib, stdenv, buildPackages, fetchurl, solo5-tools }: # WARNING: recursive make ahead @@ -44,7 +44,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Sandboxed execution environment."; homepage = "https://github.com/solo5/solo5"; license = licenses.isc; diff --git a/packages/sotest-producer/default.nix b/packages/sotest-producer/default.nix index 90d788e..a029ea6 100644 --- a/packages/sotest-producer/default.nix +++ b/packages/sotest-producer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, tup }: +{ lib, stdenv, fetchgit, tup }: stdenv.mkDerivation rec { pname = "sotest-producer"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm755 {.,$out/bin}/sotest-harness"; - meta = with stdenv.lib; { + meta = with lib; { license = "LicenseRef-Genode.txt"; maintainers = [ maintainers.ehmry ]; };