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] 2021-08-18 06:01:31 +00:00 committed by GitHub
commit 0c06e9acec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 87 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View File

@ -96,6 +96,10 @@ self: let
postInstall = ''
./install.sh --prefix=$out
'';
meta = old.meta // {
maintainers = [ lib.maintainers.sternenseemann ];
};
});
};

19
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View File

@ -214,6 +214,25 @@
};
};
urweb-mode = self.trivialBuild {
pname = "urweb-mode";
inherit (pkgs.urweb) src version;
packageRequires = [
self.cl-lib
self.flycheck
];
postUnpack = "sourceRoot=$sourceRoot/src/elisp";
meta = {
description = "Major mode for editing Ur/Web";
inherit (pkgs.urweb.meta) license homepage;
maintainers = [ lib.maintainers.sternenseemann ];
};
};
# Packages made the classical callPackage way
ebuild-mode = callPackage ./ebuild-mode { };

4
pkgs/applications/graphics/shutter/default.nix
View File

@ -64,13 +64,13 @@ let
in
stdenv.mkDerivation rec {
pname = "shutter";
version = "0.97";
version = "0.98";
src = fetchFromGitHub {
owner = "shutter-project";
repo = "shutter";
rev = "v${version}";
sha256 = "sha256-/2eQLJJZP0ArQUrxcFdogv/4wy+O021hODkJYLQmLY8=";
sha256 = "sha256-btJVY7+palstydWt5VCdtHwOj6FTXEcsregjaiXbZ5I=";
};
nativeBuildInputs = [ wrapGAppsHook ];

4
pkgs/applications/misc/sequeler/default.nix
View File

@ -11,13 +11,13 @@ let
in stdenv.mkDerivation rec {
pname = "sequeler";
version = "0.8.0";
version = "0.8.2";
src = fetchFromGitHub {
owner = "Alecaddd";
repo = pname;
rev = "v${version}";
sha256 = "090plqnby2wxzr1waq5kz89w3269j363mgxwfz9g7qg55lddaahz";
sha256 = "sha256-MsHHTYERe0v+u3KnVtx+jmJTKORJTJ7bNfJMZHV9Ly4=";
};
nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook python3 desktop-file-utils ];

32
pkgs/applications/misc/waybar/default.nix
View File

@ -14,30 +14,33 @@
, scdoc
, spdlog
, gtk-layer-shell
, howard-hinnant-date, cmake
, traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? true, libpulseaudio
, sndioSupport ? true, sndio
, nlSupport ? true, libnl
, udevSupport ? true, udev
, swaySupport ? true, sway
, mpdSupport ? true, libmpdclient
, howard-hinnant-date
, libxkbcommon
, traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? true, libpulseaudio
, sndioSupport ? true, sndio
, nlSupport ? true, libnl
, udevSupport ? true, udev
, evdevSupport ? true, libevdev
, swaySupport ? true, sway
, mpdSupport ? true, libmpdclient
, rfkillSupport ? true
, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl
}:
stdenv.mkDerivation rec {
pname = "waybar";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
sha256 = "17cn4d3dx92v40jd9vl41smp8hh3gf5chd1j2f7l1lrpfpnllg5x";
sha256 = "sha256-XOguhbvlO3iUyk5gWOvimipXV8yqnia0LKoSA1wiKoE=";
};
nativeBuildInputs = [
meson ninja pkg-config scdoc wrapGAppsHook cmake
meson ninja pkg-config scdoc wrapGAppsHook
] ++ lib.optional withMediaPlayer gobject-introspection;
propagatedBuildInputs = lib.optionals withMediaPlayer [
@ -48,12 +51,13 @@ stdenv.mkDerivation rec {
strictDeps = false;
buildInputs = with lib;
[ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ]
[ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
++ optional traySupport libdbusmenu-gtk3
++ optional pulseSupport libpulseaudio
++ optional sndioSupport sndio
++ optional nlSupport libnl
++ optional udevSupport udev
++ optional evdevSupport libevdev
++ optional swaySupport sway
++ optional mpdSupport libmpdclient;
@ -66,10 +70,12 @@ stdenv.mkDerivation rec {
libnl = nlSupport;
libudev = udevSupport;
mpd = mpdSupport;
rfkill = rfkillSupport;
}
) ++ [
"-Dout=${placeholder "out"}"
"-Dsystemd=disabled"
"-Dgtk-layer-shell=enabled"
"-Dman-pages=enabled"
];
preFixup = lib.optional withMediaPlayer ''

4
pkgs/applications/radio/sdrangel/default.nix
View File

@ -33,13 +33,13 @@
mkDerivation rec {
pname = "sdrangel";
version = "6.8.0";
version = "6.16.2";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
sha256 = "sha256-dFWwEs2nvcaCWpM4tA3/w8PbmNXn/R7JvxP3XEHasSQ=";
sha256 = "sha256-wWGKJWd3JDaT0dDMUrxv9ShMVe+q4zvH8SjyKw7UIbo=";
fetchSubmodules = false;
};

10
pkgs/development/libraries/gpgme/default.nix
View File

@ -23,12 +23,18 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch { # probably included in > 1.16.0
name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969";
urls = [
"https://files.gnupg.net/file/data/w43xz2zf73pnyqk5mm5l/PHID-FILE-hm2x5mjntsdyxrxve5tb/file"
"https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969"
];
sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h";
})
(fetchpatch { # gpg: Send --with-keygrip when listing keys
name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch";
url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992";
urls = [
"https://files.gnupg.net/file/data/2ufcg7ny5jdnv7hmewb4/PHID-FILE-7iwvryn2btti6txr3bsz/file"
"http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"
];
sha256 = "0y0b0lb2nq5p9kx13b59b2jaz157mvflliw1qdvg1v1hynvgb8m4";
})
# https://lists.gnupg.org/pipermail/gnupg-devel/2020-April/034591.html

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rdkafka";
version = "1.6.1";
version = "1.7.0";
src = fetchFromGitHub {
owner = "edenhill";
repo = "librdkafka";
rev = "v${version}";
sha256 = "sha256-EoNzxwuLiYi6sMhyqD/x+ku6BKA+i5og4XsUy2JBN0U=";
sha256 = "sha256-NLlg9S3bn5rAFyRa1ETeQGhFJYb/1y2ZiDylOy7xNbY=";
};
nativeBuildInputs = [ pkg-config python3 ];

4
pkgs/development/libraries/s2n-tls/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "s2n-tls";
version = "1.0.1";
version = "1.0.16";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-V/ZtO6t+Jxu/HmAEVzjkXuGWbZFwkGLsab1UCSG2tdk=";
sha256 = "sha256-gF4VhNEq/gpxXqOKvBtWZ5iZ3Jf98vSuSZYUu8r1jKA=";
};
nativeBuildInputs = [ cmake ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
version = "0.9.2";
version = "0.9.7";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
sha256 = "sha256-L/a/vTthh7XkiwuvlGk9q+uLEBf8vaPoV1x1fG44zeg=";
sha256 = "sha256-3ZLEp2RQhQ7QsRGLimWlZQM8PMTv07NlFoe64ES2+Ug=";
};
nativeBuildInputs = [ cmake ];

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

@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "binwalk";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "ReFirmLabs";
repo = "binwalk";
rev = "v${version}";
sha256 = "108mj4jjffdmaz6wjvglbv44j7fkhspaxz1rj2bi1fcnwsri5wsm";
sha256 = "sha256-lfHXutAp06Xr/TSBpDwBUBC/mWI9XuyImoKwA3inqgU=";
};
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]

4
pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-runtimeconfig";
version = "0.32.3";
version = "0.32.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-un5WZ2rxVXPKj9CPfhrojlA9ml6wfPIu0JD6p8WCY/A=";
sha256 = "ee239455a5393b51018071678ec0f4cc58ddf0904390e9f317f704f158ab16ab";
};
propagatedBuildInputs = [ google-api-core google-cloud-core ];

4
pkgs/development/python-modules/google-cloud-speech/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.6.0";
version = "2.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NkUgRYoli/ngoyJmuF9/va7Ao5ouw3cxsbwCrSIaOQc=";
sha256 = "3c2d533a524d35c036d0387e8b2e0c7ce6aa7cdaa80392ec7fe68bce6cd2f152";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];

4
pkgs/development/python-modules/google-cloud-storage/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-storage";
version = "1.41.1";
version = "1.42.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-qB7MDzgrjkQ3zH8VL3TXfvkXyCgKXRBA9dz70FAseQY=";
sha256 = "c1dd3d09198edcf24ec6803dd4545e867d82b998f06a68ead3b6857b1840bdae";
};
propagatedBuildInputs = [

6
pkgs/development/web/deno/default.nix
View File

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.13.0";
version = "1.13.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iSL9YAcYdeZ9E5diAJG1oHzujPmfblOvheewOu9QIu8=";
sha256 = "sha256-5/n4DpTWPwCVfTk0rqxPhKaKXu3KqotgiYCj8tRAqaM=";
};
cargoSha256 = "sha256-1aibJwZ3o3bU5PWPVPBsRpjGo4JgOsNAgnPVAk1ZQHE=";
cargoSha256 = "sha256-FY8qXqVDKxai4VwdruJ7aBNTdXK5taOuvTr6gTgU8BM=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];

6
pkgs/games/freeorion/default.nix
View File

@ -24,14 +24,14 @@
}:
stdenv.mkDerivation rec {
version = "0.4.10.1";
version = "0.4.10.2";
pname = "freeorion";
src = fetchFromGitHub {
owner = "freeorion";
repo = "freeorion";
rev = "v${version}";
sha256 = "sha256-Itt2JIStx+JsnMMBvbeJXSEJpaS/pd1UMvPGNd50k7I=";
sha256 = "sha256-k/YwTg0N2b70igfqRuFl/zwxMQhD2QjbapsazYbi0Ik=";
};
buildInputs = [
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
makeWrapper
];
# as of 0.4.10.1 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND"
# as of 0.4.10.2 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND"
cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=LEGACY" ];
postInstall = ''

8
pkgs/os-specific/linux/usbutils/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }:
{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata, python3 }:
stdenv.mkDerivation rec {
name = "usbutils-014";
pname = "usbutils";
version = "014";
src = fetchurl {
url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz";
sha256 = "sha256-Ogec+tYFYCJ7ZxkkgteBO/ljJvy7ZsBCVIOXFfJ2/Gk=";
};
@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://www.linux-usb.org/";
description = "Tools for working with USB devices, such as lsusb";
maintainers = with maintainers; [ ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};

4
pkgs/shells/zsh/spaceship-prompt/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "spaceship-prompt";
version = "3.12.25";
version = "3.14.0";
src = fetchFromGitHub {
owner = "denysdovhan";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qDy0HkaX3N7VGptv88gB3284yDTbp2EpiZ1kvaLX8dc=";
sha256 = "sha256-K9dNQAMW/Ms6rlAmfgQCqMiA7S4gLh9ZhvUoQiLoHOY=";
};
dontBuild = true;

4
pkgs/tools/filesystems/catcli/default.nix
View File

@ -7,13 +7,13 @@
buildPythonApplication rec {
pname = "catcli";
version = "0.6.2";
version = "0.7.0";
src = fetchFromGitHub {
owner = "deadc0de6";
repo = pname;
rev = "v${version}";
sha256 = "0704022gbm987q6x6vcflq4b4p4hvcqm5ikiyndy5n8fj1q8lq95";
sha256 = "1r30345wzpg8yk542fmgh3khdb91s4sr9hnqxh1s71ifjsrgmpph";
};
propagatedBuildInputs = [ docopt anytree ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rlwrap";
version = "0.45";
version = "0.45.2";
src = fetchFromGitHub {
owner = "hanslub42";
repo = "rlwrap";
rev = "v${version}";
sha256 = "1ppkjdnxrxh99g4xaiaglm5bmp24006rfahci0cn1g7zwilkjy8s";
sha256 = "sha256-ubhAOyswdDG0mFKpnSDDq5f7umyCHsW/m721IHdjNMc=";
};
postPatch = ''