From f487c6a5af51549290b8bd7655ba9911f90f0031 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 6 Nov 2021 16:38:36 -0500 Subject: [PATCH 1/9] opam: 2.1.0 -> 2.1.1 https://github.com/ocaml/opam/releases/tag/2.1.1 --- pkgs/development/tools/ocaml/opam/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index eb0d284c0821..05c555a6e141 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -19,12 +19,12 @@ let sha256 = "17ajdzrnmnyfig3s6hinb56mcmhywbssxhsq32dz0v90dhz3wmfv"; }; "cudf" = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; + url = "https://github.com/ocaml/opam-source-archives/raw/main/cudf-0.9.tar.gz"; sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"; }; "dose3" = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz"; - sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; + url = "https://gitlab.com/irill/dose3/-/archive/5.0.1/dose3-5.0.1.tar.gz"; + sha256 = "1mh6fv8qbf8xx4h2dc0dpv2lzygvikzjhw1idrknibbwsjw3jg9c"; }; "dune-local" = fetchurl { url = "https://github.com/ocaml/dune/releases/download/2.9.0/dune-2.9.0.tbz"; @@ -67,13 +67,13 @@ let sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.1.0.zip"; - sha256 = "063df5gsvp4yrbqbnd8k7a1f04cf12prc5wh4f1200acs3jwjxwb"; + url = "https://github.com/ocaml/opam/archive/2.1.1.zip"; + sha256 = "0sm9a7yh1iqcd51j5wdrc34w71iga619hvmgyy5fq1hwvgmfssrj"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.1.0"; + version = "2.1.1"; nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -133,4 +133,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.1.0 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.1.1 -p opam-shebangs.patch From 625677111a2a597ea9b2a401d896bb3b05387d7c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 8 Nov 2021 04:20:00 +0000 Subject: [PATCH 2/9] gallery-dl: 1.19.1 -> 1.19.2 https://github.com/mikf/gallery-dl/releases/tag/v1.19.2 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 656a5f3bea48..e7a7eb0465bf 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.19.1"; + version = "1.19.2"; src = fetchPypi { inherit pname version; - sha256 = "ea1a7bf908507a87edffde6d6be93b8859ab0832ca788b61690a13aa5dd52216"; + sha256 = "7fec9ac69582dbd9922666e6ece3142ae52dc9679a2c4a613f6ee94ad09e5f68"; }; propagatedBuildInputs = [ requests ]; From 2248e8c1d0c8795778f267ab885f98a97791d1a4 Mon Sep 17 00:00:00 2001 From: Moises Nessim Date: Mon, 8 Nov 2021 21:01:28 -0500 Subject: [PATCH 3/9] dotnetCorePackages: 6.0.0-rc.2 -> 6.0 --- pkgs/development/compilers/dotnet/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 1b34a5953c89..62a08b145bfb 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -79,35 +79,35 @@ rec { }; }; - # v6.0 (RC) + # v6.0 aspnetcore_6_0 = buildAspNetCore { - version = "6.0.0-rc.2.21480.10"; + version = "6.0.0"; sha512 = { - x86_64-linux = "d48895237644a3999663b2e16baa2303d8b77f66385a04d8edb5601fdffacce18b1b1318827d09f74f6b133ff2c179ef659bd21cf8460289b5f81f404fa8b326"; - aarch64-linux = "3a92e93a8cb0c186f1c4a822d46a37604bc470599dbcbe05a7f1ea7c7d1dd9c0e6571de524de8729d19d237078742a0b4e3a1daa11b5eb5f8cce74b69710ada4"; - x86_64-darwin = "ed1cad94acf207d0f18201af1e0e6c386466f94b8fd0474dc8d59f47d8f3c456f3a55de392dda126e0e1f4f934249b0e17b7b86f6bc7c510dc475324ee1395f0"; - aarch64-darwin = "688879db73aa6b7556da70907920f3e443dff54bf8624030352ed5ba3896cceda69040ef359dacf55d50cc52fc2c75057d259a1cc11a2258d4446ebbd2200820"; + x86_64-linux = "6a1ae878efdc9f654e1914b0753b710c3780b646ac160fb5a68850b2fd1101675dc71e015dbbea6b4fcf1edac0822d3f7d470e9ed533dd81d0cfbcbbb1745c6c"; + aarch64-linux = "e61eade344b686180b8a709229d6b3180ea6f085523e5e4e4b0d23dd00cf9edce3e51a920c986b1bab7d04d8cab5aae219c3b533b6feb84b32a02810936859b0"; + x86_64-darwin = "76029272ff50fbf9fcc513109b98c0db5f74dbf970c1380be4dfac0dae7558824d68a167d0a8ceb39042ff4a7ca973cdcc15afed2d1ffef55b0adba8e40c9073"; + aarch64-darwin = "e459ddf33243d680baecc5378b9c4182daf42b8c36a9a996205d91146a614d048a385f953c43727350ad55b1221c5f5d43b383d03e3883e862bf12faeaa02dfb"; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.0-rc.2.21480.5"; + version = "6.0.0"; sha512 = { - x86_64-linux = "45062417c6111af4d635868927e8f69d43f66c9e0f111cb71c1861eaf5ceda4aefa99d97c6ce3b13fac2bc7c57c435e6f8b2d43c51a3bb3304b42081d98f7047"; - aarch64-linux = "b0f8128d994b0de0c72b9dd8083a7350218adfafedc643c59b497fa605420602004d9e21e8acb488d92bc498f9783a3240cfcafa77443eb6f08b66aadc4f5b65"; - x86_64-darwin = "0f702645719af5a4f1e720c0f2a0c67c7a4a84fac525b3ac6ce6357ca6d44405aeca674d04d8a976a7338ddf8782350debd53dce85e614c837106ffadf84cfb9"; - aarch64-darwin = "747abb8eaad53e0ca7e5b2908b620076fa68a75c5e822361483ed13f7544e31def26bbf67bb85f47633e2dddde9cb095503bf70d1a4b0b2f33c6ef6f887d95fa"; + x86_64-linux = "7cc8d93f9495b516e1b33bf82af3af605f1300bcfeabdd065d448cc126bd97ab4da5ec5e95b7775ee70ab4baf899ff43671f5c6f647523fb41cda3d96f334ae5"; + aarch64-linux = "b0f0f2b4dc0a31b06cc3af541a3c44260317ca3a4414a5d50e6cf859d93821b3d2c2246baec9f96004aeb1eb0e353631283b11cf3acc134d4694f0ed71c9503d"; + x86_64-darwin = "d6842bddd9652dd7ad1d8156c3e9012f9412b3d89b4cfc0b6d644fd76744298aa5ed2cde8a80d14bb2b247ee162bae255875ee2ca62033a422dacb7adaeece2d"; + aarch64-darwin = "5cfc3c8a70f0e90f09047d3eeccd699e7210756b60fabbf1a30d6fdc121df084e5d8c3210557273739d5421f031dc9e4d07c611406734ca0671585de6e28e028"; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.100-rc.2.21505.57"; + version = "6.0.100"; sha512 = { - x86_64-linux = "0a8f85a2757f61ca7f9b8c546af4554c2aac9cdb06f6d62879a60de6f2a3d37ea7136f48896c9c85828a2d55df354e7b9b5b4dc22896c927f0c6370a5ade1b9c"; - aarch64-linux = "14aa96f47f7f3520075e41753c705bdbf7f84fd7cff7cc2add1095a13e3e3c44eaaf2d822551902f05a6ad0c9acd7f7424190b7c09c397004c632eddc8acd5ac"; - x86_64-darwin = "6a896f2d1e8e2d00b52641e8b1aee88888a2b30e0f18e499b1eaf4ae7dbdaa24ea5af0dbd4a6a1cee715738e6e91cecdbc02c2c7d3d4c71d4c9af3e04f1b4fc9"; - aarch64-darwin = "c96c8a86e36ca16a0e10f635250472d5c8eda290dc505ed8eb4bd6a68b8e6ae6b2770236f5bda1573bc3124229531b3ed7dd71f60a821e39aaaa6697a82fdf8a"; + x86_64-linux = "cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b"; + aarch64-linux = "e5983c1c599d6dc7c3c7496b9698e47c68247f04a5d0d1e3162969d071471297bce1c2fd3a1f9fb88645006c327ae79f880dcbdd8eefc9166fd717331f2716e7"; + x86_64-darwin = "6e2f502a84f712d60daed31c4076c5b55ee98a03259adf4bdc01659afcac2be7050e5a404dcda35fdc598bf5cd766772c08abc483ed94f6985c9501057b0186a"; + aarch64-darwin = "92ead34c7e082dbed2786db044385ddfc68673e096a3edf64bc0bf70c76ea1c5cb816cde99aab2d8c528a44c86593b812877d075486dd0ae565f0e01e9eaa562"; }; }; } From e59e24b3702745ca03fd9fb62ad42197ae060827 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 28 Oct 2021 21:01:34 +0300 Subject: [PATCH 4/9] nextcloud-client: 3.3.5 -> 3.3.6 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d3612321c352..027a1b6dd798 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-kqNN9P0G/Obi/8PStmLxImQdqkhLnJoFZ7dLpqe11TI="; + sha256 = "sha256-HhFm8rIsDaV4QmvHplbj49gf1vYCZyBl8WH5bvRHT7I="; }; patches = [ From afce4452088cdc4d28058184a8df0c0407b8ccfe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Nov 2021 13:49:01 -0800 Subject: [PATCH 5/9] lua/setup-hook: remove empty hook --- pkgs/development/interpreters/lua-5/setup-hook.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 pkgs/development/interpreters/lua-5/setup-hook.nix diff --git a/pkgs/development/interpreters/lua-5/setup-hook.nix b/pkgs/development/interpreters/lua-5/setup-hook.nix deleted file mode 100644 index e69de29bb2d1..000000000000 From 52ffa1c36d6d79ea7b9285f5410a8128b74688ce Mon Sep 17 00:00:00 2001 From: Marvin Dostal Date: Thu, 21 Oct 2021 18:19:24 +0200 Subject: [PATCH 6/9] nextcloud-client: make autostart entry start client from path --- ...e-autostart-entry-do-not-use-an-abso.patch | 26 +++++++++++++++++++ .../networking/nextcloud-client/default.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch new file mode 100644 index 000000000000..73325791fc2b --- /dev/null +++ b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch @@ -0,0 +1,26 @@ +From bade623bb98c957d9a274df75b58296beb8ae6a7 Mon Sep 17 00:00:00 2001 +From: Marvin Dostal +Date: Sun, 17 Oct 2021 21:26:51 +0200 +Subject: [PATCH] When creating the autostart entry, do not use an absolute + path + +--- + src/common/utility_unix.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/utility_unix.cpp b/src/common/utility_unix.cpp +index 010408395..16964c64f 100644 +--- a/src/common/utility_unix.cpp ++++ b/src/common/utility_unix.cpp +@@ -83,7 +83,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName, + ts << QLatin1String("[Desktop Entry]") << endl + << QLatin1String("Name=") << guiName << endl + << QLatin1String("GenericName=") << QLatin1String("File Synchronizer") << endl +- << QLatin1String("Exec=\"") << executablePath << "\" --background" << endl ++ << QLatin1String("Exec=") << "nextcloud --background" << endl + << QLatin1String("Terminal=") << "false" << endl + << QLatin1String("Icon=") << APPLICATION_ICON_NAME << endl + << QLatin1String("Categories=") << QLatin1String("Network") << endl +-- +2.31.1 + diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 027a1b6dd798..e611f9ee015e 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -33,6 +33,7 @@ mkDerivation rec { patches = [ # Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`. ./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch + ./0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch ]; nativeBuildInputs = [ From 788119f78101a10b2c58de0690c23572ac348076 Mon Sep 17 00:00:00 2001 From: Marvin Dostal Date: Thu, 28 Oct 2021 19:53:57 +0200 Subject: [PATCH 7/9] nextcloud-client: disable qml caching There currently seems to be a chance that after a nextcloud-client update it will crash on startup. This crashing can be fixed by deleting the `~/.cache/Nextcloud/qmlcache` folder. For the crashing behavior, see also: * #127324 * #121594 * #119029 * ... The workaround introduced in this commit is also already used by muse. See: https://github.com/NixOS/nixpkgs/blob/842a0d94cbb0a385854e15d4f6fde57714981abd/pkgs/applications/audio/musescore/default.nix#L34 --- pkgs/applications/networking/nextcloud-client/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index e611f9ee015e..b7ff968f79bd 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -60,6 +60,8 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" + # See also: https://bugreports.qt.io/browse/QTBUG-85967 + "--set QML_DISABLE_DISK_CACHE 1" ]; cmakeFlags = [ From dac0fabd5e6befc959ea36098bc04866562649a7 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Tue, 9 Nov 2021 11:51:22 +0800 Subject: [PATCH 8/9] godns: 2.5 -> 2.5.1 --- pkgs/tools/networking/godns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index fb46a144ee7b..b677dd8277d5 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "godns"; - version = "2.5"; + version = "2.5.1"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-ia0FmV2KlFPh9gmKOqVxiStgmBbX9vUIc7KllpUt44Q="; + sha256 = "sha256-a0wq/qPtwhAtm8khQsusHpsjXzsYixHqH1aAeBs1dKM="; }; - vendorSha256 = "sha256-FZLDaMrPEyoTGFmGBlpqPWsMuobqwkBaot5qjcRJe9w="; + vendorSha256 = "sha256-TYjkow/9W467CMyqV2SSRJAuqXGdnAgR9gtfq4vX4u0="; # Some tests require internet access, broken in sandbox doCheck = false; From 09af1585ca43f9a015398f0a99f66a58c92577d6 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Tue, 9 Nov 2021 11:51:43 +0800 Subject: [PATCH 9/9] godns: add missing ldflags --- pkgs/tools/networking/godns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index b677dd8277d5..f04b40da0c4f 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { # Some tests require internet access, broken in sandbox doCheck = false; - ldflags = [ "-X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "A dynamic DNS client tool supports AliDNS, Cloudflare, Google Domains, DNSPod, HE.net & DuckDNS & DreamHost, etc";