pyrox.dev
Merge staging-next into staging
authored by
github-actions[bot]
and committed by
GitHub
095df456
f6ad0961
+2
-2
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
+2
-2
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
···
2
3
stdenv.mkDerivation rec {
4
pname = "git-filter-repo";
5
-
version = "2.32.0";
6
7
src = fetchurl {
8
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
9
-
sha256 = "sha256-CztFSyeKM9Bmcf0eSrLHH3vHGepd8WXPvcAACT+vFps=";
10
};
11
12
buildInputs = [ pythonPackages.python ];
···
2
3
stdenv.mkDerivation rec {
4
pname = "git-filter-repo";
5
+
version = "2.33.0";
6
7
src = fetchurl {
8
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
9
+
sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk=";
10
};
11
12
buildInputs = [ pythonPackages.python ];
+2
-2
pkgs/build-support/dhall-to-nix.nix
+2
-2
pkgs/build-support/dhall-to-nix.nix
···
15
Note that this uses "import from derivation", meaning that Nix will perform
16
a build during the evaluation phase if you use this `dhallToNix` utility
17
*/
18
-
{ stdenv, dhall-nix }:
19
20
let
21
dhallToNix = code :
22
let
23
-
file = builtins.toFile "dhall-expression" code;
24
25
drv = stdenv.mkDerivation {
26
name = "dhall-compiled.nix";
···
15
Note that this uses "import from derivation", meaning that Nix will perform
16
a build during the evaluation phase if you use this `dhallToNix` utility
17
*/
18
+
{ stdenv, dhall-nix, writeText }:
19
20
let
21
dhallToNix = code :
22
let
23
+
file = writeText "dhall-expression" code;
24
25
drv = stdenv.mkDerivation {
26
name = "dhall-compiled.nix";
+2
-2
pkgs/development/tools/esbuild/default.nix
+2
-2
pkgs/development/tools/esbuild/default.nix
···
2
3
buildGoModule rec {
4
pname = "esbuild";
5
-
version = "0.12.20";
6
7
src = fetchFromGitHub {
8
owner = "evanw";
9
repo = "esbuild";
10
rev = "v${version}";
11
-
sha256 = "sha256-40r0f+bzzD0M97pbiSoVSJvVvcCizQvw9PPeXhw7U48=";
12
};
13
14
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
···
2
3
buildGoModule rec {
4
pname = "esbuild";
5
+
version = "0.12.22";
6
7
src = fetchFromGitHub {
8
owner = "evanw";
9
repo = "esbuild";
10
rev = "v${version}";
11
+
sha256 = "sha256-vZlrHfcXOz4QHTH9otpwtPIWHGxK4TAol5o/Tl0M98E=";
12
};
13
14
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+4
-3
pkgs/servers/sql/postgresql/ext/timescaledb.nix
+4
-3
pkgs/servers/sql/postgresql/ext/timescaledb.nix
···
8
9
stdenv.mkDerivation rec {
10
pname = "timescaledb";
11
-
version = "2.3.1";
12
13
nativeBuildInputs = [ cmake ];
14
buildInputs = [ postgresql openssl libkrb5 ];
···
17
owner = "timescale";
18
repo = "timescaledb";
19
rev = "refs/tags/${version}";
20
-
sha256 = "0azcg8fh0bbc4a6b0mghdg4b9v62bb3haaq6cycj40fk4mf1dldx";
21
};
22
23
-
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]
24
++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
25
26
# Fix the install phase which tries to install into the pgsql extension dir,
···
44
maintainers = with maintainers; [ volth marsam ];
45
platforms = postgresql.meta.platforms;
46
license = licenses.asl20;
47
};
48
}
···
8
9
stdenv.mkDerivation rec {
10
pname = "timescaledb";
11
+
version = "2.4.1";
12
13
nativeBuildInputs = [ cmake ];
14
buildInputs = [ postgresql openssl libkrb5 ];
···
17
owner = "timescale";
18
repo = "timescaledb";
19
rev = "refs/tags/${version}";
20
+
sha256 = "0nc6nvngp5skz8rasvb7pyi9nlw642iwk19p17lizmw8swdm5nji";
21
};
22
23
+
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
24
++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
25
26
# Fix the install phase which tries to install into the pgsql extension dir,
···
44
maintainers = with maintainers; [ volth marsam ];
45
platforms = postgresql.meta.platforms;
46
license = licenses.asl20;
47
+
broken = versionOlder postgresql.version "12";
48
};
49
}