Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
sternenseemann
@@ -244,6 +244,7 @@ mapAliases ({
|
||||
gdb-multitarget = gdb; # added 2017-11-13
|
||||
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
|
||||
gettextWithExpat = gettext; # 2016-02-19
|
||||
giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12
|
||||
gitAndTools = self // { # added 2021-01-14
|
||||
darcsToGit = darcs-to-git;
|
||||
gitAnnex = git-annex;
|
||||
@@ -346,6 +347,7 @@ mapAliases ({
|
||||
julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13
|
||||
julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15
|
||||
julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13
|
||||
kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11
|
||||
kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28
|
||||
kdiff3-qt5 = kdiff3; # added 2017-02-18
|
||||
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
|
||||
@@ -398,6 +400,7 @@ mapAliases ({
|
||||
libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa";
|
||||
libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa";
|
||||
libudev = udev; # added 2018-04-25
|
||||
libungif = giflib; # added 2020-02-12
|
||||
libusb = libusb1; # added 2020-04-28
|
||||
libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
|
||||
libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22
|
||||
@@ -634,6 +637,7 @@ mapAliases ({
|
||||
rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
|
||||
rdiff_backup = rdiff-backup; # added 2014-11-23
|
||||
rdmd = dtools; # added 2017-08-19
|
||||
readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # added 2021-04-22
|
||||
rhc = throw "rhc was deprecated on 2019-04-09: abandoned by upstream.";
|
||||
rng_tools = rng-tools; # added 2018-10-24
|
||||
robomongo = robo3t; #added 2017-09-28
|
||||
@@ -670,6 +674,8 @@ mapAliases ({
|
||||
rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
|
||||
rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
|
||||
subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31
|
||||
thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";
|
||||
thunderbird-bin-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25 and was therefore removed from nixpkgs";
|
||||
togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained";
|
||||
urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
|
||||
urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02
|
||||
|
||||
+226
-229
@@ -30,7 +30,7 @@ in
|
||||
# just the plain stdenv.
|
||||
stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv);
|
||||
|
||||
stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; };
|
||||
stdenvNoCC = stdenv.override { cc = null; hasCC = false; };
|
||||
|
||||
mkStdenvNoLibs = stdenv: let
|
||||
bintools = stdenv.cc.bintools.override {
|
||||
@@ -201,7 +201,7 @@ in
|
||||
castget = callPackage ../applications/networking/feedreaders/castget { };
|
||||
|
||||
castxml = callPackage ../development/tools/castxml {
|
||||
inherit (llvmPackages) clang-unwrapped libclang llvm;
|
||||
inherit (llvmPackages) libclang llvm;
|
||||
inherit (python3Packages) sphinx;
|
||||
};
|
||||
|
||||
@@ -457,60 +457,60 @@ in
|
||||
|
||||
# `fetchurl' downloads a file from the network.
|
||||
fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform
|
||||
then buildPackages.fetchurl # No need to do special overrides twice,
|
||||
else makeOverridable (import ../build-support/fetchurl) {
|
||||
inherit lib stdenvNoCC buildPackages;
|
||||
inherit cacert;
|
||||
curl = buildPackages.curlMinimal.override (old: rec {
|
||||
# break dependency cycles
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
pkg-config = buildPackages.pkg-config.override (old: {
|
||||
pkg-config = old.pkg-config.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
};
|
||||
});
|
||||
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
openssl = buildPackages.openssl.override {
|
||||
then buildPackages.fetchurl # No need to do special overrides twice,
|
||||
else makeOverridable (import ../build-support/fetchurl) {
|
||||
inherit lib stdenvNoCC buildPackages;
|
||||
inherit cacert;
|
||||
curl = buildPackages.curlMinimal.override (old: rec {
|
||||
# break dependency cycles
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
buildPackages = {
|
||||
coreutils = buildPackages.coreutils.override {
|
||||
zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
pkg-config = buildPackages.pkg-config.override (old: {
|
||||
pkg-config = old.pkg-config.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
};
|
||||
});
|
||||
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
openssl = buildPackages.openssl.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
buildPackages = {
|
||||
coreutils = buildPackages.coreutils.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
inherit perl;
|
||||
xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
gmp = null;
|
||||
aclSupport = false;
|
||||
attrSupport = false;
|
||||
};
|
||||
inherit perl;
|
||||
xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
gmp = null;
|
||||
aclSupport = false;
|
||||
attrSupport = false;
|
||||
};
|
||||
inherit perl;
|
||||
};
|
||||
inherit perl;
|
||||
};
|
||||
libssh2 = buildPackages.libssh2.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
inherit zlib openssl;
|
||||
};
|
||||
# On darwin, libkrb5 needs bootstrap_cmds which would require
|
||||
# converting many packages to fetchurl_boot to avoid evaluation cycles.
|
||||
# So turn gssSupport off there, and on Windows.
|
||||
# On other platforms, keep the previous value.
|
||||
gssSupport =
|
||||
if stdenv.isDarwin || stdenv.hostPlatform.isWindows
|
||||
then false
|
||||
else old.gssSupport or true; # `? true` is the default
|
||||
libkrb5 = buildPackages.libkrb5.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
inherit pkg-config perl openssl;
|
||||
keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
};
|
||||
nghttp2 = buildPackages.nghttp2.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
inherit zlib pkg-config openssl;
|
||||
c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
};
|
||||
});
|
||||
};
|
||||
libssh2 = buildPackages.libssh2.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
inherit zlib openssl;
|
||||
};
|
||||
# On darwin, libkrb5 needs bootstrap_cmds which would require
|
||||
# converting many packages to fetchurl_boot to avoid evaluation cycles.
|
||||
# So turn gssSupport off there, and on Windows.
|
||||
# On other platforms, keep the previous value.
|
||||
gssSupport =
|
||||
if stdenv.isDarwin || stdenv.hostPlatform.isWindows
|
||||
then false
|
||||
else old.gssSupport or true; # `? true` is the default
|
||||
libkrb5 = buildPackages.libkrb5.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
inherit pkg-config perl openssl;
|
||||
keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
};
|
||||
nghttp2 = buildPackages.nghttp2.override {
|
||||
fetchurl = stdenv.fetchurlBoot;
|
||||
inherit zlib pkg-config openssl;
|
||||
c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
fetchRepoProject = callPackage ../build-support/fetchrepoproject { };
|
||||
|
||||
@@ -1470,7 +1470,7 @@ in
|
||||
grc = python3Packages.callPackage ../tools/misc/grc { };
|
||||
|
||||
green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {
|
||||
SDL = SDL_sixel;
|
||||
SDL = SDL_sixel;
|
||||
};
|
||||
|
||||
gremlin-console = callPackage ../applications/misc/gremlin-console {
|
||||
@@ -2341,13 +2341,9 @@ in
|
||||
|
||||
discount = callPackage ../tools/text/discount { };
|
||||
|
||||
discourse = callPackage ../servers/web-apps/discourse {
|
||||
ruby = ruby_2_7;
|
||||
};
|
||||
discourse = callPackage ../servers/web-apps/discourse { };
|
||||
|
||||
discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver {
|
||||
ruby = ruby_2_7;
|
||||
};
|
||||
discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { };
|
||||
|
||||
discocss = callPackage ../tools/misc/discocss { };
|
||||
|
||||
@@ -4233,7 +4229,7 @@ in
|
||||
wallutils = callPackage ../tools/graphics/wallutils { };
|
||||
|
||||
wrangler = callPackage ../development/tools/wrangler {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
|
||||
};
|
||||
|
||||
wsl-open = callPackage ../tools/misc/wsl-open { };
|
||||
@@ -5031,19 +5027,14 @@ in
|
||||
|
||||
gitkraken = callPackage ../applications/version-management/gitkraken { };
|
||||
|
||||
gitlab = callPackage ../applications/version-management/gitlab {
|
||||
ruby = ruby_2_7;
|
||||
};
|
||||
gitlab = callPackage ../applications/version-management/gitlab { };
|
||||
gitlab-ee = callPackage ../applications/version-management/gitlab {
|
||||
ruby = ruby_2_7;
|
||||
gitlabEnterprise = true;
|
||||
};
|
||||
|
||||
gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
|
||||
|
||||
gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell {
|
||||
ruby = ruby_2_7;
|
||||
};
|
||||
gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
|
||||
|
||||
gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
|
||||
|
||||
@@ -5051,9 +5042,7 @@ in
|
||||
|
||||
gitleaks = callPackage ../tools/security/gitleaks { };
|
||||
|
||||
gitaly = callPackage ../applications/version-management/gitlab/gitaly {
|
||||
ruby = ruby_2_7;
|
||||
};
|
||||
gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
|
||||
|
||||
gitstats = callPackage ../applications/version-management/gitstats { };
|
||||
|
||||
@@ -5145,10 +5134,9 @@ in
|
||||
|
||||
gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { };
|
||||
|
||||
gnused = if !stdenv.hostPlatform.isWindows then
|
||||
callPackage ../tools/text/gnused { } # broken on Windows
|
||||
else
|
||||
gnused_422;
|
||||
gnused = if !stdenv.hostPlatform.isWindows
|
||||
then callPackage ../tools/text/gnused { } # broken on Windows
|
||||
else gnused_422;
|
||||
# This is an easy work-around for [:space:] problems.
|
||||
gnused_422 = callPackage ../tools/text/gnused/422.nix { };
|
||||
|
||||
@@ -8614,7 +8602,7 @@ in
|
||||
|
||||
spacebar = callPackage ../os-specific/darwin/spacebar {
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
Carbon Cocoa ScriptingBridge;
|
||||
Carbon Cocoa ScriptingBridge SkyLight;
|
||||
};
|
||||
|
||||
spaceFM = callPackage ../applications/misc/spacefm { };
|
||||
@@ -10248,6 +10236,7 @@ in
|
||||
chez-matchable = callPackage ../development/chez-modules/chez-matchable { };
|
||||
|
||||
clang = llvmPackages.clang;
|
||||
libclang = llvmPackages.libclang;
|
||||
clang-manpages = llvmPackages.clang-manpages;
|
||||
|
||||
clang-sierraHack = clang.override {
|
||||
@@ -10390,9 +10379,16 @@ in
|
||||
if stdenv.targetPlatform.isAarch64 then gcc9 else gcc10;
|
||||
gcc-unwrapped = gcc.cc;
|
||||
|
||||
wrapNonDeterministicGcc = stdenv: ccWrapper:
|
||||
if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: {
|
||||
cc = old.cc.override {
|
||||
reproducibleBuild = false;
|
||||
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
|
||||
};
|
||||
}) else ccWrapper;
|
||||
|
||||
gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {
|
||||
allowedRequisites = null;
|
||||
cc = gcc;
|
||||
# Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses
|
||||
# clang's internal assembler).
|
||||
extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc;
|
||||
@@ -10406,6 +10402,11 @@ in
|
||||
gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10;
|
||||
gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
|
||||
|
||||
# This is not intended for use in nixpkgs but for providing a faster-running
|
||||
# compiler to nixpkgs users by building gcc with reproducibility-breaking
|
||||
# profile-guided optimizations
|
||||
fastStdenv = overrideCC gccStdenv (wrapNonDeterministicGcc gccStdenv buildPackages.gcc10);
|
||||
|
||||
wrapCCMulti = cc:
|
||||
if stdenv.targetPlatform.system == "x86_64-linux" then let
|
||||
# Binutils with glibc multi
|
||||
@@ -10449,10 +10450,12 @@ in
|
||||
stripped = false;
|
||||
}));
|
||||
|
||||
crossLibcStdenv = overrideCC stdenv
|
||||
(if stdenv.hostPlatform.useLLVM or false
|
||||
then buildPackages.llvmPackages_8.lldClangNoLibc
|
||||
else buildPackages.gccCrossStageStatic);
|
||||
gccCrossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic;
|
||||
|
||||
crossLibcStdenv =
|
||||
if stdenv.hostPlatform.useLLVM or false
|
||||
then overrideCC stdenv buildPackages.llvmPackages_8.lldClangNoLibc
|
||||
else gccCrossLibcStdenv;
|
||||
|
||||
# The GCC used to build libc for the target platform. Normal gccs will be
|
||||
# built with, and use, that cross-compiled libc.
|
||||
@@ -10462,8 +10465,10 @@ in
|
||||
cc = gccFun {
|
||||
# copy-pasted
|
||||
inherit noSysDirs;
|
||||
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
|
||||
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
|
||||
|
||||
reproducibleBuild = true;
|
||||
profiledCompiler = false;
|
||||
|
||||
isl = if !stdenv.isDarwin then isl_0_20 else null;
|
||||
|
||||
# just for stage static
|
||||
@@ -10481,8 +10486,8 @@ in
|
||||
gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 {
|
||||
inherit noSysDirs;
|
||||
|
||||
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
|
||||
profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64));
|
||||
reproducibleBuild = true;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
|
||||
@@ -10495,8 +10500,8 @@ in
|
||||
gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {
|
||||
inherit noSysDirs;
|
||||
|
||||
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
|
||||
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
|
||||
reproducibleBuild = true;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
|
||||
@@ -10509,8 +10514,8 @@ in
|
||||
gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 {
|
||||
inherit noSysDirs;
|
||||
|
||||
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
|
||||
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
|
||||
reproducibleBuild = true;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
|
||||
@@ -10528,8 +10533,8 @@ in
|
||||
gcc7 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/7 {
|
||||
inherit noSysDirs;
|
||||
|
||||
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
|
||||
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
|
||||
reproducibleBuild = true;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
|
||||
@@ -10543,8 +10548,8 @@ in
|
||||
gcc8 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/8 {
|
||||
inherit noSysDirs;
|
||||
|
||||
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
|
||||
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
|
||||
reproducibleBuild = true;
|
||||
profiledCompiler = false;
|
||||
|
||||
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
|
||||
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
|
||||
@@ -10558,8 +10563,8 @@ in
|
||||
gcc9 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/9 {
|
||||
inherit noSysDirs;
|
||||
|
||||
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
|
||||
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
|
||||
reproducibleBuild = true;
|
||||
profiledCompiler = false;
|
||||
|
||||
enableLTO = !stdenv.isi686;
|
||||
|
||||
@@ -10572,8 +10577,8 @@ in
|
||||
gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 {
|
||||
inherit noSysDirs;
|
||||
|
||||
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
|
||||
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
|
||||
reproducibleBuild = true;
|
||||
profiledCompiler = false;
|
||||
|
||||
enableLTO = !stdenv.isi686;
|
||||
|
||||
@@ -11180,6 +11185,7 @@ in
|
||||
lldb_12 = llvmPackages_12.lldb;
|
||||
|
||||
llvm = llvmPackages.llvm;
|
||||
libllvm = llvmPackages.libllvm;
|
||||
llvm-manpages = llvmPackages.llvm-manpages;
|
||||
|
||||
llvm_12 = llvmPackages_12.llvm;
|
||||
@@ -11236,7 +11242,7 @@ in
|
||||
llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 {
|
||||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_10.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_10.libraries;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_10.libraries or llvmPackages_10.libraries;
|
||||
});
|
||||
|
||||
llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({
|
||||
@@ -11274,15 +11280,15 @@ in
|
||||
mint = callPackage ../development/compilers/mint { };
|
||||
|
||||
mitscheme = callPackage ../development/compilers/mit-scheme {
|
||||
texLive = texlive.combine { inherit (texlive) scheme-small; };
|
||||
texinfo = texinfo5;
|
||||
xlibsWrapper = null;
|
||||
texLive = texlive.combine { inherit (texlive) scheme-small; };
|
||||
texinfo = texinfo5;
|
||||
xlibsWrapper = null;
|
||||
};
|
||||
|
||||
mitschemeX11 = mitscheme.override {
|
||||
texLive = texlive.combine { inherit (texlive) scheme-small; };
|
||||
texinfo = texinfo5;
|
||||
enableX11 = true;
|
||||
texLive = texlive.combine { inherit (texlive) scheme-small; };
|
||||
texinfo = texinfo5;
|
||||
enableX11 = true;
|
||||
};
|
||||
|
||||
miranda = callPackage ../development/compilers/miranda {};
|
||||
@@ -11463,9 +11469,11 @@ in
|
||||
# So this commit doesn't remove the 1.45.2 release.
|
||||
rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
llvm_10 = llvmPackages_10.libllvm;
|
||||
};
|
||||
rust_1_51 = callPackage ../development/compilers/rust/1_51.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
llvm_11 = llvmPackages_11.libllvm;
|
||||
};
|
||||
rust = rust_1_51;
|
||||
|
||||
@@ -12260,8 +12268,8 @@ in
|
||||
ruby_2_7
|
||||
ruby_3_0;
|
||||
|
||||
ruby = ruby_2_6;
|
||||
rubyPackages = rubyPackages_2_6;
|
||||
ruby = ruby_2_7;
|
||||
rubyPackages = rubyPackages_2_7;
|
||||
|
||||
rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
|
||||
rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;
|
||||
@@ -12826,7 +12834,7 @@ in
|
||||
credstash = with python3Packages; toPythonApplication credstash;
|
||||
|
||||
creduce = callPackage ../development/tools/misc/creduce {
|
||||
inherit (llvmPackages_7) llvm clang-unwrapped;
|
||||
inherit (llvmPackages_7) llvm libclang;
|
||||
};
|
||||
|
||||
cscope = callPackage ../development/tools/misc/cscope { };
|
||||
@@ -12838,7 +12846,7 @@ in
|
||||
css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;
|
||||
|
||||
cvise = python3Packages.callPackage ../development/tools/misc/cvise {
|
||||
inherit (llvmPackages_11) llvm clang-unwrapped;
|
||||
inherit (llvmPackages_11) llvm libclang;
|
||||
};
|
||||
|
||||
libcxx = llvmPackages.libcxx;
|
||||
@@ -12916,7 +12924,7 @@ in
|
||||
# };
|
||||
#
|
||||
distccWrapper = makeOverridable ({ extraConfig ? "" }:
|
||||
wrapCC (distcc.links extraConfig)) {};
|
||||
wrapCC (distcc.links extraConfig)) {};
|
||||
distccStdenv = lowPrio (overrideCC stdenv buildPackages.distccWrapper);
|
||||
|
||||
distccMasquerade = if stdenv.isDarwin
|
||||
@@ -13797,7 +13805,7 @@ in
|
||||
|
||||
gdb = callPackage ../development/tools/misc/gdb {
|
||||
guile = null;
|
||||
readline = readline80;
|
||||
readline = readline81;
|
||||
};
|
||||
|
||||
jhiccup = callPackage ../development/tools/java/jhiccup { };
|
||||
@@ -14047,7 +14055,7 @@ in
|
||||
belr = callPackage ../development/libraries/belr { };
|
||||
|
||||
beignet = callPackage ../development/libraries/beignet {
|
||||
inherit (llvmPackages_6) llvm clang-unwrapped;
|
||||
inherit (llvmPackages_6) libllvm libclang;
|
||||
};
|
||||
|
||||
belle-sip = callPackage ../development/libraries/belle-sip { };
|
||||
@@ -14727,7 +14735,9 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
|
||||
};
|
||||
|
||||
glibc = callPackage ../development/libraries/glibc { };
|
||||
glibc = callPackage ../development/libraries/glibc {
|
||||
stdenv = gccStdenv; # doesn't compile without gcc
|
||||
};
|
||||
|
||||
# Provided by libc on Operating Systems that use the Extensible Linker Format.
|
||||
elf-header =
|
||||
@@ -14743,7 +14753,7 @@ in
|
||||
|
||||
# Being redundant to avoid cycles on boot. TODO: find a better way
|
||||
glibcCross = callPackage ../development/libraries/glibc {
|
||||
stdenv = crossLibcStdenv;
|
||||
stdenv = gccCrossLibcStdenv; # doesn't compile without gcc
|
||||
};
|
||||
|
||||
muslCross = musl.override {
|
||||
@@ -14766,7 +14776,7 @@ in
|
||||
else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
|
||||
else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries
|
||||
else if name == "libSystem" then targetPackages.darwin.xcode
|
||||
else if name == "nblibc" then targetPackages.netbsdCross.libc
|
||||
else if name == "nblibc" then targetPackages.netbsdCross.libc or netbsdCross.libc
|
||||
else if name == "wasilibc" then targetPackages.wasilibc or wasilibc
|
||||
else if name == "relibc" then targetPackages.relibc or relibc
|
||||
else if stdenv.targetPlatform.isGhcjs then null
|
||||
@@ -14808,7 +14818,6 @@ in
|
||||
|
||||
glsurf = callPackage ../applications/science/math/glsurf {
|
||||
libpng = libpng12;
|
||||
giflib = giflib_4_1;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_01_0;
|
||||
};
|
||||
|
||||
@@ -15229,8 +15238,13 @@ in
|
||||
} // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
|
||||
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
|
||||
}));
|
||||
icu69 = callPackage ../development/libraries/icu/69.nix ({
|
||||
nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; };
|
||||
} // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
|
||||
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
|
||||
}));
|
||||
|
||||
icu = icu68;
|
||||
icu = icu69;
|
||||
|
||||
id3lib = callPackage ../development/libraries/id3lib { };
|
||||
|
||||
@@ -16062,8 +16076,8 @@ in
|
||||
libiconv =
|
||||
if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"]
|
||||
then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform
|
||||
then libcCross
|
||||
else stdenv.cc.libc)
|
||||
then libcCross
|
||||
else stdenv.cc.libc)
|
||||
else if stdenv.hostPlatform.isDarwin
|
||||
then darwin.libiconv
|
||||
else libiconvReal;
|
||||
@@ -16331,7 +16345,7 @@ in
|
||||
libpwquality = callPackage ../development/libraries/libpwquality { };
|
||||
|
||||
libqalculate = callPackage ../development/libraries/libqalculate {
|
||||
readline = readline80;
|
||||
readline = readline81;
|
||||
};
|
||||
|
||||
libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };
|
||||
@@ -16481,13 +16495,10 @@ in
|
||||
|
||||
libwhereami = callPackage ../development/libraries/libwhereami { };
|
||||
|
||||
giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
|
||||
giflib = callPackage ../development/libraries/giflib { };
|
||||
|
||||
libunarr = callPackage ../development/libraries/libunarr { };
|
||||
|
||||
libungif = callPackage ../development/libraries/giflib/libungif.nix { };
|
||||
|
||||
libunibreak = callPackage ../development/libraries/libunibreak { };
|
||||
|
||||
libuninameslist = callPackage ../development/libraries/libuninameslist { };
|
||||
@@ -16875,7 +16886,7 @@ in
|
||||
notify-sharp = callPackage ../development/libraries/notify-sharp { };
|
||||
|
||||
notcurses = callPackage ../development/libraries/notcurses {
|
||||
readline = readline80;
|
||||
readline = readline81;
|
||||
};
|
||||
|
||||
ncurses5 = ncurses.override {
|
||||
@@ -16929,7 +16940,6 @@ in
|
||||
};
|
||||
|
||||
nss = lowPrio (callPackage ../development/libraries/nss { });
|
||||
nss_3_44 = lowPrio (callPackage ../development/libraries/nss/3.44.nix { });
|
||||
nssTools = nss.tools;
|
||||
|
||||
# required for stable thunderbird and firefox-esr-78
|
||||
@@ -17236,8 +17246,9 @@ in
|
||||
python = python37;
|
||||
};
|
||||
|
||||
protobuf = protobuf3_15;
|
||||
protobuf = protobuf3_16;
|
||||
|
||||
protobuf3_16 = callPackage ../development/libraries/protobuf/3.16.nix { };
|
||||
protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { };
|
||||
protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { };
|
||||
protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { };
|
||||
@@ -17444,7 +17455,7 @@ in
|
||||
|
||||
readline70 = callPackage ../development/libraries/readline/7.0.nix { };
|
||||
|
||||
readline80 = callPackage ../development/libraries/readline/8.0.nix { };
|
||||
readline81 = callPackage ../development/libraries/readline/8.1.nix { };
|
||||
|
||||
readosm = callPackage ../development/libraries/readosm { };
|
||||
|
||||
@@ -17521,13 +17532,13 @@ in
|
||||
|
||||
s2geometry = callPackage ../development/libraries/s2geometry { };
|
||||
|
||||
/* This package references ghc844, which we no longer have. Unfortunately, I
|
||||
have been unable to mark it as "broken" in a way that the ofBorg bot
|
||||
recognizes. Since I don't want to merge code into master that generates
|
||||
evaluation errors, I have no other idea but to comment it out entirely.
|
||||
/* This package references ghc844, which we no longer have. Unfortunately, I
|
||||
have been unable to mark it as "broken" in a way that the ofBorg bot
|
||||
recognizes. Since I don't want to merge code into master that generates
|
||||
evaluation errors, I have no other idea but to comment it out entirely.
|
||||
|
||||
sad = callPackage ../applications/science/logic/sad { };
|
||||
*/
|
||||
*/
|
||||
|
||||
safefile = callPackage ../development/libraries/safefile {};
|
||||
|
||||
@@ -18291,9 +18302,7 @@ in
|
||||
|
||||
yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
|
||||
|
||||
yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { };
|
||||
|
||||
yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { };
|
||||
|
||||
@@ -19740,7 +19749,7 @@ in
|
||||
|
||||
inherit (callPackages ../os-specific/linux/apparmor { python = python3; })
|
||||
libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
|
||||
apparmor-profiles apparmor-kernel-patches;
|
||||
apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure;
|
||||
|
||||
aseq2json = callPackage ../os-specific/linux/aseq2json {};
|
||||
|
||||
@@ -20016,8 +20025,6 @@ in
|
||||
|
||||
kbd = callPackage ../os-specific/linux/kbd { };
|
||||
|
||||
kbdKeymaps = callPackage ../os-specific/linux/kbd/keymaps.nix { };
|
||||
|
||||
kbdlight = callPackage ../os-specific/linux/kbdlight { };
|
||||
|
||||
kmscon = callPackage ../os-specific/linux/kmscon { };
|
||||
@@ -20254,11 +20261,11 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
/* Linux kernel modules are inherently tied to a specific kernel. So
|
||||
rather than provide specific instances of those packages for a
|
||||
specific kernel, we have a function that builds those packages
|
||||
for a specific kernel. This function can then be called for
|
||||
whatever kernel you're using. */
|
||||
/* Linux kernel modules are inherently tied to a specific kernel. So
|
||||
rather than provide specific instances of those packages for a
|
||||
specific kernel, we have a function that builds those packages
|
||||
for a specific kernel. This function can then be called for
|
||||
whatever kernel you're using. */
|
||||
|
||||
linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; {
|
||||
callPackage = newScope self;
|
||||
@@ -20398,9 +20405,8 @@ in
|
||||
|
||||
mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };
|
||||
|
||||
/* compiles but has to be integrated into the kernel somehow
|
||||
Let's have it uncommented and finish it..
|
||||
*/
|
||||
# compiles but has to be integrated into the kernel somehow
|
||||
# Let's have it uncommented and finish it..
|
||||
ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };
|
||||
|
||||
netatop = callPackage ../os-specific/linux/netatop { };
|
||||
@@ -20459,13 +20465,12 @@ in
|
||||
zenpower = callPackage ../os-specific/linux/zenpower { };
|
||||
|
||||
inherit (callPackages ../os-specific/linux/zfs {
|
||||
configFile = "kernel";
|
||||
inherit kernel;
|
||||
}) zfsStable zfsUnstable;
|
||||
configFile = "kernel";
|
||||
inherit kernel;
|
||||
}) zfsStable zfsUnstable;
|
||||
zfs = zfsStable;
|
||||
|
||||
zfs = zfsStable;
|
||||
|
||||
can-isotp = callPackage ../os-specific/linux/can-isotp { };
|
||||
can-isotp = callPackage ../os-specific/linux/can-isotp { };
|
||||
});
|
||||
|
||||
# The current default kernel / kernel modules.
|
||||
@@ -20710,8 +20715,9 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Security;
|
||||
};
|
||||
|
||||
nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
|
||||
else unixtools.nettools;
|
||||
nettools = if stdenv.isLinux
|
||||
then callPackage ../os-specific/linux/net-tools { }
|
||||
else unixtools.nettools;
|
||||
|
||||
nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { };
|
||||
|
||||
@@ -20910,8 +20916,9 @@ in
|
||||
|
||||
prayer = callPackage ../servers/prayer { };
|
||||
|
||||
procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
|
||||
else unixtools.procps;
|
||||
procps = if stdenv.isLinux
|
||||
then callPackage ../os-specific/linux/procps-ng { }
|
||||
else unixtools.procps;
|
||||
|
||||
procdump = callPackage ../os-specific/linux/procdump { };
|
||||
|
||||
@@ -22061,7 +22068,6 @@ in
|
||||
ucs-fonts = callPackage ../data/fonts/ucs-fonts
|
||||
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
|
||||
|
||||
|
||||
ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
|
||||
|
||||
ultralist = callPackage ../applications/misc/ultralist { };
|
||||
@@ -22069,7 +22075,7 @@ in
|
||||
undefined-medium = callPackage ../data/fonts/undefined-medium { };
|
||||
|
||||
uni-vga = callPackage ../data/fonts/uni-vga
|
||||
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
|
||||
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
|
||||
|
||||
unicode-character-database = callPackage ../data/misc/unicode-character-database { };
|
||||
|
||||
@@ -22078,7 +22084,7 @@ in
|
||||
unihan-database = callPackage ../data/misc/unihan-database { };
|
||||
|
||||
unifont = callPackage ../data/fonts/unifont
|
||||
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
|
||||
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
|
||||
|
||||
unifont_upper = callPackage ../data/fonts/unifont_upper { };
|
||||
|
||||
@@ -23109,7 +23115,7 @@ in
|
||||
flwrap = callPackage ../applications/radio/flwrap { };
|
||||
|
||||
fluidsynth = callPackage ../applications/audio/fluidsynth {
|
||||
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
|
||||
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
|
||||
};
|
||||
fluidsynth_1 = fluidsynth.override { version = "1"; };
|
||||
|
||||
@@ -25106,9 +25112,8 @@ in
|
||||
|
||||
plank = callPackage ../applications/misc/plank { };
|
||||
|
||||
playonlinux = callPackage ../applications/misc/playonlinux {
|
||||
stdenv = stdenv_32bit;
|
||||
};
|
||||
playonlinux = callPackage ../applications/misc/playonlinux
|
||||
{ stdenv = stdenv_32bit; };
|
||||
|
||||
pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { };
|
||||
|
||||
@@ -26488,20 +26493,11 @@ in
|
||||
gtk3Support = true;
|
||||
};
|
||||
|
||||
thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix {
|
||||
inherit (rustPackages) cargo rustc;
|
||||
libpng = libpng_apng;
|
||||
nss = nss_3_44;
|
||||
gtk3Support = true;
|
||||
};
|
||||
|
||||
thunderbolt = callPackage ../os-specific/linux/thunderbolt {};
|
||||
|
||||
thunderbird-bin = thunderbird-bin-78;
|
||||
thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { };
|
||||
|
||||
thunderbird-bin-68 = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { };
|
||||
|
||||
ticpp = callPackage ../development/libraries/ticpp { };
|
||||
|
||||
ticker = callPackage ../applications/misc/ticker { };
|
||||
@@ -27026,9 +27022,7 @@ in
|
||||
|
||||
weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
|
||||
|
||||
wio = callPackage ../applications/window-managers/wio {
|
||||
wlroots = wlroots_0_12;
|
||||
};
|
||||
wio = callPackage ../applications/window-managers/wio { };
|
||||
|
||||
whitebox-tools = callPackage ../applications/gis/whitebox-tools {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
@@ -27520,10 +27514,10 @@ in
|
||||
zgrviewer = callPackage ../applications/graphics/zgrviewer { };
|
||||
|
||||
zgv = callPackage ../applications/graphics/zgv {
|
||||
# Enable the below line for terminal display. Note
|
||||
# that it requires sixel graphics compatible terminals like mlterm
|
||||
# or xterm -ti 340
|
||||
SDL = SDL_sixel;
|
||||
# Enable the below line for terminal display. Note
|
||||
# that it requires sixel graphics compatible terminals like mlterm
|
||||
# or xterm -ti 340
|
||||
SDL = SDL_sixel;
|
||||
};
|
||||
|
||||
zim = callPackage ../applications/office/zim { };
|
||||
@@ -29454,8 +29448,8 @@ in
|
||||
elan = callPackage ../applications/science/logic/elan {};
|
||||
mathlibtools = with python3Packages; toPythonApplication mathlibtools;
|
||||
|
||||
leo2 = callPackage ../applications/science/logic/leo2 {
|
||||
ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;};
|
||||
leo2 = callPackage ../applications/science/logic/leo2
|
||||
{ ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; };
|
||||
|
||||
leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {};
|
||||
|
||||
@@ -30251,57 +30245,58 @@ in
|
||||
|
||||
nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };
|
||||
|
||||
/* Evaluate a NixOS configuration using this evaluation of Nixpkgs.
|
||||
/*
|
||||
Evaluate a NixOS configuration using this evaluation of Nixpkgs.
|
||||
|
||||
With this function you can write, for example, a package that
|
||||
depends on a custom virtual machine image.
|
||||
With this function you can write, for example, a package that
|
||||
depends on a custom virtual machine image.
|
||||
|
||||
Parameter: A module, path or list of those that represent the
|
||||
Parameter: A module, path or list of those that represent the
|
||||
configuration of the NixOS system to be constructed.
|
||||
|
||||
Result: An attribute set containing packages produced by this
|
||||
evaluation of NixOS, such as toplevel, kernel and
|
||||
initialRamdisk.
|
||||
The result can be extended in the modules by defining
|
||||
extra attributes in system.build.
|
||||
Alternatively, you may use the result's config and
|
||||
options attributes to query any option.
|
||||
Result: An attribute set containing packages produced by this
|
||||
evaluation of NixOS, such as toplevel, kernel and
|
||||
initialRamdisk.
|
||||
The result can be extended in the modules by defining
|
||||
extra attributes in system.build.
|
||||
Alternatively, you may use the result's config and
|
||||
options attributes to query any option.
|
||||
|
||||
Example:
|
||||
Example:
|
||||
|
||||
let
|
||||
myOS = pkgs.nixos ({ lib, pkgs, config, ... }: {
|
||||
let
|
||||
myOS = pkgs.nixos ({ lib, pkgs, config, ... }: {
|
||||
|
||||
config.services.nginx = {
|
||||
enable = true;
|
||||
# ...
|
||||
};
|
||||
config.services.nginx = {
|
||||
enable = true;
|
||||
# ...
|
||||
};
|
||||
|
||||
# Use config.system.build to exports relevant parts of a
|
||||
# configuration. The runner attribute should not be
|
||||
# considered a fully general replacement for systemd
|
||||
# functionality.
|
||||
config.system.build.run-nginx = config.systemd.services.nginx.runner;
|
||||
});
|
||||
in
|
||||
myOS.run-nginx
|
||||
# Use config.system.build to exports relevant parts of a
|
||||
# configuration. The runner attribute should not be
|
||||
# considered a fully general replacement for systemd
|
||||
# functionality.
|
||||
config.system.build.run-nginx = config.systemd.services.nginx.runner;
|
||||
});
|
||||
in
|
||||
myOS.run-nginx
|
||||
|
||||
Unlike in plain NixOS, the nixpkgs.config and
|
||||
nixpkgs.system options will be ignored by default. Instead,
|
||||
nixpkgs.pkgs will have the default value of pkgs as it was
|
||||
constructed right after invoking the nixpkgs function (e.g. the
|
||||
value of import <nixpkgs> { overlays = [./my-overlay.nix]; }
|
||||
but not the value of (import <nixpkgs> {} // { extra = ...; }).
|
||||
Unlike in plain NixOS, the nixpkgs.config and
|
||||
nixpkgs.system options will be ignored by default. Instead,
|
||||
nixpkgs.pkgs will have the default value of pkgs as it was
|
||||
constructed right after invoking the nixpkgs function (e.g. the
|
||||
value of import <nixpkgs> { overlays = [./my-overlay.nix]; }
|
||||
but not the value of (import <nixpkgs> {} // { extra = ...; }).
|
||||
|
||||
If you do want to use the config.nixpkgs options, you are
|
||||
probably better off by calling nixos/lib/eval-config.nix
|
||||
directly, even though it is possible to set config.nixpkgs.pkgs.
|
||||
If you do want to use the config.nixpkgs options, you are
|
||||
probably better off by calling nixos/lib/eval-config.nix
|
||||
directly, even though it is possible to set config.nixpkgs.pkgs.
|
||||
|
||||
For more information about writing NixOS modules, see
|
||||
https://nixos.org/nixos/manual/index.html#sec-writing-modules
|
||||
For more information about writing NixOS modules, see
|
||||
https://nixos.org/nixos/manual/index.html#sec-writing-modules
|
||||
|
||||
Note that you will need to have called Nixpkgs with the system
|
||||
parameter set to the right value for your deployment target.
|
||||
Note that you will need to have called Nixpkgs with the system
|
||||
parameter set to the right value for your deployment target.
|
||||
*/
|
||||
nixos =
|
||||
configuration:
|
||||
@@ -30369,11 +30364,11 @@ in
|
||||
test:
|
||||
let
|
||||
loadedTest = if builtins.typeOf test == "path"
|
||||
then import test
|
||||
else test;
|
||||
then import test
|
||||
else test;
|
||||
calledTest = if pkgs.lib.isFunction loadedTest
|
||||
then callPackage loadedTest {}
|
||||
else loadedTest;
|
||||
then callPackage loadedTest {}
|
||||
else loadedTest;
|
||||
in
|
||||
nixosTesting.makeTest calledTest;
|
||||
|
||||
@@ -30875,9 +30870,7 @@ in
|
||||
|
||||
vbam = callPackage ../misc/emulators/vbam { };
|
||||
|
||||
vice = callPackage ../misc/emulators/vice {
|
||||
giflib = giflib_4_1;
|
||||
};
|
||||
vice = callPackage ../misc/emulators/vice { };
|
||||
|
||||
ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { };
|
||||
|
||||
@@ -31033,10 +31026,10 @@ in
|
||||
};
|
||||
|
||||
xsw = callPackage ../applications/misc/xsw {
|
||||
# Enable the next line to use this in terminal.
|
||||
# Note that it requires sixel capable terminals such as mlterm
|
||||
# or xterm -ti 340
|
||||
SDL = SDL_sixel;
|
||||
# Enable the next line to use this in terminal.
|
||||
# Note that it requires sixel capable terminals such as mlterm
|
||||
# or xterm -ti 340
|
||||
SDL = SDL_sixel;
|
||||
};
|
||||
|
||||
xteddy = callPackage ../applications/misc/xteddy { };
|
||||
@@ -31295,8 +31288,12 @@ in
|
||||
|
||||
fts = if stdenv.hostPlatform.isMusl then netbsd.fts else null;
|
||||
|
||||
netbsd = callPackages ../os-specific/bsd/netbsd {};
|
||||
netbsdCross = callPackages ../os-specific/bsd/netbsd {
|
||||
bsdSetupHook = makeSetupHook {
|
||||
name = "bsd-setup-hook";
|
||||
} ../os-specific/bsd/setup-hook.sh;
|
||||
|
||||
netbsd = callPackage ../os-specific/bsd/netbsd {};
|
||||
netbsdCross = callPackage ../os-specific/bsd/netbsd {
|
||||
stdenv = crossLibcStdenv;
|
||||
};
|
||||
|
||||
|
||||
@@ -116,12 +116,11 @@ let
|
||||
then callPackage ../development/ocaml-modules/camomile { }
|
||||
else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { };
|
||||
|
||||
camlimages_4_0 =
|
||||
camlimages_4_1_2 =
|
||||
if lib.versionOlder "4.02" ocaml.version
|
||||
then null
|
||||
else callPackage ../development/ocaml-modules/camlimages/4.0.nix {
|
||||
else callPackage ../development/ocaml-modules/camlimages/4.1.2.nix {
|
||||
libpng = pkgs.libpng12;
|
||||
giflib = pkgs.giflib_4_1;
|
||||
};
|
||||
camlimages = callPackage ../development/ocaml-modules/camlimages { };
|
||||
|
||||
@@ -587,7 +586,7 @@ let
|
||||
linenoise = callPackage ../development/ocaml-modules/linenoise { };
|
||||
|
||||
llvm = callPackage ../development/ocaml-modules/llvm {
|
||||
llvm = pkgs.llvm_8;
|
||||
libllvm = pkgs.llvmPackages_8.libllvm;
|
||||
};
|
||||
|
||||
logs = callPackage ../development/ocaml-modules/logs { };
|
||||
|
||||
@@ -2062,6 +2062,8 @@ in {
|
||||
inherit (pkgs) graphviz;
|
||||
};
|
||||
|
||||
dotmap = callPackage ../development/python-modules/dotmap { };
|
||||
|
||||
dparse = callPackage ../development/python-modules/dparse { };
|
||||
|
||||
dpath = callPackage ../development/python-modules/dpath { };
|
||||
@@ -4175,6 +4177,8 @@ in {
|
||||
|
||||
meshlabxml = callPackage ../development/python-modules/meshlabxml { };
|
||||
|
||||
meshtastic = callPackage ../development/python-modules/meshtastic { };
|
||||
|
||||
meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs
|
||||
(oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently.
|
||||
setupHook = null;
|
||||
@@ -5320,6 +5324,8 @@ in {
|
||||
|
||||
py-dmidecode = callPackage ../development/python-modules/py-dmidecode { };
|
||||
|
||||
py-ubjson = callPackage ../development/python-modules/py-ubjson { };
|
||||
|
||||
py2bit = callPackage ../development/python-modules/py2bit { };
|
||||
|
||||
py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });
|
||||
@@ -5623,6 +5629,8 @@ in {
|
||||
|
||||
pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };
|
||||
|
||||
pygatt = callPackage ../development/python-modules/pygatt { };
|
||||
|
||||
pygbm = callPackage ../development/python-modules/pygbm { };
|
||||
|
||||
pygccxml = callPackage ../development/python-modules/pygccxml { };
|
||||
@@ -7556,9 +7564,9 @@ in {
|
||||
|
||||
signify = callPackage ../development/python-modules/signify { };
|
||||
|
||||
sip = callPackage ../development/python-modules/sip { };
|
||||
sip = callPackage ../development/python-modules/sip/default.nix { };
|
||||
|
||||
sip_5 = callPackage ../development/python-modules/sip/5.x.nix { };
|
||||
sip_4 = callPackage ../development/python-modules/sip/4.x.nix { };
|
||||
|
||||
six = callPackage ../development/python-modules/six { };
|
||||
|
||||
@@ -8157,6 +8165,8 @@ in {
|
||||
|
||||
tilestache = callPackage ../development/python-modules/tilestache { };
|
||||
|
||||
timeago = callPackage ../development/python-modules/timeago { };
|
||||
|
||||
timelib = callPackage ../development/python-modules/timelib { };
|
||||
|
||||
timeout-decorator = callPackage ../development/python-modules/timeout-decorator { };
|
||||
|
||||
Reference in New Issue
Block a user