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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-04-17 06:01:07 +00:00 committed by GitHub
commit deb60260a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 106 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/mininet.nix
View File

@ -23,8 +23,8 @@ let
ln -s ${pyEnv}/bin/mn $out/bin/mn
# mn errors out without a telnet binary
# pkgs.telnet brings an undesired ifconfig into PATH see #43105
ln -s ${pkgs.telnet}/bin/telnet $out/bin/telnet
# pkgs.inetutils brings an undesired ifconfig into PATH see #43105
ln -s ${pkgs.inetutils}/bin/telnet $out/bin/telnet
'';
in
{

75
pkgs/applications/misc/gnome-firmware-updater/default.nix
View File

@ -1,75 +0,0 @@
{ lib, stdenv
, fetchFromGitLab
, fetchpatch
, appstream-glib
, desktop-file-utils
, fwupd
, gettext
, glib
, gtk3
, libsoup
, libxmlb
, meson
, ninja
, pkg-config
, systemd
, help2man
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "gnome-firmware-updater";
version = "3.34.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "hughsie";
repo = "gnome-firmware-updater";
rev = version;
sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l";
};
patches = [
# Fixes manual build
(fetchpatch {
url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch";
sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06";
})
(fetchpatch {
url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch";
sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1";
})
];
nativeBuildInputs = [
appstream-glib # for ITS rules
desktop-file-utils
gettext
help2man
meson
ninja
pkg-config
wrapGAppsHook
];
buildInputs = [
fwupd
glib
gtk3
libsoup
libxmlb
systemd
];
mesonFlags = [
"-Dconsolekit=false"
];
meta = with lib; {
homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater";
description = "Tool for installing firmware on devices";
license = licenses.gpl2Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}

63
pkgs/applications/misc/gnome-firmware/default.nix Normal file
View File

@ -0,0 +1,63 @@
{ stdenv
, lib
, fetchFromGitLab
, appstream-glib
, desktop-file-utils
, fwupd
, gettext
, glib
, gtk4
, libadwaita
, libxmlb
, meson
, ninja
, pkg-config
, systemd
, help2man
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "gnome-firmware";
version = "42.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gnome-firmware";
rev = version;
sha256 = "9QZ98EElENWsME/jXoj9YJl2e+ipyLm0g4grQUwmnuE=";
};
nativeBuildInputs = [
appstream-glib # for ITS rules
desktop-file-utils
gettext
help2man
meson
ninja
pkg-config
wrapGAppsHook4
];
buildInputs = [
fwupd
glib
gtk4
libadwaita
libxmlb
systemd
];
mesonFlags = [
"-Dconsolekit=false"
];
meta = with lib; {
homepage = "https://gitlab.gnome.org/World/gnome-firmware";
description = "Tool for installing firmware on devices";
license = licenses.gpl2Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}

4
pkgs/applications/networking/cluster/driftctl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "driftctl";
version = "0.28.0";
version = "0.28.1";
src = fetchFromGitHub {
owner = "snyk";
repo = "driftctl";
rev = "v${version}";
sha256 = "sha256-sh4A3f6Wnq9yic2p42SEvoIXeh0dm8pQ0e/5Pr04koE=";
sha256 = "sha256-v6NtnCwIAqzlbtvwmWr39wauPxT0I/m5HOykQfmAexQ=";
};
vendorSha256 = "sha256-2mAPOUAv0ORRCMxesmcwZZh9SCa12k94y/iiN/rzUbs=";

6
pkgs/development/libraries/nghttp3/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "nghttp3";
version = "unstable-2021-12-22";
version = "unstable-2022-04-10";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "8d8184acf850b06b53157bba39022bc7b7b5f1cd";
sha256 = "sha256-pV1xdQa5RBz17jDINC2uN1Q+jpa2edDwqTqf8D5VU3E=";
rev = "1e4bef2cc45b1fd3971ca3606d08a1e1d1567b1a";
sha256 = "sha256-DHNxtu4X0S8l1ADwRJC3yQ+Z1ja3FT0Zb/boRh6PvYw=";
};
nativeBuildInputs = [ autoreconfHook pkg-config file ];

6
pkgs/development/libraries/ngtcp2/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "unstable-2021-12-19";
version = "unstable-2022-04-11";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "20c710a8789ec910455ae4e588c72e9e39f8cec9";
sha256 = "sha256-uBmD26EYT8zxmHD5FuHCbEuTdWxer/3uhRp8PhUT87M=";
rev = "825899c051ea2a1f06a0c4617f41782f37009a18";
sha256 = "sha256-VoSy0tyIXWNTmcVdsaiM9ijXLq41AOaPBajvsEIrfjo=";
};
nativeBuildInputs = [ autoreconfHook pkg-config file ];

11
pkgs/development/libraries/quictls/default.nix
View File

@ -9,20 +9,15 @@
, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
}:
assert (
lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform)
"withPerl should not be disabled unless cross compiling"
);
stdenv.mkDerivation rec {
pname = "quictls";
version = "3.0.1+quick_unstable-2021-12.14";
version = "3.0.2+quick_unstable-2022-03.15";
src = fetchFromGitHub {
owner = "quictls";
repo = "openssl";
rev = "ab8b87bdb436b11bf2a10a2a57a897722224f828";
sha256 = "sha256-835oZgoM1CTS+JLxPO3oGSTnhLmJXGT1cFaJhCJK++8=";
rev = "7f2ab56a2b842b8e6fefc7b9d20eb5ff9c6ef151";
sha256 = "sha256-We4ow0mGJFXqYM4PqbGn8qY5IYH/MtNaefrSaJreoRA=";
};
patches = [

4
pkgs/development/libraries/science/astronomy/wcslib/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wcslib";
version = "7.7";
version = "7.9";
src = fetchurl {
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
sha256 = "sha256-pwjmtOkOLNZCdDRxW1kbucPUAFyZcl7ElLjgvtLeU1U=";
sha256 = "sha256-vv+MHw6GAAeIE8Ay0a/NnLMFwx9WdWdDSCQjPVgqulg=";
};
nativeBuildInputs = [ flex ];

25
pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix Normal file
View File

@ -0,0 +1,25 @@
#
# Files came from this Hydra build:
#
# https://hydra.nixos.org/build/172142499
#
# Which used nixpkgs revision 49a83445c28c4ffb8a1a90a1f68e6150ea48893b
# to instantiate:
#
# /nix/store/gj272sd56gsj6qpyzh4njpfzwdhviliz-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu.drv
#
# and then built:
#
# /nix/store/n81pljbd8m0xgypm84krc2bnvqgjrfxx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu
#
{
busybox = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/49a83445c28c4ffb8a1a90a1f68e6150ea48893b/busybox";
sha256 = "sha256-UscnfGKOZAKLkPcRtwrbT5Uj8m3Kj9jhkKp9MUc1eCY=";
executable = true;
};
bootstrapTools =import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/49a83445c28c4ffb8a1a90a1f68e6150ea48893b/bootstrap-tools.tar.xz";
sha256 = "sha256-A20GKGn3rM8K2JcU0SApRp3+avUE+bIm1h632AitRzU=";
};
}

1
pkgs/stdenv/linux/default.nix
View File

@ -16,6 +16,7 @@
armv7l-linux = import ./bootstrap-files/armv7l.nix;
aarch64-linux = import ./bootstrap-files/aarch64.nix;
mipsel-linux = import ./bootstrap-files/loongson2f.nix;
powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix;
riscv64-linux = import ./bootstrap-files/riscv64.nix;
};
musl = {

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

@ -448,6 +448,7 @@ mapAliases ({
gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07
gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08
gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06
gnome-firmware-updater = gnome-firmware; # added 2022-04-14
gnome-passwordsafe = gnome-secrets; # added 2022-01-30
gnome-mpv = celluloid; # Added 2019-08-22
gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15

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

@ -15169,7 +15169,7 @@ with pkgs;
gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {};
gnome-firmware-updater = callPackage ../applications/misc/gnome-firmware-updater {};
gnome-firmware = callPackage ../applications/misc/gnome-firmware {};
gnome-usage = callPackage ../applications/misc/gnome-usage {};