Skip to content

Commit b22cc53

Browse files
FRidhFRidh
committed
Merge staging into master
2 parents d90eea8 + dac633f commit b22cc53

File tree

511 files changed

+3907
-3155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

511 files changed

+3907
-3155
lines changed

‎doc/languages-frameworks/perl.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ buildPerlPackage rec {
109109
};
110110

111111
preConfigure = ''
112-
echo "LIB = ${db}/lib" > config.in
113-
echo "INCLUDE = ${db}/include" >> config.in
112+
echo "LIB = ${db.out}/lib" > config.in
113+
echo "INCLUDE = ${db.dev}/include" >> config.in
114114
'';
115115
}
116116
</programlisting>

‎doc/stdenv.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,6 +1163,14 @@ passthru = {
11631163
</para>
11641164
</listitem>
11651165
</varlistentry>
1166+
<varlistentry>
1167+
<term><varname>checkInputs</varname>
1168+
</term>
1169+
<listitem><para>
1170+
A list of dependencies used by the phase. This gets included in
1171+
<varname>buildInputs</varname> when <varname>doCheck</varname> is set.
1172+
</para></listitem>
1173+
</varlistentry>
11661174
<varlistentry>
11671175
<term><varname>makeFlags</varname>
11681176
</term>
@@ -1646,6 +1654,15 @@ set debug-file-directory ~/.nix-profile/lib/debug
16461654
</para>
16471655
</listitem>
16481656
</varlistentry>
1657+
<varlistentry>
1658+
<term><varname>installCheckInputs</varname>
1659+
</term>
1660+
<listitem><para>
1661+
A list of dependencies used by the phase. This gets included in
1662+
<varname>buildInputs</varname> when <varname>doInstallCheck</varname>
1663+
is set.
1664+
</para></listitem>
1665+
</varlistentry>
16491666
<varlistentry>
16501667
<term><varname>preInstallCheck</varname>
16511668
</term>

‎lib/systems/for-meta.nix‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ in rec {
2121
darwin = [ patterns.isDarwin ];
2222
freebsd = [ patterns.isFreeBSD ];
2323
# Should be better, but MinGW is unclear, and HURD is bit-rotted.
24-
gnu = [ { kernel = parse.kernels.linux; abi = abis.gnu; } ];
24+
gnu = [
25+
{ kernel = parse.kernels.linux; abi = parse.abis.gnu; }
26+
{ kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }
27+
{ kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }
28+
];
2529
illumos = [ patterns.isSunOS ];
2630
linux = [ patterns.isLinux ];
2731
netbsd = [ patterns.isNetBSD ];

‎nixos/modules/services/misc/nix-daemon.nix‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ let
3333
sh = pkgs.runtimeShell;
3434
binshDeps = pkgs.writeReferencesToFile sh;
3535
in
36-
pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } ''
36+
pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } (''
3737
${optionalString (!isNix20) ''
3838
extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
3939
''}
@@ -62,7 +62,11 @@ let
6262
''}
6363
$extraOptions
6464
END
65-
'';
65+
'' + optionalString cfg.checkConfig ''
66+
echo "Checking that Nix can read nix.conf..."
67+
ln -s $out ./nix.conf
68+
NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
69+
'');
6670

6771
in
6872

@@ -351,6 +355,13 @@ in
351355
'';
352356
};
353357

358+
checkConfig = mkOption {
359+
type = types.bool;
360+
default = true;
361+
description = ''
362+
If enabled (the default), checks that Nix can parse the generated nix.conf.
363+
'';
364+
};
354365
};
355366

356367
};

‎nixos/release.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ in rec {
288288
tests.flatpak = callTest tests/flatpak.nix {};
289289
tests.firewall = callTest tests/firewall.nix {};
290290
tests.fwupd = callTest tests/fwupd.nix {};
291+
tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};
291292
#tests.gitlab = callTest tests/gitlab.nix {};
292293
tests.gitolite = callTest tests/gitolite.nix {};
293294
tests.gjs = callTest tests/gjs.nix {};

‎nixos/tests/gdk-pixbuf.nix‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# run installed tests
2+
import ./make-test.nix ({ pkgs, ... }: {
3+
name = "gdk-pixbuf";
4+
5+
meta = {
6+
maintainers = pkgs.gdk_pixbuf.meta.maintainers;
7+
};
8+
9+
machine = { pkgs, ... }: {
10+
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
11+
environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];
12+
13+
virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE
14+
};
15+
16+
testScript = ''
17+
$machine->succeed("gnome-desktop-testing-runner");
18+
'';
19+
})

‎pkgs/applications/altcoins/bitcoin.nix‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec{
2525
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
2626
];
2727

28+
# Fails with "This application failed to start because it could not
29+
# find or load the Qt platform plugin "minimal""
30+
doCheck = false;
31+
2832
meta = {
2933
description = "Peer-to-peer electronic cash system";
3034
longDescription= ''

‎pkgs/applications/altcoins/dapp.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
, seth, git, solc, shellcheck, nodejs, hevm }:
33

44
stdenv.mkDerivation rec {
5-
name = "dapp";
5+
name = "dapp-${version}";
66
version = "0.5.7";
77

88
src = fetchFromGitHub {

‎pkgs/applications/altcoins/mist.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let
2525
categories = "Network;";
2626
};
2727

28-
mist = stdenv.mkDerivation {
28+
mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
2929
inherit name version;
3030

3131
src = {
@@ -53,10 +53,10 @@ let
5353
--set-rpath "${atomEnv.libPath}:$out/lib/mist" \
5454
$out/lib/mist/mist
5555
'';
56-
};
56+
});
5757
in
5858
buildFHSUserEnv {
59-
name = "mist";
59+
name = "mist-${stdenv.lib.getVersion mist}";
6060

6161
targetPkgs = pkgs: with pkgs; [
6262
mist

‎pkgs/applications/audio/easytag/default.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ in stdenv.mkDerivation rec {
2222
gsettings-desktop-schemas gnome3.defaultIconTheme
2323
];
2424

25+
doCheck = false; # fails 1 out of 9 tests
26+
2527
passthru = {
2628
updateScript = gnome3.updateScript {
2729
packageName = pname;

0 commit comments

Comments
 (0)