cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-07-26 12:01:38 +00:00 committed by GitHub
commit 6cdce414a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 37 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/ocaml-modules/odoc-parser/default.nix
View file

@ -1,11 +1,21 @@
{ lib, fetchurl, buildDunePackage, astring, result , version ? "1.0.0" }:
{ lib, fetchurl, buildDunePackage, astring, result, camlp-streams, version ? "2.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";

4
pkgs/development/python-modules/slack-sdk/default.nix
View file

@ -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 = [

7
pkgs/development/tools/database/timescaledb-tune/default.nix
View file

@ -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";

4
pkgs/development/tools/ocaml/dune/3.nix
View file

@ -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 ];

34
pkgs/development/tools/ocaml/ocamlformat/default.nix
View file

@ -1,35 +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 = ocamlformat_0_23_0;
ocamlformat = callPackage ./generic.nix {};
}

9
pkgs/development/tools/ocaml/ocamlformat/generic.nix
View file

@ -1,5 +1,5 @@
{ lib, fetchurl, fetchzip, ocaml-ng
, version
, version ? "0.24.0"
, tarballName ? "ocamlformat-${version}.tbz",
}:
@ -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 ]

6
pkgs/development/tools/rust/cargo-modules/default.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -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 { };