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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-03-06 00:02:44 +00:00 committed by GitHub
commit 90f82a2f9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 72 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/feedreaders/gnome-feeds/default.nix
View File

@ -11,6 +11,7 @@
, wrapGAppsHook
, glib
, glib-networking
, gtk3
, libhandy
, listparser ? callPackage ./listparser.nix { }
@ -44,6 +45,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [
glib
glib-networking
gtk3
libhandy
webkitgtk

2
pkgs/applications/science/misc/root/default.nix
View File

@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
# Hardcode path to fix use with cmake
sed -i cmake/scripts/ROOTConfig.cmake.in \
-e 'iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")'
-e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")'
patchShebangs build/unix/
'' + lib.optionalString noSplash ''

5
pkgs/applications/video/streamlink/default.nix
View File

@ -6,11 +6,11 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "3.1.1";
version = "3.2.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-hVzTHpAOOuHVMoo3Ejv//irsUBoddLzdEvDSonWAYOQ=";
sha256 = "sha256-l3DS2DhExTeKc+FBMNy3YKvIVlZsqgpB/FuXoN7V2SY=";
};
checkInputs = with python3Packages; [
@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec {
'';
changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md";
license = licenses.bsd2;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ];
};
}

1
pkgs/build-support/appimage/default.nix
View File

@ -123,7 +123,6 @@ rec {
atk
at-spi2-atk
libudev0-shim
networkmanager098
xorg.libXt
xorg.libXmu

17
pkgs/development/compilers/go-jsonnet/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, testVersion }:
buildGoModule rec {
let self = buildGoModule rec {
pname = "go-jsonnet";
version = "0.18.0";
@ -15,12 +15,19 @@ buildGoModule rec {
doCheck = false;
subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ];
subPackages = [ "cmd/jsonnet*" ];
passthru.tests.version = testVersion {
package = self;
version = "v${version}";
};
meta = with lib; {
description = "An implementation of Jsonnet in pure Go";
homepage = "https://github.com/google/go-jsonnet";
license = licenses.asl20;
maintainers = with maintainers; [ nshalman ];
maintainers = with maintainers; [ nshalman aaronjheng ];
mainProgram = "jsonnet";
};
}
};
in self

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

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "fastavro";
version = "1.4.9";
version = "1.4.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0af6d67s6mi9ylqla8nga6cj4y0y4gp3l2q68br2mrdyivkml0g0";
sha256 = "sha256-JTNRm/nCQckAZrVTgcJVP3bLE53QPtccdoDcGLbP6BE=";
};
preBuild = ''

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

@ -13,6 +13,7 @@
, pytest-sugar
, pytestCheckHook
, pythonOlder
, pythonAtLeast
, sanic-routing
, sanic-testing
, ujson
@ -26,7 +27,8 @@ buildPythonPackage rec {
version = "21.12.1";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.7" ||
pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88
src = fetchFromGitHub {
owner = "sanic-org";

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

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "bacon";
version = "1.2.5";
version = "2.0.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dpdQ1qBfLU6whkqVHQ/zQxqs/y+nmdvxHanaNw66QxA=";
sha256 = "sha256-Wa5K21QGI43sZkv7xgatf37Wqy9RT3S7HQBsjGUZovA=";
};
cargoSha256 = "sha256-jidZhaB8gF4QBcTvVuygTZdQnlOVwOQO8MMjUuSPht0=";
cargoSha256 = "sha256-PpLZOQd4r50LWJwB2WX5IrRyzYhWgsv9wOqm/sZCaug=";
buildInputs = lib.optional stdenv.isDarwin CoreServices;

4
pkgs/development/tools/haskell/vaultenv/default.nix
View File

@ -28,13 +28,13 @@
}:
mkDerivation rec {
pname = "vaultenv";
version = "0.13.3";
version = "0.14.0";
src = fetchFromGitHub {
owner = "channable";
repo = "vaultenv";
rev = "v${version}";
sha256 = "sha256-17tdlqG8z4GviI7kkLbktC6SqnQFDdZhWtejscG0n48=";
sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI=";
};
buildTools = [ hpack ];

1
pkgs/games/steam/fhsenv.nix
View File

@ -167,7 +167,6 @@ in buildFHSUserEnv rec {
ffmpeg
# Only libraries are needed from those two
libudev0-shim
networkmanager098
# Verified games requirements
xorg.libXt

13
pkgs/servers/fishnet/Cargo.lock.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/Cargo.lock b/Cargo.lock
index 963e40e..fb76d78 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -230,7 +230,7 @@ dependencies = [
[[package]]
name = "fishnet"
-version = "2.5.1-dev"
+version = "2.5.1"
dependencies = [
"arrayvec",
"atty",

16
pkgs/servers/fishnet/default.nix
View File

@ -6,21 +6,21 @@
}:
let
nnueFile = "nn-6762d36ad265.nnue";
nnueFile = "nn-13406b1dcbe0.nnue";
nnue = fetchurl {
url = "https://tests.stockfishchess.org/api/nn/${nnueFile}";
sha256 = "0727dsxfpns9fkyir95fybibqmigk5h45k154b2c5rk5s9md6qk7";
sha256 = "sha256-E0BrHcvgo238XgfaUdjbOLekXX2kMHjsJadiTCuDI28=";
};
in
rustPlatform.buildRustPackage rec {
pname = "fishnet";
version = "2.4.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "niklasf";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1Gl2vJFn9yVYH62yBJefAOBX/jJaFAdSZj2Lj3imcps=";
sha256 = "sha256-nVRG60sSpTqfqhCclvWoeyHR0+oO1Jn1PgftigDGq5c=";
fetchSubmodules = true;
};
@ -29,7 +29,13 @@ rustPlatform.buildRustPackage rec {
cp -v '${nnue}' 'Fairy-Stockfish/src/${nnueFile}'
'';
cargoSha256 = "sha256-/s7Yyi2FUh+EDvgaHLgZ/FA6kk2FQrZr3L3B76fqTuc=";
cargoSha256 = "sha256-BJK7M/pjHRj74xoeciavhkK2YRpeogkELIuXetX73so=";
# TODO: Cargo.lock is out of date, so fix it. Likely not necessary anymore in
# the next update.
cargoPatches = [
./Cargo.lock.patch
];
meta = with lib; {
description = "Distributed Stockfish analysis for lichess.org";

14
pkgs/tools/admin/awscli2/default.nix
View File

@ -25,15 +25,7 @@ let
rev = "7083e5c204e139dc41f646e0ad85286b5e7c0c23";
sha256 = "sha256-aiCc/CXoTem0a9wI/AMBRK3g2BXJi7LpnUY/BxBEKVM=";
};
propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt];
});
prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec {
version = "2.0.10";
src = oldAttrs.src.override {
inherit version;
sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi";
};
propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [ py.pkgs.awscrt ];
});
};
};
@ -41,13 +33,13 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.4.9"; # N.B: if you change this, change botocore to a matching version too
version = "2.4.19"; # N.B: if you change this, change botocore to a matching version too
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
sha256 = "sha256-ihmbw+gS7zZz/nebrmpEr9MR+dVabc70DBPPSrm3eeE=";
sha256 = "sha256-ZOSZBZT4d5jv5lg8KkGoOJqAvStUsGZbiXp3dpsrOpo=";
};
propagatedBuildInputs = [

4
pkgs/tools/audio/audiowaveform/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "audiowaveform";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "bbc";
repo = "audiowaveform";
rev = version;
sha256 = "sha256-WODAgiwZ7UfoukTcujXE5atw/Z03+Vo6aR2jubPwQeU=";
sha256 = "sha256-ZkkGRohcydi2C1S7J0+yGWsqK7ivxQmFuq1NGNiPPNY=";
};
nativeBuildInputs = [ cmake gtest ];

9
pkgs/tools/backup/restic/rest-server.nix
View File

@ -2,19 +2,20 @@
buildGoModule rec {
pname = "restic-rest-server";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "restic";
repo = "rest-server";
rev = "v${version}";
sha256 = "1msa6mah76zfif5wp0129jjk2jlq5ff38p9p6d241mw45i1xjfy7";
hash = "sha256-ninPODztNzvB2js9cuNAuExQLK/OGOu80ZNW0BPrdds=";
};
vendorSha256 = "04w63sx7p0fm9xq0m7xab808az7lgw7i3p8basndszky8kgvxhmg";
vendorSha256 = "sha256-8x5qYvIX/C5BaewrTNVbIIadL+7XegbRUZiEDWmJM+c=";
preCheck = ''
substituteInPlace handlers_test.go --replace "TestJoin" "SkipTestJoin"
substituteInPlace cmd/rest-server/main_test.go \
--replace "/tmp/restic" "/build/restic"
'';
meta = with lib; {

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

@ -11,11 +11,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "205";
version = "207";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-Smx9trogh7E6jsH0K+FXAocN8znnMXXnN6N/QzXkdJQ=";
sha256 = "sha256-0PWnaOQV4Pj0hFMpn98xYhZDexctkweIE2ZM3ppYfvg=";
};
outputs = [ "out" "man" ];

6
pkgs/tools/misc/rauc/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "rauc";
version = "1.5.1";
version = "1.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-AIizbD2jaZ5SY0K/hwpHdGE20KEhWC53LWUiVYs9Oiw=";
sha256 = "sha256-HBeH9vzzfY7pG88xyoL+NJ78LMGphCAfyZiOxFSJnnc=";
};
passthru = {
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Safe and secure software updates for embedded Linux";
homepage = "https://rauc.io";
license = licenses.lgpl21;
license = licenses.lgpl21Only;
maintainers = with maintainers; [ emantor ];
platforms = with platforms; linux;
};

64
pkgs/tools/networking/networkmanager/0.9.8/default.nix
View File

@ -1,64 +0,0 @@
{ lib, stdenv, fetchurl, intltool, pkg-config, dbus-glib
, udev, libnl, libuuid, gnutls, dhcp
, libgcrypt, perl, libgudev, avahi, ppp, kmod }:
stdenv.mkDerivation rec {
pname = "networkmanager";
version = "0.9.8.10";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86";
};
preConfigure = ''
substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
substituteInPlace src/nm-device.c \
--replace @avahi@ ${avahi} \
--replace @kmod@ ${kmod}
substituteInPlace src/ppp-manager/nm-ppp-manager.c \
--replace @ppp@ ${ppp} \
--replace @kmod@ ${kmod}
'';
# Right now we hardcode quite a few paths at build time. Probably we should
# patch networkmanager to allow passing these path in config file. This will
# remove unneeded build-time dependencies.
configureFlags = [
"--with-distro=exherbo"
"--with-dhclient=${dhcp}/sbin/dhclient"
"--with-dhcpcd=no"
"--with-iptables=no"
"--with-udev-dir=\${out}/lib/udev"
"--with-resolvconf=no"
"--sysconfdir=/etc" "--localstatedir=/var"
"--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
"--with-crypto=gnutls" "--disable-more-warnings"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-kernel-firmware-dir=/run/current-system/firmware"
"--disable-ppp"
];
buildInputs = [ udev libnl libuuid gnutls libgcrypt libgudev ];
propagatedBuildInputs = [ dbus-glib ];
nativeBuildInputs = [ intltool pkg-config ];
patches =
[ ./libnl-3.2.25.patch
./nixos-purity.patch
];
preInstall =
''
installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" )
'';
meta = with lib; {
homepage = "http://projects.gnome.org/NetworkManager/";
description = "Network configuration and management tool";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

61
pkgs/tools/networking/networkmanager/0.9.8/libnl-3.2.25.patch
View File

@ -1,61 +0,0 @@
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
index ba8053e..5ac39d3 100644
--- a/src/nm-netlink-monitor.c
+++ b/src/nm-netlink-monitor.c
@@ -177,40 +177,15 @@ link_msg_handler (struct nl_object *obj, void *arg)
static int
event_msg_recv (struct nl_msg *msg, void *arg)
{
- struct nl_sock *nlh = arg;
- struct nlmsghdr *hdr = nlmsg_hdr (msg);
struct ucred *creds = nlmsg_get_creds (msg);
- const struct sockaddr_nl *snl;
- guint32 local_port;
- gboolean accept_msg = FALSE;
-
- /* Only messages sent from the kernel */
- if (!creds || creds->uid != 0) {
- nm_log_dbg (LOGD_HW, "ignoring netlink message from UID %d",
- creds ? creds->uid : -1);
- return NL_SKIP;
- }
-
- snl = nlmsg_get_src (msg);
- g_assert (snl);
-
- /* Accept any messages from the kernel */
- if (hdr->nlmsg_pid == 0 || snl->nl_pid == 0)
- accept_msg = TRUE;
- /* And any multicast message directed to our netlink PID, since multicast
- * currently requires CAP_ADMIN to use.
- */
- local_port = nl_socket_get_local_port (nlh);
- if ((hdr->nlmsg_pid == local_port) && snl->nl_groups)
- accept_msg = TRUE;
-
- if (accept_msg == FALSE) {
- nm_log_dbg (LOGD_HW, "ignoring netlink message from PID %d (local PID %d, multicast %d)",
- hdr->nlmsg_pid,
- local_port,
- (hdr->nlmsg_flags & NLM_F_MULTI));
- return NL_SKIP;
+ if (!creds || creds->pid || creds->uid || creds->gid) {
+ if (creds)
+ nm_log_dbg (LOGD_HW, "netlink: received non-kernel message (pid %d uid %d gid %d)",
+ creds->pid, creds->uid, creds->gid);
+ else
+ nm_log_dbg (LOGD_HW, "netlink: received message without credentials");
+ return NL_STOP;
}
return NL_OK;
@@ -285,7 +260,7 @@ nlh_setup (struct nl_sock *nlh,
{
int err;
- nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data);
+ nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, NULL);
if (valid_func)
nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data);

77
pkgs/tools/networking/networkmanager/0.9.8/nixos-purity.patch
View File

@ -1,77 +0,0 @@
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 0932139..5b5aee8 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -68,10 +68,6 @@ const char *
nm_dhcp_dhclient_get_path (const char *try_first)
{
static const char *dhclient_paths[] = {
- "/sbin/dhclient",
- "/usr/sbin/dhclient",
- "/usr/pkg/sbin/dhclient",
- "/usr/local/sbin/dhclient",
NULL
};
const char **path = dhclient_paths;
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
index 237661f..48bc33f 100644
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
@@ -51,10 +51,6 @@ const char *
nm_dhcp_dhcpcd_get_path (const char *try_first)
{
static const char *dhcpcd_paths[] = {
- "/sbin/dhcpcd",
- "/usr/sbin/dhcpcd",
- "/usr/pkg/sbin/dhcpcd",
- "/usr/local/sbin/dhcpcd",
NULL
};
const char **path = dhcpcd_paths;
diff --git a/src/nm-device.c b/src/nm-device.c
index 1dc94ee..e60f3c8 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -1321,8 +1321,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason)
char *argv[6], *cmdline;
const char **aipd_binary = NULL;
static const char *aipd_paths[] = {
- "/usr/sbin/avahi-autoipd",
- "/usr/local/sbin/avahi-autoipd",
+ "@avahi@/sbin/avahi-autoipd",
NULL
};
int i = 0;
@@ -2555,7 +2554,7 @@ share_init (void)
}
for (iter = modules; *iter; iter++) {
- char *argv[3] = { "/sbin/modprobe", *iter, NULL };
+ char *argv[3] = { "@kmod@/bin/modprobe", *iter, NULL };
char *envp[1] = { NULL };
GError *error = NULL;
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 59698c3..7dba0f7 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -661,9 +661,7 @@ static inline const char *
nm_find_pppd (void)
{
static const char *pppd_binary_paths[] = {
- "/usr/local/sbin/pppd",
- "/usr/sbin/pppd",
- "/sbin/pppd",
+ "@ppp@/sbin/pppd",
NULL
};
@@ -988,7 +986,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
/* Make sure /dev/ppp exists (bgo #533064) */
if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode))
- ignored = system ("/sbin/modprobe ppp_generic");
+ ignored = system ("@kmod@/bin/modprobe ppp_generic");
connection = nm_act_request_get_connection (req);
g_assert (connection);

4
pkgs/tools/nix/nix-output-monitor/default.nix
View File

@ -5,11 +5,11 @@
}:
mkDerivation rec {
pname = "nix-output-monitor";
version = "1.0.4.0";
version = "1.0.5.0";
src = fetchFromGitHub {
owner = "maralorn";
repo = "nix-output-monitor";
hash = "sha256-3EQgjrDX8C3qG6danuPRl2gnPlX1qZjxjrROrKitsS0=";
hash = "sha256-7vjGE/MfRlFplGQBkhYwqMWjiFfky7J9aI8Tt5FycBo=";
rev = "v${version}";
};
isLibrary = true;

7
pkgs/tools/text/igrep/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "igrep";
version = "0.1.2";
version = "0.2.0";
src = fetchFromGitHub {
owner = "konradsz";
repo = "igrep";
rev = "v${version}";
sha256 = "sha256-ZbJogp4rTc3GAD71iQUIf5EqwJ8XD9/WmvdAcGIgcvY=";
sha256 = "sha256-CH0wf9EhNnfi93W/4IJf6bPqU4pgw6Q9965Wjln9pso=";
};
cargoSha256 = "sha256-sj2GEyUPq9+JXlGpKYRNfhfwGf5F/J46AoOjUu4xm7I=";
cargoSha256 = "sha256-VnZuRLBt/Q+D89+jKm0rak+ID5oNbvN1k8or3pYzfIM=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Interactive Grep";
homepage = "https://github.com/konradsz/igrep";
changelog = "https://github.com/konradsz/igrep/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ _0x4A6F ];
};

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

@ -8165,9 +8165,6 @@ with pkgs;
inherit (skawarePackages) cleanPackaging;
};
# stripped down, needed by steam
networkmanager098 = callPackage ../tools/networking/networkmanager/0.9.8 { };
networkmanager = callPackage ../tools/networking/networkmanager { };
networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };