From 3b450777c3213c010e92b76adb1b364df1943551 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 26 Jul 2022 04:20:00 +0000 Subject: [PATCH 1/8] timescaledb-tune: 0.12.0 -> 0.13.0 https://github.com/timescale/timescaledb-tune/releases/tag/v0.13.0 --- .../tools/database/timescaledb-tune/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index be29a0457ee0..28b0506ff180 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,19 +2,18 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p1SU0wnB2XftuPMbm47EbJ2aZGV9amlk0y7FI0QOBkk="; + sha256 = "sha256-YZMjgEnZKxmGIO9gK00JXBpBRvNgZoXNA/cNieovT+g="; }; vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; - # Temporary fix of bug: https://github.com/timescale/timescaledb-tune/issues/95 - patches = [ ./fixMinMaxConn.diff ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A tool for tuning your TimescaleDB for better performance"; From 81c3bae1662a6af25b99d8233e2707e546ad294d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Jul 2022 10:49:07 +0000 Subject: [PATCH 2/8] python310Packages.slack-sdk: 3.18.0 -> 3.18.1 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 49e911f307bc..06ab6cd78832 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.18.0"; + version = "3.18.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-R4ZiILsU3HCSra2qwIzMIfsD91QrpN9LvXl9gFYa8N0="; + sha256 = "sha256-pHIsYOY+/LlH9+kmp2ETEY1IE8izy5+R4tm0iY7NmQk="; }; propagatedBuildInputs = [ From f4943b31bc13d145f33b9dfd599a44cde70e6c00 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 26 Jul 2022 19:10:39 +0800 Subject: [PATCH 3/8] cargo-modules: 0.5.9 -> 0.5.10 --- pkgs/development/tools/rust/cargo-modules/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 3b833ae42522..3dbaa0b29fe8 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-7bcFKsKDp+DBOZRBrSOat+7AIShCgmasKItI8xcsaC0="; + sha256 = "sha256-tzJBbDo3xYZ/db8Oz8MJqWtRyljxWMNJu071zYq7d7A="; }; - cargoSha256 = "sha256-CCjJq2ghAL6k7unPlZGYKKAxXfv05GIDivw/rbl2Wd4="; + cargoSha256 = "sha256-LO0Y7X498WwmZ7zl+AUBteLJeo65c0VUIAvjbW4ZDqw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation From f201a7722ce266d052188818f6bca7ba2b099f17 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 26 Jul 2022 04:20:00 +0000 Subject: [PATCH 4/8] dune_3: 3.4.0 -> 3.4.1 https://github.com/ocaml/dune/releases/tag/3.4.1 --- pkgs/development/tools/ocaml/dune/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index d2819d8d300d..2917a4905bda 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-ClVmxJEPGT1gmWWgNLSCCF3ATgvN/sl1b/mVffK2ejw="; + sha256 = "sha256-KZ+jPP/BCMwm/1nV/J0J9ssKs6woC/I6ARTP3AtAxsU="; }; nativeBuildInputs = [ ocaml findlib ]; From 6d559df86798cbe99b7de8c94a25a5ac1b240c98 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Tue, 19 Jul 2022 10:58:34 +0200 Subject: [PATCH 5/8] ocamlPackages.odoc-parser: init 1.0.1 & 2.0.0 --- .../ocaml-modules/odoc-parser/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/odoc-parser/default.nix b/pkgs/development/ocaml-modules/odoc-parser/default.nix index 9e4e4bc8d1de..653db5ae50aa 100644 --- a/pkgs/development/ocaml-modules/odoc-parser/default.nix +++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix @@ -1,11 +1,21 @@ -{ lib, fetchurl, buildDunePackage, astring, result , version ? "1.0.0" }: +{ lib, fetchurl, buildDunePackage, astring, result, camlp-streams, version ? "1.0.0" }: let param = { + "2.0.0" = { + sha256 = "sha256-QHkZ+7DrlXYdb8bsZ3dijZSqGQc0O9ymeLGIC6+zOSI="; + extraBuildInputs = [ camlp-streams ]; + }; + "1.0.1" = { + sha256 = "sha256-orvo5CAbYOmAurAeluQfK6CwW6P1C0T3WDfoovuQfSw="; + extraBuildInputs = [ camlp-streams ]; + }; "1.0.0" = { sha256 = "sha256-tqoI6nGp662bK+vE2h7aDXE882dObVfRBFnZNChueqE="; + extraBuildInputs = []; }; "0.9.0" = { sha256 = "sha256-3w2tG605v03mvmZsS2O5c71y66O3W+n3JjFxIbXwvXk="; + extraBuildInputs = []; }; }."${version}"; in @@ -23,7 +33,7 @@ buildDunePackage rec { useDune2 = true; - propagatedBuildInputs = [ astring result ]; + propagatedBuildInputs = [ astring result ] ++ param.extraBuildInputs; meta = { description = "Parser for Ocaml documentation comments"; From 6ac387a3a327970e5838a9c53efd3baef22e4c88 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Tue, 19 Jul 2022 11:04:23 +0200 Subject: [PATCH 6/8] ocamlformat_0_24_0: init --- pkgs/development/tools/ocaml/ocamlformat/default.nix | 6 +++++- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index a441d9745200..1a6a9ba77752 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -31,5 +31,9 @@ rec { version = "0.23.0"; }; - ocamlformat = ocamlformat_0_23_0; + ocamlformat_0_24_0 = mkOCamlformat { + version = "0.24.0"; + }; + + ocamlformat = ocamlformat_0_24_0; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 5e58699fa745..0f6433c0e6a8 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -13,6 +13,7 @@ let src = "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; "0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0="; + "0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM="; }."${version}"; }; ocamlPackages = ocaml-ng.ocamlPackages; @@ -48,8 +49,10 @@ buildDunePackage { uutf ] ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ ocaml-version either ] - ++ (if lib.versionAtLeast version "0.20.1" - then [ odoc-parser ] + ++ (if lib.versionAtLeast version "0.24.0" + then [ (odoc-parser.override { version = "2.0.0"; }) ] + else if lib.versionAtLeast version "0.20.1" + then [ (odoc-parser.override { version = "1.0.1"; }) ] else [ (odoc-parser.override { version = "0.9.0"; }) ]) ++ (if lib.versionAtLeast version "0.21.0" then [ cmdliner_1_1 ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df7aaa7ff1fb..7820cc6b4d0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13995,7 +13995,7 @@ with pkgs; inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4 ocamlformat_0_23_0; + ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_0; orc = callPackage ../development/compilers/orc { }; From 1afb55692d3c5523c4524c0b694c0e535bd22a23 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Tue, 19 Jul 2022 10:59:11 +0200 Subject: [PATCH 7/8] ocamlPackages.odoc-parser: 1.0.0 -> 2.0.0 Switch the default version to the lastest. --- pkgs/development/ocaml-modules/odoc-parser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/odoc-parser/default.nix b/pkgs/development/ocaml-modules/odoc-parser/default.nix index 653db5ae50aa..5224f241798f 100644 --- a/pkgs/development/ocaml-modules/odoc-parser/default.nix +++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, astring, result, camlp-streams, version ? "1.0.0" }: +{ lib, fetchurl, buildDunePackage, astring, result, camlp-streams, version ? "2.0.0" }: let param = { "2.0.0" = { From 98db578afa81422e1fecafbd76195a384fb17989 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Tue, 19 Jul 2022 11:08:25 +0200 Subject: [PATCH 8/8] ocamlformat: Support the version override Rewrite the OCamlformat declaration to support overriding the 'version' argument. --- .../tools/ocaml/ocamlformat/default.nix | 38 ++++--------------- .../tools/ocaml/ocamlformat/generic.nix | 2 +- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 1a6a9ba77752..a92fafeac4ac 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,39 +1,17 @@ { lib, fetchurl, fetchzip, callPackage }: -let mkOCamlformat = callPackage ./generic.nix; in - # Older versions should be removed when their usage decrease # This script scraps Github looking for OCamlformat's options and versions usage: # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 rec { - ocamlformat_0_19_0 = mkOCamlformat { - version = "0.19.0"; - }; + ocamlformat_0_19_0 = ocamlformat.override { version = "0.19.0"; }; + ocamlformat_0_20_0 = ocamlformat.override { version = "0.20.0"; }; + ocamlformat_0_20_1 = ocamlformat.override { version = "0.20.1"; }; + ocamlformat_0_21_0 = ocamlformat.override { version = "0.21.0"; }; + ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; }; + ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; }; + ocamlformat_0_24_0 = ocamlformat.override { version = "0.24.0"; }; - ocamlformat_0_20_0 = mkOCamlformat { - version = "0.20.0"; - }; - - ocamlformat_0_20_1 = mkOCamlformat { - version = "0.20.1"; - }; - - ocamlformat_0_21_0 = mkOCamlformat { - version = "0.21.0"; - }; - - ocamlformat_0_22_4 = mkOCamlformat { - version = "0.22.4"; - }; - - ocamlformat_0_23_0 = mkOCamlformat { - version = "0.23.0"; - }; - - ocamlformat_0_24_0 = mkOCamlformat { - version = "0.24.0"; - }; - - ocamlformat = ocamlformat_0_24_0; + ocamlformat = callPackage ./generic.nix {}; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 0f6433c0e6a8..a27672fcd7f3 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, fetchzip, ocaml-ng -, version +, version ? "0.24.0" , tarballName ? "ocamlformat-${version}.tbz", }: