JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt 2021-03-09 17:05:41 +01:00 committed by GitHub
commit 16f9e4da3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 141 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/graphics/sane/backends/airscan/default.nix
View File

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng, gnutls { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, avahi, libjpeg, libpng
, sane-backends, meson, ninja }: , libxml2, gnutls, sane-backends }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sane-airscan"; pname = "sane-airscan";
version = "0.99.16"; version = "0.99.24";
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ avahi libsoup libjpeg libpng gnutls sane-backends ]; buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexpevzner"; owner = "alexpevzner";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "00lgcdbpns0shwlpkvrpfm4z05s7v5q3al4kcw6ii7xnkzmv1721"; sha256 = "sha256-2zSLC9P7Q/GMefHvmrUz6nV2hgScb4BhPAkahNBouqk=";
}; };
meta = with lib; { meta = with lib; {

7
pkgs/applications/misc/sent/default.nix
View File

@ -2,10 +2,11 @@
, patches ? [] }: , patches ? [] }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sent-1"; pname = "sent";
version = "1";
src = fetchurl { src = fetchurl {
url = "https://dl.suckless.org/tools/${name}.tar.gz"; url = "https://dl.suckless.org/tools/sent-${version}.tar.gz";
sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv";
}; };
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A simple plaintext presentation tool"; description = "A simple plaintext presentation tool";
homepage = "https://tools.suckless.org/sent/"; homepage = "https://tools.suckless.org/sent/";
license = licenses.isc; license = licenses.isc;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ];
}; };
} }

4
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "seaweedfs"; pname = "seaweedfs";
version = "2.27"; version = "2.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chrislusf"; owner = "chrislusf";
repo = "seaweedfs"; repo = "seaweedfs";
rev = version; rev = version;
sha256 = "sha256-0KT/5seJs8GkatL4BsZ+r71t6AJrpHB6Q92sCvplKcQ="; sha256 = "sha256-wyqshtL3wGrmb1oEMOMk2QmDXW9M5tt9d1QEtMFiXa4=";
}; };
vendorSha256 = "sha256-uT/Y/TfpqDyOUElc4M/w/v77bWF3tTJz+Yu0KRMcxk4="; vendorSha256 = "sha256-uT/Y/TfpqDyOUElc4M/w/v77bWF3tTJz+Yu0KRMcxk4=";

4
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qalculate-gtk"; pname = "qalculate-gtk";
version = "3.16.0"; version = "3.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qalculate"; owner = "qalculate";
repo = "qalculate-gtk"; repo = "qalculate-gtk";
rev = "v${version}"; rev = "v${version}";
sha256 = "1vqzrh5zxwfvih6c3lak0wkkw6bajl88xzl1zk84gxsk9wdymrk4"; sha256 = "sha256-Nxe1DZL8mh9aBWXQdlp5wC1l5b9mchlrRyE+LKC+yLI=";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

4
pkgs/desktops/gnome-3/core/rygel/default.nix
View File

@ -28,14 +28,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rygel"; pname = "rygel";
version = "0.40.0"; version = "0.40.1";
# TODO: split out lib # TODO: split out lib
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn"; sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

10
pkgs/development/interpreters/metamath/default.nix
View File

@ -1,12 +1,10 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook }: { lib, stdenv, fetchFromGitHub, autoreconfHook }:
let stdenv.mkDerivation rec {
version = "0.196";
in stdenv.mkDerivation {
pname = "metamath"; pname = "metamath";
inherit version; version = "0.196";
buildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "metamath"; owner = "metamath";
@ -25,7 +23,7 @@ in stdenv.mkDerivation {
''; '';
homepage = "http://us.metamath.org"; homepage = "http://us.metamath.org";
downloadPage = "http://us.metamath.org/#downloads"; downloadPage = "http://us.metamath.org/#downloads";
license = licenses.gpl2Only; license = licenses.gpl2Plus;
maintainers = [ maintainers.taneb ]; maintainers = [ maintainers.taneb ];
platforms = platforms.all; platforms = platforms.all;
}; };

29
pkgs/development/interpreters/sollya/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib
, stdenv
, fetchurl
, gmp
, mpfr
, mpfi
, libxml2
, fplll
}:
stdenv.mkDerivation rec {
pname = "sollya";
version = "7.0";
src = fetchurl {
url = "https://www.sollya.org/releases/sollya-${version}/sollya-${version}.tar.gz";
sha256 = "0amrxg7567yy5xqpgchxggjpfr11xyl27vy29c7vlh7v8a17nj1h";
};
buildInputs = [ gmp mpfr mpfi libxml2 fplll ];
meta = with lib; {
description = "A tool environment for safe floating-point code development";
homepage = "https://www.sollya.org/";
license = licenses.cecill-c;
platforms = platforms.linux;
maintainers = with maintainers; [ eduardosm ];
};
}

46
pkgs/development/python-modules/HAP-python/default.nix
View File

@ -1,11 +1,13 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, base36
, cryptography , cryptography
, curve25519-donna , curve25519-donna
, ecdsa , ecdsa
, ed25519 , ed25519
, fetchFromGitHub , fetchFromGitHub
, h11 , h11
, pyqrcode
, pytest-asyncio , pytest-asyncio
, pytest-timeout , pytest-timeout
, pytestCheckHook , pytestCheckHook
@ -15,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "HAP-python"; pname = "HAP-python";
version = "3.3.2"; version = "3.4.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
# pypi package does not include tests # pypi package does not include tests
@ -23,15 +25,17 @@ buildPythonPackage rec {
owner = "ikalchev"; owner = "ikalchev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-oDTyFIhf7oogYyh9LpmVtagi1kDXLCc/7c2UH1dL2Sg="; sha256 = "0mkrs3fwiyp4am9fx1dnhd9h7rphfwymr46khw40xavrfb5jmsa7";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
base36
cryptography cryptography
curve25519-donna curve25519-donna
ecdsa ecdsa
ed25519 ed25519
h11 h11
pyqrcode
zeroconf zeroconf
]; ];
@ -41,35 +45,19 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
# Disable tests requiring network access
disabledTestPaths = [
"tests/test_accessory_driver.py"
"tests/test_hap_handler.py"
"tests/test_hap_protocol.py"
];
disabledTests = [ disabledTests = [
# Disable tests needing network "test_persist_and_load"
"camera" "test_we_can_connect"
"pair" "test_idle_connection_cleanup"
"test_async_subscribe_client_topic"
"test_auto_add_aid_mac"
"test_connection_management"
"test_crypto_failure_closes_connection"
"test_empty_encrypted_data"
"test_external_zeroconf"
"test_get_accessories"
"test_get_characteristics"
"test_handle_set_handle_set"
"test_handle_snapshot_encrypted_non_existant_accessory"
"test_http_11_keep_alive"
"test_http10_close"
"test_mdns_service_info"
"test_mixing_service_char_callbacks_partial_failure"
"test_not_standalone_aid"
"test_persist"
"test_push_event"
"test_send_events"
"test_service_callbacks"
"test_set_characteristics_with_crypto"
"test_setup_endpoints"
"test_start"
"test_upgrade_to_encrypted"
"test_we_can_start_stop" "test_we_can_start_stop"
"test_xhm_uri" "test_push_event"
]; ];
meta = with lib; { meta = with lib; {

12
pkgs/development/python-modules/defcon/default.nix
View File

@ -1,18 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder { lib, buildPythonPackage, fetchPypi, pythonOlder
, fonttools , fonttools, setuptools-scm
, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens , pytest, pytestrunner, lxml, fs, unicodedata2, fontpens
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "defcon"; pname = "defcon";
version = "0.7.2"; version = "0.8.0";
disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1lfqsvxmq1j0nvp26gidnqkj1dyxv7jalc6i7fz1r3nc7niflrqr"; sha256 = "028j7i39m75fnbyc6jsvwwiz31vq4slxwf47y6yszy1qn61xkcna";
extension = "zip"; extension = "zip";
}; };
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [ propagatedBuildInputs = [
fonttools fonttools
]; ];

4
pkgs/development/python-modules/pymysensors/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymysensors"; pname = "pymysensors";
version = "0.20.1"; version = "0.21.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "theolind"; owner = "theolind";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1hz3551ydsmd23havd0dljmvkhzjnmd28k41ws60s8ms3gzlzqfy"; sha256 = "1k75gwvyzslyjr3cdx8b74fb302k2i7bda4q92rb75rhgp4gch55";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

2
pkgs/development/python-modules/pytile/default.nix
View File

@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "bachya"; owner = "bachya";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-/QaIMNImeZuAocxU9dfDoudcgJEkjv1doo7KR9TrwzQ="; sha256 = "0d63xga4gjlfl9fzv3i4j605rrx2qgbzam6cl609ny96s8q8h1px";
}; };
format = "pyproject"; format = "pyproject";

8
pkgs/development/tools/build-managers/bear/default.nix
View File

@ -12,17 +12,19 @@
, c-ares , c-ares
, abseil-cpp , abseil-cpp
, zlib , zlib
, sqlite
, re2
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bear"; pname = "bear";
version = "3.0.3"; version = "3.0.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rizsotto"; owner = "rizsotto";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1abx5h6xy0h3mz29ial5si8smkmjzla050d130pcc6dzr4ic642w"; sha256 = "xac8PYo3qYjtQbDy8piOz5BQQpcVlAvMCv1qHrVZmPQ=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
@ -38,6 +40,8 @@ stdenv.mkDerivation rec {
c-ares c-ares
abseil-cpp abseil-cpp
zlib zlib
sqlite
re2
]; ];
patches = [ patches = [

10
pkgs/development/tools/build-managers/bear/no-double-relative.patch
View File

@ -1,5 +1,5 @@
diff --git a/source/config.h.in b/source/config.h.in diff --git a/source/config.h.in b/source/config.h.in
index 2ca8853..2564c63 100644 index 728c234..a3e76c6 100644
--- a/source/config.h.in --- a/source/config.h.in
+++ b/source/config.h.in +++ b/source/config.h.in
@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; @@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@";
@ -7,8 +7,8 @@ index 2ca8853..2564c63 100644
constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames";
constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept";
-constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
-constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/er"; -constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper";
-constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; -constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";
+constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; +constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
+constexpr char EXECUTOR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/er"; +constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper";
+constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; +constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";

4
pkgs/development/tools/gops/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gops"; pname = "gops";
version = "0.3.16"; version = "0.3.17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "gops"; repo = "gops";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ksypkja5smxvrhgcjk0w18ws97crx6bx5sj20sh8352xx0nm6mp"; sha256 = "1l0k1v2wwwdrwwznrdq2ivbrl5z3hxa89xm89jlaglkd7jjg74zk";
}; };
vendorSha256 = null; vendorSha256 = null;

18
pkgs/development/tools/misc/openocd/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchgit , fetchurl
, autoreconfHook
, pkg-config , pkg-config
, hidapi , hidapi
, libftdi1 , libftdi1
@ -10,16 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openocd"; pname = "openocd";
version = "0.11.0-rc1"; version = "0.11.0";
src = fetchurl {
src = fetchgit { url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2";
url = "https://git.code.sf.net/p/openocd/code"; sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3";
rev = "v${version}";
sha256 = "15g8qalyxhdp0imfrg8mxwnp0nimd836fc5laaavajw49gcm65m4";
fetchSubmodules = true;
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ hidapi libftdi1 libusb1 ]; buildInputs = [ hidapi libftdi1 libusb1 ];
@ -64,7 +60,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "https://openocd.sourceforge.net/"; homepage = "https://openocd.sourceforge.net/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ bjornfor ]; maintainers = with maintainers; [ bjornfor prusnak ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

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

@ -1,26 +1,26 @@
{ {
"4.14": { "4.14": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.14.222-hardened1.patch", "name": "linux-hardened-4.14.224-hardened1.patch",
"sha256": "1p692sn0d6cwmilgpi8chs99m0c36pd2rphrljz7b8ywc394jxsb", "sha256": "017bczkz0njj5icr3xzw8ai7kgyg919k8jnj3iq8d865db4n9nid",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.222-hardened1/linux-hardened-4.14.222-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.224-hardened1/linux-hardened-4.14.224-hardened1.patch"
}, },
"4.19": { "4.19": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-4.19.177-hardened1.patch", "name": "linux-hardened-4.19.179-hardened1.patch",
"sha256": "1l9qic5ggak9qa04bhxrwsrdi6ih9a8dvnzv0l2dfrp7f5z4zmj9", "sha256": "1j6gvwjkigv47rc5wcc3cng0n1k1wfw27i34lb5zzlxzkjwbs1rx",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.177-hardened1/linux-hardened-4.19.177-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.179-hardened1/linux-hardened-4.19.179-hardened1.patch"
}, },
"5.10": { "5.10": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.10.18-hardened1.patch", "name": "linux-hardened-5.10.21-hardened1.patch",
"sha256": "19z1dlwqfwaxi72yr6yh9dzqqrk1v3za3i6qz95xyz5afwn8vp33", "sha256": "1c0sdbw8vwrxq2bdhv1xnmp43x1cc3nwd0l77bw3wiq3x76d8sfp",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.18-hardened1/linux-hardened-5.10.18-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.21-hardened1/linux-hardened-5.10.21-hardened1.patch"
}, },
"5.4": { "5.4": {
"extra": "-hardened1", "extra": "-hardened1",
"name": "linux-hardened-5.4.100-hardened1.patch", "name": "linux-hardened-5.4.103-hardened1.patch",
"sha256": "0wr6lgb1xkj11y08y0v58ipkwifs56vy4bd3h70i52b7vhqwsb19", "sha256": "1ci0zml2g1q1438c7wkq6xn9kk39jsms8pj81chcyxwz67h7xvbc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.100-hardened1/linux-hardened-5.4.100-hardened1.patch" "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.103-hardened1/linux-hardened-5.4.103-hardened1.patch"
} }
} }

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

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.222"; version = "4.14.224";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0i67va37ca3avalgh2ab797c6w2v0h41y1mh4fql73lz7nq84h3k"; sha256 = "1x8wyj28zcx6nn3mkfvs7aywrq1rd8xam5f3r02mynb09kn5hdnq";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

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

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.19.177"; version = "4.19.179";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0z9m081jg84mzp639ifx3321bpysfs3rpcrsx9mwdsh19rwv63mc"; sha256 = "14iy4i6xm2mva359dyrx6s1djpw7rxvnkydcbm6lnfvn7sik37a9";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

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

@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.4.258"; version = "4.4.260";
extraMeta.branch = "4.4"; extraMeta.branch = "4.4";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0rb6sww4yd2m4a4v12klx29nyxb66f55ziv8xcihgf2iw4d62h8c"; sha256 = "1vl8zhlkhqbw2xqvkqhw1z75mrzk5lsdcj8bd2k2fw7cbwa00ln6";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

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

@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.9.258"; version = "4.9.260";
extraMeta.branch = "4.9"; extraMeta.branch = "4.9";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1kf8wlcf8gkpnglx1ggn1c3xfz4yx9995yb919mvin7nd7hghy6l"; sha256 = "1xcgqvk1g3l9bidpx377rbbwzvyxb0sbkszlk722bj7vk6c4asmq";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

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

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.10.18"; version = "5.10.21";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "04dnkg5j73f6cd8ws1prrrjx37srz7rm66bj6slmnfzp3cmyxh9v"; sha256 = "1bz2gmyvpl4vsk0r6fsnh451fzvvfbv63rw8ia75gfv52vzyczwy";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

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

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.11.2"; version = "5.11.5";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"; sha256 = "0srxpl44px1fr7y6nl8pq61vmbkkdbsmxy5k7wvqka33gdhy8212";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

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

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.4.100"; version = "5.4.103";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # 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; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "02i47fmx2jbnjr3sd1bvldf9vc712528phpnybsbq8h8lqd6hpbr"; sha256 = "12wy2w7yc6fcn61xm6l7a86rfwwcchfq89lpznm2v3dmy5y3mqw4";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

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

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux { stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn { , scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "17873"; rev = "17920";
sha256 = "1r1c8wagbq3cgxys7ylvsg6bnxiky66xgx9l0282zsmnn3gh83l7"; sha256 = "0qmhabh4922lpiimrh9smi1q0w8giw3qqxpyzzy2bmr2037011k0";
} }
, ... , ...
}: }:

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

@ -6,7 +6,7 @@
, ... } @ args: , ... } @ args:
let let
version = "5.4.93-rt51"; # updated by ./update-rt.sh version = "5.4.102-rt53"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version; branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0; kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // { in buildLinux (args // {
@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "08nmwd13z10866pc16fqbj41krnvk6hxkl4nmhdkpk346r04jx6k"; sha256 = "1vcscg7cn8qycay913nbc1xl1691anhvakkxwx54s0pnqghpqsgx";
}; };
kernelPatches = let rt-patch = { kernelPatches = let rt-patch = {
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1ffipbnzv8rnmawjlglm667jq67asdr1mwrfhsmwkvlmivm9k4x1"; sha256 = "0d1653cd5dcv4p13mxmva3jz5mp1phvmibfabhha0wsiqkabvx80";
}; };
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

4
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2021.3.2"; version = "2021.3.3";
components = { components = {
"abode" = ps: with ps; [ abodepy ]; "abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ]; "accuweather" = ps: with ps; [ accuweather ];
@ -609,7 +609,7 @@
"otp" = ps: with ps; [ pyotp ]; "otp" = ps: with ps; [ pyotp ];
"ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy
"owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ];
"ozw" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ];
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
"pandora" = ps: with ps; [ pexpect ]; "pandora" = ps: with ps; [ pexpect ];

4
pkgs/servers/home-assistant/default.nix
View File

@ -66,7 +66,7 @@ let
extraBuildInputs = extraPackages py.pkgs; extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2021.3.2"; hassVersion = "2021.3.3";
in with py.pkgs; buildPythonApplication rec { in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -85,7 +85,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
sha256 = "09z2sds9my4vq0vmryjpzi7fv787zjfikfkd711d34c140bgcjch"; sha256 = "0kfvjpzz6ynw8bwd91nm0aiw1pkrmaydwf1r93dnwi8rmzq10zpb";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here # the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend"; pname = "home-assistant-frontend";
version = "20210302.5"; version = "20210302.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-+SKXLOuvMYfNyR++uQMMY4M5deRgm2w3AhMM/DP470k="; sha256 = "sha256-h3jCqfAPg+z6vsdLm5Pdr+7PCEWW58GCG9viIz3Mi64=";
}; };
# there is nothing to strip in this package # there is nothing to strip in this package

4
pkgs/servers/nosql/redis/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "redis"; pname = "redis";
version = "6.2.0"; version = "6.2.1";
src = fetchurl { src = fetchurl {
url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; url = "https://download.redis.io/releases/${pname}-${version}.tar.gz";
sha256 = "1jnv6acjlljvrlxmz0mqarsx1fl5vwss24l8zy5dcawnbp129mk7"; sha256 = "sha256-zSIlBQEsziCyVoL8qTHsk70hrpLLSr/nQs97dqqQdSA=";
}; };
# Cross-compiling fixes # Cross-compiling fixes

4
pkgs/servers/ser2net/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ser2net"; pname = "ser2net";
version = "4.3.2"; version = "4.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cminyard"; owner = "cminyard";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-fA4rtFZ2lhGAwY3KUl/Jk8gjueI761J1QRdivMtbqX4="; sha256 = "sha256-p8iQifCf/IXXPdbjB3pgcw8FgkqRLShHSSeTzJ83Ecg=";
}; };
passthru = { passthru = {

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

@ -12778,9 +12778,7 @@ in
opengrok = callPackage ../development/tools/misc/opengrok { }; opengrok = callPackage ../development/tools/misc/opengrok { };
openocd = callPackage ../development/tools/misc/openocd { openocd = callPackage ../development/tools/misc/openocd { };
autoreconfHook = buildPackages.autoreconfHook269;
};
oprofile = callPackage ../development/tools/profiling/oprofile { oprofile = callPackage ../development/tools/profiling/oprofile {
libiberty_static = libiberty.override { staticBuild = true; }; libiberty_static = libiberty.override { staticBuild = true; };
@ -27441,6 +27439,8 @@ in
soldat-unstable = callPackage ../games/soldat-unstable { }; soldat-unstable = callPackage ../games/soldat-unstable { };
sollya = callPackage ../development/interpreters/sollya { };
# You still can override by passing more arguments. # You still can override by passing more arguments.
space-orbit = callPackage ../games/space-orbit { }; space-orbit = callPackage ../games/space-orbit { };