Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-19 00:01:36 +00:00 committed by GitHub
commit dc802b2e19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 112 additions and 67 deletions

View File

@ -7,7 +7,7 @@
<itemizedlist spacing="compact">
<listitem>
<para>
Support is planned until the end of April 2022, handing over to
Support is planned until the end of June 2022, handing over to
22.05.
</para>
</listitem>

View File

@ -2,7 +2,7 @@
In addition to numerous new and upgraded packages, this release has the following highlights:
- Support is planned until the end of April 2022, handing over to 22.05.
- Support is planned until the end of June 2022, handing over to 22.05.
## Highlights {#sec-release-21.11-highlights}

View File

@ -105,7 +105,7 @@ let
pkgs.stdenv.mkDerivation {
name = "hercules-ci-check-system-nix-src";
inherit (config.nix.package) src patches;
configurePhase = ":";
dontConfigure = true;
buildPhase = ''
echo "Checking in-memory pathInfoCache expiry"
if ! grep 'PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then

View File

@ -54,8 +54,7 @@ stdenv.mkDerivation {
${addAllNetDev netDevices}
'';
installPhase = ":";
dontInstall = true;
dontStrip = true;
dontPatchELF = true;

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
buildInputs = [ emacs ];
buildPhase = ":";
dontBuild = true;
installPhase = ''
install -d $out/share/emacs/site-lisp

View File

@ -27,7 +27,7 @@ rec {
});
buildKakounePluginFrom2Nix = attrs: buildKakounePlugin ({
buildPhase = ":";
configurePhase = ":";
dontBuild = true;
dontConfigure = true;
} // attrs);
}

View File

@ -58,7 +58,7 @@ in
homepage = "https://code.visualstudio.com/";
downloadPage = "https://code.visualstudio.com/Updates";
license = licenses.unfree;
maintainers = with maintainers; [ eadwu synthetica ];
maintainers = with maintainers; [ eadwu synthetica maxeaubrey ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ];
};
}

View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
chmod +x $out/bin/thinkingrock
'';
installPhase = ":";
dontInstall = true;
meta = with lib; {
description = "Task management system";

View File

@ -53,6 +53,6 @@ buildGoPackage rec {
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
platforms = platforms.unix;
license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes ];
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ];
};
}

View File

@ -62,6 +62,7 @@ let
marsam
timstott
zimbatm
maxeaubrey
];
};
} // attrs');

View File

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
dontUnpack = true;
dontBuild = true;
unpackPhase = ":";
installPhase = ''
runHook preInstall

View File

@ -225,7 +225,7 @@ in {
mkdir -p $out/lib/vdr
'';
installPhase = ":";
dontInstall = true;
meta = with lib; {
homepage = "https://projects.vdr-developer.org/projects/plg-text2skin";

View File

@ -86,6 +86,16 @@ stdenv.mkDerivation rec {
patches = [
./fix-qemu-ga.patch
./9p-ignore-noatime.patch
(fetchpatch {
name = "CVE-2021-3545.patch";
url = "https://gitlab.com/qemu-project/qemu/-/commit/121841b25d72d13f8cad554363138c360f1250ea.patch";
sha256 = "13dgfd8dmxcalh2nvb68iv0kyv4xxrvpdqdxf1h3bjr4451glag1";
})
(fetchpatch {
name = "CVE-2021-3546.patch";
url = "https://gitlab.com/qemu-project/qemu/-/commit/9f22893adcb02580aee5968f32baa2cd109b3ec2.patch";
sha256 = "1vkhm9vl671y4cra60b6704339qk1h5dyyb3dfvmvpsvfyh2pm7n";
})
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
++ optionals stdenv.hostPlatform.isMusl [
(fetchpatch {

View File

@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/ubuntu/yaru";
license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ];
platforms = platforms.linux;
maintainers = with maintainers; [ fortuneteller2k ];
maintainers = with maintainers; [ fortuneteller2k maxeaubrey ];
};
}

View File

@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ jre ];
buildPhase = ":";
dontBuild = true;
postPatch = ''
shopt -s extglob
@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc
'';
fixupPhase = ":";
dontFixup = true;
meta = with lib; {
description = "Flex SDK for Adobe Flash / ActionScript";

View File

@ -100,7 +100,7 @@ let
homepage = "https://wiki.gnome.org/Projects/Vala";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ antono jtojnar peterhoeg ];
maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ];
};
});

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
# proto_path. By default the current directory is automatically added to the
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
# not work because they end up in the store at different locations.
installPhase = ":";
dontInstall = true;
buildPhase = ''
mkdir $out

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
# proto_path. By default the current directory is automatically added to the
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
# not work because they end up in the store at different locations.
installPhase = ":";
dontInstall = true;
buildPhase = ''
mkdir $out

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
# proto_path. By default the current directory is automatically added to the
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
# not work because they end up in the store at different locations.
installPhase = ":";
dontInstall = true;
buildPhase = ''
mkdir $out

View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
# proto_path. By default the current directory is automatically added to the
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did
# not work because they end up in the store at different locations.
installPhase = ":";
dontInstall = true;
buildPhase = ''
mkdir $out

View File

@ -38,7 +38,7 @@ buildPythonPackage rec {
];
# pytest-astropy is a meta package and has no tests
checkPhase = ":";
doCheck = false;
meta = with lib; {
description = "Meta-package containing dependencies for testing";

View File

@ -57,7 +57,7 @@ let
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ selected ruby ];
unpackPhase = ":";
dontUnpack = true;
installPhase = ''
for i in ${ruby}/bin/* ${gemEnv}/bin/*; do

View File

@ -17,7 +17,7 @@ mkDerivation rec {
dontUseQmakeConfigure = true;
buildPhase = ":";
dontBuild = true;
installPhase = ''
python build.py install --verbose --prefix="$out"

View File

@ -33,7 +33,8 @@ stdenv.mkDerivation {
buildInputs = [ tree-sitter ];
dontUnpack = true;
configurePhase = ":";
dontConfigure = true;
buildPhase = ''
runHook preBuild
scanner_cc="$src/src/scanner.cc"

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
gunzip -c $curSrc > now-linux
'';
buildPhase = ":";
dontBuild = true;
installPhase = ''
mkdir $out

View File

@ -9,8 +9,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config intltool autoreconfHook ];
dontConfigure = true;
buildPhase = ":";
dontBuild = true;
installPhase = ''
echo "Copying libraries from apulse."

View File

@ -0,0 +1,28 @@
{ stdenv, lib, fetchurl, makeWrapper, python3, gettext
, pyqt5, setuptools, requests
}:
stdenv.mkDerivation rec {
pname = "fs-uae-launcher";
version = "3.0.5";
src = fetchurl {
url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz";
sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97";
};
makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ makeWrapper python3 gettext ];
buildInputs = [ pyqt5 setuptools requests ];
postInstall = ''
wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH"
'';
meta = {
description = "Graphical front-end for the FS-UAE emulator";
license = lib.licenses.gpl2Plus;
homepage = "https://fs-uae.net";
maintainers = with lib; [ maintainers.sander ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

View File

@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ mic92 dtzWill ];
maintainers = with maintainers; [ mic92 dtzWill maxeaubrey ];
};
}

View File

@ -91,6 +91,6 @@ stdenv.mkDerivation rec {
description = "Wireless daemon for Linux";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill fpletz ];
maintainers = with maintainers; [ dtzWill fpletz maxeaubrey ];
};
}

View File

@ -1,32 +1,32 @@
{
"4.14": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.238-hardened1.patch",
"sha256": "13wld3dm9ymwcsk5f06l64z9q49ff7rh7dqfqxxhkngdx2i1h566",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.238-hardened1/linux-hardened-4.14.238-hardened1.patch"
"name": "linux-hardened-4.14.239-hardened1.patch",
"sha256": "1yfg6c75y1dp627qn8c4795sc9vwywc5dl95ngg8zk15n5d7j9in",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.239-hardened1/linux-hardened-4.14.239-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.196-hardened1.patch",
"sha256": "1wna5j1g1703gl4xw4x5z8dmc8gjqg879zq4xnmlyc0vryqjrxyq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.196-hardened1/linux-hardened-4.19.196-hardened1.patch"
"name": "linux-hardened-4.19.197-hardened1.patch",
"sha256": "1cbcas5kl6k8hn60p08pvw073mrv8lkrav3pc9sxvdcscdbwkkpr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.197-hardened1/linux-hardened-4.19.197-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.48-hardened1.patch",
"sha256": "1drfh4ljiih4y5fn2bvg15wrmz10s50q5qyhn89r63b5qkb1lp21",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.48-hardened1/linux-hardened-5.10.48-hardened1.patch"
"name": "linux-hardened-5.10.50-hardened1.patch",
"sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch"
},
"5.12": {
"extra": "-hardened1",
"name": "linux-hardened-5.12.15-hardened1.patch",
"sha256": "1d81z67y9659icgmkchj0y2jlcs4nh4grlzf7ppbq6vmrr92xq8x",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.15-hardened1/linux-hardened-5.12.15-hardened1.patch"
"name": "linux-hardened-5.12.17-hardened1.patch",
"sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.130-hardened1.patch",
"sha256": "0d7q6pkl74hkx65p25jxjjky08zdprsfbcyik9cdlsfrbiidwn53",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.130-hardened1/linux-hardened-5.4.130-hardened1.patch"
"name": "linux-hardened-5.4.132-hardened1.patch",
"sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch"
}
}

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.238";
version = "4.14.239";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1phjgm1fhyfpm2h9b2bngcbh91v2qrxcm7vma86q7pdqrcbh1fih";
sha256 = "167zwm3giizv42m0xjz71xnb2swlwiaw0xw0dg8j8mb74hz1drx0";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.196";
version = "4.19.197";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0liapgaczv6lq7223wnq2cbwfb6w93iw14dv1xidcb3bnakm4h5f";
sha256 = "10kj442qaky6rpl65k5rrvd3p6mdgz4p321zvf4s312ixfdja0g6";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.48";
version = "5.10.50";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0pn24bkz9mkphv9f634117zam0ak6q3pbpfwv0l5kf71h0s1klfv";
sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.12.15";
version = "5.12.17";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1nlgwcxfhxzf5wak8c0gamn4k8vpdllzqlpqqn5fa08cdjcymz27";
sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.130";
version = "5.4.132";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0ywwy6g0fd05fxgwsrycz2l6khjljxa3qbi6hywp3rjgmgxp2ak6";
sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.47-rt45"; # updated by ./update-rt.sh
version = "5.10.47-rt46"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -25,7 +25,7 @@ in buildLinux (args // {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0s3y636ymrhm8rg6n47wdk1pvvmpsnynmyhyy5681f2pw5z2c1ay";
sha256 = "12jnnwnh3bgz2ygc173r45sbqm74rz3f2nlp7m2fb8dlxdby460q";
};
}; in [ rt-patch ] ++ kernelPatches;

View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
# Source: https://wooting.helpscoutdocs.com/article/68-wootility-configuring-device-access-for-wootility-under-linux-udev-rules
src = [ ./wooting.rules ];
unpackPhase = ":";
dontUnpack = true;
installPhase = ''
install -Dpm644 $src $out/lib/udev/rules.d/70-wooting.rules

View File

@ -12,7 +12,7 @@ let
inherit src;
locale = _locale;
dbName = _name;
buildPhase = ":";
dontBuild = true;
unpackPhase = ''
tar xf ${src}
'';

View File

@ -21,7 +21,7 @@ let
};
dontConfigure = true;
buildPhase = ":";
dontBuild = true;
installPhase = "mkdir -p $out/include && cp -R boost $out/include/";
};

View File

@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
lnl7
pjones
thoughtpolice
maxeaubrey
];
description = "Media library streaming server";
longDescription = ''

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf";
};
buildPhase = ":";
dontBuild = true;
installPhase = ''
mkdir -p $out/share/postgresql/extension
cp pg*sql *.control $out/share/postgresql/extension

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
scons PREFIX=$out WITH_ORILOCAL=1 install
'';
installPhase = ":";
dontInstall = true;
meta = with lib; {
description = "A secure distributed file system";

View File

@ -21,7 +21,7 @@
ar p "$src" data.tar.xz | tar xJ
'';
buildPhase = ":";
dontBuild = true;
installPhase = ''
mkdir -p $out/bin $out/share/sweep-visualizer

View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "004svkfzhc3ab6q2qvwzgj36wvicg5bs8d2gcibx6adq042di7zj";
};
buildPhase = ":";
dontBuild = true;
installPhase = ''
mkdir -p $out/{bin,share}

View File

@ -20,8 +20,10 @@ mkDerivation rec {
buildInputs = [ qtbase ];
nativeBuildInputs = [ qmake cmake zip ];
configurePhase = ":";
buildPhase = "bash unixbuild.sh";
dontConfigure = true;
buildPhase = ''
bash unixbuild.sh
'';
installPhase = ''
mkdir -p "$out"/bin

View File

@ -309,7 +309,7 @@ latexindent = perlPackages.buildPerlPackage rec {
preConfigure = ''
touch Makefile.PL
'';
buildPhase = ":";
dontBuild = true;
installPhase = ''
install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent
mkdir -p "$out"/${perl.libPrefix}

View File

@ -31494,6 +31494,10 @@ in
fsuae = callPackage ../misc/emulators/fs-uae { };
fsuae-launcher = callPackage ../misc/emulators/fs-uae-launcher {
inherit (python3Packages) pyqt5 setuptools requests;
};
putty = callPackage ../applications/networking/remote/putty {
gtk2 = gtk2-x11;
};