lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
6cdce414 d5f29c9f

+37 -43
+12 -2
pkgs/development/ocaml-modules/odoc-parser/default.nix
··· 1 - { lib, fetchurl, buildDunePackage, astring, result , version ? "1.0.0" }: 1 + { lib, fetchurl, buildDunePackage, astring, result, camlp-streams, version ? "2.0.0" }: 2 2 3 3 let param = { 4 + "2.0.0" = { 5 + sha256 = "sha256-QHkZ+7DrlXYdb8bsZ3dijZSqGQc0O9ymeLGIC6+zOSI="; 6 + extraBuildInputs = [ camlp-streams ]; 7 + }; 8 + "1.0.1" = { 9 + sha256 = "sha256-orvo5CAbYOmAurAeluQfK6CwW6P1C0T3WDfoovuQfSw="; 10 + extraBuildInputs = [ camlp-streams ]; 11 + }; 4 12 "1.0.0" = { 5 13 sha256 = "sha256-tqoI6nGp662bK+vE2h7aDXE882dObVfRBFnZNChueqE="; 14 + extraBuildInputs = []; 6 15 }; 7 16 "0.9.0" = { 8 17 sha256 = "sha256-3w2tG605v03mvmZsS2O5c71y66O3W+n3JjFxIbXwvXk="; 18 + extraBuildInputs = []; 9 19 }; 10 20 }."${version}"; in 11 21 ··· 23 33 24 34 useDune2 = true; 25 35 26 - propagatedBuildInputs = [ astring result ]; 36 + propagatedBuildInputs = [ astring result ] ++ param.extraBuildInputs; 27 37 28 38 meta = { 29 39 description = "Parser for Ocaml documentation comments";
+2 -2
pkgs/development/python-modules/slack-sdk/default.nix
··· 21 21 22 22 buildPythonPackage rec { 23 23 pname = "slack-sdk"; 24 - version = "3.18.0"; 24 + version = "3.18.1"; 25 25 format = "setuptools"; 26 26 27 27 disabled = pythonOlder "3.6"; ··· 30 30 owner = "slackapi"; 31 31 repo = "python-slack-sdk"; 32 32 rev = "refs/tags/v${version}"; 33 - sha256 = "sha256-R4ZiILsU3HCSra2qwIzMIfsD91QrpN9LvXl9gFYa8N0="; 33 + sha256 = "sha256-pHIsYOY+/LlH9+kmp2ETEY1IE8izy5+R4tm0iY7NmQk="; 34 34 }; 35 35 36 36 propagatedBuildInputs = [
+3 -4
pkgs/development/tools/database/timescaledb-tune/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "timescaledb-tune"; 5 - version = "0.12.0"; 5 + version = "0.13.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "timescale"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-p1SU0wnB2XftuPMbm47EbJ2aZGV9amlk0y7FI0QOBkk="; 11 + sha256 = "sha256-YZMjgEnZKxmGIO9gK00JXBpBRvNgZoXNA/cNieovT+g="; 12 12 }; 13 13 14 14 vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; 15 15 16 - # Temporary fix of bug: https://github.com/timescale/timescaledb-tune/issues/95 17 - patches = [ ./fixMinMaxConn.diff ]; 16 + ldflags = [ "-s" "-w" ]; 18 17 19 18 meta = with lib; { 20 19 description = "A tool for tuning your TimescaleDB for better performance";
+2 -2
pkgs/development/tools/ocaml/dune/3.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "dune"; 9 - version = "3.4.0"; 9 + version = "3.4.1"; 10 10 11 11 src = fetchurl { 12 12 url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; 13 - sha256 = "sha256-ClVmxJEPGT1gmWWgNLSCCF3ATgvN/sl1b/mVffK2ejw="; 13 + sha256 = "sha256-KZ+jPP/BCMwm/1nV/J0J9ssKs6woC/I6ARTP3AtAxsU="; 14 14 }; 15 15 16 16 nativeBuildInputs = [ ocaml findlib ];
+8 -26
pkgs/development/tools/ocaml/ocamlformat/default.nix
··· 1 1 { lib, fetchurl, fetchzip, callPackage }: 2 2 3 - let mkOCamlformat = callPackage ./generic.nix; in 4 - 5 3 # Older versions should be removed when their usage decrease 6 4 # This script scraps Github looking for OCamlformat's options and versions usage: 7 5 # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 8 6 9 7 rec { 10 - ocamlformat_0_19_0 = mkOCamlformat { 11 - version = "0.19.0"; 12 - }; 13 - 14 - ocamlformat_0_20_0 = mkOCamlformat { 15 - version = "0.20.0"; 16 - }; 17 - 18 - ocamlformat_0_20_1 = mkOCamlformat { 19 - version = "0.20.1"; 20 - }; 21 - 22 - ocamlformat_0_21_0 = mkOCamlformat { 23 - version = "0.21.0"; 24 - }; 8 + ocamlformat_0_19_0 = ocamlformat.override { version = "0.19.0"; }; 9 + ocamlformat_0_20_0 = ocamlformat.override { version = "0.20.0"; }; 10 + ocamlformat_0_20_1 = ocamlformat.override { version = "0.20.1"; }; 11 + ocamlformat_0_21_0 = ocamlformat.override { version = "0.21.0"; }; 12 + ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; }; 13 + ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; }; 14 + ocamlformat_0_24_0 = ocamlformat.override { version = "0.24.0"; }; 25 15 26 - ocamlformat_0_22_4 = mkOCamlformat { 27 - version = "0.22.4"; 28 - }; 29 - 30 - ocamlformat_0_23_0 = mkOCamlformat { 31 - version = "0.23.0"; 32 - }; 33 - 34 - ocamlformat = ocamlformat_0_23_0; 16 + ocamlformat = callPackage ./generic.nix {}; 35 17 }
+6 -3
pkgs/development/tools/ocaml/ocamlformat/generic.nix
··· 1 1 { lib, fetchurl, fetchzip, ocaml-ng 2 - , version 2 + , version ? "0.24.0" 3 3 , tarballName ? "ocamlformat-${version}.tbz", 4 4 }: 5 5 ··· 13 13 "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; 14 14 "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; 15 15 "0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0="; 16 + "0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM="; 16 17 }."${version}"; 17 18 }; 18 19 ocamlPackages = ocaml-ng.ocamlPackages; ··· 48 49 uutf 49 50 ] 50 51 ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ ocaml-version either ] 51 - ++ (if lib.versionAtLeast version "0.20.1" 52 - then [ odoc-parser ] 52 + ++ (if lib.versionAtLeast version "0.24.0" 53 + then [ (odoc-parser.override { version = "2.0.0"; }) ] 54 + else if lib.versionAtLeast version "0.20.1" 55 + then [ (odoc-parser.override { version = "1.0.1"; }) ] 53 56 else [ (odoc-parser.override { version = "0.9.0"; }) ]) 54 57 ++ (if lib.versionAtLeast version "0.21.0" 55 58 then [ cmdliner_1_1 ]
+3 -3
pkgs/development/tools/rust/cargo-modules/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "cargo-modules"; 5 - version = "0.5.9"; 5 + version = "0.5.10"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "regexident"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "sha256-7bcFKsKDp+DBOZRBrSOat+7AIShCgmasKItI8xcsaC0="; 11 + sha256 = "sha256-tzJBbDo3xYZ/db8Oz8MJqWtRyljxWMNJu071zYq7d7A="; 12 12 }; 13 13 14 - cargoSha256 = "sha256-CCjJq2ghAL6k7unPlZGYKKAxXfv05GIDivw/rbl2Wd4="; 14 + cargoSha256 = "sha256-LO0Y7X498WwmZ7zl+AUBteLJeo65c0VUIAvjbW4ZDqw="; 15 15 16 16 buildInputs = lib.optionals stdenv.isDarwin [ 17 17 CoreFoundation
+1 -1
pkgs/top-level/all-packages.nix
··· 13995 13995 inherit (callPackage ../development/tools/ocaml/ocamlformat { }) 13996 13996 ocamlformat # latest version 13997 13997 ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 13998 - ocamlformat_0_22_4 ocamlformat_0_23_0; 13998 + ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_0; 13999 13999 14000 14000 orc = callPackage ../development/compilers/orc { }; 14001 14001