From a4cd25533dd14d63f0a486352c6f2c0b0fbfac37 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 1 May 2021 22:27:10 +0200 Subject: [PATCH 01/22] bitcoin: 0.21.0 -> 0.21.1 --- pkgs/applications/blockchains/bitcoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index b241fcc49ee7..1f222477ab24 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -22,7 +22,7 @@ with lib; let - version = "0.21.0"; + version = "0.21.1"; majorMinorVersion = versions.majorMinor version; desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37"; + sha256 = "caff23449220cf45753f312cefede53a9eac64000bb300797916526236b6a1e0"; }; nativeBuildInputs = From 04ca6340bd0668af243a5ac7cb56f20350cedcfd Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Thu, 5 Nov 2020 00:13:37 +0800 Subject: [PATCH 02/22] miniscript: init at unstable-2020-11-04 Closes #102808 Co-authored-by: William Casarin --- .../blockchains/miniscript/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/blockchains/miniscript/default.nix diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix new file mode 100644 index 000000000000..0520101c4cc7 --- /dev/null +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "miniscript"; + version = "unstable-2020-12-01"; + + src = fetchFromGitHub { + owner = "sipa"; + repo = pname; + rev = "02682a398a35b410571b10cde7f39837141ddad6"; + sha256 = "079jz4g88cfzfm9a6ykby9haxwcs033c1288mgr8cl2hw4qd2sjl"; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp miniscript $out/bin/miniscript + runHook postInstall + ''; + + meta = with lib; { + description = "Compiler and inspector for the miniscript Bitcoin policy language"; + longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more."; + homepage = "http://bitcoin.sipa.be/miniscript/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ RaghavSood jb55 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b485168c6ecd..8c22045dcac1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2826,6 +2826,8 @@ in mididings = callPackage ../tools/audio/mididings { }; + miniscript = callPackage ../applications/blockchains/miniscript { }; + miniserve = callPackage ../tools/misc/miniserve { inherit (darwin.apple_sdk.frameworks) Security; }; From 1d00429e59300942c7c74d69c18a91be1f9ca66b Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 01:17:52 +0000 Subject: [PATCH 03/22] ideamaker: mark as broken This just segfaults on startup for me. --- pkgs/applications/misc/ideamaker/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix index 7b2eeec292bf..1996ba5c1ea0 100644 --- a/pkgs/applications/misc/ideamaker/default.nix +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -9,7 +9,7 @@ , libcork , makeDesktopItem , qt5 -, quazip_qt4 +, quazip , zlib }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { libcork qt5.qtbase qt5.qtserialport - quazip_qt4 + quazip zlib ]; @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; + broken = true; # Segfaults on startup. }; } From de536ac410ed16664dca0f076348e8b03344f0d9 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 01:18:33 +0000 Subject: [PATCH 04/22] all-packages: remove quazip_qt4 --- pkgs/top-level/all-packages.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b485168c6ecd..7f314fe974cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8229,16 +8229,10 @@ in screen-message = callPackage ../tools/X11/screen-message { }; - screencloud = callPackage ../applications/graphics/screencloud { - quazip = quazip_qt4; - }; + screencloud = libsForQt5.callPackage ../applications/graphics/screencloud { }; screenkey = callPackage ../applications/video/screenkey { }; - quazip_qt4 = libsForQt5.quazip.override { - qtbase = qt4; - }; - scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { }; scriptaculous = callPackage ../development/libraries/scriptaculous { }; @@ -23918,7 +23912,7 @@ in id3v2 = callPackage ../applications/audio/id3v2 { }; - ideamaker = callPackage ../applications/misc/ideamaker { }; + ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { }; ifenslave = callPackage ../os-specific/linux/ifenslave { }; From da1a0f5ce4c626e42712cfba7ae7befd11572541 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Nov 2020 00:35:25 +0000 Subject: [PATCH 05/22] libsForQt5.quazip: 0.9.1 -> 1.1 --- pkgs/development/libraries/quazip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index a12d6cafe4ae..4184f3276c06 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "quazip"; - version = "0.9.1"; + version = "1.1"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; rev = "v${version}"; - sha256 = "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq"; + sha256 = "06srglrj6jvy5ngmidlgx03i0d5w91yhi7sf846wql00v8rvhc5h"; }; buildInputs = [ zlib qtbase ]; From eb5588f9147a0035e14b05c9b3ff2181dae539fa Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 00:31:45 +0000 Subject: [PATCH 06/22] nomacs: support quazip 1.x --- pkgs/applications/graphics/nomacs/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index bd6d732ac684..142c76b2f6d5 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -27,6 +27,15 @@ mkDerivation rec { sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; }; + patches = [ + # Add support for Quazip 1.x. + (fetchpatch { + url = "https://github.com/nomacs/nomacs/pull/576.patch"; + sha256 = "11ryjvd9jbb0cqagai4a6980jfq8lrcbyw2d7z9yld1f42w9kbxm"; + stripLen = 1; + }) + ]; + setSourceRoot = '' sourceRoot=$(echo */ImageLounge) ''; From 59ecd5167a7ecbd199c05c8db463b040e78f14e1 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 00:43:13 +0000 Subject: [PATCH 07/22] qmapshack: support Quazip 1.x --- pkgs/applications/gis/qmapshack/default.nix | 6 +- .../qmapshack/pr350-support-quazip-1x.patch | 141 ++++++++++++++++++ 2 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix index ef036fb71b04..30231e7135ac 100644 --- a/pkgs/applications/gis/qmapshack/default.nix +++ b/pkgs/applications/gis/qmapshack/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { cmakeFlags = [ "-DROUTINO_XML_PATH=${routino}/share/routino" - "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5" - "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so" ]; patches = [ "${src}/FindPROJ4.patch" - "${src}/FindQuaZip5.patch" + + # Support QuaZip 1.x. + ./pr350-support-quazip-1x.patch ]; qtWrapperArgs = [ diff --git a/pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch b/pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch new file mode 100644 index 000000000000..82ebed14dbbf --- /dev/null +++ b/pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch @@ -0,0 +1,141 @@ +From 8fb751c656a14020ba37fb91b7f7cba3c49d8504 Mon Sep 17 00:00:00 2001 +From: kiozen +Date: Sat, 20 Mar 2021 12:14:29 +0100 +Subject: [PATCH] [QMS-349] Upgrade to Quazip Qt5 V1.x + +Simply adjusted the cmake scripts +--- + CMakeLists.txt | 2 +- + src/qmapshack/CMakeLists.txt | 27 +++++++++++++-------------- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d2cf127..7420d9b2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,7 +152,7 @@ find_package(GDAL REQUIRED) + find_package(PROJ REQUIRED) + find_package(JPEG REQUIRED) + find_package(ROUTINO REQUIRED) +-find_package(QuaZip5 REQUIRED) ++find_package(QuaZip-Qt5 REQUIRED) + find_package(ALGLIB ) # optional as we can use our local version + + +diff --git a/src/qmapshack/CMakeLists.txt b/src/qmapshack/CMakeLists.txt +index 08eeb183..9b3836d6 100644 +--- a/src/qmapshack/CMakeLists.txt ++++ b/src/qmapshack/CMakeLists.txt +@@ -22,8 +22,8 @@ add_definitions(-DROUTINO_XML_PATH=${ROUTINO_XML_PATH}) + # All source files needed to compile + ############################################################################################### + +-set( SRCS +- CAbout.cpp ++set( SRCS ++ CAbout.cpp + CMainWindow.cpp + CSingleInstanceProxy.cpp + canvas/CCanvas.cpp +@@ -160,7 +160,7 @@ set( SRCS + gis/trk/CInvalidTrk.cpp + gis/trk/CKnownExtension.cpp + gis/trk/CListTrkPts.cpp +- gis/trk/CPropertyTrk.cpp ++ gis/trk/CPropertyTrk.cpp + gis/trk/CScrOptTrk.cpp + gis/trk/CSelectActivityColor.cpp + gis/trk/CTableTrk.cpp +@@ -272,7 +272,7 @@ set( SRCS + mouse/line/CLineOpMovePoint.cpp + mouse/line/CLineOpSelectRange.cpp + mouse/line/CScrOptEditLine.cpp +- mouse/line/CScrOptRangeLine.cpp ++ mouse/line/CScrOptRangeLine.cpp + mouse/line/ILineOp.cpp + mouse/line/IMouseEditLine.cpp + plot/CPlot.cpp +@@ -401,7 +401,7 @@ set( HDRS + gis/CGisListDB.h + gis/CGisListWks.h + gis/CGisWorkspace.h +- gis/CSelDevices.h ++ gis/CSelDevices.h + gis/IGisItem.h + gis/IGisLine.h + gis/Poi.h +@@ -512,7 +512,7 @@ set( HDRS + gis/trk/CInvalidTrk.h + gis/trk/CKnownExtension.h + gis/trk/CListTrkPts.h +- gis/trk/CPropertyTrk.h ++ gis/trk/CPropertyTrk.h + gis/trk/CScrOptTrk.h + gis/trk/CSelectActivityColor.h + gis/trk/CTableTrk.h +@@ -579,7 +579,7 @@ set( HDRS + map/CMapList.h + map/CMapMAP.h + map/CMapPathSetup.h +- map/CMapPropSetup.h ++ map/CMapPropSetup.h + map/CMapRMAP.h + map/CMapTMS.h + map/CMapVRT.h +@@ -655,7 +655,7 @@ set( HDRS + realtime/CRtSelectSource.h + realtime/CRtWorkspace.h + realtime/IRtInfo.h +- realtime/IRtRecord.h ++ realtime/IRtRecord.h + realtime/IRtSource.h + realtime/gpstether/CRtGpsTether.h + realtime/gpstether/CRtGpsTetherInfo.h +@@ -764,7 +764,7 @@ set( UIS + gis/search/IGeoSearchWebConfigDialog.ui + gis/search/ISearchExplanationDialog.ui + gis/summary/IGisSummary.ui +- gis/summary/IGisSummarySetup.ui ++ gis/summary/IGisSummarySetup.ui + gis/trk/ICombineTrk.ui + gis/trk/ICutTrk.ui + gis/trk/IDetailsTrk.ui +@@ -818,7 +818,7 @@ set( UIS + mouse/range/IActionSelect.ui + mouse/range/IRangeToolSetup.ui + mouse/range/IScrOptRangeTool.ui +- mouse/range/IScrOptRangeTrk.ui ++ mouse/range/IScrOptRangeTrk.ui + mouse/IScrOptRuler.ui + mouse/IScrOptSelect.ui + mouse/line/IScrOptEditLine.ui +@@ -899,7 +899,6 @@ include_directories( + ${PROJ_INCLUDE_DIRS} + ${ROUTINO_INCLUDE_DIRS} + ${ALGLIB_INCLUDE_DIRS} +- ${QUAZIP_INCLUDE_DIRS} + ) + + if(APPLE) +@@ -934,10 +933,10 @@ endif(Qt5DBus_FOUND) + + target_link_libraries(${APPLICATION_NAME} + Qt5::Widgets +- Qt5::Xml ++ Qt5::Xml + Qt5::Sql + Qt5::PrintSupport +- Qt5::UiTools ++ Qt5::UiTools + Qt5::Network + Qt5::WebEngineWidgets + Qt5::Qml +@@ -947,7 +946,7 @@ target_link_libraries(${APPLICATION_NAME} + ${PROJ_LIBRARIES} + ${ROUTINO_LIBRARIES} + ${ALGLIB_LIBRARIES} +- ${QUAZIP_LIBRARIES} ++ QuaZip::QuaZip + ) + + if(APPLE) From beca3d2c0b1a953dfdcbef78cdcf3ec27cd7e8ee Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 02:25:15 +0000 Subject: [PATCH 08/22] openboard: build with quazip 1.x --- pkgs/applications/graphics/openboard/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 859c22192181..ca51d74a0a14 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -34,7 +34,8 @@ in mkDerivation rec { postPatch = '' substituteInPlace OpenBoard.pro \ - --replace '/usr/include/quazip' '${quazip}/include/quazip5' \ + --replace '/usr/include/quazip' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ + --replace '-lquazip5' '-lquazip1-qt5' \ --replace '/usr/include/poppler' '${poppler.dev}/include/poppler' ''; From ad5f25123091545fbd5026f4008fddbfa22a6a0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Nov 2020 02:06:41 +0000 Subject: [PATCH 09/22] dcm2niix: 1.0.20200331 -> 1.0.20201102 --- pkgs/applications/science/biology/dcm2niix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 7ec5476cb826..c07ac084b3af 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.20200331"; + version = "1.0.20201102"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1"; + sha256 = "0r21a55fd1fhkkrqqrynasvvnrbhzq0g3ifav2858hppdicw1j35"; }; nativeBuildInputs = [ cmake git ]; From 2fa2d15a7d8702846dbf8dc86c714ef35001b9a9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 2 May 2021 13:28:11 +0700 Subject: [PATCH 10/22] knightos-mkrom : 1.0.3 -> 1.0.4 --- pkgs/development/tools/knightos/mkrom/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix index 2e067e92d919..21caa5b8b32a 100644 --- a/pkgs/development/tools/knightos/mkrom/default.nix +++ b/pkgs/development/tools/knightos/mkrom/default.nix @@ -1,25 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }: +{ lib, stdenv, fetchFromGitHub, libxslt, asciidoc }: stdenv.mkDerivation rec { pname = "mkrom"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "KnightOS"; repo = "mkrom"; rev = version; - sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2"; + sha256 = "sha256-YFrh0tOGiM90uvU9ZWopW1+9buHDQtetuOtPDSYYaXw="; }; strictDeps = true; - nativeBuildInputs = [ asciidoc cmake libxslt.bin ]; + nativeBuildInputs = [ asciidoc libxslt.bin ]; - hardeningDisable = [ "format" ]; + installFlags = [ "DESTDIR=$(out)" ]; + installTargets = [ "install" "install_man" ]; meta = with lib; { homepage = "https://knightos.org/"; description = "Packages KnightOS distribution files into a ROM"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; }; } From a54ed3611b4adf72425b4976c93da5b0a2df825d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 2 May 2021 15:23:05 +0700 Subject: [PATCH 11/22] knightos-scas: 0.5.3 -> 0.5.5 --- pkgs/development/tools/knightos/scas/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix index ceb8212cf7f9..255ecf798d86 100644 --- a/pkgs/development/tools/knightos/scas/default.nix +++ b/pkgs/development/tools/knightos/scas/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation rec { pname = "scas"; - - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "KnightOS"; repo = "scas"; rev = version; - sha256 = "0z6r07cl92kq860ddas5p88l990ih9cfqlzy5y4mk5hrmjzya60j"; + sha256 = "sha256-JGQE+orVDKKJsTt8sIjPX+3yhpZkujISroQ6g19+MzU="; }; cmakeFlags = [ "-DSCAS_LIBRARY=1" ]; From c576998594b4b8790f291d17fa92d499d1dc5d42 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 30 Apr 2021 16:37:54 +0200 Subject: [PATCH 12/22] nim: 1.4.4 -> 1.4.6 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 676e35b06bb4..21d1017a6753 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -95,12 +95,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.4.4"; + version = "1.4.6"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd"; + hash = "sha256-D7wPkoLP/oXembxHv6h2Ulud3aKi6uVcGFoIgEuY070="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; From 4dfcc530cdd2d0f046f5503839bd117edd7efa79 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 2 May 2021 11:30:04 +0200 Subject: [PATCH 13/22] quirc: 2016-08-16 -> 2020-04-06 --- pkgs/tools/graphics/quirc/default.nix | 52 ++++++++++++++------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 8ca8ecf2c893..dec2a1020c89 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -1,36 +1,40 @@ -{lib, stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkg-config}: -let - s = - rec { - date = "2016-08-16"; - version = "git-${date}"; - baseName = "quirc"; - name = "${baseName}-${version}"; - url = "https://github.com/dlbeer/quirc"; - rev = "5b262480091d5f84a67a4a56c728fc8b39844339"; - sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy"; - }; -in +{ lib, stdenv, fetchFromGitHub +, SDL_gfx, SDL, libjpeg, libpng, pkg-config +}: + stdenv.mkDerivation { - inherit (s) name version; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - SDL SDL_gfx libjpeg libpng - ]; - src = fetchgit { - inherit (s) url sha256 rev; + pname = "quirc"; + version = "2020-04-16"; + + src = fetchFromGitHub { + owner = "dlbeer"; + repo = "quirc"; + rev = "ed455904f35270888bc902b9e8c0c9b3184a8302"; + sha256 = "1kqqvcnxcaxdgls9sibw5pqjz3g1gys2v64i4kfqp8wfcgd9771q"; }; - NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL -I${SDL_gfx}/include/SDL"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ SDL SDL_gfx libjpeg libpng ]; + + makeFlags = [ "PREFIX=$(out)" ]; + NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL -I${SDL_gfx}/include/SDL"; + configurePhase = '' + runHook preConfigure + + # don't try to change ownership sed -e 's/-[og] root//g' -i Makefile + + runHook postConfigure ''; preInstall = '' mkdir -p "$out"/{bin,lib,include} - find . -maxdepth 1 -type f -perm -0100 -exec cp '{}' "$out"/bin ';' + + # install all binaries + find -maxdepth 1 -type f -executable ! -name '*.so.*' | xargs cp -t "$out"/bin ''; - makeFlags = [ "PREFIX=$(out)" ]; + meta = { - inherit (s) version; description = "A small QR code decoding library"; license = lib.licenses.isc; maintainers = [lib.maintainers.raskin]; From 26d524374faffbc81844a7869ebb05a7ef3e6b19 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 2 May 2021 11:31:05 +0200 Subject: [PATCH 14/22] monero: 0.17.1.9 -> 0.17.2.0 --- pkgs/applications/blockchains/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 3be8b908c7a2..2a12bfe872b6 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.9"; + version = "0.17.2.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0jqss4csvkcrhrmaa3vrnyv6yiwqpbfw7037clx9xcfm4qrrfiwy"; + sha256 = "0jwlmrpzisvw1c06cvd5b3s3hd4w0pa1qmrypfwah67qj3x6hnb6"; fetchSubmodules = true; }; From 3227f676cb168b9310b0f386e37ad706c1f84b8c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 2 May 2021 11:41:56 +0200 Subject: [PATCH 15/22] monero-gui: 0.17.1.9 -> 0.17.2.1 --- .../blockchains/monero-gui/default.nix | 26 +++++-------- .../monero-gui/use-system-libquirc.patch | 37 +++++++++++++++++++ 2 files changed, 47 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 5f430bc8869e..47df64b514f1 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -17,22 +17,15 @@ with lib; -let - arch = if stdenv.isx86_64 then "x86-64" - else if stdenv.isi686 then "i686" - else if stdenv.isAarch64 then "armv8-a" - else throw "unsupported architecture"; -in - stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.9"; + version = "0.17.2.1"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0143mmxk0jfb5pmjlx6v0knvf8v49kmkpjxlp6rw8lwnlf71xadn"; + sha256 = "1apjvpvn6hg0k0ak6wpg4prcdcslnb6fqhzzg2p4iy846f0ai9ji"; }; nativeBuildInputs = [ @@ -58,7 +51,10 @@ stdenv.mkDerivation rec { chmod -R +w source/monero ''; - patches = [ ./move-log-file.patch ]; + patches = [ + ./move-log-file.patch + ./use-system-libquirc.patch + ]; postPatch = '' # set monero-gui version @@ -69,17 +65,15 @@ stdenv.mkDerivation rec { substituteInPlace src/daemon/DaemonManager.cpp \ --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin' - # only build external deps, *not* the full monero + # 1: only build external deps, *not* the full monero + # 2: use nixpkgs libraries substituteInPlace CMakeLists.txt \ --replace 'add_subdirectory(monero)' \ - 'add_subdirectory(monero EXCLUDE_FROM_ALL)' - - # use nixpkgs quirc - substituteInPlace CMakeLists.txt \ + 'add_subdirectory(monero EXCLUDE_FROM_ALL)' \ --replace 'add_subdirectory(external)' "" ''; - cmakeFlags = [ "-DARCH=${arch}" ]; + cmakeFlags = [ "-DARCH=default" ]; desktopItem = makeDesktopItem { name = "monero-wallet-gui"; diff --git a/pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch b/pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch new file mode 100644 index 000000000000..b60057294b10 --- /dev/null +++ b/pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch @@ -0,0 +1,37 @@ +diff --git a/src/QR-Code-scanner/CMakeLists.txt b/src/QR-Code-scanner/CMakeLists.txt +index 15e288df..2e9b3305 100644 +--- a/src/QR-Code-scanner/CMakeLists.txt ++++ b/src/QR-Code-scanner/CMakeLists.txt +@@ -1,11 +1,18 @@ ++find_library(QUIRC_LIBRARY quirc REQUIRED) ++find_path(QUIRC_INCLUDE_DIR quirc.h REQUIRED) ++ + add_library(qrdecoder STATIC + Decoder.cpp + ) ++target_include_directories(qrdecoder ++ PUBLIC ++ ${QUIRC_INCLUDE_DIR} ++) + target_link_libraries(qrdecoder + PUBLIC + Qt5::Gui + PRIVATE +- quirc ++ ${QUIRC_LIBRARY} + ) + + if(WITH_SCANNER) +diff --git a/src/QR-Code-scanner/Decoder.cpp b/src/QR-Code-scanner/Decoder.cpp +index 1bb99140..353ca189 100644 +--- a/src/QR-Code-scanner/Decoder.cpp ++++ b/src/QR-Code-scanner/Decoder.cpp +@@ -30,7 +30,7 @@ + + #include + +-#include "quirc.h" ++#include + + QrDecoder::QrDecoder() + : m_qr(quirc_new()) From 8309374a78fd201cb4c352f5c2cd087d400df6a5 Mon Sep 17 00:00:00 2001 From: Mazurel Date: Sun, 2 May 2021 11:53:36 +0200 Subject: [PATCH 16/22] ogre: Added SDL2 as dependency --- pkgs/development/libraries/ogre/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index ae65da3f418b..d097dc623e76 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -6,6 +6,7 @@ , libXxf86vm, libICE , unzip , libXrender +, SDL2 , withNvidiaCg ? false, nvidia_cg_toolkit , withSamples ? false }: @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4"; }; - cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] + cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { libX11 libXmu libSM libXxf86vm libICE libXrender + SDL2 ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { From 884cf29501c424ee68d1f2791edd1ed4ef2a9361 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 11:10:40 +0000 Subject: [PATCH 17/22] dcm2niix: 1.0.20201102 -> 1.0.20210317 --- pkgs/applications/science/biology/dcm2niix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index c07ac084b3af..6224ccabb069 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.20201102"; + version = "1.0.20210317"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "0r21a55fd1fhkkrqqrynasvvnrbhzq0g3ifav2858hppdicw1j35"; + sha256 = "05rjk0xsrzcxa979vlx25k1rdz1in84gkfm9l1h9f7k4a4aa5r6j"; }; nativeBuildInputs = [ cmake git ]; From cf39deb8a32d2b154e1d36c317cc4a163d448836 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 2 May 2021 06:37:21 -0500 Subject: [PATCH 18/22] python38Packages.flask-restx: 0.2.0 -> 0.3.0 (#121465) https://github.com/python-restx/flask-restx/releases/tag/0.3.0 --- pkgs/development/python-modules/flask-restx/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index f2b7222c3d06..e1de7bf0d3b3 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "0.2.0"; + version = "0.3.0"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; repo = pname; rev = version; - sha256 = "0xf2vkmdngp9cv9klznizai4byxjcf0iqh1pr4b83nann0jxqwy7"; + sha256 = "0aj13nd3z71gb8c2kqiaz3f9k7jr0srlvrsx8hpz4nkpki8jiz2s"; }; propagatedBuildInputs = [ aniso8601 jsonschema flask werkzeug pytz six ] @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://flask-restx.readthedocs.io/en/${version}/"; description = "Fully featured framework for fast, easy and documented API development with Flask"; + changelog = "https://github.com/python-restx/flask-restx/raw/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; From 4da5de00a546f7820d33a3b11deb02c20816130a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 2 May 2021 06:39:39 -0500 Subject: [PATCH 19/22] flexget: 3.1.110 -> 3.1.116 (#121464) --- pkgs/applications/networking/flexget/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 3f2e3490955b..592c5282cd12 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.110"; + version = "3.1.116"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "e8642dcbbfe941e2d2def7bf2e28889082a78c1d041edb33dae180036832a96b"; + sha256 = "6372b36495ae023bd64ce28ca649feba54b060ed8f0a5f606a4845974e834493"; }; postPatch = '' @@ -54,6 +54,7 @@ python3Packages.buildPythonApplication rec { sqlalchemy terminaltables zxcvbn + psutil # plugins transmission-rpc ]; From 637c7391adf6e221a882b5ea98d8ba9666436e49 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Sun, 2 May 2021 17:10:58 +0530 Subject: [PATCH 20/22] xplr: 0.5.10 -> 0.5.12 (#121473) --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 14a50dbeb9e8..bcb5beff2875 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "xplr"; - version = "0.5.10"; + version = "0.5.12"; src = fetchFromGitHub { owner = "sayanarijit"; repo = name; rev = "v${version}"; - sha256 = "1gy0iv39arq2ri57iqsycp1sfnn1yafnhblr7p1my2wnmqwmd4qw"; + sha256 = "0dmqa56sxyvrq03rpf9yczp75zk44s79ilz6kbykdghp0d9lyldf"; }; - cargoSha256 = "01b4dlbakkdn3pfyyphabzrmqyp7fjy6n1nfk38z3zap5zvx8ipl"; + cargoSha256 = "1mb1rfax91cbi2wvshl8jsfykx9kfwff8fkqa7rc4plqxnz0qxkx"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From 8a92cdd9f5b83af9ea6c44c0ec3f8622d12364b9 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 11:55:06 +0000 Subject: [PATCH 21/22] teamspeak_client: fix for quazip 1.x --- .../networking/instant-messengers/teamspeak/client.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 988674079163..d2648eff57cc 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { '' mv ts3client_linux_${arch} ts3client echo "patching ts3client..." - patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip5.so ts3client + patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ From 9a943b4b4213888382d88c1d69d8dacffa936867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Fri, 5 Mar 2021 14:49:49 +0100 Subject: [PATCH 22/22] maintainers: add vojta001 --- maintainers/maintainer-list.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60c6f093f3b2..d9de8a22f2f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10559,7 +10559,12 @@ githubId = 45292658; name = "Julius Schmitt"; }; - + vojta001 = { + email = "vojtech.kane@gmail.com"; + github = "vojta001"; + githubId = 7038383; + name = "Vojta Káně"; + }; volhovm = { email = "volhovm.cs@gmail.com"; github = "volhovm";