diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-01-23 15:57:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-23 15:57:23 +0000 |
| commit | 09f47ac855ac8356b8b467f3c4870c20ba77d8b0 (patch) | |
| tree | 822118de3b4148cd92b12cca73ebd66ec570013a /pkgs/development | |
| parent | c522fec2743ffb95f2bc296f249232d73ae57dd1 (diff) | |
| parent | 9d6fd2ba135c5b5c85c3332604d39b43e93b8298 (diff) | |
Merge branch 'master' into development-tools-stdenv-lib
Diffstat (limited to 'pkgs/development')
124 files changed, 567 insertions, 470 deletions
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 83b54e442aa33..c089916158bdc 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll +{ lib, stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll , sbcl, bash, which, perl, nettools , openssl, glucose, minisat, abc-verifier, z3, python2 , certifyBooks ? true @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { buildInputs = [ # ACL2 itself only needs a Common Lisp compiler/interpreter: sbcl - ] ++ stdenv.lib.optionals certifyBooks [ + ] ++ lib.optionals certifyBooks [ # To build community books, we need Perl and a couple of utilities: which perl nettools # Some of the books require one or more of these external tools: @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { preConfigure = '' # When certifying books, ACL2 doesn't like $HOME not existing. export HOME=$(pwd)/fake-home - '' + stdenv.lib.optionalString certifyBooks '' + '' + lib.optionalString certifyBooks '' # Some books also care about $USER being nonempty. export USER=nobody ''; @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin ln -s $out/share/${pname}/saved_acl2 $out/bin/${pname} - '' + stdenv.lib.optionalString certifyBooks '' + '' + lib.optionalString certifyBooks '' ln -s $out/share/${pname}/books/build/cert.pl $out/bin/${pname}-cert ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean ''; @@ -100,7 +100,7 @@ in stdenv.mkDerivation rec { rm -rf $out/share/${pname}/books ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interpreter and a prover for a Lisp dialect"; longDescription = '' ACL2 is a logic and programming language in which you can model computer diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix index 5186cd69584e1..b9a61b88a3064 100644 --- a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, unzip }: +{ lib, stdenv, fetchurl, zlib, unzip }: stdenv.mkDerivation rec { pname = "libipasirglucose4"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -D libipasirglucose4.so $out/lib/libipasirglucose4.so ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Shared library providing IPASIR interface to the Glucose SAT solver"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index b82b0b978f9cf..19e90a00e6cbf 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { pname = "alda"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/alda ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A music programming language for musicians"; homepage = "https://alda.io"; license = licenses.epl10; diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix index 15e7f4dd5c13a..922d964e8abed 100644 --- a/pkgs/development/interpreters/angelscript/2.22.nix +++ b/pkgs/development/interpreters/angelscript/2.22.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: let s = # Generated upstream information rec { @@ -35,9 +35,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Light-weight scripting library"; - license = stdenv.lib.licenses.zlib ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.zlib ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; badPlatforms = [ "aarch64-linux" ]; downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; homepage="http://www.angelcode.com/angelscript/"; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index f4139a37eea52..fb8c6b2844d60 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: let s = # Generated upstream information rec { @@ -29,9 +29,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Light-weight scripting library"; - license = stdenv.lib.licenses.zlib ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.zlib ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; homepage="http://www.angelcode.com/angelscript/"; }; diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index de12185b96f0b..a9b8f54ab877f 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, mlton }: +{ lib, stdenv, fetchgit, mlton }: stdenv.mkDerivation { name = "ceptre-2016-11-27"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { cp ceptre $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A linear logic programming language for modeling generative interactive systems"; homepage = "https://github.com/chrisamaphone/interactive-lp"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 7bf4c0fd52d03..96c884ab602e7 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper }: let version = "0.9.1"; name = "chibi-scheme-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ashinn/chibi-scheme"; description = "Small Footprint Scheme for use as a C Extension Language"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.DerGuteMoritz ]; }; src = fetchFromGitHub { diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index c22ad3f4cb0f1..8f80d2f4ee685 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python , libffi , git @@ -50,7 +50,7 @@ let "-DCLING_INCLUDE_TESTS=ON" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "The Interactive C++ Interpreter"; homepage = "https://root.cern/cling/"; license = with licenses; [ lgpl21 ncsa ]; @@ -73,7 +73,7 @@ let flags = [ "-nostdinc" "-nostdinc++" - "-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include" + "-isystem" "${lib.getDev stdenv.cc.libc}/include" "-I" "${unwrapped}/include" "-I" "${unwrapped}/lib/clang/5.0.2/include" ]; diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index cf0710f36a1a9..d38fb8279f0b3 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { version = "6.30"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { installPhase = '' install -D -t $out/bin core/clips ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Tool for Building Expert Systems"; homepage = "http://www.clipsrules.net/"; longDescription = '' diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 1b7ff2c8cba32..566d16179b578 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -3,7 +3,7 @@ # - base (default): contains readline and i18n, regexp and syscalls modules # by default # - full: contains base plus modules in withModules -{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 +{ lib, stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 , libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext , libffi , libffcall @@ -16,8 +16,8 @@ "pcre" "rawsock" ] - ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ] - ++ stdenv.lib.optional x11Support "clx/new-clx" + ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ] + ++ lib.optional x11Support "clx/new-clx" }: assert x11Support -> (libX11 != null && libXau != null && libXt != null @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { ffcallAvailable = stdenv.isLinux && (libffcall != null); buildInputs = [libsigsegv] - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (ncurses != null) ncurses - ++ stdenv.lib.optional (pcre != null) pcre - ++ stdenv.lib.optional (zlib != null) zlib - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi - ++ stdenv.lib.optional ffcallAvailable libffcall - ++ stdenv.lib.optionals x11Support [ + ++ lib.optional (gettext != null) gettext + ++ lib.optional (ncurses != null) ncurses + ++ lib.optional (pcre != null) pcre + ++ lib.optional (zlib != null) zlib + ++ lib.optional (readline != null) readline + ++ lib.optional (ffcallAvailable && (libffi != null)) libffi + ++ lib.optional ffcallAvailable libffcall + ++ lib.optionals x11Support [ libX11 libXau libXt libXpm xorgproto libXext ]; @@ -68,14 +68,14 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "builddir" ] - ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules" - ++ stdenv.lib.optional (readline != null) "--with-readline" + ++ lib.optional (!dllSupport) "--without-dynamic-modules" + ++ lib.optional (readline != null) "--with-readline" # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" - ++ stdenv.lib.optional ffcallAvailable "--with-ffcall" - ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall" + ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" + ++ lib.optional ffcallAvailable "--with-ffcall" + ++ lib.optional (!ffcallAvailable) "--without-ffcall" ++ builtins.map (x: "--with-module=" + x) withModules - ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS"; + ++ lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d @@ -83,11 +83,11 @@ stdenv.mkDerivation rec { ''; postInstall = - stdenv.lib.optionalString (withModules != []) + lib.optionalString (withModules != []) (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' - + stdenv.lib.concatMapStrings (x: " " + x) withModules); + + lib.concatMapStrings (x: " " + x) withModules); - NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; + NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; # TODO : make mod-check fails doCheck = false; @@ -95,10 +95,10 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; homepage = "http://clisp.cons.org"; - maintainers = with stdenv.lib.maintainers; [raskin tohl]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [raskin tohl]; + platforms = lib.platforms.unix; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 6898f84669f7e..83a1870d182b7 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -3,7 +3,7 @@ # - base (default): contains readline and i18n, regexp and syscalls modules # by default # - full: contains base plus modules in withModules -{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 +{ lib, stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 , libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext , libffi, libffcall, automake , coreutils @@ -15,8 +15,8 @@ "pcre" "rawsock" ] - ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] - ++ stdenv.lib.optional x11Support "clx/new-clx" + ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] + ++ lib.optional x11Support "clx/new-clx" }: assert x11Support -> (libX11 != null && libXau != null && libXt != null @@ -38,14 +38,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake ]; # sometimes fails otherwise buildInputs = [libsigsegv] - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (ncurses != null) ncurses - ++ stdenv.lib.optional (pcre != null) pcre - ++ stdenv.lib.optional (zlib != null) zlib - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi - ++ stdenv.lib.optional ffcallAvailable libffcall - ++ stdenv.lib.optionals x11Support [ + ++ lib.optional (gettext != null) gettext + ++ lib.optional (ncurses != null) ncurses + ++ lib.optional (pcre != null) pcre + ++ lib.optional (zlib != null) zlib + ++ lib.optional (readline != null) readline + ++ lib.optional (ffcallAvailable && (libffi != null)) libffi + ++ lib.optional ffcallAvailable libffcall + ++ lib.optionals x11Support [ libX11 libXau libXt libXpm xorgproto libXext ]; @@ -63,14 +63,14 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "builddir" ] - ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules" - ++ stdenv.lib.optional (readline != null) "--with-readline" + ++ lib.optional (!dllSupport) "--without-dynamic-modules" + ++ lib.optional (readline != null) "--with-readline" # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" - ++ stdenv.lib.optional ffcallAvailable "--with-ffcall" - ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall" + ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" + ++ lib.optional ffcallAvailable "--with-ffcall" + ++ lib.optional (!ffcallAvailable) "--without-ffcall" ++ builtins.map (x: " --with-module=" + x) withModules - ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS"; + ++ lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d @@ -79,11 +79,11 @@ stdenv.mkDerivation rec { ''; postInstall = - stdenv.lib.optionalString (withModules != []) + lib.optionalString (withModules != []) (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' - + stdenv.lib.concatMapStrings (x: " " + x) withModules); + + lib.concatMapStrings (x: " " + x) withModules); - NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; + NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; # TODO : make mod-check fails doCheck = false; @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; homepage = "http://clisp.cons.org"; - maintainers = with stdenv.lib.maintainers; [raskin tohl]; + maintainers = with lib.maintainers; [raskin tohl]; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index a6beaf1a57610..e10236fe1eeea 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, graalvm11-ce, glibcLocales }: +{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "babashka"; version = "0.2.3"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { cp bb $out/bin/bb ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Clojure babushka for the grey areas of Bash"; longDescription = '' The main idea behind babashka is to leverage Clojure in places where you diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index d51fa76003b23..57da5e862e994 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: let version = "0.4.4"; in @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "A lightweight IDE for Clojure"; homepage = "https://github.com/arthuredelstein/clooj"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 06e18c96ac384..ab5422378599c 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }: +{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # See https://github.com/clojure/brew-install/blob/1.10.1/src/main/resources/clojure/install/linux-install.sh installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; + binPath = lib.makeBinPath [ rlwrap jdk ]; in '' clojure_lib_dir=$out @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { -Sverbose \ -Scp $out/libexec/clojure-tools-${version}.jar ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Lisp dialect for the JVM"; homepage = "https://clojure.org/"; license = licenses.epl10; diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 61fd94c09bf4f..a269d0b158e2c 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -280,8 +280,8 @@ stdenv.mkDerivation { making it the fastest Clojure REPL in existence. ''; homepage = "https://github.com/anmonteiro/lumo"; - license = stdenv.lib.licenses.epl10; - maintainers = [ stdenv.lib.maintainers.hlolli ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.epl10; + maintainers = [ lib.maintainers.hlolli ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix index 60a5fd9e65f6a..c0a11cf9f0269 100644 --- a/pkgs/development/interpreters/cyclone/default.nix +++ b/pkgs/development/interpreters/cyclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libck, darwin }: +{ lib, stdenv, fetchFromGitHub, libck, darwin }: let version = "0.21"; @@ -15,7 +15,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ]; buildInputs = [ libck ]; @@ -36,13 +36,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ bootstrap ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ]; + ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; buildInputs = [ libck ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://justinethier.github.io/cyclone/"; description = "A brand-new compiler that allows practical application development using R7RS Scheme"; license = licenses.mit; diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 99e6d96628397..7fa59a18c5f13 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, version ? "2.7.2" }: +{ lib, stdenv, fetchurl, unzip, version ? "2.7.2" }: let @@ -80,7 +80,7 @@ let in -with stdenv.lib; +with lib; stdenv.mkDerivation { diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index 8dbfee2064179..f864f5bf6f9ed 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "duktape"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "An embeddable Javascript engine, with a focus on portability and compact footprint"; homepage = "https://duktape.org/"; downloadPage = "https://duktape.org/download.html"; diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index cfd3bbbda4c32..8dba500c15bde 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, ocamlPackages }: +{ lib, stdenv, fetchFromGitHub, which, ocamlPackages }: let version = "5.0"; in @@ -25,7 +25,7 @@ stdenv.mkDerivation { doCheck = true; checkTarget = "test"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.eff-lang.org"; description = "A functional programming language based on algebraic effects and their handlers"; longDescription = '' diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 8dddd5befd4db..358fff039c6aa 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper, +{ pkgs, lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, curl, bash, debugInfo ? false }: { baseName ? "elixir" @@ -10,7 +10,7 @@ } @ args: let - inherit (stdenv.lib) getVersion versionAtLeast optional; + inherit (lib) getVersion versionAtLeast optional; in assert versionAtLeast (getVersion erlang) minimumOTPVersion; @@ -46,7 +46,7 @@ in b=$(basename $f) if [ "$b" = mix ]; then continue; fi wrapProgram $f \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \ --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt done @@ -55,7 +55,7 @@ in ''; pos = builtins.unsafeGetAttrPos "sha256" args; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://elixir-lang.org/"; description = "A functional, meta-programming aware language built on top of the Erlang VM"; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 91ea2fe57ab9a..4429dc1eaf378 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused +{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoconf # TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 , openjdk8 ? null # javacSupport @@ -41,7 +41,7 @@ assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk8 != null; let - inherit (stdenv.lib) optional optionals optionalAttrs optionalString; + inherit (lib) optional optionals optionalAttrs optionalString; wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages; in stdenv.mkDerivation ({ @@ -106,12 +106,12 @@ in stdenv.mkDerivation ({ # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; - meta = with stdenv.lib; ({ + meta = with lib; ({ homepage = "https://www.erlang.org/"; downloadPage = "https://www.erlang.org/download.html"; description = "Programming language used for massively scalable soft real-time systems"; diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 60a284de3f1be..fa428b983356f 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -1,4 +1,4 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, stdenv, gcc, Security, cmake }: +{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }: rustPlatform.buildRustPackage rec { pname = "evcxr"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; nativeBuildInputs = [ pkg-config makeWrapper cmake ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; postInstall = let wrap = exe: '' wrapProgram $out/bin/${exe} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \ + --prefix PATH : ${lib.makeBinPath [ cargo gcc ]} \ --set-default RUST_SRC_PATH "$RUST_SRC_PATH" ''; in '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { rm $out/bin/testing_runtime ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An evaluation context for Rust"; homepage = "https://github.com/google/evcxr"; license = licenses.asl20; diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 9ff81553550c5..541e7b6f32485 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }: stdenv.mkDerivation { pname = "falcon"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ cmake pcre zlib sqlite ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming language with macros and syntax at once"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index f01cfc2444bc7..9ae373ff7a81e 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, gettext, ncurses }: +{ lib, stdenv, fetchurl, readline, gettext, ncurses }: stdenv.mkDerivation rec { pname = "gnu-apl"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; # Needed with GCC 8 - NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [ + NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [ "-Wno-error=int-in-bool-context" "-Wno-error=class-memaccess" "-Wno-error=restrict" "-Wno-error=format-truncation" ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" ''; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { find $out/share/doc/support-files -name 'Makefile*' -delete ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Free interpreter for the APL programming language"; homepage = "https://www.gnu.org/software/apl/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index dd9cac84ddd8a..0e3a0a46afdec 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, which, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, unzip, which, makeWrapper, jdk }: # at runtime, need jdk @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An agile dynamic language for the Java Platform"; homepage = "http://groovy-lang.org/"; license = licenses.asl20; diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 7203ba3199325..3841785e8ac43 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , glib , gtk3 , libffcall @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureOptions = [ "--with-gtk3" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "gtk-server for interpreted GUI programming"; homepage = "http://www.gtk-server.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index b1c80b13af99f..93eca9a73f1f4 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildBuild, buildPackages +{ lib, stdenv, pkgsBuildBuild, buildPackages , fetchurl, makeWrapper, gawk, pkg-config , libtool, readline, gmp }: @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-error-on-warning" ] # Guile needs patching to preset results for the configure tests about # pthreads, which work only in native builds. - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-threads=no"; depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_1_8; nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool ]; @@ -67,9 +67,9 @@ stdenv.mkDerivation rec { meta = { description = "Embeddable Scheme implementation"; homepage = "https://www.gnu.org/software/guile/"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2Plus; + maintainers = [ lib.maintainers.ludo ]; + platforms = lib.platforms.unix; longDescription = '' GNU Guile is an interpreter for the Scheme programming language, diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 1db5676a8c7bb..b93ec556cd436 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildBuild, buildPackages +{ lib, stdenv, pkgsBuildBuild, buildPackages , fetchpatch, fetchurl, makeWrapper, gawk, pkg-config , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null @@ -21,7 +21,7 @@ setOutputFlags = false; # $dev gets into the library otherwise depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_0; nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool libunistring libffi ]; @@ -46,8 +46,8 @@ }) ./riscv.patch ] ++ - (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch) - ++ stdenv.lib.optionals stdenv.isDarwin [ + (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch) + ++ lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; @@ -59,10 +59,10 @@ # "libgcc_s.so.1 must be installed for pthread_cancel to work". # don't have "libgcc_s.so.1" on darwin - LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; + LDFLAGS = lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix" ] - ++ stdenv.lib.optionals stdenv.isSunOS [ + ++ lib.optionals stdenv.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> @@ -102,9 +102,9 @@ meta = { description = "Embeddable Scheme implementation"; homepage = "https://www.gnu.org/software/guile/"; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ ludo lovek323 ]; + platforms = lib.platforms.all; longDescription = '' GNU Guile is an implementation of the Scheme programming language, with @@ -120,7 +120,7 @@ // -(stdenv.lib.optionalAttrs (!stdenv.isLinux) { +(lib.optionalAttrs (!stdenv.isLinux) { # Work around <https://bugs.gnu.org/14201>. SHELL = stdenv.shell; CONFIG_SHELL = stdenv.shell; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 77483b2256a1f..ed685682db66d 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgsBuildBuild, buildPackages +{ lib, stdenv, pkgsBuildBuild, buildPackages , fetchurl, makeWrapper, gawk, pkg-config , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null @@ -23,7 +23,7 @@ setOutputFlags = false; # $dev gets into the library otherwise depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile; nativeBuildInputs = [ makeWrapper gawk pkg-config ]; buildInputs = [ readline libtool libunistring libffi ]; @@ -48,8 +48,8 @@ patches = [ ./eai_system.patch - ] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch - ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch + ++ lib.optional stdenv.isDarwin (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; }); @@ -58,11 +58,11 @@ # "libgcc_s.so.1 must be installed for pthread_cancel to work". # don't have "libgcc_s.so.1" on darwin - LDFLAGS = stdenv.lib.optionalString + LDFLAGS = lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ] - ++ stdenv.lib.optionals stdenv.isSunOS [ + ++ lib.optionals stdenv.isSunOS [ # Make sure the right <gmp.h> is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> @@ -101,9 +101,9 @@ meta = { description = "Embeddable Scheme implementation"; homepage = "https://www.gnu.org/software/guile/"; - license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ ludo lovek323 vrthra ]; + platforms = lib.platforms.all; longDescription = '' GNU Guile is an implementation of the Scheme programming language, with diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index 35463b161572b..6af489473c9c7 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison }: +{ lib, stdenv, fetchurl, bison }: stdenv.mkDerivation { @@ -39,7 +39,7 @@ stdenv.mkDerivation { "--enable-pthreads" # build Hugs using POSIX threads C library ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter"; maintainers = with maintainers; [ joachifm ]; diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index a8890b048fbe4..6bfef26b4ddc7 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages }: +{ lib, stdenv, python3Packages }: python3Packages.buildPythonApplication rec { pname = "hy"; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { $out/bin/hy --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A LISP dialect embedded in Python"; homepage = "http://hylang.org/"; license = licenses.mit; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 30e260eee4650..5481f7825c987 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , libX11 , libXt @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2"; }; - buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; + buildInputs = lib.optionals withGraphics [ libX11 libXt ]; configurePhase = let @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mv $out/doc $out/share/doc/icon ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A very high level general-purpose programming language"; maintainers = with maintainers; [ vrthra yurrriq ]; platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index a87b3ef86786e..d0a3b20e5038c 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, +{ lib, stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached @@ -37,7 +37,7 @@ stdenv.mkDerivation { # for gcc5; c11 inline semantics breaks the build NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - meta = with stdenv.lib; { + meta = with lib; { description = "Io programming language"; homepage = "http://iolanguage.org/"; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index b7f8b63d54ad4..ab64505e091d8 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, readline, libedit, bc +{ lib, stdenv, fetchFromGitHub, readline, libedit, bc , avxSupport ? stdenv.hostPlatform.avxSupport }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; # Causes build failure due to warning - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow"; + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; buildPhase = '' export SOURCE_DIR=$(pwd) @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { cp -r $JLIB/bin "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "J programming language, an ASCII-based APL successor"; maintainers = with maintainers; [ raskin synthetica ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index fe0d3073acbdf..aefc158b000c9 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "janet"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Janet programming language"; homepage = "https://janet-lang.org/"; license = licenses.mit; diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index d803fe43fd7ad..78b9e40b64709 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }: +{ lib, stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }: let - makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL"); + makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); in stdenv.mkDerivation rec { pname = "jimtcl"; @@ -52,8 +52,8 @@ in stdenv.mkDerivation rec { meta = { description = "An open source small-footprint implementation of the Tcl programming language"; homepage = "http://jim.tcl.tk/"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ dbohdan vrthra ]; }; } diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 2eb01b376446a..3d36dde8e0f9c 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "joker"; @@ -21,7 +21,7 @@ buildGoModule rec { subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/candid82/joker"; description = "A small Clojure interpreter and linter written in Go"; license = licenses.epl10; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 9159f026e1f31..f792471c0619e 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeWrapper, jre }: +{ lib, stdenv, callPackage, fetchurl, makeWrapper, jre }: let # The version number here is whatever is reported by the RUBY_VERSION string @@ -50,7 +50,7 @@ jruby = stdenv.mkDerivation rec { libPath = "lib/${rubyEngine}/${rubyVersion.libDir}"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Ruby interpreter written in Java"; homepage = "http://jruby.org/"; license = with licenses; [ cpl10 gpl2 lgpl21 ]; diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 35af365c1f7df..61cc8f9cd0f56 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "jython"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Python interpreter written in Java"; homepage = "https://jython.org/"; - license = stdenv.lib.licenses.psfl; + license = lib.licenses.psfl; platforms = jre.meta.platforms; }; } diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 041616cc1f637..15ce9321a8d7d 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "kona"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; preInstall = ''mkdir -p "$out/bin"''; - meta = with stdenv.lib; { + meta = with lib; { description = "An interpreter of K, APL-like programming language"; homepage = "https://github.com/kevinlawler/kona/"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index ba42c2d59d56b..d6090152d158f 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }: +{ lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }: { baseName ? "lfe" , version @@ -10,7 +10,7 @@ }: let - inherit (stdenv.lib) + inherit (lib) assertMsg makeBinPath optionalString getVersion versionAtLeast versionOlder versions; @@ -75,7 +75,7 @@ buildRebar3 { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The best of Erlang and of Lisp; at the same time!"; longDescription = '' LFE, Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index 180ce28c9ae5a..65653701b8060 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkg-config, doxygen, cmake, readline }: +{ lib, stdenv, fetchurl, pkg-config, doxygen, cmake, readline }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lolcode"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; maintainers = [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 9319fa12406c2..ed002d99fbbe2 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, +{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -34,8 +34,8 @@ stdenv.mkDerivation { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + license = lib.licenses.zlib; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 2198ff962a18a..6cba19bff0f16 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config , SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 866ce83adf1e2..8bad501170dbd 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config , SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 315a07bd9caef..b7e20498a39c3 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config , SDL2, libGLU, libGL, openal, luajit , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; broken = true; }; } diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 48ac142934b7c..bf76547a07a73 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, +{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -34,8 +34,8 @@ stdenv.mkDerivation { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.raskin ]; + license = lib.licenses.zlib; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index d78d5ba0c2df3..3a52d58ffaba0 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -40,7 +40,7 @@ in rec { sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile ''; - postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postBuild = lib.optionalString (!stdenv.isDarwin) '' ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so ) ''; }; diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index a3e633bbab17b..d4e68b5cb7624 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/keplerproject/luafilesystem"; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 98e4684e0921e..7e4283838a0f5 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline +{ lib, stdenv, fetchurl, readline , compat ? false , callPackage , packageOverrides ? (self: super: {}) @@ -50,7 +50,7 @@ self = stdenv.mkDerivation rec { runHook preConfigure makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" ) - makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"}) + makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" ) @@ -107,8 +107,8 @@ self = stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; }; in self diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index 73fbbc3e66a6e..d16f068883ac7 100644 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://w3.impa.br/~diego/software/luasocket/"; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 53ec2baeb5e5d..0459b67534d4e 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lua, buildEnv, makeWrapper +{ lib, stdenv, lua, buildEnv, makeWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" @@ -28,7 +28,7 @@ let addToLuaPath "$out" # take every binary from lua packages and put them into the env - for path in ${stdenv.lib.concatStringsSep " " paths}; do + for path in ${lib.concatStringsSep " " paths}; do nix_debug "looking for binaries in path = $path" if [ -d "$path/bin" ]; then cd "$path/bin" @@ -37,7 +37,7 @@ let rm -f "$out/bin/$prg" if [ -x "$prg" ]; then nix_debug "Making wrapper $prg" - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index e0e15ca327507..860642b0fd2f1 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPackages +{ lib, stdenv, fetchFromGitHub, buildPackages , name ? "luajit-${version}" , isStable , sha256 @@ -26,7 +26,7 @@ assert enableValgrindSupport -> valgrind != null; let luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; - XCFLAGS = with stdenv.lib; + XCFLAGS = with lib; optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { configurePhase = false; - buildInputs = stdenv.lib.optional enableValgrindSupport valgrind; + buildInputs = lib.optional enableValgrindSupport valgrind; buildFlags = [ "amalg" # Build highly optimized version @@ -70,14 +70,14 @@ stdenv.mkDerivation rec { "CROSS=${stdenv.cc.targetPrefix}" # TODO: when pointer size differs, we would need e.g. -m32 "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" - ] ++ stdenv.lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)"; + ] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = XCFLAGS; postInstall = '' ( cd "$out/include"; ln -s luajit-*/* . ) ln -s "$out"/bin/luajit-* "$out"/bin/lua - '' + stdenv.lib.optionalString (!isStable) '' + '' + lib.optionalString (!isStable) '' ln -s "$out"/bin/luajit-* "$out"/bin/luajit ''; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { interpreter = "${self}/bin/lua"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance JIT compiler for Lua 5.1"; homepage = "http://luajit.org"; license = licenses.mit; diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index a8db08e87a2cd..fe51d154956a1 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL +{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL , blas, libbfd, intltool, gettext, zlib, libSM}: stdenv.mkDerivation rec { @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "Lisp Universal SHell"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index d824d29c35c0b..6dcb697d7639b 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla +{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla , libsigsegv, gmpxx, cln, yices }: @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; hardeningDisable = [ "stackprotector" ] ++ - stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ]; + lib.optionals stdenv.isi686 [ "pic" "fortify" ]; preConfigure = '' configureFlagsArray=( @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = { homepage = "http://maude.cs.illinois.edu/"; description = "High-level specification language"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; longDescription = '' Maude is a high-performance reflective language and system @@ -66,7 +66,7 @@ stdenv.mkDerivation { rewriting logic computation. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index cccb7434797aa..34591c4c84b8a 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation { +let + version = "0.194"; +in stdenv.mkDerivation { pname = "metamath"; - version = "0.193"; + inherit version; buildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "metamath"; repo = "metamath-exe"; - rev = "f973c81222ebe36580a24f0fa7bbb600990af7d6"; - sha256 = "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b"; + rev = "v${version}"; + sha256 = "1bc5h2jdqbgna8zbhqyphlqcldz4vddg72r2rnjjjzxnxb2skvj7"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Interpreter for the metamath proof language"; longDescription = '' The metamath program is an ASCII-based ANSI C program with a command-line @@ -23,7 +25,7 @@ stdenv.mkDerivation { ''; homepage = "http://us.metamath.org"; downloadPage = "http://us.metamath.org/#downloads"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.taneb ]; platforms = platforms.all; }; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 692aed3e4ee6a..5e600a92fb77e 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, readline }: stdenv.mkDerivation rec { pname = "mujs"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mujs.com/"; description = "A lightweight, embeddable Javascript interpreter"; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index de829c14c98a1..c2a3fa2c77490 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, nix, git }: let +{ lib, stdenv, fetchurl, pkg-config, nix, git }: let version = "4.1.6"; in stdenv.mkDerivation { pname = "nix-exec"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { meta = { description = "Run programs defined in nix expressions"; homepage = "https://github.com/shlevy/nix-exec"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = nix.meta.platforms; broken = true; }; diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index 2e3d394f85152..865d8fde9eace 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, buildEnv, makeWrapper +{ lib, stdenv, perl, buildEnv, makeWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" @@ -28,7 +28,7 @@ let mkdir -p "$out/bin" # take every binary from perl packages and put them into the env - for path in ${stdenv.lib.concatStringsSep " " paths}; do + for path in ${lib.concatStringsSep " " paths}; do if [ -d "$path/bin" ]; then cd "$path/bin" for prg in *; do diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 2389b56bd6faf..191d589aa90ca 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -269,7 +269,7 @@ let inherit ztsSupport; }; - meta = with stdenv.lib; { + meta = with lib; { description = "An HTML-embedded scripting language"; homepage = "https://www.php.net/"; license = licenses.php301; diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index f7343f6e4d607..2c674754935c1 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, readline }: +{ lib, stdenv, fetchFromGitHub, readline }: stdenv.mkDerivation rec { pname = "picoc"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { install -m644 *.h $out/include ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Very small C interpreter for scripting"; longDescription = '' PicoC is a very small C interpreter for scripting. It was originally diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 1511698c92153..341797fa3f4c3 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }: -with stdenv.lib; +{ lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }: +with lib; stdenv.mkDerivation rec { pname = "picoLisp"; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 02f561c004e2d..ca55eceaedbfc 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, +{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -23,11 +23,11 @@ let sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq"; }; libs = [ libffi libedit libuv boost.dev boost.out zlib ]; - include-path = stdenv.lib.concatStringsSep ":" + include-path = lib.concatStringsSep ":" (map (p: "${p}/include") libs); - library-path = stdenv.lib.concatStringsSep ":" + library-path = lib.concatStringsSep ":" (map (p: "${p}/lib") libs); - bin-path = stdenv.lib.concatStringsSep ":" + bin-path = lib.concatStringsSep ":" (map (p: "${p}/bin") [ gcc ]); build = {flags, target}: stdenv.mkDerivation rec { pname = "pixie"; @@ -85,9 +85,9 @@ let meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; homepage = "https://github.com/pixie-lang/pixie"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + maintainers = with lib.maintainers; [ bendlas ]; }; }; in build (builtins.getAttr variant variants) diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index 4a7f3423defda..e6818cb03ed22 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -1,4 +1,4 @@ -{ stdenv, pixie, fetchFromGitHub }: +{ lib, stdenv, pixie, fetchFromGitHub }: stdenv.mkDerivation rec { name = "dust-0-91"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; homepage = src.meta.homepage; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix index 3569f66aed0ac..2d4acbd398ea1 100644 --- a/pkgs/development/interpreters/proglodyte-wasm/default.nix +++ b/pkgs/development/interpreters/proglodyte-wasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }: +{ lib, stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }: let sexpr_wasm_prototype = stdenv.mkDerivation { @@ -51,7 +51,7 @@ stdenv.mkDerivation { make install ''; - meta = with stdenv.lib; { + meta = with lib; { description = "wasm runs WebAssembly from the command line"; maintainers = with maintainers; [ proglodyte ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 40eb1daf49c81..668adf2c44a26 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, stdenv, fetchurl, python2Packages }: let version = "0.9.5.1.1"; in @@ -16,6 +16,6 @@ python2Packages.buildPythonPackage { meta = { homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; description = "A language for writing Python extension modules"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index e518edba1b396..2c4c74baecf1b 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, stdenv, fetchurl, python2Packages }: let version = "0.9.6.4"; in @@ -16,6 +16,6 @@ python2Packages.buildPythonPackage { meta = { homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; description = "A language for writing Python extension modules"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 4c0501aebcd25..85af394e3f65f 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , bzip2 , expat , libffi @@ -36,7 +36,7 @@ assert x11Support -> tcl != null && xlibsWrapper != null && libX11 != null; -with stdenv.lib; +with lib; let buildPackages = pkgsBuildHost; @@ -215,7 +215,7 @@ let }; # Python 2.7 needs this - crossCompileEnv = stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) + crossCompileEnv = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; }; # Build the basic Python interpreter without modules that have @@ -227,7 +227,7 @@ in with passthru; stdenv.mkDerivation ({ inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags; - LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2" @@ -298,9 +298,9 @@ in with passthru; stdenv.mkDerivation ({ hierarchical packages; exception-based error handling; and very high level dynamic data types. ''; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ fridh ]; + license = lib.licenses.psfl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fridh ]; # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2` # in case both 2 and 3 are installed. priority = -100; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 347245f8a01b3..7bc6084f61ddf 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , bzip2 , expat , libffi @@ -54,7 +54,7 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -with stdenv.lib; +with lib; let buildPackages = pkgsBuildHost; @@ -369,14 +369,14 @@ in with passthru; stdenv.mkDerivation { find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}" ''; - preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # Ensure patch-shebangs uses shebangs of host interpreter. - export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH + export PATH=${lib.makeBinPath [ "$out" bash ]}:$PATH ''; # Add CPython specific setup-hook that configures distutils.sysconfig to # always load sysconfigdata from host Python. - postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' cat << "EOF" >> "$out/nix-support/setup-hook" ${sysconfigdataHook} EOF @@ -385,8 +385,8 @@ in with passthru; stdenv.mkDerivation { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = - stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ] - ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + lib.optionals (openssl != null && !static) [ openssl.dev ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. pythonForBuild buildPackages.bash diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 9c6457d22aa35..cfa1ac71891c0 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchurl +{ lib, stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 , self, gdbm, db, lzma @@ -14,12 +14,12 @@ , pythonVersion , sha256 , passthruFun -, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}" +, pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}" }: assert zlibSupport -> zlib != null; -with stdenv.lib; +with lib; let isPy3k = substring 0 1 pythonVersion == "3"; @@ -144,7 +144,7 @@ in with passthru; stdenv.mkDerivation rec { ln -s $out/${executable}-c/include $out/include/${libPrefix} ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable} ''} @@ -158,7 +158,7 @@ in with passthru; stdenv.mkDerivation rec { inherit passthru; enableParallelBuilding = true; # almost no parallelization without STM - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 1522047a38060..6fd0ee2e925f5 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -22,7 +22,7 @@ # This version of PyPy is primarily added to speed-up translation of # our PyPy source build when developing that expression. -with stdenv.lib; +with lib; let isPy3k = majorVersion == "3"; @@ -78,7 +78,7 @@ in with passthru; stdenv.mkDerivation { pushd $out find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; - find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \; + find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \; echo "Removing bytecode" find . -name "__pycache__" -type d -depth -exec rm -rf {} \; @@ -115,7 +115,7 @@ in with passthru; stdenv.mkDerivation { inherit passthru; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index a291919b3277d..61fc497024be1 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -93,4 +93,4 @@ let -in stdenv.lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests) +in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index dffad6b98f5e5..61ad4a8a6ad9e 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, python, buildEnv, makeWrapper +{ lib, stdenv, python, buildEnv, makeWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" @@ -30,14 +30,14 @@ let fi mkdir -p "$out/bin" - for path in ${stdenv.lib.concatStringsSep " " paths}; do + for path in ${lib.concatStringsSep " " paths}; do if [ -d "$path/bin" ]; then cd "$path/bin" for prg in *; do if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 4ce4db5aca10b..ba46989c94a7f 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }: +{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }: stdenv.mkDerivation { pname = "qnial"; @@ -33,8 +33,8 @@ stdenv.mkDerivation { meta = { description = "An array language from Nial Systems"; homepage = "https://github.com/vrthra/qnial"; - license = stdenv.lib.licenses.artistic1; - maintainers = [ stdenv.lib.maintainers.vrthra ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.artistic1; + maintainers = [ lib.maintainers.vrthra ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index b1d03252d7ef8..b9d2b9deb7978 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "quickjs"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { out=$(mktemp) && qjsbnc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A small and embeddable Javascript engine"; homepage = "https://bellard.org/quickjs/"; maintainers = with maintainers; [ stesie ]; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 2c51c691a8b8f..8d33962f914cf 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeFontsConf +{ lib, stdenv, fetchurl, makeFontsConf , cacert , cairo, coreutils, fontconfig, freefont_ttf , glib, gmp @@ -22,7 +22,7 @@ let fontDirectories = [ freefont_ttf ]; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ cairo fontconfig glib @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { pname = "racket"; version = "7.9"; # always change at once with ./minimal.nix - src = (stdenv.lib.makeOverridable ({ name, sha256 }: + src = (lib.makeOverridable ({ name, sha256 }: fetchurl { url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; inherit sha256; @@ -60,15 +60,15 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = stdenv.lib.concatStringsSep " " [ - (stdenv.lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") - (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") + NIX_LDFLAGS = lib.concatStringsSep " " [ + (lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") + (lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; nativeBuildInputs = [ cacert wrapGAppsHook ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; + ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; preConfigure = '' unset AR @@ -83,15 +83,15 @@ stdenv.mkDerivation rec { shared = if stdenv.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] - ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] - ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ]; + ++ lib.optional disableDocs [ "--disable-docs" ] + ++ lib.optional stdenv.isDarwin [ "--enable-xonx" ]; configureScript = "../configure"; enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A programmable programming language"; longDescription = '' Racket is a full-spectrum programming language. It goes beyond diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index c645fae0d8481..99a812905d423 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # Some tests fail on Darwin doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Raku implementation on top of Moar virtual machine"; homepage = "https://www.rakudo.org"; license = licenses.artistic2; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 54b487c259510..f833c153b964b 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ lib, stdenv, fetchurl, perl , CoreServices, ApplicationServices }: stdenv.mkDerivation rec { @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488"; }; - buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; + buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; doCheck = false; # MoarVM does not come with its own test suite configureScript = "${perl}/bin/perl ./Configure.pl"; - meta = with stdenv.lib; { + meta = with lib; { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; homepage = "https://www.moarvm.org/"; license = licenses.artistic2; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 04b628bc9dae9..b4b41fa88046f 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines"; homepage = "https://github.com/perl6/nqp"; license = licenses.artistic2; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index b2cea4ad473b7..860ffc0aea0ab 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rakudo, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, rakudo, makeWrapper }: stdenv.mkDerivation rec { pname = "zef"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Raku / Perl6 Module Management"; homepage = "https://github.com/ugexe/zef"; license = licenses.artistic2; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 8b802043fe3fa..cd2b74db05207 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { name = "rascal-0.6.2"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rascal-mpl.org/"; description = "Command-line REPL for the Rascal metaprogramming language"; - license = stdenv.lib.licenses.epl10; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.epl10; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 4206e1e1604d0..39a4108e041d3 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cp r3 $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Relative expression based object language, a language where code is data"; maintainers = with maintainers; [ vrthra ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 554dc81bffb9a..6689f7eb5c3c4 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: +{ lib, stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { pname = "red"; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' New programming language strongly inspired by Rebol, but with a broader field of usage thanks to its native-code compiler, from system diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix index ec19b0679f4b8..79258d2cc0fa0 100644 --- a/pkgs/development/interpreters/regina/default.nix +++ b/pkgs/development/interpreters/regina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "Regina-REXX"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "--libdir=$(out)/lib" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "REXX interpreter"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 3768751efdc07..ae5227fb1989e 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, pkg-config, SDL2 +{ lib, stdenv, fetchurl, python2Packages, pkg-config, SDL2 , libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib , glib }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "renpy"; version = "7.3.5"; - meta = with stdenv.lib; { + meta = with lib; { description = "Ren'Py Visual Novel Engine"; homepage = "https://renpy.org/"; license = licenses.mit; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { pythonPath = [ pygame_sdl2 tkinter ]; - RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [ + RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib ]); diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 87aa5aca1e142..2678188e8cf70 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -159,7 +159,7 @@ let export GEM_HOME="$out/${passthru.gemPath}" ''; - installFlags = stdenv.lib.optional docSupport "install-doc"; + installFlags = lib.optional docSupport "install-doc"; # Bundler tries to create this directory postInstall = '' # Remove unnecessary groff reference from runtime closure, since it's big @@ -208,7 +208,7 @@ let disallowedRequisites = op (!jitSupport) stdenv.cc.cc; - meta = with stdenv.lib; { + meta = with lib; { description = "The Ruby language"; homepage = "http://www.ruby-lang.org/en/"; license = licenses.ruby; diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 5a1e3f265b24b..ca34d5055c561 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "scheme48-1.9.2"; @@ -6,8 +6,8 @@ stdenv.mkDerivation { meta = { homepage = "http://s48.org/"; description = "Scheme 48"; - platforms = with stdenv.lib.platforms; unix; - license = stdenv.lib.licenses.bsd3; + platforms = with lib.platforms; unix; + license = lib.licenses.bsd3; }; src = fetchurl { diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index bb4f418f502a0..6dcb8bd27c5b1 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, scheme48 }: +{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }: stdenv.mkDerivation { name = "scsh-0.7pre"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ scheme48 ]; configureFlags = [ "--with-scheme48=${scheme48}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Scheme shell"; homepage = "http://www.scsh.net/"; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 0d5cc061f5917..58cac6bbe9b17 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }: +{ lib, stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }: stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --set SELF_ROOT "$out" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; homepage = "https://selflanguage.org/"; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix index 6d10669d20d8b..f93e0ae5d958f 100644 --- a/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , shen-sources , sbcl @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://shenlanguage.org; description = "Port of Shen running on Steel Bank Common Lisp"; platforms = sbcl.meta.platforms; diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix index f35631daa2822..84839cf42deec 100644 --- a/pkgs/development/interpreters/shen-sources/default.nix +++ b/pkgs/development/interpreters/shen-sources/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp . $out -R ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://shenlanguage.org; description = "Source code for the Shen Language"; platforms = platforms.all; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 0588d564b1c17..4892e0b8abef0 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch"; sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99"; }) - ] ++ stdenv.lib.optionals stdenv.isAarch32 [ + ] ++ lib.optionals stdenv.isAarch32 [ # Explained below in configureFlags for ARM ./1.8.5-findvanilla.patch # Fix for hard float flags. @@ -49,7 +49,7 @@ stdenv.mkDerivation { # of polkit, which is what matters most, it does not override the allocator # so the failure of that test does not matter much. configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ - stdenv.lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [ + lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [ "--with-cpu-arch=armv5t" "--disable-tracejit" ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation { rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 2a527eb8640ef..482561a901ea8 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages +{ lib, stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages , libobjc }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "38.8.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libffi readline icu zlib ] - ++ stdenv.lib.optional stdenv.isDarwin libobjc; + ++ lib.optional stdenv.isDarwin libobjc; nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 4bb6c815b2d49..d75e5e8b28599 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages , which, readline, zlib, icu }: -with stdenv.lib; +with lib; let version = "60.9.0"; @@ -73,7 +73,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix index bb577be4cd7b4..0ac005b07dea9 100644 --- a/pkgs/development/interpreters/spidermonkey/68.nix +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages , which, readline, zlib, icu, cargo, rustc, llvmPackages }: -with stdenv.lib; +with lib; let python3Env = buildPackages.python3.withPackages (p: [p.six]); @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index e7f6387018103..81ebcedf7bc05 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , autoconf213 @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e "--enable-optimize" "--enable-release" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Spidermonkey seems to use different host/build terminology for cross # compilation here. "--host=${stdenv.buildPlatform.config}" @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index df873937b4f83..f80e18c7bb96d 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, cmake, pkg-config, alsaLib +{ lib, stdenv, fetchurl, cmake, pkg-config, alsaLib , libjack2, libsndfile, fftw, curl, gcc , libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs }: -let optional = stdenv.lib.optional; +let optional = lib.optional; in stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) alsaLib ++ optional useSCEL emacs; - meta = with stdenv.lib; { + meta = with lib; { description = "Programming language for real time audio synthesis"; homepage = "https://supercollider.github.io"; maintainers = with maintainers; [ mrmebelman ]; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 9aaf8223837d7..e665e8cfb1ead 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv # Version specific stuff , release, version, src @@ -27,7 +27,7 @@ stdenv.mkDerivation { # Don't install tzdata because NixOS already has a more up-to-date copy. "--with-tzdata=no" "tcl_cv_strtod_unbroken=ok" - ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"; + ] ++ lib.optional stdenv.is64bit "--enable-64bit"; enableParallelBuilding = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation { ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The Tcl scripting language"; homepage = "https://www.tcl.tk/"; license = licenses.tcltk; diff --git a/pkgs/development/interpreters/tclreadline/default.nix b/pkgs/development/interpreters/tclreadline/default.nix index bbd34f71d22d6..44d2745dac8bd 100644 --- a/pkgs/development/interpreters/tclreadline/default.nix +++ b/pkgs/development/interpreters/tclreadline/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , automake , autoconf @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { # The provided makefile leaves a wrong reference to /build/ in RPATH, # so we fix it after checking that everything is also present in $out - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.isLinux '' needed_libraries=$(ls .libs | grep '\.\(so\|la\)$') for lib in $needed_libraries; do if ! ls $out/lib | grep "$lib"; then @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU readline for interactive tcl shells"; homepage = "https://github.com/flightaware/tclreadline"; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index b49a37a728565..8dd27b3f00065 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tinyscheme"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp scheme $out/bin/tinyscheme ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight Scheme implementation"; longDescription = '' TinyScheme is a lightweight Scheme interpreter that implements as large a diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 4889a21ddfd4d..ac0a944f2105b 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libX11, libXt, libnsl }: +{ lib, stdenv, fetchurl, unzip, libX11, libXt, libnsl }: stdenv.mkDerivation { pname = "unicon-lang"; @@ -33,7 +33,7 @@ stdenv.mkDerivation { cp -r bin $out/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A very high level, goal-directed, object-oriented, general purpose applications language"; maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 21a87de4a1605..0e5c6edc96409 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -3,7 +3,7 @@ , fetchpatch , pkg-config , gettext -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , gtk-doc , meson @@ -48,13 +48,11 @@ assert cupsSupport -> cups != null; -with lib; - stdenv.mkDerivation rec { pname = "gtk+3"; version = "3.24.24"; - outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; + outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; setupHooks = [ @@ -69,12 +67,13 @@ stdenv.mkDerivation rec { patches = [ ./patches/3.0-immodules.cache.patch + (fetchpatch { name = "Xft-setting-fallback-compute-DPI-properly.patch"; url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 @@ -82,35 +81,6 @@ stdenv.mkDerivation rec { ./patches/3.0-darwin-x11.patch ]; - separateDebugInfo = stdenv.isLinux; - - mesonFlags = [ - "-Dgtk_doc=${boolToString withGtkDoc}" - "-Dtests=false" - "-Dtracker3=${boolToString trackerSupport}" - "-Dbroadway_backend=${boolToString broadwaySupport}" - ]; - - # These are the defines that'd you'd get with --enable-debug=minimum (default). - # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options - NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; - - postPatch = '' - files=( - build-aux/meson/post-install.py - demos/gtk-demo/geninclude.py - gdk/broadway/gen-c-array.py - gdk/gen-gdk-gresources-xml.py - gtk/cursor/dnd-copy.png - gtk/gen-gtk-gresources-xml.py - gtk/gen-rc.py - gtk/gentypefuncs.py - ) - - chmod +x ''${files[@]} - patchShebangs ''${files[@]} - ''; - nativeBuildInputs = [ gettext gobject-introspection @@ -120,9 +90,9 @@ stdenv.mkDerivation rec { pkg-config python3 sassc - ] ++ setupHooks ++ optionals withGtkDoc [ + ] ++ setupHooks ++ lib.optionals withGtkDoc [ docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gtk-doc # For xmllint libxml2 @@ -133,10 +103,12 @@ stdenv.mkDerivation rec { epoxy json-glib isocodes - ] - ++ optional stdenv.isDarwin AppKit - ++ optional trackerSupport tracker - ; + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ] ++ lib.optionals trackerSupport [ + tracker + ]; + #TODO: colord? propagatedBuildInputs = with xorg; [ at-spi2-atk @@ -155,17 +127,51 @@ stdenv.mkDerivation rec { libXrandr libXrender pango - ] - ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed - ++ optionals waylandSupport [ mesa wayland wayland-protocols ] - ++ optional xineramaSupport libXinerama - ++ optional cupsSupport cups - ; - #TODO: colord? + ] ++ lib.optionals stdenv.isDarwin [ + # explicitly propagated, always needed + Cocoa + ] ++ lib.optionals waylandSupport [ + mesa + wayland + wayland-protocols + ] ++ lib.optionals xineramaSupport [ + libXinerama + ] ++ lib.optionals cupsSupport [ + cups + ]; + + mesonFlags = [ + "-Dgtk_doc=${lib.boolToString withGtkDoc}" + "-Dtests=false" + "-Dtracker3=${lib.boolToString trackerSupport}" + "-Dbroadway_backend=${lib.boolToString broadwaySupport}" + ]; doCheck = false; # needs X11 - postInstall = optionalString (!stdenv.isDarwin) '' + separateDebugInfo = stdenv.isLinux; + + # These are the defines that'd you'd get with --enable-debug=minimum (default). + # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options + NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; + + postPatch = '' + files=( + build-aux/meson/post-install.py + demos/gtk-demo/geninclude.py + gdk/broadway/gen-c-array.py + gdk/gen-gdk-gresources-xml.py + gtk/cursor/dnd-copy.png + gtk/gen-gtk-gresources-xml.py + gtk/gen-rc.py + gtk/gentypefuncs.py + ) + + chmod +x ''${files[@]} + patchShebangs ''${files[@]} + ''; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk-update-icon-cache "$out" # Launcher @@ -178,7 +184,7 @@ stdenv.mkDerivation rec { ''; # Wrap demos - postFixup = optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory) for program in ''${demos[@]}; do @@ -194,7 +200,7 @@ stdenv.mkDerivation rec { }; }; - meta = { + meta = with lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; longDescription = '' GTK is a highly usable, feature rich toolkit for creating diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index f050a9c7b3baa..28138f103b9da 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.3.3"; + version = "20.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "1diq1gqpfv5bawvag6bzwnd3ilhacwmwx3bl67abjvbb0m3jw4lk"; + sha256 = "0qb0wpinfv8lg1pq1pxkl6v0kd8ax86m8zxzm6zjx91alsch1mi6"; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/gmmlib"; license = licenses.mit; description = "Intel Graphics Memory Management Library"; + longDescription = '' + The Intel(R) Graphics Memory Management Library provides device specific + and buffer management for the Intel(R) Graphics Compute Runtime for + OpenCL(TM) and the Intel(R) Media Driver for VAAPI. + ''; platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 75175bde4b3fe..6e62484ac681f 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.4.5"; + version = "21.1.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "149xkhhp8q06c1jzxjs24lnbfrlvf19m0hcwld593vv4arfpbpmf"; + sha256 = "17cgs52f42jdvfb6q3wpkxaz2b41z59jdribpgb9qmcvizsnglxc"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 38c95a5a19f85..d1834de55588b 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -5,8 +5,6 @@ , pkg-config , boost17x , openssl -, zlib -, libsodium , olm , spdlog , nlohmann_json @@ -42,8 +40,6 @@ stdenv.mkDerivation rec { spdlog boost17x openssl - zlib - libsodium olm ]; @@ -51,7 +47,7 @@ stdenv.mkDerivation rec { description = "Client API library for Matrix, built on top of Boost.Asio"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz pstn ]; platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index 3e3530215bf85..4e71c4d65e6eb 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/libraries/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.0.2.2"; - sha256 = "0am195wabv63n545ykqnch9gs8cs1g5zw35k2ddxb9dnamhxfi9k"; + version = "0.1.0.0"; + sha256 = "15rxbwf16wm1la079yr2xn4bccjgd7m8dh6r7bpr6s57cj93i2mq"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/libraries/phonetisaurus/default.nix b/pkgs/development/libraries/phonetisaurus/default.nix index abacfdc1cce26..9ba00833d623b 100644 --- a/pkgs/development/libraries/phonetisaurus/default.nix +++ b/pkgs/development/libraries/phonetisaurus/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "phonetisaurus"; - version = "2020-07-31"; + version = "0.9.1"; src = fetchFromGitHub { owner = "AdolfVonKleist"; repo = pname; - rev = "2831870697de5b4fbcb56a6e1b975e0e1ea10deb"; + rev = version; sha256 = "1b18s5zz0l0fhqh9n9jnmgjz2hzprwzf6hx5a12zibmmam3qyriv"; }; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index a691107f9a1d3..1efac7fc5e480 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.9.3.0"; - sha256 = "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph"; + version = "2.10.0.1"; + sha256 = "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg"; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index 16b4cd563b2b1..107c23dcb59b1 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.0.3.2"; - sha256 = "0zri5pqnva48bm8za4ic5mx0ymv70y4ga16bjh4i5pscs40sj5dh"; + version = "0.1.0.0"; + sha256 = "09p0k2sgxr7jlsbrn66fzvzf9zxvpjp85y79xk10hxjglypszyml"; description = "A secure utmpx and wtmp implementation"; diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index d2e43d1060810..bec022f08c7e3 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation { install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1; install -D -m 755 abootimg-pack-initrd $out/bin - wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils cpio findutils gzip ]} + wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${lib.makeBinPath [ coreutils cpio findutils gzip ]} install -D -m 755 abootimg-unpack-initrd $out/bin - wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]} + wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${lib.makeBinPath [ cpio gzip ]} ''; meta = with lib; { diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index fc37eefc21212..c88ac5dbca5e6 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { dontBuild = true; installPhase = let - dependencies = stdenv.lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ]; + dependencies = lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ]; in '' runHook preInstall diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 84c42c895ce1c..e00ff3acce026 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }: +{ stdenv, lib, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }: # TODO: # @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { sed -i \ -e 's|$(uname -m)|i686|' \ -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \ - -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \ + -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \ FlashTool FlashToolConsole ''; @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { mv * $out/ ''; - meta = { + meta = with lib; { homepage = "http://www.flashtool.net/"; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; - license = stdenv.lib.licenses.unfreeRedistributableFirmware; + license = licenses.unfreeRedistributableFirmware; platforms = [ "i686-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = platforms.none; broken = true; }; } diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 72a376d39a819..b443150651558 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon +{ stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon , xdg_utils # For glewinfo , libXmu, libXi, libXext }: @@ -7,7 +7,7 @@ let packages = [ stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL ]; - libPath = stdenv.lib.makeLibraryPath packages; + libPath = lib.makeLibraryPath packages; in stdenv.mkDerivation rec { pname = "genymotion"; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { rm $out/libexec/genymotion/libxkbcommon* ''; - meta = { + meta = with lib; { description = "Fast and easy Android emulation"; longDescription = '' Genymotion is a relatively fast Android emulator which comes with @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { suitable for application testing. ''; homepage = "https://www.genymotion.com/"; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; platforms = ["x86_64-linux"]; - maintainers = [ stdenv.lib.maintainers.puffnfresh ]; + maintainers = [ maintainers.puffnfresh ]; }; } diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index a7e158bd3bb13..82a264e702dee 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,4 +1,4 @@ -{stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}: +{stdenv, lib, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}: { name, src, preBuild ? "", target, tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false @@ -34,14 +34,14 @@ let extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ]; in stdenv.mkDerivation ({ - name = stdenv.lib.replaceChars [" "] [""] name; + name = lib.replaceChars [" "] [""] name; buildInputs = [ nodejs titanium alloy python which file jdk ]; buildPhase = '' ${preBuild} - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error. alloy=$(dirname $(type -p alloy))/.. cp -rv $alloy/* alloy @@ -51,7 +51,7 @@ stdenv.mkDerivation ({ export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"} - ${stdenv.lib.optionalString (tiVersion != null) '' + ${lib.optionalString (tiVersion != null) '' # Replace titanium version by the provided one sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml ''} @@ -76,7 +76,7 @@ stdenv.mkDerivation ({ export GRADLE_USER_HOME=$TMPDIR/gradle ${if release then '' - ${stdenv.lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' # Signing the app does not work with OpenJDK on macOS, use host SDK instead export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" ''} @@ -171,7 +171,7 @@ stdenv.mkDerivation ({ mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products - ${stdenv.lib.optionalString enableWirelessDistribution '' + ${lib.optionalString enableWirelessDistribution '' appname="$(basename $out/*.ipa .ipa)" bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g') version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g') @@ -184,5 +184,5 @@ stdenv.mkDerivation ({ else throw "Target: ${target} is not supported!"} ''; - failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain; + failureHook = lib.optionalString (release && target == "iphone") deleteKeychain; } // extraArgs) diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 44ec91d7e5962..151502a5d1602 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -8,11 +8,11 @@ rec { else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { - inherit (pkgs) stdenv fetchurl unzip makeWrapper; + inherit (pkgs) stdenv lib fetchurl unzip makeWrapper; }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv python which file jdk nodejs; + inherit (pkgs) stdenv lib python which file jdk nodejs; inherit (pkgs.nodePackages) alloy titanium; inherit (androidenv) composeAndroidPackages; inherit (xcodeenv) composeXcodeWrapper; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 2af53a63b58dc..0742247893c3d 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper}: +{stdenv, lib, fetchurl, unzip, makeWrapper}: let # Gradle is a build system that bootstraps itself. This is what it actually @@ -87,7 +87,7 @@ stdenv.mkDerivation { # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle - ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + ${lib.optionalString (stdenv.system == "x86_64-darwin") '' # Patch the strip frameworks script in the iPhone build template to not let # it skip the strip phase. This is caused by an assumption on the file # permissions in which Nix deviates from the standard. diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index b995a566f5293..965a385ac56c7 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper}: +{stdenv, lib, fetchurl, unzip, makeWrapper}: let # Gradle is a build system that bootstraps itself. This is what it actually @@ -87,7 +87,7 @@ stdenv.mkDerivation { # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle - ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + ${lib.optionalString (stdenv.system == "x86_64-darwin") '' # Patch the strip frameworks script in the iPhone build template to not let # it skip the strip phase. This is caused by an assumption on the file # permissions in which Nix deviates from the standard. diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index adf64f9561c69..ae8416c8d769e 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,4 +1,4 @@ -{stdenv, composeXcodeWrapper}: +{stdenv, lib, composeXcodeWrapper}: { name , src , sdkVersion ? "13.1" @@ -53,13 +53,13 @@ let extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs); in stdenv.mkDerivation ({ - name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed + name = lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed buildPhase = '' # Be sure that the Xcode wrapper has priority over everything else. # When using buildInputs this does not seem to be the case. export PATH=${xcodewrapper}/bin:$PATH - ${stdenv.lib.optionalString release '' + ${lib.optionalString release '' export HOME=/Users/$(whoami) keychainName="$(basename $out)" @@ -91,10 +91,10 @@ stdenv.mkDerivation ({ # Do the building export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} - ${stdenv.lib.optionalString release '' - ${stdenv.lib.optionalString generateIPA '' + ${lib.optionalString release '' + ${lib.optionalString generateIPA '' # Create export plist file cat > "${name}.plist" <<EOF <?xml version="1.0" encoding="UTF-8"?> @@ -112,7 +112,7 @@ stdenv.mkDerivation ({ <string>manual</string> <key>method</key> <string>${signMethod}</string> - ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' + ${lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' <key>compileBitcode</key> <false/> ''} @@ -127,14 +127,14 @@ stdenv.mkDerivation ({ mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products - ${stdenv.lib.optionalString enableWirelessDistribution '' + ${lib.optionalString enableWirelessDistribution '' # Add another hacky build product that enables wireless adhoc installations appname="$(basename "$(echo $out/*.ipa)" .ipa)" sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/''${appname}.html echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products ''} ''} - ${stdenv.lib.optionalString generateXCArchive '' + ${lib.optionalString generateXCArchive '' mkdir -p $out mv "${name}.xcarchive" $out ''} @@ -144,7 +144,7 @@ stdenv.mkDerivation ({ ''} ''; - failureHook = stdenv.lib.optionalString release deleteKeychain; + failureHook = lib.optionalString release deleteKeychain; installPhase = "true"; } // extraArgs) diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index 47686e6d69e9a..90642ca7d9ac5 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,4 +1,4 @@ -{stdenv}: +{ stdenv, lib }: rec { composeXcodeWrapper = import ./compose-xcodewrapper.nix { @@ -6,10 +6,10 @@ rec { }; buildApp = import ./build-app.nix { - inherit stdenv composeXcodeWrapper; + inherit stdenv lib composeXcodeWrapper; }; simulateApp = import ./simulate-app.nix { - inherit stdenv composeXcodeWrapper; + inherit stdenv lib composeXcodeWrapper; }; } diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 1a55f8366a3b7..ea0502eb98186 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,4 +1,4 @@ -{stdenv, composeXcodeWrapper}: +{stdenv, lib, composeXcodeWrapper}: {name, app ? null, bundleId ? null, ...}@args: assert app != null -> bundleId != null; @@ -9,7 +9,7 @@ let xcodewrapper = composeXcodeWrapper xcodewrapperArgs; in stdenv.mkDerivation { - name = stdenv.lib.replaceChars [" "] [""] name; + name = lib.replaceChars [" "] [""] name; buildCommand = '' mkdir -p $out/bin cat > $out/bin/run-test-simulator << "EOF" @@ -30,7 +30,7 @@ stdenv.mkDerivation { # Open the simulator instance open -a "$(readlink "${xcodewrapper}/bin/Simulator")" --args -CurrentDeviceUDID $udid - ${stdenv.lib.optionalString (app != null) '' + ${lib.optionalString (app != null) '' # Copy the app and restore the write permissions appTmpDir=$(mktemp -d -t appTmpDir) cp -r "$(echo ${app}/*.app)" "$appTmpDir" diff --git a/pkgs/development/python-modules/aioeafm/default.nix b/pkgs/development/python-modules/aioeafm/default.nix new file mode 100644 index 0000000000000..be91e0e955759 --- /dev/null +++ b/pkgs/development/python-modules/aioeafm/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioeafm"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Jc2k"; + repo = pname; + rev = version; + sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + pytest-aiohttp + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "aioeafm" ]; + + meta = with lib; { + description = "Python client for access the Real Time flood monitoring API"; + homepage = "https://github.com/Jc2k/aioeafm"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix new file mode 100644 index 0000000000000..772b8fbaa0466 --- /dev/null +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -0,0 +1,43 @@ +{ lib +, argcomplete +, buildPythonPackage +, fetchFromGitHub +, mock +, pytestCheckHook +, requests +, responses +, urllib3 +}: + +buildPythonPackage rec { + pname = "amcrest"; + version = "1.7.2"; + + src = fetchFromGitHub { + owner = "tchellomello"; + repo = "python-amcrest"; + rev = version; + sha256 = "06gbrshf6vqvq3k813d1w37k2kmps0g6msa4lp2f9xvzw3iczshy"; + }; + + propagatedBuildInputs = [ + argcomplete + requests + urllib3 + ]; + + checkInputs = [ + mock + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "amcrest" ]; + + meta = with lib; { + description = "Python module for Amcrest and Dahua Cameras"; + homepage = "https://github.com/tchellomello/python-amcrest"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index edde4131a0d94..3fff2aae1f4dc 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,16 +4,16 @@ with lib; buildGoModule rec { pname = "kind"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "1kyjmlp1kmr3lwylnya6w392j1qpqgbvcacwpnz3ifyh3pbv32qr"; + sha256 = "1pp2x4bfqsd15siahyv9xkdyswsipmp9n86iwavrd0xhliqxlsa7"; }; - vendorSha256 = "04fmqh6lhvvzpvf1l2xk1r8687k5jx2lb5199rgmjbfnjgsa0q2d"; + vendorSha256 = "0c0j4s8kfzk2b3hy0d2g5bp1zr60l6vnwnpynsg6ksv8spwnpl5m"; doCheck = false; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 00cf1da522adb..f2fe3693ed7a0 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.8.0"; + version = "2.8.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "12yly2lp93ijhy7b72p6y2q3cr3yy3hk7rlmrh072py8a6d4s407"; + sha256 = "07mf6pnmv1a6wh4la45zf6cn6qy2vcmz4xgx0djj75kw1wiyii72"; }; buildInputs = [ ocaml findlib ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dune.build/"; description = "A composable build system"; - changelog = "https://github.com/ocaml/dune/releases/tag/${version}"; + changelog = "https://github.com/ocaml/dune/blob/${version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; license = lib.licenses.mit; inherit (ocaml.meta) platforms; |