lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
aca2797c a40463a3

+41 -26
+3 -3
pkgs/applications/misc/octoprint/default.nix
··· 16 16 packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( 17 17 [ 18 18 ( 19 - # with version 3 of flask-limiter octoprint 1.8.6 fails to start with 19 + # with version 3 of flask-limiter octoprint 1.8.7 fails to start with 20 20 # TypeError: Limiter.__init__() got multiple values for argument 'key_func' 21 21 self: super: { 22 22 flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec { ··· 105 105 self: super: { 106 106 octoprint = self.buildPythonPackage rec { 107 107 pname = "OctoPrint"; 108 - version = "1.8.6"; 108 + version = "1.8.7"; 109 109 110 110 src = fetchFromGitHub { 111 111 owner = "OctoPrint"; 112 112 repo = "OctoPrint"; 113 113 rev = version; 114 - hash = "sha256-DCUesPy4/g7DYN/9CDRvwAWHcv4dFsF+gsysg5UWThQ="; 114 + hash = "sha256-g4PYB9YbkX0almRPgMFlb8D633Y5fc3H+Boa541suqc="; 115 115 }; 116 116 117 117 propagatedBuildInputs = with self; [
+6 -6
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
··· 21 21 22 22 let 23 23 libdeltachat' = libdeltachat.overrideAttrs (old: rec { 24 - version = "1.107.1"; 24 + version = "1.110.0"; 25 25 src = fetchFromGitHub { 26 26 owner = "deltachat"; 27 27 repo = "deltachat-core-rust"; 28 28 rev = version; 29 - hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI="; 29 + hash = "sha256-SPBuStrBp9fnrLfFT2ec9yYItZsvQF9BHdJxi+plbgw="; 30 30 }; 31 31 cargoDeps = rustPlatform.fetchCargoTarball { 32 32 inherit src; 33 33 name = "${old.pname}-${version}"; 34 - hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4="; 34 + hash = "sha256-Y4+CkaV9njHqmmiZnDtfZ5OwMVk583FtncxOgAqACkA="; 35 35 }; 36 36 }); 37 37 esbuild' = esbuild.override { ··· 48 48 }; 49 49 in buildNpmPackage rec { 50 50 pname = "deltachat-desktop"; 51 - version = "1.34.4"; 51 + version = "1.34.5"; 52 52 53 53 src = fetchFromGitHub { 54 54 owner = "deltachat"; 55 55 repo = "deltachat-desktop"; 56 56 rev = "v${version}"; 57 - hash = "sha256-LV8/r6psUZuCEGbaH1nWlrkeNbEYG8R5O1aCxECPH1E="; 57 + hash = "sha256-gNcYcxyztUrcxbOO7kaTSCyxqdykjp7Esm3jPJ/d4gc="; 58 58 }; 59 59 60 - npmDepsHash = "sha256-rdZVvsyCo/6C4+gjytCCn9Qcl+chc6U+6orkcM59I8U="; 60 + npmDepsHash = "sha256-I0PhE+GXFgOdvH5aLZRyn3lVmXgATX2kmltXYC9chog="; 61 61 62 62 nativeBuildInputs = [ 63 63 makeWrapper
+2 -2
pkgs/servers/dns/bind/default.nix
··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 pname = "bind"; 11 - version = "9.18.11"; 11 + version = "9.18.12"; 12 12 13 13 src = fetchurl { 14 14 url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; 15 - sha256 = "sha256-j/M1KBIjDLy9pC34fK2WH5QWPT2kV8XkvvgFf9XfIVg="; 15 + sha256 = "sha256-R3Zrt7BjqrutBUOGsZCqf2wUUkQnr9Qnww7EJlEgJ+c="; 16 16 }; 17 17 18 18 outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
+17 -11
pkgs/tools/graphics/gmic-qt/default.nix
··· 1 1 { lib 2 2 , mkDerivation 3 3 , variant ? "standalone" 4 - , fetchFromGitHub 4 + , fetchzip 5 + , fetchpatch 5 6 , cmake 6 7 , pkg-config 7 8 , ninja ··· 16 17 , curl 17 18 , gimp ? null 18 19 , gmic 19 - , cimg 20 20 , qtbase 21 21 , qttools 22 22 , writeShellScript ··· 54 54 pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; 55 55 version = "3.2.1"; 56 56 57 - src = fetchFromGitHub { 58 - owner = "c-koi"; 59 - repo = "gmic-qt"; 60 - rev = "v.${version}"; 61 - sha256 = "sha256-z+GtYLBcHVufXwdeSd8WKmPmU1+/EKMv26kNaEgyt5w="; 57 + src = fetchzip { 58 + url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; 59 + hash = "sha256-2lMnn19FcFKnfIjSxOObqxIjqLMUoWgi0ADZBCBePY4="; 62 60 }; 63 61 62 + patches = [ 63 + (fetchpatch { 64 + name = "gmic-qt-3.2.1-fix-system-gmic.patch"; 65 + url = "https://github.com/c-koi/gmic-qt/commit/e8d7a3523753ff592da63b1d54edf0921c54fe53.patch"; 66 + hash = "sha256-kBFZo2qvod4pH3oK8gvnmw39x6eMH9zjr4mMcY74mFo="; 67 + }) 68 + ]; 69 + 70 + sourceRoot = "source/gmic-qt"; 71 + 64 72 nativeBuildInputs = [ 65 73 cmake 66 74 pkg-config ··· 69 77 70 78 buildInputs = [ 71 79 gmic 72 - cimg 73 80 qtbase 74 81 qttools 75 82 fftw ··· 85 92 86 93 cmakeFlags = [ 87 94 "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}" 88 - "-DENABLE_SYSTEM_GMIC:BOOL=ON" 95 + "-DENABLE_SYSTEM_GMIC=ON" 96 + "-DENABLE_DYNAMIC_LINKING=ON" 89 97 ]; 90 98 91 99 postPatch = '' ··· 108 116 }; 109 117 110 118 meta = with lib; { 111 - # Broken since 3.2.0 update, cannot handle system gmic and cimg. 112 - broken = true; 113 119 description = variants.${variant}.description; 114 120 homepage = "http://gmic.eu/"; 115 121 license = licenses.gpl3Plus;
+9
pkgs/tools/graphics/gmic/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , fetchurl 5 6 , cmake 6 7 , ninja ··· 36 37 rev = "v.${version}"; 37 38 hash = "sha256-oEH4GlSV+642TGSJJhV4yzydh1hAQZfzwaiPAZFNQtI="; 38 39 }; 40 + 41 + patches = [ 42 + (fetchpatch { 43 + name = "gmic-3.2.1-fix-system-gmic.patch"; 44 + url = "https://github.com/GreycLab/gmic/commit/9db3f6a39d9ed67b4279654da88993a8057575ff.patch"; 45 + hash = "sha256-JznKCs56t6cJ4HLqlhMZjSOupEB8cdkn3j6RgZpcpzo="; 46 + }) 47 + ]; 39 48 40 49 # TODO: build this from source 41 50 # https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729
+4 -4
pkgs/tools/misc/fortune/default.nix
··· 1 - { lib, stdenv, fetchurl, cmake, recode, perl, withOffensive ? false }: 1 + { lib, stdenv, fetchurl, cmake, recode, perl, rinutils, withOffensive ? false }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "fortune-mod"; 5 - version = "3.14.1"; 5 + version = "3.16.0"; 6 6 7 7 # We use fetchurl instead of fetchFromGitHub because the release pack has some 8 8 # special files. 9 9 src = fetchurl { 10 10 url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; 11 - sha256 = "sha256-NnAj9dsB1ZUuTm2W8mPdK2h15Dtro8ve6c+tPoKUsXs="; 11 + sha256 = "sha256-dkpkTBulXaN52BHaV4MWEIoQFkmWaG66O9Ppes/GLPo="; 12 12 }; 13 13 14 - nativeBuildInputs = [ cmake perl ]; 14 + nativeBuildInputs = [ cmake perl rinutils ]; 15 15 16 16 buildInputs = [ recode ]; 17 17