cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-05-10 00:48:32 +00:00 committed by GitHub
commit 1e3d91bd19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 518 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View file

@ -428,6 +428,12 @@
githubId = 782180;
name = "Alex Vorobiev";
};
alex-eyre = {
email = "A.Eyre@sms.ed.ac.uk";
github = "alex-eyre";
githubId = 38869148;
name = "Alex Eyre";
};
algorith = {
email = "dries_van_daele@telenet.be";
name = "Dries Van Daele";
@ -7249,6 +7255,12 @@
githubId = 40049608;
name = "Andy Chun";
};
noreferences = {
email = "norkus@norkus.net";
github = "noreferences";
githubId = 13085275;
name = "Juozas Norkus";
};
norfair = {
email = "syd@cs-syd.eu";
github = "NorfairKing";

2
nixos/tests/web-servers/unit-php.nix
View file

@ -34,7 +34,7 @@ in {
};
users = {
users.testuser = {
isNormalUser = false;
isSystemUser = true;
uid = 1074;
group = "testgroup";
};

4
pkgs/applications/graphics/feh/default.nix
View file

@ -7,11 +7,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "feh";
version = "3.6.3";
version = "3.7";
src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
sha256 = "sha256-Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q=";
sha256 = "0hdvlrlpjxvmhnjvr32nxgpsw0366higg0gh9h37fxrvdh3v3k87";
};
outputs = [ "out" "man" "doc" ];

4
pkgs/applications/misc/moonlight-qt/default.nix
View file

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "moonlight-qt";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "moonlight-stream";
repo = pname;
rev = "v${version}";
sha256 = "e7fwb76zzidtF1COqrQ6gSF7bCX20j/CGjPu1Cb4HGc=";
sha256 = "1bz4wjl8zydw46bh2mdbrsx8prh2fw0cmzqliy912fdz5aal2b74";
fetchSubmodules = true;
};

28
pkgs/applications/misc/nimbo/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib, setuptools, boto3, requests, click, pyyaml, pydantic, buildPythonApplication
, pythonOlder, fetchFromGitHub, awscli }:
buildPythonApplication rec {
pname = "nimbo";
version = "0.2.4";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "nimbo-sh";
repo = pname;
rev = "v${version}";
sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24";
};
propagatedBuildInputs = [ setuptools boto3 awscli requests click pyyaml pydantic ];
# nimbo tests require an AWS instance
doCheck = false;
pythonImportsCheck = [ "nimbo" ];
meta = with lib; {
description = "Run machine learning jobs on AWS with a single command";
homepage = "https://github.com/nimbo-sh/nimbo";
license = licenses.bsl11;
maintainers = with maintainers; [ alex-eyre noreferences ];
};
}

5
pkgs/applications/networking/flexget/default.nix
View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
version = "3.1.116";
version = "3.1.121";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "6372b36495ae023bd64ce28ca649feba54b060ed8f0a5f606a4845974e834493";
sha256 = "91270a51ed29e4a578c7549ebd01665f4bcf49bf7773a15db27f4ccb13659e00";
};
postPatch = ''
@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec {
flask-restful
flask-restx
flask
greenlet
guessit
html5lib
jinja2

89
pkgs/applications/office/timeline/default.nix Normal file
View file

@ -0,0 +1,89 @@
{ lib
, fetchurl
, python3
, gettext
, makeDesktopItem
, copyDesktopItems
}:
python3.pkgs.buildPythonApplication rec {
pname = "timeline";
version = "2.4.0";
src = fetchurl {
url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip";
sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23";
};
nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ];
pythonPath = with python3.pkgs; [
wxPython_4_0 # not compatible with wxPython_4_1. reported upstream https://github.com/wxWidgets/Phoenix/issues/1956
humblewx
icalendar
markdown
pysvg-py3
pillow
];
checkInputs = [
gettext
python3.pkgs.mock
];
desktopItems = [
(makeDesktopItem {
desktopName = "Timeline";
name = "timeline";
comment = "Display and navigate information on a timeline";
icon = "timeline";
terminal = false;
exec = "timeline";
categories = "Office;Calendar;";
})
];
dontBuild = true;
doCheck = false;
patchPhase = ''
sed -i "s|_ROOT =.*|_ROOT = \"$out/usr/share/timeline/\"|" source/timelinelib/config/paths.py
'';
installPhase = ''
runHook preInstall
site_packages=$out/${python3.pkgs.python.sitePackages}
install -D -m755 source/timeline.py $out/bin/timeline
mkdir -p $site_packages
cp -r source/timelinelib $site_packages/
mkdir -p $out/usr/share/timeline/locale
cp -r icons $out/usr/share/timeline/
cp -r translations/ $out/usr/share/timeline/
mkdir -p $out/share/icons/hicolor/{48x48,32x32,16x16}/apps
cp icons/48.png $out/share/icons/hicolor/48x48/apps/timeline.png
cp icons/32.png $out/share/icons/hicolor/32x32/apps/timeline.png
cp icons/16.png $out/share/icons/hicolor/16x16/apps/timeline.png
runHook postInstall
'';
# tests fail because they need an x server
# Unable to access the X Display, is $DISPLAY set properly?
checkPhase = ''
runHook preCheck
${python3.interpreter} tools/execute-specs.py
runHook postCheck
'';
meta = with lib; {
homepage = "http://thetimelineproj.sourceforge.net/";
changelog = "http://thetimelineproj.sourceforge.net/changelog.html";
description = "Display and navigate information on a timeline";
license = with licenses; [ gpl3Only cc-by-sa-30 ];
platforms = with platforms; unix;
maintainers = with maintainers; [ davidak ];
};
}

25
pkgs/applications/science/logic/coq2html/default.nix
View file

@ -1,20 +1,17 @@
{ lib, stdenv, fetchgit, ocaml }:
{ lib, stdenv, fetchFromGitHub, ocaml }:
let
version = "20170720";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "coq2html";
inherit version;
version = "1.2";
src = fetchgit {
url = "https://github.com/xavierleroy/coq2html";
rev = "e2b94093c6b9a877717f181765e30577de22439e";
sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610";
src = fetchFromGitHub {
owner = "xavierleroy";
repo = "coq2html";
rev = "v${version}";
sha256 = "sha256-ty/6A3wivjDCrmlZAcZyaIwQQ+vPBJm9MhtW6nZcV3s=";
};
buildInputs = [ ocaml ];
nativeBuildInputs = [ ocaml ];
installPhase = ''
mkdir -p $out/bin
@ -32,8 +29,8 @@ stdenv.mkDerivation {
"Proof" keyword.
'';
homepage = "https://github.com/xavierleroy/coq2html";
license = licenses.gpl2;
maintainers = with maintainers; [ jwiegley ];
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jwiegley siraben ];
platforms = platforms.unix;
};
}

115
pkgs/applications/window-managers/cardboard/default.nix Normal file
View file

@ -0,0 +1,115 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchurl
, fetchgit
, ffmpeg
, libGL
, libX11
, libcap
, libdrm
, libinput
, libpng
, libxcb
, libxkbcommon
, mesa
, meson
, ninja
, pixman
, pkg-config
, unzip
, wayland
, wayland-protocols
, xcbutilerrors
, xcbutilimage
, xcbutilwm
}:
let
# cereal.wrap
cereal-wrap = fetchurl {
name = "cereal-1.3.0.tar.gz";
url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz";
hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU=";
};
cereal-wrapdb = fetchurl {
name = "cereal-1.3.0-1-wrap.zip";
url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip";
hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY=";
};
# expected.wrap
expected-wrap = fetchgit {
name = "expected";
url = "https://gitlab.com/cardboardwm/expected";
rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e";
sha256 = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo=";
};
# wlroots.wrap
wlroots-wrap = fetchgit {
name = "wlroots";
url = "https://github.com/swaywm/wlroots";
rev = "0.12.0";
sha256 = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY=";
};
in
stdenv.mkDerivation rec {
pname = "cardboard";
version = "0.0.0-unstable=2021-01-21";
src = fetchFromGitLab {
owner = "cardboardwm";
repo = pname;
rev = "f2ef2ff076ddbbd23994553b8eff131f9bd0207f";
hash = "sha256-43aqAWk4QoIP0BpRyPRDWFtVh/1UbrBoEeTDEF2gZX4=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
unzip
];
buildInputs = [
ffmpeg
libGL
libX11
libcap
libdrm
libinput
libpng
libxcb
libxkbcommon
mesa
pixman
wayland
wayland-protocols
xcbutilerrors
xcbutilimage
xcbutilwm
];
postPatch = ''
(cd subprojects
tar xvf ${cereal-wrap}
unzip ${cereal-wrapdb}
cp -r ${expected-wrap} ${expected-wrap.name}
cp -r ${wlroots-wrap} ${wlroots-wrap.name}
)
'';
# "Inherited" from Nixpkgs expression for wlroots
mesonFlags = [
"-Dwlroots:logind-provider=systemd"
"-Dwlroots:libseat=disabled"
];
meta = with lib; {
homepage = "https://gitlab.com/cardboardwm/cardboard";
description = "A scrollable, tiling Wayland compositor inspired on PaperWM";
license = licenses.gpl3Only;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}

7
pkgs/applications/window-managers/i3/status-rust.nix
View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.14.7";
version = "0.20.0";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
sha256 = "1ndqh4bzwim32n8psgsgdd47xmlb45rhvcwla1wm506byb21nk4c";
sha256 = "sha256-rio+3S3bA8KfosKAE9Txzftr/q2PVyd8Z9crz1O/ysc=";
};
cargoSha256 = "098dzwqwbhcyswm73m880z0w03i7xrq56x79vfyvacw4k27q2zm9";
cargoSha256 = "sha256-17bIeK/mPE+rAO/c65IWvMGqAU6sOClJQC8z+O36cmU=";
nativeBuildInputs = [ pkg-config makeWrapper ];
@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [
"--features=notmuch"
"--features=maildir"
];
postFixup = ''

4
pkgs/data/themes/plano/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "plano-theme";
version = "3.36-2";
version = "3.38-1";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = pname;
rev = "v${version}";
sha256 = "01dkjck9rlrf8wa30ad7kfv0gbpdf3l05rw7nxrvb1gh5d2vxig9";
sha256 = "0g2mwvzc04z3dsdfhwqgw9s7987406pv22s9rbazfvprk4ddc5b6";
};
nativeBuildInputs = [

4
pkgs/development/libraries/glfw/3.x.nix
View file

@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
version = "3.3.3";
version = "3.3.4";
pname = "glfw";
src = fetchFromGitHub {
owner = "glfw";
repo = "GLFW";
rev = version;
sha256 = "sha256-NfEPXjpVnFvh3Y70RZm8nDG0QwJbefF9wYNUq0BZTN4=";
sha256 = "sha256-BP4wxjgm0x0E68tNz5eudkVUyBnXkQlP7LY3ppZunhw=";
};
propagatedBuildInputs = [ libGL ];

22
pkgs/development/python-modules/bpython/default.nix
View file

@ -3,12 +3,15 @@
, fetchPypi
, curtsies
, greenlet
, mock
, jedi
, pygments
, pyxdg
, requests
, substituteAll
, urwid
, which }:
, watchdog
, which
}:
buildPythonPackage rec {
pname = "bpython";
@ -24,17 +27,22 @@ buildPythonPackage rec {
which = "${which}/bin/which";
})];
propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ];
propagatedBuildInputs = [
curtsies
greenlet
pygments
pyxdg
requests
urwid
];
postInstall = ''
substituteInPlace "$out/share/applications/org.bpython-interpreter.bpython.desktop" \
--replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython"
'';
checkInputs = [ mock ];
# tests fail: https://github.com/bpython/bpython/issues/712
doCheck = false;
checkInputs = [ jedi watchdog ];
pythonImportsCheck = [ "bpython" ];
meta = with lib; {
description = "A fancy curses interface to the Python interactive interpreter";

16
pkgs/development/python-modules/curtsies/default.nix
View file

@ -1,22 +1,14 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing ? null}:
{ lib, buildPythonPackage, fetchPypi, pythonOlder, blessings, mock, nose, pyte, cwcwidth, typing ? null}:
buildPythonPackage rec {
pname = "curtsies";
version = "0.3.0";
version = "0.3.5";
src = fetchPypi {
inherit pname version;
sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9";
sha256 = "1g8dwafx4vx06isjkn28r3cwb0hw1bv67lgygaz34yk66lrzz1x5";
};
patches = [
# Fix dependency on typing. Remove with the next release
(fetchpatch {
url = "https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch";
sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs";
})
];
propagatedBuildInputs = [ blessings wcwidth ]
propagatedBuildInputs = [ blessings cwcwidth ]
++ lib.optionals (pythonOlder "3.5") [ typing ];
checkInputs = [ mock pyte nose ];

34
pkgs/development/python-modules/cwcwidth/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ lib, buildPythonPackage, fetchPypi, cython, pytestCheckHook }:
buildPythonPackage rec {
pname = "cwcwidth";
version = "0.1.4";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "1azrphpkcyggg38xvkfb9dpc4xmmm90p02kf8dkqd4d6j5w96aj8";
};
nativeBuildInputs = [ cython ];
checkInputs = [ pytestCheckHook ];
# Hack needed to make pytest + cython work
# https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298
preCheck = ''
export HOME=$(mktemp -d)
cp -r $TMP/$sourceRoot/tests $HOME
pushd $HOME
'';
postCheck = "popd";
pythonImportsCheck = [ "cwcwidth" ];
meta = with lib; {
description = "Python bindings for wc(s)width";
homepage = "https://github.com/sebastinas/cwcwidth";
changelog = "https://github.com/sebastinas/cwcwidth/blob/main/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ eduardosm ];
};
}

42
pkgs/development/python-modules/humblewx/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, wxPython_4_0
, python3
}:
buildPythonPackage rec {
pname = "humblewx";
version = "0.2.2";
src = fetchFromGitHub {
owner = "thetimelineproj";
repo = pname;
rev = version;
sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210";
};
# timeline is not compatible with wxPython_4_1. reported upstream
propagatedBuildInputs = [ wxPython_4_0 ];
checkPhase = ''
runHook preCheck
for i in examples/*; do
${python3.interpreter} $i
done
runHook postCheck
'';
# Unable to access the X Display, is $DISPLAY set properly?
# would have to use nixos module tests, but it is not worth it
doCheck = false;
pythonImportsCheck = [ "humblewx" ];
meta = {
homepage = "https://github.com/thetimelineproj/humblewx";
description = "Library that simplifies creating user interfaces with wxPython";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ davidak ];
};
}

4
pkgs/development/python-modules/pychannels/default.nix
View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pychannels";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "fancybits";
repo = pname;
rev = version;
sha256 = "0dqc0vhf6c5r3g7nfbpa668x6z2zxrznk6h907s6sxkq4sbqnhqf";
sha256 = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s=";
};
propagatedBuildInputs = [ requests ];

4
pkgs/development/python-modules/pylast/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "pylast";
version = "4.2.0";
version = "4.2.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-w/mkAUUgj7L7Xv+nz1pI1TYKfihH3S3MbxaNQ4VtoH0=";
sha256 = "sha256-R1enQk6luuBiobMPDn5x1SXx7zUI/5c8dPtyWkmG/18=";
};
nativeBuildInputs = [ setuptools-scm ];

33
pkgs/development/python-modules/pysvg-py3/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, python
}:
buildPythonPackage rec {
pname = "pysvg-py3";
version = "0.2.2-post3";
src = fetchFromGitHub {
owner = "alorence";
repo = pname;
rev = version;
sha256 = "1slync0knpcjgl4xpym8w4249iy6vmrwbarpnbjzn9xca8g1h2f0";
};
checkPhase = ''
runHook preCheck
mkdir testoutput
${python.interpreter} sample/tutorial.py
runHook postCheck
'';
pythonImportsCheck = [ "pysvg" ];
meta = {
homepage = "https://github.com/alorence/pysvg-py3";
description = "Creating SVG with Python";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ davidak ];
};
}

4
pkgs/development/python-modules/slixmpp/default.nix
View file

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "slixmpp";
version = "1.7.0";
version = "1.7.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fy7sRKS7ih4JmjOW/noL8qJ1xWVpQLbBbObHnMwT3Bc=";
sha256 = "sha256-mvg23FdHJZeIZRcm8GLWmm9DDTBt29jmsUHB/smVSec=";
};
patches = [

31
pkgs/development/tools/rust/cargo-binutils/default.nix
View file

@ -5,23 +5,28 @@ rustPlatform.buildRustPackage rec {
version = "0.3.3";
# Upstream doesn't commit `Cargo.lock`, see https://github.com/rust-embedded/cargo-binutils/pull/99
src = let
repo = fetchFromGitHub {
owner = "rust-embedded";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo=";
};
in runCommand "source" { } ''
cp -R ${repo} $out
chmod -R +w $out
cp ${./Cargo.lock} $out/Cargo.lock
'';
src =
let
repo = fetchFromGitHub {
owner = "rust-embedded";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Dgn+f4aSsDSh+RC8yvt3ydkdtwib5jEVsnZkod5c7Vo=";
};
in
runCommand "source" { } ''
cp -R ${repo} $out
chmod -R +w $out
cp ${./Cargo.lock} $out/Cargo.lock
'';
cargoSha256 = "sha256-Zrl269PacPi81TrGTIDzmVndgGY5i5lYyspiOj43rpw=";
meta = with lib; {
description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain";
description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain.";
longDescription = ''
In order for this to work, you either need to run `rustup component add llvm-tools-preview` or install the `llvm-tools-preview` component using your Nix library (e.g. nixpkgs-mozilla, or rust-overlay)
'';
homepage = "https://github.com/rust-embedded/cargo-binutils";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ stupremee ];

2
pkgs/games/assaultcube/default.nix
View file

@ -67,6 +67,6 @@ stdenv.mkDerivation rec {
homepage = "https://assault.cubers.net";
maintainers = [ ];
platforms = platforms.linux; # should work on darwin with a little effort.
license = lib.licenses.zlib;
license = lib.licenses.unfree;
};
}

30
pkgs/os-specific/linux/kernel/hardened/patches.json
View file

@ -1,32 +1,32 @@
{
"4.14": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.231-hardened1.patch",
"sha256": "0camacpjlix1ajx2z1krsv7j5m9g7vaikp2qsa43w3xxgms1slp6",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.231-hardened1/linux-hardened-4.14.231-hardened1.patch"
"name": "linux-hardened-4.14.232-hardened1.patch",
"sha256": "141bjr8z5gg5c9bwbq2krhpwzhs225g5465izgz38sls57dllll4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.232-hardened1/linux-hardened-4.14.232-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.188-hardened1.patch",
"sha256": "1l5hmfzkp9aajj48xny2khrg54501m57llykp6p3vpg9hwh19j1q",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.188-hardened1/linux-hardened-4.19.188-hardened1.patch"
"name": "linux-hardened-4.19.190-hardened1.patch",
"sha256": "111pxnnmajd1c7p51v99qc28dq7hrhji6ja0i5m46d2r8am1z4cz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.190-hardened1/linux-hardened-4.19.190-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.32-hardened1.patch",
"sha256": "0vl01f6kpb38qv9855x1c4fzih1xmfb1xby70dzfkp5bg53ms5r3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.32-hardened1/linux-hardened-5.10.32-hardened1.patch"
"name": "linux-hardened-5.10.35-hardened1.patch",
"sha256": "133k9h187jpkyfqrd66v4k0z3l3gg6r0g4x8nsic9sarapdd62v7",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.35-hardened1/linux-hardened-5.10.35-hardened1.patch"
},
"5.11": {
"extra": "-hardened1",
"name": "linux-hardened-5.11.16-hardened1.patch",
"sha256": "1fxf1qcqrvgywxnyywsbav80ys0y4c9qg6s8ygmplyjvncd9005l",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.16-hardened1/linux-hardened-5.11.16-hardened1.patch"
"name": "linux-hardened-5.11.19-hardened1.patch",
"sha256": "16czmg41nijl7zaahb4ggi8z7hizc0qsqg3az8vzll5kvzzr313f",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.19-hardened1/linux-hardened-5.11.19-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.114-hardened1.patch",
"sha256": "0zbn9x59m6b62c9hjp47xkg1qk8a489nd99px2g4i24mnhgan0kf",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.114-hardened1/linux-hardened-5.4.114-hardened1.patch"
"name": "linux-hardened-5.4.117-hardened1.patch",
"sha256": "0b9mfw49yrdgsj9804nh0qxzj49z2xb1jvxhvdxpm9yjlnyw85bv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.117-hardened1/linux-hardened-5.4.117-hardened1.patch"
}
}

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.231";
version = "4.14.232";
# 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 = "10k63vwibygdd6gzs4r6rncqqa0qf8cbnqznhbfsi41lxsnpjfsp";
sha256 = "0sa3sz7bznlhijd0iwv37nyrrnw34iq6dq1bqr6cj2wpyrhr7h8x";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.188";
version = "4.19.190";
# 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 = "0xq00mwgclk89bk5jpmncjnz7vsq353qrnc0cjp0n9mi4vqg375h";
sha256 = "0pf8py0id0r8wzr5050bik1sbhl8gsznnr5bvcmrs4jkhpp2m73g";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];

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

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
buildLinux (args // rec {
version = "4.4.267";
version = "4.4.268";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1qk629fsl1glr0h1hxami3f4ivgl58iqsnw43slvn1yc91cb7ws4";
sha256 = "1srk08kaxq5jjlqx804cgjffhcsrdkv3idh8ipagl6v2w4kas5v8";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

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

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
buildLinux (args // rec {
version = "4.9.267";
version = "4.9.268";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0q0a49b3wsxk9mqyy8b55lr1gmiqxjpqh2nlhj4xwcfzd7z9lfwq";
sha256 = "0aknrlf5q0dsqib8c9klmf5c60dy7hg2zksb020qvyrp077gcrjv";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.32";
version = "5.10.35";
# 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 = "1fnp0wyiswg8q4w89ssm1fz1ryfc1567fx08bz3fmf2cdqr8wkv4";
sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

4
pkgs/os-specific/linux/kernel/linux-5.11.nix
View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.11.16";
version = "5.11.19";
# 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 = "0hqgai4r40xxlfqp1paxhn2g4i4yqvi1k473dddcxjrhs60kc5i1";
sha256 = "0jrb8wbxj0dadyadggcn49hlxzxgz8mz8xr0ckgbnnvb8snikvjs";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];

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

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.114";
version = "5.4.117";
# 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 = "0mwmvvz817zgxalb2xcx0i49smjag6j81vmqxp2kpwjqrf3z165y";
sha256 = "0w679qymqh8dlb1mh2vxr382m1pzxdjwlp3bqzjr4043fmbrp62f";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View file

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "17990";
sha256 = "1hras4018lgvql1zxw26fzcvk0w1xh6pyh3kmhxxh23k61zl83zk";
rev = "18063";
sha256 = "1mmijqra6sq2pcc8yhh8m4k6x0dvhnq4xxzm1qs7kdznj2zwr8is";
}
, ...
}:

4
pkgs/os-specific/linux/kernel/linux-lqx.nix
View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.11.18";
version = "5.11.19";
suffix = "lqx1";
in
@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "0fz0s6bdcvbzy1149acqkq3aqg481dwiq85wh7ii1hx6p1gbsx71";
sha256 = "17gdlkixsy68j6c7lpkkk242x71rqj78hpqg3kp01fckj633za5n";
};
extraMeta = {

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

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.30-rt37"; # updated by ./update-rt.sh
version = "5.10.30-rt38"; # 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 = "1jibjfmjyn90n5jz5vq056n9xfzn9p8g9fsv7nmj5mfxxm4qhjal";
sha256 = "0f8wcs0y1qx3kqsan8g7bh1my2yc77k6d1g3q12nfxvbmlgs766n";
};
}; in [ rt-patch ] ++ lib.remove 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.109-rt56"; # updated by ./update-rt.sh
version = "5.4.115-rt57"; # 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 = "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc";
sha256 = "1llxk04vlpi7a4ca2f5vlcxfn68n8yhmsar3hsl259i7hms28isv";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "08cg8b7mwihs8zgdh0jwi8hrn3hnf9j0jyplsyc7644wd6mqby4a";
sha256 = "1xh7xi27q58njhfayi2lnk4id7hnlklkgh2zx012gxv4ari76g0k";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

4
pkgs/servers/atlassian/confluence.nix
View file

@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
stdenvNoCC.mkDerivation rec {
pname = "atlassian-confluence";
version = "7.10.1";
version = "7.11.0";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-ScE0UXmoxHb7HOJhSfOLXj3Wb3/XitFuOR36Iktmgxk=";
sha256 = "sha256-/D/fMg+WRkGGV4NG73gvVDZwwi/8BB0w6IWK/OQ3caA=";
};
buildPhase = ''

4
pkgs/servers/atlassian/jira.nix
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "8.14.0";
version = "8.14.1";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "12dm0sasw98ywd074rjd9hnbymvy8z16bicjxfxqz91n1y13732i";
sha256 = "sha256-AtBkGODC8x25GQENRSRiptUvDIcHGg9JnqVnDxXzmmQ=";
};
buildPhase = ''

6
pkgs/tools/misc/dua/default.nix
View file

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.11.2";
version = "2.11.3";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "sha256-sT4hg5MC6xuhSKeNxaVY9vOlMEx23uwxgK6UMLO4kVs=";
sha256 = "sha256-rwbeWjYhAgZhQDg1/Pux08Kw+7NQG7dJlhZnwlaEjJ4=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-DOotIN8XScgHR9L6aFgky2B18piGIKfLWx1GTdYnCB0=";
cargoSha256 = "sha256-ta5mHTfSs72HUz3ezZhVvU61ECvyWY3Sba7/UoJGc8U=";
doCheck = false;

6
pkgs/tools/misc/ffsend/default.nix
View file

@ -17,16 +17,16 @@ with rustPlatform;
buildRustPackage rec {
pname = "ffsend";
version = "0.2.71";
version = "0.2.72";
src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
sha256 = "sha256-dXFnM8085XVzUwk1e3SoO+O+z9lJ40htJzHBGRQ95XY=";
sha256 = "sha256-YEmEaf0ob2ulmQghwDYi0RtGuTdRHCoLdPnuVjxvlxE=";
};
cargoSha256 = "sha256-VwxIH/n1DjZsMOLAREclqanb4q7QEOZ35KWWciyrnyQ=";
cargoSha256 = "sha256-mcWQzfMc2cJjp0EFcfG7SAM70ItwEC/N13UDiRiI3ys=";
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs =

20
pkgs/tools/package-management/createrepo_c/default.nix
View file

@ -1,18 +1,22 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }:
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm
, openssl, sqlite, file, xz, pcre, bash-completion, zstd, zchunk, libmodulemd
}:
stdenv.mkDerivation rec {
pname = "createrepo_c";
version = "0.11.1";
version = "0.17.1";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = "createrepo_c";
rev = version;
sha256 = "0cmysc7gdd2czagl4drfh9gin6aa2847vgi30a3p0cfqvczf9cm6";
sha256 = "G2xioH9XWntHFmUfTN2s2mdtIqgTTLKr5jZflwpaC8Q=";
};
patches = [
# Use the output directory to install the bash completions.
./fix-bash-completion-path.patch
# Use the output directory to install the python modules.
./fix-python-install-path.patch
];
@ -23,15 +27,15 @@ stdenv.mkDerivation rec {
--replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"
'';
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config rpm ];
buildInputs = [ bzip2 expat glib curl libxml2 python3 rpm openssl sqlite file xz pcre bash-completion ];
buildInputs = [ bzip2 expat glib curl libxml2 python3 openssl sqlite file xz pcre bash-completion zstd zchunk libmodulemd ];
meta = with lib; {
description = "C implementation of createrepo";
homepage = "http://rpm-software-management.github.io/createrepo_c/";
license = licenses.gpl2;
platforms = platforms.linux;
homepage = "https://rpm-software-management.github.io/createrepo_c/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin ];
};
}

22
pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
View file

@ -1,11 +1,11 @@
--- createrepo_c-0.10.0-src.orig/CMakeLists.txt 2017-03-19 11:01:02.703173617 +0100
+++ createrepo_c-0.10.0-src/CMakeLists.txt 2017-03-19 11:02:38.617448248 +0100
@@ -100,7 +100,7 @@
pkg_check_modules(BASHCOMP bash-completion)
if (BASHCOMP_FOUND)
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ SET(BASHCOMP_DIR "@BASHCOMP_DIR@")
message("Bash completion directory: ${BASHCOMP_DIR}")
INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)
INSTALL(CODE "
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ OPTION(ENABLE_BASHCOMP "Install Bash autocompletions?" ON)
IF (ENABLE_BASHCOMP)
pkg_check_modules(BASHCOMP bash-completion)
IF (BASHCOMP_FOUND)
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ SET(BASHCOMP_DIR "@BASHCOMP_DIR@")
message("Bash completion directory: ${BASHCOMP_DIR}")
INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)
INSTALL(CODE "

14
pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch
View file

@ -1,11 +1,11 @@
--- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt 2017-03-19 10:50:33.796342953 +0100
+++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt 2017-03-19 10:53:51.207580073 +0100
@@ -19,7 +19,7 @@
FIND_PACKAGE(PythonInterp 3.0 REQUIRED)
endif()
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -14,7 +14,7 @@ if (NOT SKBUILD)
FIND_PACKAGE(PythonLibs 3 REQUIRED)
endif (NOT SKBUILD)
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
+SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")

8
pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "google-compute-engine-oslogin";
version = "20200507.00";
version = "20210429.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "guest-oslogin";
rev = version;
sha256 = "1np8c96sm29pwnxykc0id8kkgalhw576g43fgi1y936sr2hfvx3v";
sha256 = "eHAg9K5oxcygEzqaac81jSFHF+zsW6uB7q2Kfo9hSrA=";
};
postPatch = ''
@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
buildInputs = [ curl.dev pam ];
NIX_CFLAGS_COMPILE="-I${json_c.dev}/include/json-c";
NIX_CFLAGS_LINK="-L${json_c}/lib";
NIX_CFLAGS_COMPILE = "-I${json_c.dev}/include/json-c";
NIX_CFLAGS_LINK = "-L${json_c}/lib";
makeFlags = [
"VERSION=${version}"

6
pkgs/top-level/all-packages.nix
View file

@ -4155,6 +4155,8 @@ in
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
timeline = callPackage ../applications/office/timeline/default.nix { };
tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; };
tsm-client-withGui = callPackage ../tools/backup/tsm-client { };
@ -13295,6 +13297,8 @@ in
ninja = callPackage ../development/tools/build-managers/ninja { };
nimbo = with python3Packages; callPackage ../applications/misc/nimbo { };
gn = callPackage ../development/tools/build-managers/gn { };
nixbang = callPackage ../development/tools/misc/nixbang {
@ -22418,6 +22422,8 @@ in
caerbannog = callPackage ../applications/misc/caerbannog { };
cardboard = callPackage ../applications/window-managers/cardboard { };
cage = callPackage ../applications/window-managers/cage { };
calf = callPackage ../applications/audio/calf {

6
pkgs/top-level/python-packages.nix
View file

@ -1631,6 +1631,8 @@ in {
cvxpy = callPackage ../development/python-modules/cvxpy { };
cwcwidth = callPackage ../development/python-modules/cwcwidth { };
cx_Freeze = callPackage ../development/python-modules/cx_freeze { };
cx_oracle = callPackage ../development/python-modules/cx_oracle { };
@ -3151,6 +3153,8 @@ in {
humanize = callPackage ../development/python-modules/humanize { };
humblewx = callPackage ../development/python-modules/humblewx { };
hupper = callPackage ../development/python-modules/hupper { };
hvac = callPackage ../development/python-modules/hvac { };
@ -6228,6 +6232,8 @@ in {
py_stringmatching = callPackage ../development/python-modules/py_stringmatching { };
pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { };
pysvn = callPackage ../development/python-modules/pysvn {
inherit (pkgs) bash subversion apr aprutil expat neon openssl;
};