nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 11:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-12-08 06:02:07 +00:00
committed by GitHub
parent bd080376d3 8c220e0dcb
commit 777d4e2b31
44 changed files with 273 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@@ -278,6 +278,12 @@
githubId = 1250775;
name = "Adolfo E. García Castro";
};
AdsonCicilioti = {
name = "Adson Cicilioti";
email = "adson.cicilioti@live.com";
github = "AdsonCicilioti";
githubId = 6278398;
};
adsr = {
email = "as@php.net";
github = "adsr";

6
pkgs/applications/audio/netease-music-tui/default.nix
View File

@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "netease-music-tui";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "betta-cyber";
repo = "netease-music-tui";
rev = "v${version}";
sha256 = "09355a6d197ckayh9833y39dsarklgpgrq3raapiv25z59di30qq";
sha256 = "sha256-ILJkejRKG2DRXgR6O2tAFbrbd8HtnLZJmITq7hF41DQ=";
};
cargoPatches = [ ./cargo-lock.patch ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib openssl ];
cargoSha256 = "1pca0sz4rz8qls6k2vhf70ixhnvgk81c4hbx81q3pv106g5k205f";
cargoSha256 = "sha256-/JQDUtSSkuO9nrYVSkQOaZjps1BUuH8Bc1SMyDSSJS4=";
meta = with lib; {
homepage = "https://github.com/betta-cyber/netease-music-tui";

10
pkgs/applications/graphics/pdfcpu/default.nix
View File

@@ -2,19 +2,25 @@
buildGoModule rec {
pname = "pdfcpu";
version = "0.3.12";
version = "0.3.13";
src = fetchFromGitHub {
owner = "pdfcpu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ts4FJWUeWHVfeBEetgACYMGEsDLHm5JOEEn7EtQduPU=";
sha256 = "sha256-CFKo8YEAXAniX+jL2A0naJUOn3KAWwcrPsabdiZevhI=";
};
vendorSha256 = "sha256-p/2Bu5h2P3ebgvSC12jdR2Zpd27xCFwtB/KZV0AULAM=";
# No tests
doCheck = false;
doInstallCheck = true;
installCheckPhase = ''
export HOME=$(mktemp -d)
echo checking the version print of pdfcpu
$out/bin/pdfcpu version | grep ${version}
'';
subPackages = [ "cmd/pdfcpu" ];

4
pkgs/applications/misc/nwg-panel/default.nix
View File

@@ -13,13 +13,13 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.4.3";
version = "0.5.0";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "v${version}";
sha256 = "1ihwrs0h2kcw0jw9zq43a9m1qaxllqmbvz0wyv73sgh9zsid5733";
sha256 = "16qpl8dyvll6zy45q8nrg4n6g6n72pj9425gdxv2wfq96mcxfmbl";
};
# No tests

6
pkgs/applications/misc/tut/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tut";
version = "0.0.41";
version = "0.0.42";
src = fetchFromGitHub {
owner = "RasmusLindroth";
repo = pname;
rev = version;
sha256 = "sha256-13d3EE/rswcHRALUfL46qpKYJUDwGiou5kUz+nCC8VQ=";
sha256 = "sha256-zWhG9lzerzDqqFN8IG5JSv3voLzvtp/gg6jBisbodMc=";
};
vendorSha256 = "sha256-RtvzQvZIFdLo24U9IWcoL9qnf4/q/+1UCrb7dcRKEIE=";
vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk=";
meta = with lib; {
description = "A TUI for Mastodon with vim inspired keys";

6
pkgs/applications/networking/cluster/fluxctl/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
version = "1.24.1";
version = "1.24.3";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
sha256 = "sha256-lgcEkOu4iaLg+tP826Qpgmn0ogOpr62o1iWlv1yLbBQ=";
sha256 = "sha256-i86WwSR14hxaXWMesvG2mG8nqXd97M3TekK2FLTLL+Y=";
};
vendorSha256 = "sha256-NQonBTHToGPo7QsChvuVM/jbV5FK71HMJfe5fe1gZYw=";
vendorSha256 = "sha256-Fw3/SMO66eExlDNcIaHM+G2kB4zb1Cih7kp8xfel/iY=";
nativeBuildInputs = [ installShellFiles ];

10
pkgs/applications/networking/cluster/octant/default.nix
View File

@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "octant";
version = "0.24.0";
version = "0.25.0";
src =
let
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
};
in
fetchsrc version {
x86_64-linux = "sha256-fvGVcp6SpHY0UuWurRuypDXbWEs565bK1Peg0Q4Y0m8=";
aarch64-linux = "sha256-7h8l4Pm34UCZ5NhD1scM1c5sM4ePGLDRGAQBfI5vSHI=";
x86_64-darwin = "sha256-2S+D5Gg98GEL5L6bC8ZUSEJXFs74ZaZlNkYHYJYZvqw=";
aarch64-darwin = "sha256-rEhMX+v2sjsmc1p22uscjIyhcnpv2fWjgEnU+lUq9RE=";
x86_64-linux = "sha256-woBmYDOOh3AQH0RZJtMCrOfjFBrpMPzv22cVZ2/xHZo=";
aarch64-linux = "sha256-3YUUdOZULjJZqVJP0aO/d1WulXlpwf012NYJ6Mc2qp8=";
x86_64-darwin = "sha256-9lbMyEid4I1fRLkLwGbmrB2OkycnGBPUU5wEdVZoTLo=";
aarch64-darwin = "sha256-Q0ZkQX9FpzEc6WC3mRoYfg9oW3fvLB1/Ksa64TDlSgo=";
};
dontConfigure = true;

6
pkgs/applications/networking/gmailctl/default.nix
View File

@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "gmailctl";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "mbrt";
repo = "gmailctl";
rev = "v${version}";
sha256 = "sha256-1gOixuOvPHEjnnDNNda9sktnhffovOfeG4XDrLRRMlE=";
sha256 = "sha256-JuE8+OW+qM6tir4A25tN2GTXQIkcKVE4uKbZNSTcNlA=";
};
nativeBuildInputs = [
@@ -26,7 +26,7 @@ buildGoModule rec {
--zsh <($out/bin/gmailctl completion zsh)
'';
vendorSha256 = "sha256-Yv3OGHFOmenst/ujUgvCaSEjwwBf3W9n+55ztVhuWjo=";
vendorSha256 = "sha256-zEWEcv6G/9tmM6/+lhMFkyew3r/pvQRjvh74BENTYI4=";
doCheck = false;

59
pkgs/data/icons/bibata-cursors/default.nix
View File

@@ -1,51 +1,54 @@
{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, clickgen
, unzip
}:
let
py = python3.withPackages(ps: [ ps.pillow ]);
in stdenvNoCC.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "bibata-cursors";
version = "0.4.2";
version = "1.1.2";
src = fetchFromGitHub {
owner = "KaizIqbal";
owner = "ful1e5";
repo = "Bibata_Cursor";
rev = "v${version}";
sha256 = "1f7i5jkl21fvrr45zpcj40avkc7camjb1ddrrdlaabbplgz5mcgn";
sha256 = "1q2wdbrmdnr9mwiilm5cc9im3zwbl7yaj1zpy5wwn44ypq3hcngy";
};
postPatch = ''
patchShebangs .
substituteInPlace build.sh --replace "sudo" ""
bitmaps = fetchurl {
url = "https://github.com/ful1e5/Bibata_Cursor/releases/download/v${version}/bitmaps.zip";
sha256 = "1pcn6par0f0syyhzpzmqr3c6b9ri4lprkdd2ncwzdas01p2d9v1i";
};
# Don't generate windows cursors,
# they aren't used and aren't installed
# by the project's install script anyway.
echo "exit 0" > w32-make.sh
'';
nativeBuildInputs = [ unzip ];
nativeBuildInputs = [
gnome-themes-extra
inkscape
xcursorgen
py
];
buildInputs = [ clickgen ];
buildPhase = ''
HOME="$NIX_BUILD_ROOT" ./build.sh
mkdir bitmaps
unzip $bitmaps -d bitmaps
rm -rf themes
cd builder && make build_unix
'';
installPhase = ''
install -dm 0755 $out/share/icons
for x in Bibata_*; do
cp -pr $x/out/X11/$x $out/share/icons/
done
cd ../
cp -rf themes/* $out/share/icons/
'';
postPatch = ''
substituteInPlace "builder/Makefile" \
--replace "/bin/bash" "bash"
'';
meta = with lib; {
description = "Material Based Cursor";
homepage = "https://github.com/KaizIqbal/Bibata_Cursor";
description = "Material Based Cursor Theme";
homepage = "https://github.com/ful1e5/Bibata_Cursor";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ rawkode ];
maintainers = with maintainers; [ rawkode AdsonCicilioti ];
};
}

59
pkgs/data/icons/bibata-cursors/extra.nix
View File

@@ -1,51 +1,54 @@
{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, clickgen
, unzip
}:
let
py = python3.withPackages(ps: [ ps.pillow ]);
in stdenvNoCC.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "bibata-extra-cursors";
version = "0.3";
version = "1.0.1";
src = fetchFromGitHub {
owner = "KaizIqbal";
owner = "ful1e5";
repo = "Bibata_Extra_Cursor";
rev = "v${version}";
sha256 = "1bh945hvakbh985jkr6g6x0myw3k49pvn24m1clvqdv35v65nfxk";
sha256 = "0wndl4c547k99y0gq922hn7z1mwdgxvvyjfm6757g6shfbcmkz7m";
};
postPatch = ''
patchShebangs .
substituteInPlace build.sh --replace "sudo" ""
bitmaps = fetchurl {
url = "https://github.com/ful1e5/Bibata_Extra_Cursor/releases/download/v${version}/bitmaps.zip";
sha256 = "0vf14ln53wigaq3dkqdk5avarqplsq751nlv72da04ms6gqjfhdl";
};
# Don't generate windows cursors,
# they aren't used and aren't installed
# by the project's install script anyway.
echo "exit 0" > w32-make.sh
'';
nativeBuildInputs = [ unzip ];
nativeBuildInputs = [
gnome-themes-extra
inkscape
xcursorgen
py
];
buildInputs = [ clickgen ];
buildPhase = ''
HOME="$NIX_BUILD_ROOT" ./build.sh
mkdir bitmaps
unzip $bitmaps -d bitmaps
rm -rf themes
cd builder && make build_unix
'';
installPhase = ''
install -dm 0755 $out/share/icons
for x in Bibata_*; do
cp -pr $x/out/X11/$x $out/share/icons/
done
cd ../
cp -rf themes/* $out/share/icons/
'';
postPatch = ''
substituteInPlace "builder/Makefile" \
--replace "/bin/bash" "bash"
'';
meta = with lib; {
description = "Cursors Based on Bibata";
homepage = "https://github.com/KaizIqbal/Bibata_Extra_Cursor";
description = "Material Based Cursor Theme";
homepage = "https://github.com/ful1e5/Bibata_Extra_Cursor";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ dtzWill AdsonCicilioti ];
};
}

27
pkgs/data/icons/bibata-cursors/translucent.nix
View File

@@ -1,31 +1,16 @@
{ lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
{ lib, stdenv, fetchFromGitHub }:
stdenvNoCC.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "bibata-cursors-translucent";
version = "unstable-2019-09-13";
version = "1.1.1";
src = fetchFromGitHub {
owner = "Silicasandwhich";
repo = "Bibata_Cursor_Translucent";
rev = "2eed979d817148817ea6bca15c594809aa9c2cb9";
sha256 = "1s688v40xx9jbvfncb4kgfnnxkmknji7igqx7c4q1ly9s7imbd1f";
rev = "v${version}";
sha256 = "1ddnwqkxricnd731blckcxvksbgql8k4pfiz65591p81n5095k8y";
};
postPatch = ''
patchShebangs .
substituteInPlace build.sh --replace "gksu " ""
'';
nativeBuildInputs = [
gnome-themes-extra
inkscape
xcursorgen
];
buildPhase = ''
HOME="$NIX_BUILD_ROOT" ./build.sh
'';
installPhase = ''
install -dm 0755 $out/share/icons
cp -pr Bibata_* $out/share/icons/
@@ -36,6 +21,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ dtzWill AdsonCicilioti ];
};
}

4
pkgs/data/icons/papirus-icon-theme/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
version = "20211001";
version = "20211201";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
sha256 = "sha256-OVG/bKWOdSxOXVvtMOITnCDoGNSc+zPNZ/XOablfSEE=";
sha256 = "sha256-lcwQALFQ4zkgDLCX1uthAP3QZwP7UcWcPSOU+UTDykE=";
};
nativeBuildInputs = [ gtk3 ];

14
pkgs/development/beam-modules/elixir-ls/default.nix
View File

@@ -2,23 +2,25 @@
# Based on the work of Hauleth
# None of this would have happened without him
mixRelease rec {
let
pname = "elixir-ls";
version = "0.8.1";
inherit elixir;
pinData = lib.importJSON ./pin.json;
version = pinData.version;
src = fetchFromGitHub {
owner = "elixir-lsp";
repo = "elixir-ls";
rev = "v${version}";
sha256 = "sha256-KlZq12RCor9GrwA8QMP3R+jUQ/xFHRjkLwwkvthiMU0=";
sha256 = pinData.sha256;
fetchSubmodules = true;
};
in
mixRelease {
inherit pname version src elixir;
mixFodDeps = fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version elixir;
sha256 = "sha256-OzjToAg+q/ybCyqzNFk28OBsItjFTbdPi416EPh2qX0=";
sha256 = pinData.depsSha256;
};
# elixir_ls is an umbrella app

5
pkgs/development/beam-modules/elixir-ls/pin.json Normal file
View File

@@ -0,0 +1,5 @@
{
"version": "0.9.0",
"sha256": "sha256-dHHmA9TAM5YEfbUoujgy1XLzdh7zGWhR9SsFoTnKX48=",
"depsSha256": "sha256-YkZ/tp537ULKfXka4IdD+RgLlXuv6ayxdYn9KFyXrr4="
}

35
pkgs/development/beam-modules/elixir-ls/update.sh
View File

@@ -2,31 +2,30 @@
#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
# TODO set to `verbose` or `extdebug` once implemented in oil
shopt --set xtrace
set -x
var directory = $(dirname $0 | xargs realpath)
var owner = "elixir-lsp"
var repo = "elixir-ls"
var latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
const directory = $(dirname $0 | xargs realpath)
const owner = "elixir-lsp"
const repo = "elixir-ls"
const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
jq -r '.tag_name')
var latest_version = $(echo $latest_rev | sd 'v' '')
var current_version = $(nix-instantiate -A elixir_ls.version --eval --json | jq -r)
if ("$latest_version" == "$current_version") {
const latest_version = $(echo $latest_rev | sd 'v' '')
const current_version = $(jq -r '.version' $directory/pin.json)
if ("$latest_version" === "$current_version") {
echo "elixir-ls is already up-to-date"
return 0
} else {
var tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
var tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
var sha256s = $(rg '"sha256-.+"' $directory/default.nix | sd '.+"(.+)";' '$1' )
echo $sha256s | read --line :github_sha256
echo $sha256s | tail -n 1 | read --line :old_mix_sha256
sd 'version = ".+"' "version = \"$latest_version\"" "$directory/default.nix"
sd "sha256 = \"$github_sha256\"" "sha256 = \"$tarball_hash\"" "$directory/default.nix"
sd "sha256 = \"$old_mix_sha256\"" "sha256 = \"\"" "$directory/default.nix"
const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
const sha256s = $(rg '"sha256-.+"' $directory/default.nix | sd '.+"(.+)";' '$1' )
var new_mix_hash = $(nix-build -A elixir_ls.mixFodDeps 2>&1 | \
jq ".version = \"$latest_version\" | \
.\"sha256\" = \"$tarball_hash\" | \
.\"depsSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
const new_mix_hash = $(nix-build -A elixir_ls.mixFodDeps 2>&1 | \
tail -n 1 | \
sd '\s+got:\s+' '')
sd "sha256 = \"\"" "sha256 = \"$new_mix_hash\"" "$directory/default.nix"
jq ".depsSha256 = \"$new_mix_hash\"" $directory/pin.json | sponge $directory/pin.json
}

4
pkgs/development/libraries/cpp-utilities/default.nix
View File

@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cpp-utilities";
version = "5.11.2";
version = "5.11.3";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-my4799a9XFXWl9Xyq6gRfw4YTOCEWJgTvRKz0mVqrkQ=";
sha256 = "sha256-a/fuzZ8crmyO87QzIKuYPk0LC3EvvHZrWO17LtWu77I=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/qtutilities/default.nix
View File

@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "qtutilities";
version = "6.5.1";
version = "6.5.2";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-J5yPezXU+AIvmLTBs4lWU35DvfP+0EuuhOJpxAzwRtw=";
sha256 = "sha256-/2gw6k6RUYBRnKJ85C8sDBCCcBEfkRU+MCgWi5/Z2hc=";
};
buildInputs = [ qtbase cpp-utilities ];

45
pkgs/development/python-modules/clickgen/default.nix Normal file
View File

@@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pillow
, libX11
, libXcursor
, libpng
, python
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "clickgen";
version = "1.1.9";
src = fetchFromGitHub {
owner = "ful1e5";
repo = "clickgen";
rev = "v${version}";
sha256 = "108f3sbramd3hhs4d84s3i3lbwllfrkvjakjq4gdmbw6xpilvm0l";
};
buildInputs = [ libXcursor libX11 libpng ];
propagatedBuildInputs = [ pillow ];
pythonImportsCheck = [ "clickgen" ];
postInstall = ''
install -m644 clickgen/xcursorgen.so $out/${python.sitePackages}/clickgen/xcursorgen.so
'';
checkInputs = [ pytestCheckHook ];
meta = with lib; {
homepage = "https://github.com/ful1e5/clickgen";
description = "The hassle-free cursor building toolbox";
longDescription = ''
clickgen is API for building X11 and Windows Cursors from
.png files. clickgen is using anicursorgen and xcursorgen under the hood.
'';
license = licenses.mit;
maintainers = with maintainers; [ AdsonCicilioti ];
};
}

6
pkgs/development/tools/conftest/default.nix
View File

@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "conftest";
version = "0.28.2";
version = "0.28.3";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "v${version}";
sha256 = "sha256-lmmk6veBDI51UA/wnFB7Q3DTxZ9J/1qp0OoNgmBrR1Y=";
sha256 = "sha256-qUbrd80As5BrP67bk8aXWAq85UKL1de5sJlPQtBuxn4=";
};
vendorSha256 = "sha256-NALyUjFL6OqgCke1QiUxbSNLAoaIMB2zeIWWEfcnCjs=";
vendorSha256 = "sha256-cEa2IB65CWsWXZnVRZmOOvUyOhybHBssQGt/pP7YPcg=";
ldflags = [
"-s"

6
pkgs/development/tools/pet/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pet";
version = "0.3.6";
version = "0.4.0";
src = fetchFromGitHub {
owner = "knqyf263";
repo = "pet";
rev = "v${version}";
sha256 = "1na3az7vicjq1rxd3ybid47yrblsdazgli0dchkbwh8zchwhqj33";
sha256 = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg=";
};
vendorSha256 = "0pnd89iqdj3f719xf4iy5r04n51d0rrrf0qb2zjirpw7vh7g82i9";
vendorSha256 = "sha256-vciiBzmqUAt5ZWn9go4B1uaz0HsBk5Z9Rbw7/MAimY4=";
doCheck = false;

4
pkgs/misc/emulators/mednaffe/default.nix
View File

@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "mednaffe";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "AmatCoder";
repo = "mednaffe";
rev = version;
sha256 = "sha256-YU8PHnQHAsY90LN/WDugi4WhsuZGBj/z3BS4o69qMS4=";
sha256 = "sha256-zvSAt6CMcgdoPpTTA5sPlQaWUw9LUMsR2Xg9jM2UaWY=";
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];

60
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@@ -2,61 +2,51 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.255-hardened1.patch",
"sha256": "0d84jwf9vd86qzxq8aqcyrzmwczf3qh2f7a801qsgzb96fyvakrl",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.255-hardened1/linux-hardened-4.14.255-hardened1.patch"
"name": "linux-hardened-4.14.256-hardened1.patch",
"sha256": "0dxp40jq9xwrc8v81yyiy6vachqdwlviws152yzinh0k3j4s1c3g",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.256-hardened1/linux-hardened-4.14.256-hardened1.patch"
},
"sha256": "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh",
"version": "4.14.255"
"sha256": "180s2zmkfxk7af9nnkmfi2cs56af6vwyd21hjcfdxiygjm7j114p",
"version": "4.14.256"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.217-hardened1.patch",
"sha256": "1brx4dvh8acq1r5mbh2a5d95k3n7m4x3jnqnp0s69p3fx9gf1kxh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.217-hardened1/linux-hardened-4.19.217-hardened1.patch"
"name": "linux-hardened-4.19.219-hardened1.patch",
"sha256": "0447km2z1ww6yzixln1a3b7ymrj3ymxag7ny1d60d0d5064id6vj",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.219-hardened1/linux-hardened-4.19.219-hardened1.patch"
},
"sha256": "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5",
"version": "4.19.217"
"sha256": "1nq9228zm24d8azvv6d6r5iw8lfkb7z5lblyhk137mydzdqwsklg",
"version": "4.19.219"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.80-hardened1.patch",
"sha256": "1srm1kwh1fhc1rm7hwwyki48x1b4nq2zishscamsb82drnwl5pbs",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.80-hardened1/linux-hardened-5.10.80-hardened1.patch"
"name": "linux-hardened-5.10.83-hardened1.patch",
"sha256": "1ipx6ad7n2lzlrr02fk2qif5ac2mqpis0qghvms95dd3lpi4lj5r",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.83-hardened1/linux-hardened-5.10.83-hardened1.patch"
},
"sha256": "0ffvgxaq2ipylzavvgnnqk56pw2a6gy5zhhgdhsf8qs2cbvyhz27",
"version": "5.10.80"
},
"5.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.14.20-hardened1.patch",
"sha256": "0bnbwcayfcijgchnhyig9g9q334f4x1hwqns1zwg0wnsi3kxvcsb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.20-hardened1/linux-hardened-5.14.20-hardened1.patch"
},
"sha256": "0icb14xmwijcamqbnj3v16cl1awmjzhg9cniw5gwwk6la1d7aiwj",
"version": "5.14.20"
"sha256": "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg",
"version": "5.10.83"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.3-hardened1.patch",
"sha256": "13d78f159bhd6f1fikrnf5madrfg9zrgg4zcmnjzmb1db1irh53n",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.3-hardened1/linux-hardened-5.15.3-hardened1.patch"
"name": "linux-hardened-5.15.6-hardened1.patch",
"sha256": "1ndj0dsxpailr12pp5kg8qqsvrmcdkhzlnxarl1jsp6c70g051r1",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.6-hardened1/linux-hardened-5.15.6-hardened1.patch"
},
"sha256": "1rh5zkany0gxwha74l8ivb2psykp236h8q56plas7dc7hghxmwx9",
"version": "5.15.3"
"sha256": "1w0plw9rzk2c0g8yxzwj7c6wkq538sy56mx1skmf58wrl83bmsdk",
"version": "5.15.6"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.160-hardened1.patch",
"sha256": "06f7qnc21miz5yjrws3kbavj3v6ir8z3m87ljpnq55y6b73bxngy",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.160-hardened1/linux-hardened-5.4.160-hardened1.patch"
"name": "linux-hardened-5.4.163-hardened1.patch",
"sha256": "1yybid435c466grsfx53iax5x0b1ycz7a02ymx9r85gixp6qd3bp",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.163-hardened1/linux-hardened-5.4.163-hardened1.patch"
},
"sha256": "0n04nlg44l7p855lxkdz80x2avwm1pmrx1761cjmqv4w1qlq1c6l",
"version": "5.4.160"
"sha256": "1glh0azkrqdwydvbz9rp3czc5ppb72gq7svl3zbkjc6qfqbzwik2",
"version": "5.4.163"
}
}

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.255";
version = "4.14.256";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh";
sha256 = "180s2zmkfxk7af9nnkmfi2cs56af6vwyd21hjcfdxiygjm7j114p";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.217";
version = "4.19.219";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5";
sha256 = "1nq9228zm24d8azvv6d6r5iw8lfkb7z5lblyhk137mydzdqwsklg";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.4.292";
version = "4.4.293";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0v5rz8na1d458grc49x3j1951mhvxvqzjq5g9rv1hi0p9rjala97";
sha256 = "1z9hc68v8fvph29l2w3md4734hhgp36sy8mzdlkmdrlkjihq6bvd";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
version = "4.9.290";
version = "4.9.291";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1ns0xbcgv0ix4b3xkcws8g3ks1a31kzc5whmkf9arz1k8si5mpnd";
sha256 = "0lwb9mb4s6qnwklygvfsr5ap85k83w1apkbbfdzzacfn9rvpfpdm";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.81";
version = "5.10.83";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1nssv94zivx08vrxxflq4dxk5fxl3azsqlnzvw58qnf469hniqd2";
sha256 = "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg";
};
} // (args.argsOverride or {}))

18
pkgs/os-specific/linux/kernel/linux-5.14.nix
View File

@@ -1,18 +0,0 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.14.21";
# 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;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1cr381c179nfdrq95l4j56c4ygw09sxv493553ix4b80naf2a6pl";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.4";
version = "5.15.6";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1jnbk7mb3s5xc0a23qd07n28dls9y94cdv2bdy71bxk5bsvhz7al";
sha256 = "1w0plw9rzk2c0g8yxzwj7c6wkq538sy56mx1skmf58wrl83bmsdk";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.161";
version = "5.4.163";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "19rrz7fzka506bpgy229v1sbaxc2s609ldmxc2522y9h5aswcj9i";
sha256 = "1glh0azkrqdwydvbz9rp3czc5ppb72gq7svl3zbkjc6qfqbzwik2";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.78-rt55"; # updated by ./update-rt.sh
version = "5.10.78-rt56"; # 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 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp";
sha256 = "0fg627hd0yq2cnbli2v795qfdwhgqqyzmxrq03vyqwg8471kdqzb";
};
}; in [ rt-patch ] ++ kernelPatches;

6
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.4.154-rt65"; # updated by ./update-rt.sh
version = "5.4.161-rt66"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "01iwbz1ncakw90yykdw3cx04wnclwf1qa8nmlis08svbcvs99285";
sha256 = "19rrz7fzka506bpgy229v1sbaxc2s609ldmxc2522y9h5aswcj9i";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0vbcmwg91hzcxiwq9dj550bw24k8r7lk61j06nwcnwmjg9a3g449";
sha256 = "1prjfvymk4zp94vlgp3nqf1k184blx14kakpikbnk8nck5p9z02m";
};
}; in [ rt-patch ] ++ kernelPatches;

6
pkgs/os-specific/linux/zfs/default.nix
View File

@@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
, linuxPackages_5_14 ? pkgs.linuxKernel.packages.linux_5_14
, linuxPackages_5_10 ? pkgs.linuxKernel.packages.linux_5_10
}:
with lib;
@@ -216,7 +216,7 @@ in {
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_14;
latestCompatibleLinuxPackages = linuxPackages_5_10;
# this package should point to the latest release.
version = "2.1.1";
@@ -227,7 +227,7 @@ in {
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_14;
latestCompatibleLinuxPackages = linuxPackages_5_10;
# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the

6
pkgs/tools/graphics/oxipng/default.nix
View File

@@ -1,15 +1,15 @@
{ lib, stdenv, fetchCrate, rustPlatform }:
rustPlatform.buildRustPackage rec {
version = "5.0.0";
version = "5.0.1";
pname = "oxipng";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-rTAY+3ViPkOsRjT9FHKnVOEGfLscuBdMAiQq+N9PRNU=";
sha256 = "1g2m6ifmppgq086w3vzdsihnba4qrzmnf5k13bgah2qasnl97qfh";
};
cargoSha256 = "sha256-Z5tA2bUE/5qGKXP2hIKo6tBegaSUALRzEZ/Xext3EWY=";
cargoSha256 = "1dkfplmi21wgks8pfxxc3kww89i9wq7fq5j7jm7a8zi59p3xdars";
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;

6
pkgs/tools/misc/opentelemetry-collector/default.nix
View File

@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.38.0";
version = "0.40.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector-contrib";
rev = "v${version}";
sha256 = "1sgzz7p19vy7grvq1qrfgf5rw3yjnidcsdsky2l2g98i54md25ml";
sha256 = "sha256-YFgAS4WReyMnzb6FOeRUXHf1LUgknH5gWObiZNKMbv8=";
};
vendorSha256 = "1p9i01lwz7yidlmcri3pndmg8brgdrd0ai8sag9xn021hw2sn6qq";
vendorSha256 = "sha256-DTZLYF3BoQGou59KaL56pkxySsoQ0xeJ5aF/SkewziE=";
proxyVendor = true;
CGO_ENABLED = 0;

4
pkgs/tools/misc/pandoc-lua-filters/default.nix
View File

@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "pandoc-lua-filters";
version = "2020-11-30";
version = "2021-11-05";
src = fetchFromGitHub {
owner = "pandoc";
repo = "lua-filters";
rev = "v${version}";
sha256 = "HWBlmlIuJOSgRVrUmXOAI4XTxs1PbZhcwZgZFX0x2wM=";
sha256 = "sha256-Y962kdwg2bS3ZoPfsktv4Fy34HUTRhIIuSxPi5ODwWg=";
};
dontBuild = true;

4
pkgs/tools/misc/pistol/default.nix
View File

@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "pistol";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "doronbehar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZLSPq9FfzbuePrz11bqpAIQIfKfTIEnP6KcEIlW5LAA=";
sha256 = "sha256-DGbWlEDI/qGNpdT8N79RsLxnUm4Sw8lHFRIBFd1GmK0=";
};
vendorSha256 = "sha256-poTd0lXRaJeDxwcw+h76NPC0mFB9nwm2vLLB5UUK1dk=";

12
pkgs/tools/networking/fakeroute/default.nix
View File

@@ -1,14 +1,18 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "fakeroute";
version = "0.3";
src = fetchurl {
url = "https://moxie.org/software/fakeroute/${pname}-${version}.tar.gz";
sha256 = "1sp342rxgm1gz4mvi5vvz1knz7kn9px9s39ii3jdjp4ks7lr5c8f";
src = fetchFromGitHub {
owner = "museoa";
repo = "fakeroute";
rev = "f8cb9c0ae3abb4c0662d9e1fcac67eefeeac3963";
sha256 = "12dhahwlpjzv79wpdpryjihamfbh4d8cfzfw4wi1jkl0dv2d41jg";
};
sourceRoot = "source/fakeroute-0.3";
meta = with lib; {
description = ''
Makes your machine appear to be anywhere on the internet

6
pkgs/tools/package-management/nix/default.nix
View File

@@ -256,13 +256,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix";
version = "2.5${suffix}";
suffix = "pre20211126_${lib.substring 0 7 src.rev}";
suffix = "pre20211206_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "55275fcc5966cfad80fb6dc77b8d8939a2f1b8e0";
sha256 = "sha256-jr85Z+0TA86mdsi3Y91wM3dFHWemmFHKdNwbx9rGz2U=";
rev = "d1aaa7ef71713b6693ad3ddf8704ce62bab82095";
sha256 = "sha256-zdMODMLdJ0smEEzNMOoIzBxt9QWVzgMvr+pwxkhtD4g=";
};
boehmgc = boehmgc_nixUnstable;

6
pkgs/tools/text/mark/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mark";
version = "6.4";
version = "6.5.1";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
sha256 = "sha256-Ti7qxNb+7S67bXdvEWPyi/v/OAsAI4pd41dlF7GFjjo=";
sha256 = "sha256-NTe7J08Lu4uVI/mLj4m87n1BZXiUPDvi5OtjJfddJw8=";
};
vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0=";
vendorSha256 = "sha256-Yp47FBS8JN/idBfZG0z0f2A1bzob8KTPtZ7u0cNCrM8=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];

2
pkgs/top-level/aliases.nix
View File

@@ -481,7 +481,6 @@ mapAliases ({
linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
linuxPackages_5_14 = linuxKernel.packages.linux_5_14;
linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
@@ -497,7 +496,6 @@ mapAliases ({
linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
linux_5_10 = linuxKernel.kernels.linux_5_10;
linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
linux_5_14 = linuxKernel.kernels.linux_5_14;
linux_5_15 = linuxKernel.kernels.linux_5_15;
# added 2020-04-04

20
pkgs/top-level/all-packages.nix
View File

@@ -2478,6 +2478,8 @@ with pkgs;
clickclack = callPackage ../tools/misc/clickclack { };
clickgen = with python3Packages; toPythonApplication clickgen;
clog-cli = callPackage ../development/tools/clog-cli { };
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { };
@@ -12512,31 +12514,31 @@ with pkgs;
llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_5.tools;
targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
targetLlvmLibraries = targetPackages.llvmPackages_5.libraries or llvmPackages_5.libraries;
});
llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_6.tools;
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries or llvmPackages_6.libraries;
});
llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_7.tools;
targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
targetLlvmLibraries = targetPackages.llvmPackages_7.libraries or llvmPackages_7.libraries;
});
llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_8.tools;
targetLlvmLibraries = targetPackages.llvmPackages_8.libraries;
targetLlvmLibraries = targetPackages.llvmPackages_8.libraries or llvmPackages_8.libraries;
});
llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_9.tools;
targetLlvmLibraries = targetPackages.llvmPackages_9.libraries;
targetLlvmLibraries = targetPackages.llvmPackages_9.libraries or llvmPackages_9.libraries;
});
llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 {
@@ -12548,7 +12550,7 @@ with pkgs;
llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_11.tools;
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries;
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries;
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
stdenv = gcc7Stdenv;
}));
@@ -12556,7 +12558,7 @@ with pkgs;
llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_12.tools;
targetLlvmLibraries = targetPackages.llvmPackages_12.libraries;
targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries;
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
stdenv = gcc7Stdenv;
}));
@@ -12564,7 +12566,7 @@ with pkgs;
llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_13.tools;
targetLlvmLibraries = targetPackages.llvmPackages_13.libraries;
targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries;
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
stdenv = gcc7Stdenv;
}));
@@ -22247,8 +22249,6 @@ with pkgs;
linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened;
linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened;
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;

10
pkgs/top-level/linux-kernels.nix
View File

@@ -159,13 +159,6 @@ in {
];
};
linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_5_15 = callPackage ../os-specific/linux/kernel/linux-5.15.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -229,7 +222,6 @@ in {
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { };
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
}));
@@ -467,7 +459,6 @@ in {
linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);
linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14);
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
};
@@ -497,7 +488,6 @@ in {
linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { });
linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { });
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { });
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);

2
pkgs/top-level/python-packages.nix
View File

@@ -1602,6 +1602,8 @@ in {
click-threading = callPackage ../development/python-modules/click-threading { };
clickgen = callPackage ../development/python-modules/clickgen { };
clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash { };
clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { };