diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index a7f8dcd4427e..2564c08eb2ba 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { - owner = "anhoder"; + owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-NAAl/XmJqRnJyOYNJqmMlCIiGsCsSH7gGTMbD46gpss="; + hash = "sha256-ZqB3NL/pLIY1lHl3qMIOciqsOW9jNwjVQAq1j/ydDWs="; }; deleteVendor = true; - vendorHash = null; + vendorHash = "sha256-rJlyrPQS9UKinxIwGGo3EHlmWrzTKIm1jM1UDqnmVyg="; subPackages = [ "cmd/musicfox.go" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 440d57119f2f..142cc1879cd0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -209,13 +209,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-sXt0q6eKWk1BRm0GDsXKl/Rr3mro7FZkQcSIDan1df4=", + "hash": "sha256-cFXQgB++BcTKCFuJ3bMm8Qw3Zdr9m9d6LaZMz5tKXBM=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.25.0", + "rev": "v1.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-w7Rsr3UgijW/3RMKzhMyWCvn5b1R1oqRs87/ZPO7jHs=" + "vendorHash": "sha256-wyPwStUCprrnq0S6jKzDqAXeWTZW43ml+vBOuX05eRs=" }, "cloudflare": { "hash": "sha256-0bHKQe4wIieKdxPF0S7Qv8QLlg+AZzBOG8n2qiMOM0g=", @@ -282,11 +282,11 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-3C+jh9rGw2v2ME3PHLc+TIAY4UWcZVFdmNy4N4WyRM8=", + "hash": "sha256-i6v55pIooA+7L5V2yNL+T2KCgGNLU5ZrqeKzdzdvNoA=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.24.0", + "rev": "v3.24.1", "spdx": "MPL-2.0", "vendorHash": "sha256-MMPE1Urnlt7QCoiEnHqWnFZzmeSs/i4UtiotyrXZF2U=" }, @@ -810,11 +810,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-WtdB5aI5YS5Kc33g3RXh/gneOVXhhhKXq+pW+fm44/I=", + "hash": "sha256-/p/NBw8dPzStLs9LTvvqDUSNJ9oMCG0e4bT+gIsPEGA=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.118.0", + "rev": "v4.119.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -873,11 +873,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-ePF3lojT4Dit3n4oI/74u3372gsSW8B1FQfEPhdfmz4=", + "hash": "sha256-1AM0kHLr+wXkpncAQvt+nbYAaI25V/2asEiWDNCKsgA=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.29.0", + "rev": "v0.30.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1180,12 +1180,12 @@ "vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ=" }, "vault": { - "hash": "sha256-oyR9xqEnpt5JoTIe1jgV3aMDxKFdvrDx39UWNc5ECTM=", + "hash": "sha256-etQTHPZ1bngVMpeQ/IZ8yaoe94ZPNT2IG4ip4d+73Xg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.15.0", + "rev": "v3.15.1", "spdx": "MPL-2.0", "vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU=" }, diff --git a/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch b/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch index f379cd5e259d..25170b87129f 100644 --- a/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch +++ b/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch @@ -1,12 +1,12 @@ diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt -index b33569d39..fdbfa10a9 100644 +index 7e42016629..7211663408 100644 --- a/libgnucash/quotes/CMakeLists.txt +++ b/libgnucash/quotes/CMakeLists.txt @@ -1,6 +1,6 @@ set(_BIN_FILES "") --foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-update.in gnc-fq-dump.in) -+foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-dump.in) +-foreach(file gnc-fq-update.in finance-quote-wrapper.in) ++foreach(file finance-quote-wrapper.in) string(REPLACE ".in" "" _OUTPUT_FILE_NAME ${file}) set(_ABS_OUTPUT_FILE ${BINDIR_BUILD}/${_OUTPUT_FILE_NAME}) configure_file( ${file} ${_ABS_OUTPUT_FILE} @ONLY) @@ -14,5 +14,5 @@ index b33569d39..fdbfa10a9 100644 install(FILES ${_MAN_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) install(PROGRAMS ${_BIN_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR}) --set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in gnc-fq-update.in Quote_example.pl README) -+set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in Quote_example.pl README) +-set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-update.in finance-quote-wrapper.in README) ++set_dist_list(quotes_DIST CMakeLists.txt finance-quote-wrapper.in README) diff --git a/pkgs/applications/office/gnucash/0003-remove-valgrind.patch b/pkgs/applications/office/gnucash/0003-remove-valgrind.patch index 8bbb17e353fa..329b87985383 100644 --- a/pkgs/applications/office/gnucash/0003-remove-valgrind.patch +++ b/pkgs/applications/office/gnucash/0003-remove-valgrind.patch @@ -1,8 +1,8 @@ diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt -index 8e6e339d1..3936a8cb6 100644 +index 95ff42cd8f..1c1944a811 100644 --- a/gnucash/CMakeLists.txt +++ b/gnucash/CMakeLists.txt -@@ -163,13 +163,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash") +@@ -169,13 +169,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash") set(VALGRIND_OUTDIR ${BINDIR_BUILD}) @@ -16,7 +16,7 @@ index 8e6e339d1..3936a8cb6 100644 ## Create the environment file file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/environment.in ENV_STRINGS_IN) -@@ -253,7 +246,6 @@ file(COPY ${ENV_FILE_OUT} +@@ -259,14 +252,13 @@ file(COPY ${ENV_FILE_OUT} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) @@ -24,12 +24,11 @@ index 8e6e339d1..3936a8cb6 100644 install(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/gnucash) -@@ -274,7 +266,7 @@ gnc_add_scheme_targets(price-quotes set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script gnucash.cpp gnucash-commands.cpp gnucash-cli.cpp gnucash-core-app.cpp - gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in gnucash-valgrind.in + gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in - gnucash-gresources.xml ${gresource_files} price-quotes.scm + ${gnucash_GRESOURCES} ${gnucash_noinst_HEADERS} ${gnucash_EXTRA_DIST}) diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch deleted file mode 100644 index 289822365490..000000000000 --- a/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm -index 8e3ff255f..a6b805fa5 100644 ---- a/gnucash/price-quotes.scm -+++ b/gnucash/price-quotes.scm -@@ -44,7 +44,7 @@ - (define (start-program) - (set! program - (gnc-spawn-process-async -- (list "perl" "-w" gnc:*finance-quote-check*) #t))) -+ (list gnc:*finance-quote-check*) #t))) - - (define (get-sources) - (when program -@@ -119,7 +119,7 @@ - - (define (start-quoter) - (set! quoter -- (gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t))) -+ (gnc-spawn-process-async (list gnc:*finance-quote-helper*) #t))) - - (define (get-quotes) - (when quoter - diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch new file mode 100644 index 000000000000..e18337c74226 --- /dev/null +++ b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch @@ -0,0 +1,46 @@ +diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp +index 3003fca71f..e01cb10b50 100644 +--- a/libgnucash/app-utils/gnc-quotes.cpp ++++ b/libgnucash/app-utils/gnc-quotes.cpp +@@ -122,7 +122,6 @@ private: + + class GncFQQuoteSource final : public GncQuoteSource + { +- const bfs::path c_cmd; + std::string c_fq_wrapper; + std::string m_version; + StrVec m_sources; +@@ -145,7 +144,6 @@ static std::string parse_quotesource_error(const std::string& line); + static const std::string empty_string{}; + + GncFQQuoteSource::GncFQQuoteSource() : +-c_cmd{bp::search_path("perl")}, + m_version{}, m_sources{}, m_api_key{} + { + char *bindir = gnc_path_get_bindir(); +@@ -197,7 +195,7 @@ m_version{}, m_sources{}, m_api_key{} + QuoteResult + GncFQQuoteSource::get_quotes(const std::string& json_str) const + { +- StrVec args{"-w", c_fq_wrapper, "-f" }; ++ StrVec args{"-f" }; + return run_cmd(args, json_str); + } + +@@ -215,13 +213,13 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c + auto input_buf = bp::buffer (json_string); + bp::child process; + if (m_api_key.empty()) +- process = bp::child(c_cmd, args, ++ process = bp::child(c_fq_wrapper, args, + bp::std_out > out_buf, + bp::std_err > err_buf, + bp::std_in < input_buf, + svc); + else +- process = bp::child(c_cmd, args, ++ process = bp::child(c_fq_wrapper, args, + bp::std_out > out_buf, + bp::std_err > err_buf, + bp::std_in < input_buf, + diff --git a/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch b/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch new file mode 100644 index 000000000000..14b68555f367 --- /dev/null +++ b/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch @@ -0,0 +1,31 @@ +diff --git a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp +index 8a5221d19d..d14e96cb66 100644 +--- a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp ++++ b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp +@@ -153,25 +153,6 @@ TEST_F(GncQuotesTest, quotable_commodities) + EXPECT_EQ(4u, commodities.size()); + } + +-#ifdef HAVE_F_Q +-TEST_F(GncQuotesTest, online_wiggle) +-{ +- GncQuotes quotes; +- quotes.fetch(m_book); +- auto pricedb{gnc_pricedb_get_db(m_book)}; +- auto failures{quotes.failures()}; +- ASSERT_EQ(1u, failures.size()); +- EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[0])); +-// EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[1])); +- EXPECT_EQ(3u, gnc_pricedb_get_num_prices(pricedb)); +-} +-#else +-TEST_F(GncQuotesTest, fq_failure) +-{ +- EXPECT_THROW(GncQuotes quotes;, GncQuoteException); +-} +-#endif +- + TEST_F(GncQuotesTest, offline_wiggle) + { + StrVec quote_vec{ + diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index e22cd17cefa3..64a02e811167 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch2 , fetchurl , aqbanking , boost @@ -27,12 +26,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.12"; + version = "5.1"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-zIwFGla4u0M1ZtbiiQ31nz2JWjlcjPUkbBtygQLOEK4="; + hash = "sha256-imWB3ffHQJ22NlEGATUa9yTto2OrWbHV2o2YEDPyb3I="; }; nativeBuildInputs = [ @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { webkitgtk ] ++ (with perlPackages; [ - DateManip + JSONParse FinanceQuote perl ]); @@ -73,124 +72,24 @@ stdenv.mkDerivation rec { ./0002-disable-gnc-fq-update.patch # this patch prevents the building of gnucash-valgrind ./0003-remove-valgrind.patch - # this patch makes gnucash exec the Finance::Quote helpers directly - ./0004-exec-fq-helpers.patch - # the following patches fix compilation with gcc 13 and glib > 2.76 - # "Build fails with gcc 13 and glib > 2.76" - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/184669f517744ac7be6e420e5e1f359384f676d5.patch"; - sha256 = "sha256-X5HCK//n+V5k/pEUNL6xwZY5NTeGnBt+7GhooqOXQ2I="; - }) - # "Build fails with gcc 13 and glib > 2.76, bis" - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/abcce5000ca72bf943ca8951867729942388848e.patch"; - sha256 = "sha256-WiMkozqMAYl5wrRhAQMNVDY77aRBa3E5/a0gvYyc9Zk="; - }) - # "Build fails with gcc 13 and glib > 2.76, ter" - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/89e63ef67235d231d242f018894295a6cb38cfc3.patch"; - sha256 = "sha256-xCkY8RlZPVDaRLbVn+QT28s4qIUgtMgjmuB0axSrNpw="; - }) - # "Build fails with gcc 13" - # "Protect against passing an lseek failure rv to read()." - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/ce3447e6ea8b2f734b24a2502e865ebbbc21aaaa.patch"; - sha256 = "sha256-mfPs/5rkCamihE0z1SRoX0tV4FNPkKUGd1T6iaCwy7E="; - }) - # "Fix crashes in test-engine on Arch Linux." - # Also fixes the same crashes in nixpkgs. - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/1020bde89c77f70cee6cc8181ead96e8fade47aa.patch"; - sha256 = "sha256-JCWm3M8hdgAwjuhLbFRN4Vk3BQqpn0FUwHk6Kg5Qa7Q="; - }) + # this patch makes gnucash exec the Finance::Quote wrapper directly + ./0004-exec-fq-wrapper.patch + # this patch removes the online_wiggle GncQuotes test + ./0005-remove-gncquotes-online-wiggle.patch ]; # this needs to be an environment variable and not a cmake flag to suppress # guile warning - GUILE_AUTO_COMPILE="0"; + env.GUILE_AUTO_COMPILE = "0"; env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ # Needed with GCC 12 but breaks on darwin (with clang) or older gcc "-Wno-error=use-after-free" ]); - # `make check` target does not define its prerequisites but expects them to - # have already been built. The list of targets below was built through trial - # and error based on failing tests. doCheck = true; - preCheck = '' - make \ - test-account-object \ - test-address \ - test-agedver \ - test-app-utils \ - test-aqb \ - test-autoclear \ - test-backend-dbi \ - test-business \ - test-column-types \ - test-commodities \ - test-customer \ - test-dom-converters1 \ - test-dynload \ - test-employee \ - test-engine \ - test-exp-parser \ - test-gnc-glib-utils \ - test-gnc-guid \ - test-gnc-int128 \ - test-gnc-numeric \ - test-gnc-path-util \ - test-gnc-rational \ - test-group-vs-book \ - test-guid \ - test-import-account-matcher \ - test-import-backend \ - test-import-map \ - test-import-parse \ - test-import-pending-matches \ - test-incompatdep \ - test-job \ - test-kvp-frames \ - test-kvp-value \ - test-link-module-tax-us \ - test-link-ofx \ - test-load-backend \ - test-load-c \ - test-load-engine \ - test-load-example-account \ - test-load-xml2 \ - test-lots \ - test-modsysver \ - test-numeric \ - test-object \ - test-print-parse-amount \ - test-qof \ - test-qofquerycore \ - test-qofsession \ - test-query \ - test-querynew \ - test-recurrence \ - test-resolve-file-path \ - test-scm-query \ - test-scm-query-string \ - test-split-register-copy-ops \ - test-split-vs-account \ - test-sqlbe \ - test-string-converters \ - test-sx \ - test-tokenizer \ - test-transaction-reversal \ - test-transaction-voiding \ - test-userdata-dir \ - test-userdata-dir-invalid-home \ - test-vendor \ - test-xml-account \ - test-xml-commodity \ - test-xml-pricedb \ - test-xml-transaction \ - test-xml2-is-file - ''; + enableParallelChecking = true; + checkTarget = "check"; preFixup = '' gappsWrapperArgs+=( @@ -210,10 +109,8 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}" - for file in $out/bin/gnc-fq-check $out/bin/gnc-fq-dump $out/bin/gnc-fq-helper; do - wrapProgram $file \ - --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ DateManip FinanceQuote ]}" - done + wrapProgram $out/bin/finance-quote-wrapper \ + --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ JSONParse FinanceQuote ]}" ''; meta = with lib; { diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/applications/radio/guglielmo/default.nix index 41d1407a9af3..f449fc061d3b 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/applications/radio/guglielmo/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "guglielmo"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "marcogrecopriolo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-djBQTYbpgPFBtQZ9fZBpECP20RxB49AdxLbq8mUU6rg="; + sha256 = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM="; }; postInstall = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index a9a98ad8e6f5..40eec233f662 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -22,24 +21,15 @@ stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "mail"; rev = version; - sha256 = "sha256-IY+ml/ftLSk0A3Emi0ZL2wxIDIngNU6QKbHErRAaaMA="; + sha256 = "sha256-dvDlvn8KvFmiP/NClRtHNEs5gPTUjlzgTYmgIaCfoLw="; }; - patches = [ - # MessageListItem: avoid crashing on empty Mime - # https://github.com/elementary/mail/pull/828 - (fetchpatch { - url = "https://github.com/elementary/mail/commit/7cb412dee4cc8c0bfab55057c47d5ecce6918788.patch"; - sha256 = "sha256-7rYvgFeVmV/rVYzC/xt/lioRlveM0d8ORqZdMYkm/d4="; - }) - ]; - nativeBuildInputs = [ libxml2 meson diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 8ee49d024057..1b531d77c436 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "6.3.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-lyqALaPbkAI6MITF353PNVLJT8eGIk8QURR+1mUmrv0="; + sha256 = "sha256-GJjtGLCBRISaopZWli/MfqrPcG+xjY7nHZKS+S806GI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index cd151ee19430..8fbf7ccde4ff 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-icon-theme"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = "icons"; rev = version; - sha256 = "sha256-Hh7RiD85N48IpO2sfWSybhS7kJYXH4VOhQ6PVIP9IS8="; + sha256 = "sha256-4ZXqIMXyb9MLd6EHmPn672Dbw992GYYU64oB+4p6jXY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 27847245991e..e5a90d8f4f0a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "elementary-onboarding"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "onboarding"; rev = version; - sha256 = "sha256-qfkrjIct+Dcf2nep7ixgjC7ILz+gZt4SHGfb1hywwcY="; + sha256 = "sha256-OWALEcVOOh7wjEEvysd+MQhB/iK3105XCIVp5pklMwY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index df430c99ce04..ab54f127f7bb 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-+StE63q6niRK7ypFNzSsAQfPmbrzlBKm1GGESBKSSl4="; + sha256 = "sha256-RLKPYDWVqT2WfjLPXRFPCNNvcW+fJ0OUKjSLLgPBqdw="; }; patches = [ diff --git a/pkgs/development/interpreters/erlang/24.nix b/pkgs/development/interpreters/erlang/24.nix index 26205ba0da1d..ae0a29d08208 100644 --- a/pkgs/development/interpreters/erlang/24.nix +++ b/pkgs/development/interpreters/erlang/24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.10"; - sha256 = "sha256-mz9ZSqp/MgdW3tMLLV84Uiwqb4FIOAnYjYgri68LlWs="; + version = "24.3.4.11"; + sha256 = "sha256-1A73UOCPJnCRCAXTEPc3VTHsDJIWQjlPJXkuwQBV0r4="; } diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index f47bf7a36a24..b48986f9ce5e 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,15 +5,15 @@ , gmic-qt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; - rev = "v.${version}"; - hash = "sha256-DFTqx4v3Hf2HyT02yBLo4n1yKPuPVz1oa2C5LsIeyCY="; + rev = "v.${finalAttrs.version}"; + hash = "sha256-CQYY5aKRDe6F7GrBJfqt0t/rjjdZnr/c/cqhr6yVACA="; }; outputs = [ "out" "doc" ]; @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - # Need to update in lockstep. + # Needs to update them all in lockstep. inherit gmic gmic-qt; }; - meta = with lib; { + meta = { homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; longDescription = '' @@ -44,8 +44,11 @@ stdenv.mkDerivation rec { C++. Due to its generic conception, it can cover a wide range of image processing applications. ''; - license = licenses.cecill-c; - maintainers = [ maintainers.AndersonTorres maintainers.lilyinstarlight ]; - platforms = platforms.unix; + license = lib.licenses.cecill-c; + maintainers = [ + lib.maintainers.AndersonTorres + lib.maintainers.lilyinstarlight + ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 3ba581c101b7..180a8874e50e 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.23"; + version = "4.3.24"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-9FwctFRMmHlRT12wVpqSc07nP12/2569wwhEohOEb4A="; + sha256 = "sha256-65/LsH1ZDkeBrtQUmKc5/5C2ce4nw4nSHXnJqZMKenI="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix index dd8755a9e900..bb946780009e 100644 --- a/pkgs/development/python-modules/cron-descriptor/default.nix +++ b/pkgs/development/python-modules/cron-descriptor/default.nix @@ -2,18 +2,19 @@ , python , buildPythonPackage , fetchFromGitHub +, mock , pytestCheckHook }: buildPythonPackage rec { pname = "cron_descriptor"; - version = "1.2.30"; + version = "1.2.35"; src = fetchFromGitHub { owner = "Salamek"; repo = "cron-descriptor"; rev = "refs/tags/${version}"; - hash = "sha256-Qei9f0HlIu5sautMEASvxdUqZyXKvHDWJgd3oST1gJo="; + hash = "sha256-m+h91cddmEPHCeUWWNpTvb89mFwm8ty8tTnw3YDjCFo="; }; # remove tests_require, as we don't do linting anyways @@ -21,6 +22,10 @@ buildPythonPackage rec { sed -i "/'pep8\|flake8\|pep8-naming',/d" setup.py ''; + checkInputs = [ + mock + ]; + checkPhase = '' ${python.interpreter} setup.py test ''; diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index ae85b07d3d7f..abfeee89945b 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bW5P2casSFqM1uR9ERr5fLVvAO7bsbP+oqJ9vqcJp2U="; + hash = "sha256-dImot/jLKGePHk7ByM/gymgdstHHiS0OKxRq3YAmHuE="; }; postPatch = '' diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index fd97cc2634fd..ec21765e3a3e 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -6,11 +6,13 @@ , bash , installShellFiles , libiconv +, mdbook }: rustPlatform.buildRustPackage rec { pname = "just"; version = "1.13.0"; + outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; @@ -21,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-91C/5m2avsW7GKQDg/Ez9fzzFhe8ih1De1RbV/MBJbM="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; preCheck = '' @@ -42,6 +44,15 @@ rustPlatform.buildRustPackage rec { cp $TMPDIR/string.rs tests/string.rs ''; + postBuild = '' + cargo run --package generate-book + + # No linkcheck in sandbox + echo 'optional = true' >> book/en/book.toml + mdbook build book/en + find . + ''; + checkFlags = [ "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched "--skip=run_shebang" # test case very rarely fails with "Text file busy" @@ -49,6 +60,8 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' + mkdir -p $doc/share/doc/$name + mv ./book/en/build/html $doc/share/doc/$name installManPage man/just.1 installShellCompletion --cmd just \ diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index fa974aa97c82..f12a5b4da5c5 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -1,26 +1,27 @@ { lib , stdenv -, variant ? "standalone" , fetchzip +, cimg , cmake -, pkg-config +, curl +, fftw +, gimp +, gimpPlugins +, gmic +, graphicsmagick +, libjpeg +, libpng +, libtiff , ninja -, wrapQtAppsHook +, nix-update-script , opencv3 , openexr -, graphicsmagick -, fftw -, zlib -, libjpeg -, libtiff -, libpng -, curl -, gimp ? null -, gmic +, pkg-config , qtbase , qttools -, nix-update-script -, gimpPlugins +, wrapQtAppsHook +, zlib +, variant ? "standalone" }: let @@ -40,21 +41,23 @@ let in -assert lib.assertMsg (builtins.hasAttr variant variants) "gmic-qt variant “${variant}” is not supported. Please use one of ${lib.concatStringsSep ", " (builtins.attrNames variants)}."; +assert lib.assertMsg + (builtins.hasAttr variant variants) + "gmic-qt variant \"${variant}\" is not supported. Please use one of ${lib.concatStringsSep ", " (builtins.attrNames variants)}."; -assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps or []) "gmic-qt variant “${variant}” is missing one of its dependencies."; +assert lib.assertMsg + (builtins.all (d: d != null) variants.${variant}.extraDeps or []) + "gmic-qt variant \"${variant}\" is missing one of its dependencies."; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.2.3"; + version = "3.2.4"; src = fetchzip { - url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - hash = "sha256-OTdf9BtaRak/jv1GknidDAkdxf99saBqj6EMoRJDIuo="; + url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz"; + hash = "sha256-FJ2zlsah/3Jf5ie4UhQsPvMoxDMc6iHl3AkhKsZSuqE="; }; - sourceRoot = "source/gmic-qt"; - nativeBuildInputs = [ cmake pkg-config @@ -77,11 +80,9 @@ stdenv.mkDerivation rec { curl ] ++ variants.${variant}.extraDeps or []; - cmakeFlags = [ - "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}" - "-DENABLE_SYSTEM_GMIC=ON" - "-DENABLE_DYNAMIC_LINKING=ON" - ]; + preConfigure = '' + cd gmic-qt + ''; postPatch = '' patchShebangs \ @@ -89,6 +90,12 @@ stdenv.mkDerivation rec { translations/lrelease.sh ''; + cmakeFlags = [ + "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}" + "-DENABLE_SYSTEM_GMIC=ON" + "-DENABLE_DYNAMIC_LINKING=ON" + ]; + postFixup = lib.optionalString (variant == "gimp") '' echo "wrapping $out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt" wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt" @@ -97,17 +104,19 @@ stdenv.mkDerivation rec { passthru = { tests = { gimp-plugin = gimpPlugins.gmic; + # Needs to update them all in lockstep. + inherit cimg gmic; }; updateScript = nix-update-script { }; }; - meta = with lib; { - description = variants.${variant}.description; + meta = { homepage = "http://gmic.eu/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.lilyinstarlight ]; - platforms = platforms.unix; + inherit (variants.${variant}) description; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.lilyinstarlight ]; + platforms = lib.platforms.unix; mainProgram = "gmic_qt"; }; -} +}) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 19b04054eedd..b1df7fbcc063 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,47 +1,47 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , fetchurl -, cmake -, ninja -, pkg-config -, opencv -, openexr -, graphicsmagick , cimg -, fftw -, zlib -, libjpeg -, libtiff -, libpng -, writeShellScript +, cmake , common-updater-scripts +, coreutils , curl +, fftw +, gmic-qt , gnugrep , gnused -, coreutils +, graphicsmagick , jq -, gmic-qt +, libjpeg +, libpng +, libtiff +, ninja +, opencv +, openexr +, pkg-config +, writeShellScript +, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.2.3"; + version = "3.2.4"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchFromGitHub { owner = "GreycLab"; repo = "gmic"; - rev = "v.${version}"; - hash = "sha256-slEyZoYSNFrZ0d8a+mnJeqWQLqcJTPrkfpDpdag/vLA="; + rev = "v.${finalAttrs.version}"; + hash = "sha256-ITKsPhfDfkHmE7a04cxrpIKsSVlrPN944ySu2DCnyEU="; }; # TODO: build this from source - # https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729 + # Reference: src/Makefile, directive gmic_stdlib.h gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; - url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; + url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; hash = "sha256-ExMCxFkkctqrdSy5M/TXD5GBRmRA9YEdsYW8nWiTEYY="; }; @@ -54,13 +54,13 @@ stdenv.mkDerivation rec { buildInputs = [ cimg fftw - zlib + graphicsmagick libjpeg - libtiff libpng + libtiff opencv openexr - graphicsmagick + zlib ]; cmakeFlags = [ @@ -71,47 +71,51 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # TODO: build from source - cp -r ${gmic_stdlib} src/gmic_stdlib.h + cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib.h # CMake build files were moved to subdirectory. mv resources/CMakeLists.txt resources/cmake . - '' + lib.optionalString stdenv.isDarwin '' + '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" ''; passthru = { tests = { - # Needs to update in lockstep. - inherit gmic-qt; + # Needs to update them all in lockstep. + inherit cimg gmic-qt; }; - updateScript = writeShellScript "${pname}-update-script" '' + updateScript = writeShellScript "gmic-update-script" '' set -o errexit - PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]} + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq ]} - latestVersion=$(curl 'https://gmic.eu/files/source/' | grep -E 'gmic_[^"]+\.tar\.gz' | sed -E 's/.+