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

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-08-22 06:01:44 +00:00 committed by GitHub
commit 095df456c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-filter-repo"; pname = "git-filter-repo";
version = "2.32.0"; version = "2.33.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-CztFSyeKM9Bmcf0eSrLHH3vHGepd8WXPvcAACT+vFps="; sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk=";
}; };
buildInputs = [ pythonPackages.python ]; buildInputs = [ pythonPackages.python ];

4
pkgs/build-support/dhall-to-nix.nix
View file

@ -15,12 +15,12 @@
Note that this uses "import from derivation", meaning that Nix will perform Note that this uses "import from derivation", meaning that Nix will perform
a build during the evaluation phase if you use this `dhallToNix` utility a build during the evaluation phase if you use this `dhallToNix` utility
*/ */
{ stdenv, dhall-nix }: { stdenv, dhall-nix, writeText }:
let let
dhallToNix = code : dhallToNix = code :
let let
file = builtins.toFile "dhall-expression" code; file = writeText "dhall-expression" code;
drv = stdenv.mkDerivation { drv = stdenv.mkDerivation {
name = "dhall-compiled.nix"; name = "dhall-compiled.nix";

4
pkgs/development/tools/esbuild/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "esbuild"; pname = "esbuild";
version = "0.12.20"; version = "0.12.22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "evanw"; owner = "evanw";
repo = "esbuild"; repo = "esbuild";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-40r0f+bzzD0M97pbiSoVSJvVvcCizQvw9PPeXhw7U48="; sha256 = "sha256-vZlrHfcXOz4QHTH9otpwtPIWHGxK4TAol5o/Tl0M98E=";
}; };
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

7
pkgs/servers/sql/postgresql/ext/timescaledb.nix
View file

@ -8,7 +8,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "timescaledb"; pname = "timescaledb";
version = "2.3.1"; version = "2.4.1";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl libkrb5 ]; buildInputs = [ postgresql openssl libkrb5 ];
@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
owner = "timescale"; owner = "timescale";
repo = "timescaledb"; repo = "timescaledb";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "0azcg8fh0bbc4a6b0mghdg4b9v62bb3haaq6cycj40fk4mf1dldx"; sha256 = "0nc6nvngp5skz8rasvb7pyi9nlw642iwk19p17lizmw8swdm5nji";
}; };
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ] cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ]; ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
# Fix the install phase which tries to install into the pgsql extension dir, # Fix the install phase which tries to install into the pgsql extension dir,
@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ volth marsam ]; maintainers = with maintainers; [ volth marsam ];
platforms = postgresql.meta.platforms; platforms = postgresql.meta.platforms;
license = licenses.asl20; license = licenses.asl20;
broken = versionOlder postgresql.version "12";
}; };
} }