diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 2ce0bc608edb..ec6fe86cffa7 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-19"; + version = "6.9.12-26"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-8KofT9aNd8SXL0YBQ0RUOTccVxQNacvJL1uYPZiSPkY="; + sha256 = "sha256-oNorY/93jk1v5BS1T3wqctXuzV4o8JlyZtHnsNYmO4U="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index d0bfa5b0b962..ea38f34cb2fc 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -14,20 +14,21 @@ in buildPythonPackage rec { pname = "vyper"; - version = "0.2.11"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84"; + sha256 = "3e50cd802696ea3f5e6ab1bf4c9a90a39c332591d416c99f3d2fa93d7d7ba394"; }; nativeBuildInputs = [ pytestrunner ]; + # Replace the dynamic commit hash lookup with the hash from the tag postPatch = '' substituteInPlace setup.py \ --replace 'asttokens==' 'asttokens>=' \ --replace 'subprocess.check_output("git rev-parse HEAD".split())' "' '" \ - --replace 'commithash.decode("utf-8").strip()' "'069936fa3fee8646ff362145593128d7ef07da38'" + --replace 'commithash.decode("utf-8").strip()' "'6e7dba7a8b5f29762d3470da4f44634b819c808d'" ''; propagatedBuildInputs = [ diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index d7611baad14e..98a1223d2799 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, stdenv, lib, pkg-config, autoreconfHook +{ fetchFromGitHub, stdenv, lib, pkg-config, autoreconfHook , ncurses, gnutls, readline , openssl, perl, sqlite, libjpeg, speex, pcre, libuuid , ldns, libedit, yasm, which, libsndfile, libtiff @@ -88,21 +88,14 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.5"; + version = "1.10.6"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "18dhyb19k28dcm1i8mhqvvgm2phsrmrwyjmfn79glk8pdlalvcha"; + sha256 = "1i5n06pds3kvzhhzfwvhwxnvcb2p2fcr8k52157aplm2i7prl4q2"; }; - patches = [ - # https://github.com/signalwire/freeswitch/pull/812 fix mod_spandsp, mod_gsmopen build, drop when updating from 1.10.5 - (fetchpatch { - url = "https://github.com/signalwire/freeswitch/commit/51fba83ed3ed2d9753d8e6b13e13001aca50b493.patch"; - sha256 = "0h2bmifsyyasxjka3pczbmqym1chvz91fmb589njrdbwpkjyvqh3"; - }) - ]; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl substituteInPlace libs/libvpx/build/make/configure.sh \ @@ -117,10 +110,11 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ]; buildInputs = [ - openssl ncurses gnutls readline perl libjpeg - sqlite pcre speex ldns libedit yasm which + openssl ncurses gnutls readline libjpeg + sqlite pcre speex ldns libedit libsndfile libtiff libuuid ] diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 8e17111ce8e5..aa1d8c6c18b6 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -1,4 +1,12 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }: +{ mkDerivation +, lib +, fetchFromGitHub +, fetchpatch +, qtbase +, cmake +, qttools +, qtsvg +}: mkDerivation rec { pname = "flameshot"; @@ -11,13 +19,31 @@ mkDerivation rec { sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a"; }; + patches = [ + # Support for USE_LAUNCHER_ABSOLUTE_PATH. + # Should be removed when the next release comes out. + (fetchpatch { + url = "https://github.com/flameshot-org/flameshot/commit/1031980ed1e62d24d7f719998b7951d48801e3fa.patch"; + sha256 = "sha256-o8Zz/bBvitXMDFt5rAfubiUPOx+EQ+ITgrfnFM3dFjE="; + }) + # Fix autostart write path. + # Should be removed when the next release comes out. + (fetchpatch { + url = "https://github.com/flameshot-org/flameshot/commit/7977cbb52c2d785abd0d85d9df5991e8f7cae441.patch"; + sha256 = "sha256-wWa9Y+4flBiggOMuX7KQyL+q3f2cALGeQBGusX2x6sk="; + }) + ]; + nativeBuildInputs = [ cmake qttools qtsvg ]; buildInputs = [ qtbase ]; + # Use relative path for the .desktop file. + cmakeFlags = [ "-DUSE_LAUNCHER_ABSOLUTE_PATH=OFF" ]; + meta = with lib; { description = "Powerful yet simple to use screenshot software"; homepage = "https://github.com/flameshot-org/flameshot"; - maintainers = with maintainers; [ scode ]; + maintainers = with maintainers; [ scode oxalica ]; license = licenses.gpl3Plus; platforms = platforms.linux; };