nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 11:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-21.11 into staging-next-21.11

Browse Source
This commit is contained in:
github-actions[bot]
2022-01-24 00:10:01 +00:00
committed by GitHub
parent ce137879e5 604c44137d
commit ebfde26c00
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@@ -281,7 +281,7 @@ def main() -> None:
if os.readlink(system_dir(*gen)) == args.default_config:
write_loader_conf(*gen)
except OSError as e:
print("ignoring profile '{}' in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr)
print("ignoring generation '{}' in the list of boot entries because of the following error:\n{}".format(*gen, e), file=sys.stderr)
memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf"
if os.path.exists(memtest_entry_file):

12
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, libtool
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
, ApplicationServices
@@ -18,11 +18,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-19";
version = "7.1.0-20";
src = fetchurl {
url = "https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-${version}.tar.xz";
hash = "sha256-P9eRdKsPMLwWQ68+ZU8dL/zDqVVCY5gRVWiLT0n3/Xc=";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
sha256 = "0r8zmk2cfmf09l94hqzfz4aspnzn178ggdbgm7w4hr0p864cbvc3";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

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

@@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "469";
version = "470b";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "sha256-1E85SIsLXeG+AUqQYCJxOlSwiT26OG+n/d9GbyryGCE=";
sha256 = "0v52krjcqykrm3zqj6idzvbpjv4fhbgvq2jr8k0g63f7db7p08h9";
};
nativeBuildInputs = [

4
pkgs/applications/networking/browsers/brave/default.nix
View File

@@ -93,11 +93,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.34.80";
version = "1.34.81";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "2N+dXQGVfm3GsaKKo3EBxLu+cu08OjlrqkgXX9knFys=";
sha256 = "bMNk1l3MguQho0vck78U1e3A+/571DyoWSKKerQVE7s=";
};
dontConfigure = true;

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

@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "mattermostdriver";
version = "7.3.1";
version = "7.3.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "bf629c4b8f825bd7196208aa93995ac5077bd60939ba67cca314a7f13c1dbcea";
sha256 = "2e4d7b4a17d3013e279c6f993746ea18cd60b45d8fa3be24f47bc2de22b9b3b4";
};
propagatedBuildInputs = [ websockets requests ];