Merge master into staging-next
This commit is contained in:
commit
aca2797c2a
|
@ -16,7 +16,7 @@ let
|
|||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
|
||||
[
|
||||
(
|
||||
# with version 3 of flask-limiter octoprint 1.8.6 fails to start with
|
||||
# with version 3 of flask-limiter octoprint 1.8.7 fails to start with
|
||||
# TypeError: Limiter.__init__() got multiple values for argument 'key_func'
|
||||
self: super: {
|
||||
flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec {
|
||||
|
@ -105,13 +105,13 @@ let
|
|||
self: super: {
|
||||
octoprint = self.buildPythonPackage rec {
|
||||
pname = "OctoPrint";
|
||||
version = "1.8.6";
|
||||
version = "1.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint";
|
||||
rev = version;
|
||||
hash = "sha256-DCUesPy4/g7DYN/9CDRvwAWHcv4dFsF+gsysg5UWThQ=";
|
||||
hash = "sha256-g4PYB9YbkX0almRPgMFlb8D633Y5fc3H+Boa541suqc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
|
|
|
@ -21,17 +21,17 @@
|
|||
|
||||
let
|
||||
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
|
||||
version = "1.107.1";
|
||||
version = "1.110.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI=";
|
||||
hash = "sha256-SPBuStrBp9fnrLfFT2ec9yYItZsvQF9BHdJxi+plbgw=";
|
||||
};
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${old.pname}-${version}";
|
||||
hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4=";
|
||||
hash = "sha256-Y4+CkaV9njHqmmiZnDtfZ5OwMVk583FtncxOgAqACkA=";
|
||||
};
|
||||
});
|
||||
esbuild' = esbuild.override {
|
||||
|
@ -48,16 +48,16 @@ let
|
|||
};
|
||||
in buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.34.4";
|
||||
version = "1.34.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LV8/r6psUZuCEGbaH1nWlrkeNbEYG8R5O1aCxECPH1E=";
|
||||
hash = "sha256-gNcYcxyztUrcxbOO7kaTSCyxqdykjp7Esm3jPJ/d4gc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-rdZVvsyCo/6C4+gjytCCn9Qcl+chc6U+6orkcM59I8U=";
|
||||
npmDepsHash = "sha256-I0PhE+GXFgOdvH5aLZRyn3lVmXgATX2kmltXYC9chog=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bind";
|
||||
version = "9.18.11";
|
||||
version = "9.18.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-j/M1KBIjDLy9pC34fK2WH5QWPT2kV8XkvvgFf9XfIVg=";
|
||||
sha256 = "sha256-R3Zrt7BjqrutBUOGsZCqf2wUUkQnr9Qnww7EJlEgJ+c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, variant ? "standalone"
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ninja
|
||||
|
@ -16,7 +17,6 @@
|
|||
, curl
|
||||
, gimp ? null
|
||||
, gmic
|
||||
, cimg
|
||||
, qtbase
|
||||
, qttools
|
||||
, writeShellScript
|
||||
|
@ -54,13 +54,21 @@ mkDerivation rec {
|
|||
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c-koi";
|
||||
repo = "gmic-qt";
|
||||
rev = "v.${version}";
|
||||
sha256 = "sha256-z+GtYLBcHVufXwdeSd8WKmPmU1+/EKMv26kNaEgyt5w=";
|
||||
src = fetchzip {
|
||||
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
|
||||
hash = "sha256-2lMnn19FcFKnfIjSxOObqxIjqLMUoWgi0ADZBCBePY4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "gmic-qt-3.2.1-fix-system-gmic.patch";
|
||||
url = "https://github.com/c-koi/gmic-qt/commit/e8d7a3523753ff592da63b1d54edf0921c54fe53.patch";
|
||||
hash = "sha256-kBFZo2qvod4pH3oK8gvnmw39x6eMH9zjr4mMcY74mFo=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "source/gmic-qt";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
@ -69,7 +77,6 @@ mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
gmic
|
||||
cimg
|
||||
qtbase
|
||||
qttools
|
||||
fftw
|
||||
|
@ -85,7 +92,8 @@ mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
"-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}"
|
||||
"-DENABLE_SYSTEM_GMIC:BOOL=ON"
|
||||
"-DENABLE_SYSTEM_GMIC=ON"
|
||||
"-DENABLE_DYNAMIC_LINKING=ON"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -108,8 +116,6 @@ mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
# Broken since 3.2.0 update, cannot handle system gmic and cimg.
|
||||
broken = true;
|
||||
description = variants.${variant}.description;
|
||||
homepage = "http://gmic.eu/";
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, cmake
|
||||
, ninja
|
||||
|
@ -37,6 +38,14 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-oEH4GlSV+642TGSJJhV4yzydh1hAQZfzwaiPAZFNQtI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "gmic-3.2.1-fix-system-gmic.patch";
|
||||
url = "https://github.com/GreycLab/gmic/commit/9db3f6a39d9ed67b4279654da88993a8057575ff.patch";
|
||||
hash = "sha256-JznKCs56t6cJ4HLqlhMZjSOupEB8cdkn3j6RgZpcpzo=";
|
||||
})
|
||||
];
|
||||
|
||||
# TODO: build this from source
|
||||
# https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729
|
||||
gmic_stdlib = fetchurl {
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, stdenv, fetchurl, cmake, recode, perl, withOffensive ? false }:
|
||||
{ lib, stdenv, fetchurl, cmake, recode, perl, rinutils, withOffensive ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fortune-mod";
|
||||
version = "3.14.1";
|
||||
version = "3.16.0";
|
||||
|
||||
# We use fetchurl instead of fetchFromGitHub because the release pack has some
|
||||
# special files.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-NnAj9dsB1ZUuTm2W8mPdK2h15Dtro8ve6c+tPoKUsXs=";
|
||||
sha256 = "sha256-dkpkTBulXaN52BHaV4MWEIoQFkmWaG66O9Ppes/GLPo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
nativeBuildInputs = [ cmake perl rinutils ];
|
||||
|
||||
buildInputs = [ recode ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue