From 6744ef67770291deb74aeea8637355b5254ae64c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 9 Jun 2021 20:47:00 +0700 Subject: [PATCH 1/8] vyper: 0.2.11 -> 0.2.15 (cherry picked from commit 63510151a8590a55efa6ef3984b6f7f62cc6d5c9) --- pkgs/development/compilers/vyper/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index d0bfa5b0b962..510c1c2a9189 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.2.15"; src = fetchPypi { inherit pname version; - sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84"; + sha256 = "sha256-cNnKHVKwIx0miC2VhGYBzcSckTnyWYmjNzW0bEzP4bU="; }; 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 = [ From abe56759a8f761a7d3c581bfbc6af878e8016b54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 29 Aug 2021 08:38:08 +0000 Subject: [PATCH 2/8] python38Packages.vyper: 0.2.15 -> 0.2.16 (cherry picked from commit 1025f271896570f8110368dfddb64fc26b7cbfb3) --- pkgs/development/compilers/vyper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 510c1c2a9189..8376b3a5cf02 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -14,11 +14,11 @@ in buildPythonPackage rec { pname = "vyper"; - version = "0.2.15"; + version = "0.2.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cNnKHVKwIx0miC2VhGYBzcSckTnyWYmjNzW0bEzP4bU="; + sha256 = "6cf347440716964012d46686faefc9c689f01872f19736287a63aa8652ac3ddd"; }; nativeBuildInputs = [ pytestrunner ]; From 8201f9bb697596394bf604056cfd6cacf0091003 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 00:50:57 +0000 Subject: [PATCH 3/8] python38Packages.vyper: 0.2.16 -> 0.3.0 (cherry picked from commit e47dd11f4ae5c2d089cb32618e019eb67a5469ef) --- pkgs/development/compilers/vyper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 8376b3a5cf02..ea38f34cb2fc 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -14,11 +14,11 @@ in buildPythonPackage rec { pname = "vyper"; - version = "0.2.16"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "6cf347440716964012d46686faefc9c689f01872f19736287a63aa8652ac3ddd"; + sha256 = "3e50cd802696ea3f5e6ab1bf4c9a90a39c332591d416c99f3d2fa93d7d7ba394"; }; nativeBuildInputs = [ pytestrunner ]; From 9a7d06d4ab37b69fa1aae114d8c4ca0c792cac7c Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 10 May 2021 15:42:19 +0300 Subject: [PATCH 4/8] freeswitch: 1.10.5 > 1.10.6 (cherry picked from commit a7b56e41d4c69604e13272ace374025ca0d31b64) --- pkgs/servers/sip/freeswitch/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index d7611baad14e..31e1cafc3195 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 \ From 0833ed32f309cfab892fd7907828c05f7279995c Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 10 May 2021 17:23:54 +0300 Subject: [PATCH 5/8] freeeswitch: move perl, which and yasm to nativeBuildInputs (cherry picked from commit 85fb843759ce02989474643789fb3535e07821d4) --- pkgs/servers/sip/freeswitch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 31e1cafc3195..7c75c4636179 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -110,10 +110,10 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + 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 ] From ad861506ba87d8a759a600d37c071d78b7be388d Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 10 May 2021 21:22:46 +0300 Subject: [PATCH 6/8] freeeswitch: enable strictDeps (cherry picked from commit ef32c9e3b83c544e554c242a067770d456b3bac5) --- pkgs/servers/sip/freeswitch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 7c75c4636179..98a1223d2799 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { done ''; + strictDeps = true; nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ]; buildInputs = [ openssl ncurses gnutls readline libjpeg From c99f06221052e50e5b87a94437ddacb526b02453 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 25 Oct 2021 14:13:40 +0200 Subject: [PATCH 7/8] imagemagick6: 6.9.12-19 -> 6.9.12-26 (cherry picked from commit 8705d0826fdc6675941a4d56b2a7935f13167348) --- pkgs/applications/graphics/ImageMagick/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 5ebb1dca9bb056649cbd023f953c0c4e7970bb72 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 23 Oct 2021 22:49:42 +0800 Subject: [PATCH 8/8] flameshot: fix desktop Exec path and autostart directory location (cherry picked from commit ccb84b735be81e6e7f4360c9d3eb4b9fe512c8d5) --- pkgs/tools/misc/flameshot/default.nix | 30 +++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) 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; };