Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bdc39d2059
|
|
@ -290,8 +290,8 @@ in {
|
|||
activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix;
|
||||
activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix;
|
||||
activation-perlless = runTest ./activation/perlless.nix;
|
||||
etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
|
||||
etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
|
||||
etcd = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd.nix {};
|
||||
etcd-cluster = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd-cluster.nix {};
|
||||
etebase-server = handleTest ./etebase-server.nix {};
|
||||
etesync-dav = handleTest ./etesync-dav.nix {};
|
||||
evcc = handleTest ./evcc.nix {};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# This test runs simple etcd cluster
|
||||
|
||||
import ./make-test-python.nix ({ pkgs, ... } : let
|
||||
import ../make-test-python.nix ({ pkgs, ... } : let
|
||||
|
||||
runWithOpenSSL = file: cmd: pkgs.runCommand file {
|
||||
buildInputs = [ pkgs.openssl ];
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# This test runs simple etcd node
|
||||
|
||||
import ./make-test-python.nix ({ pkgs, ... } : {
|
||||
import ../make-test-python.nix ({ pkgs, ... } : {
|
||||
name = "etcd";
|
||||
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
|
|
@ -6,19 +6,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "optimism";
|
||||
version = "1.7.0";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum-optimism";
|
||||
repo = "optimism";
|
||||
rev = "op-node/v${version}";
|
||||
hash = "sha256-ru6/PDgsQOpOjKSolk3US6dV/NMH/lWEuJf5lmuR4SI=";
|
||||
hash = "sha256-p3dbyszUeknAXrI1WqN9WS6AkEYQdVfMP90Kk/L41vM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ];
|
||||
|
||||
vendorHash = "sha256-BrlF8uwnD1hlrrpvc2JEsaPY4/+bGR1cXwjkkYANyiE=";
|
||||
vendorHash = "sha256-24zj480UU9SYqr2mV6rCJ46gwLgzilLuhqrkNKHVR28=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ let
|
|||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.12";
|
||||
version = "13.0.13";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
|
|
@ -102,7 +102,7 @@ let
|
|||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-qqz3tdic2muBQI6JXc0/uxBeenWFYHN43K7qJee9q78=";
|
||||
hash = "sha256-CAJJs14U9zsl5PiyZIwXYZG4dZz+Cqn7sD9u3S+/WvA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.12";
|
||||
version = "13.0.13";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
|
|
@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-2AzcDYngLr+J+s12tAMdB9SjDzOWPnQY9WL7/3+N0FA=";
|
||||
hash = "sha256-l7Ka8vjVX67ZPPzRnQixtki5/cYhP6P/J91CyGPnwfI=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
|
|
@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
|
|||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-ect++2xZe00Hlikz6eMNMiiHnVoETSvjD0Cf1oBgj9E=";
|
||||
hash = "sha256-Ro9F3SZiagtj3AnDOtHmyy1G/KOi/O9M3f775qrZig4=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitsign";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+oJBpERU2WbfmS7MyBbJKrh4kzY+rgSw4uKAU1y5kR4=";
|
||||
hash = "sha256-52Vyh2aImus9ZTb082N2FRMIsfykfQ2+AVUT2VD6lJ4=";
|
||||
};
|
||||
vendorHash = "sha256-Z46eDqUc8Mdq9lEMx1YOuSh5zPIMQrSkbto33AmgANU=";
|
||||
vendorHash = "sha256-fQTd7J2l7W3E5RQIr2hn2wp9CPHn8N8TpDqfbb3TFgI=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
|
|
|||
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "121.3";
|
||||
version = "122.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "1e7125327a29b7b7a0593caf339d382728c55cf6";
|
||||
sha256 = "Rjs46TtOhFZxqnEyqa4IyrRs7HnDZ/DJZ9DPEe7Oux0=";
|
||||
rev = "562d81eb28a49ed6e0d771a430c21a458cdd33f9";
|
||||
sha256 = "l5sIUInOhhkn3ernQLIEwEpRCyICDH/1k4C/aidy1/I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-7nfeg/q8baLvB0CoRWKU60TRfLAaRkeRxGojPvKpOLs=";
|
||||
cargoHash = "sha256-2MaRfQCAjW560sdAPqdWymClwY1U5QjIMzknHry+9zs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
|
|
@ -30,9 +30,10 @@ rustPlatform.buildRustPackage rec {
|
|||
patchShebangs third_party/minijail/tools/*.py
|
||||
'';
|
||||
|
||||
CROSVM_USE_SYSTEM_MINIGBM = true;
|
||||
CROSVM_USE_SYSTEM_VIRGLRENDERER = true;
|
||||
|
||||
buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ];
|
||||
buildFeatures = [ "virgl_renderer" ];
|
||||
|
||||
passthru.updateScript = ./update.py;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
#shellcheck shell=bash
|
||||
set -eu -o pipefail
|
||||
|
||||
dirname="$(dirname "$0")"
|
||||
cd "$(dirname "$0")"
|
||||
nixpkgs=../../../../.
|
||||
|
||||
err() {
|
||||
echo "$*" >&2
|
||||
|
|
@ -11,11 +12,11 @@ err() {
|
|||
}
|
||||
|
||||
json_get() {
|
||||
jq -r "$1" < "$dirname/versions.json"
|
||||
jq -r "$1" < "./versions.json"
|
||||
}
|
||||
|
||||
json_set() {
|
||||
jq --arg x "$2" "$1 = \$x" < "$dirname/versions.json" | sponge "$dirname/versions.json"
|
||||
jq --arg x "$2" "$1 = \$x" < "./versions.json" | sponge "./versions.json"
|
||||
}
|
||||
|
||||
resolve_url() {
|
||||
|
|
@ -53,10 +54,10 @@ get_version() {
|
|||
sri_get() {
|
||||
local ouput sri
|
||||
output=$(nix-build --expr \
|
||||
'with import <nixpkgs>{};
|
||||
"with import $nixpkgs {};
|
||||
fetchurl {
|
||||
url = "'"$1"'";
|
||||
}' 2>&1 || true)
|
||||
url = \"$1\";
|
||||
}" 2>&1 || true)
|
||||
sri=$(echo "$output" | awk '/^\s+got:\s+/{ print $2 }')
|
||||
[[ -z "$sri" ]] && err "$output"
|
||||
echo "$sri"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-GgaRlROSWYZgFlH0bH6PTnRE3L/bb0kX0P6m7nmPlsY=",
|
||||
"version": "0.2024.03.12.08.02.stable_01"
|
||||
"hash": "sha256-aOw/c6Y+4x6kwxcwnajHh92ZZDeaM/Y1df76HgUjVn8=",
|
||||
"version": "0.2024.03.19.08.01.stable_01"
|
||||
},
|
||||
"linux": {
|
||||
"hash": "sha256-9reFBIu32TzxE46c3PBVzkZYaMV4HVDASvTAVQltYN0=",
|
||||
"version": "0.2024.03.12.08.02.stable_01"
|
||||
"hash": "sha256-efnYh48xcLneeotH9iSY0xQRgMXI/erM6F2fIH38yjY=",
|
||||
"version": "0.2024.03.19.08.01.stable_01"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-xfce-icon-theme";
|
||||
version = "0.18";
|
||||
version = "0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shimmerproject";
|
||||
repo = "elementary-xfce";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OgQtqBrYKDgU4mhXLFO8YwiPv2lKqGSdZnfKCd9ri4g=";
|
||||
sha256 = "sha256-exrPxJ6S3xV1EJ61KW1MqCcOSzPY9zOycuSh8I9Gdns=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,11 +23,13 @@ mkCoqDerivation {
|
|||
repo = "VST";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.15" "8.19"; out = "2.14"; }
|
||||
{ case = range "8.15" "8.17"; out = "2.13"; }
|
||||
{ case = range "8.14" "8.16"; out = "2.10"; }
|
||||
{ case = range "8.13" "8.15"; out = "2.9"; }
|
||||
{ case = range "8.12" "8.13"; out = "2.8"; }
|
||||
] null;
|
||||
release."2.14".sha256 = "sha256-NHc1ZQ2VmXZy4lK2+mtyeNz1Qr9Nhj2QLxkPhhQB7Iw=";
|
||||
release."2.13".sha256 = "sha256-i6rvP3cpayBln5KHZOpeNfraYU5h0O9uciBQ4jRH4XA=";
|
||||
release."2.12".sha256 = "sha256-4HL0U4HA5/usKNXC0Dis1UZY/Hb/LRd2IGOrqrvdWkw=";
|
||||
release."2.11.1".sha256 = "sha256-unpNstZBnRT4dIqAYOv9n1J0tWJMeRuaaa2RG1U0Xs0=";
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ compcert = mkCoqDerivation {
|
|||
releaseRev = v: "v${v}";
|
||||
|
||||
defaultVersion = with lib.versions; lib.switch coq.version [
|
||||
{ case = range "8.14" "8.17"; out = "3.13.1"; }
|
||||
{ case = range "8.14" "8.19"; out = "3.13.1"; }
|
||||
{ case = isEq "8.13" ; out = "3.10"; }
|
||||
{ case = isEq "8.12" ; out = "3.9"; }
|
||||
{ case = range "8.8" "8.11"; out = "3.8"; }
|
||||
|
|
@ -170,12 +170,27 @@ compcert.overrideAttrs (o:
|
|||
})
|
||||
];
|
||||
}
|
||||
{ cases = [ (isEq "8.17") (isEq "3.13") ];
|
||||
{ cases = [ (range "8.17" "8.19") (isEq "3.13") ];
|
||||
out = [
|
||||
# Support for Coq 8.17.0 & Coq 8.17.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/030a0fafe6a1a315bb13c5276e0af536e4f713ce.patch";
|
||||
hash = "sha256-iRdmgYuun1wp6chRoDy99KKmFyvY79NGWzrltyQaW1o=";
|
||||
url = "https://github.com/AbsInt/CompCert/commit/2e04d986bdae578186e40330842878559a550402.patch";
|
||||
hash = "sha256-2ZRAjUUSScJI8ogWFTnukCUnJdLWGvyOPyfIVlHL4ig=";
|
||||
})
|
||||
# Support for Coq 8.18.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/28218c5663cba36c6078ca342335d4e55c412bd7.patch";
|
||||
hash = "sha256-aAatUMO26oZwFYGh1BXYWxbTuyOgU8BAKMGDS5796hM=";
|
||||
})
|
||||
# MenhirLib update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/9f3d7b6eb99377ad4689cd57563c484c57baa457.patch";
|
||||
hash = "sha256-paofdSBxP/JFoBSiO1OI+mjKRI3UCanXRh/drzYt93E=";
|
||||
})
|
||||
# Support for Coq 8.19.0 & Coq 8.19.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/a2e4ed62fc558d565366845f9d135bd7db5e23c4.patch";
|
||||
hash = "sha256-ufk0bokuayLfkSvK3cK4E9iXU5eZpp9d/ETSa/zCfMg=";
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -611,6 +611,14 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
|
|||
inherit src;
|
||||
name = "python${pythonVersion}-${version}-doc";
|
||||
|
||||
patches = optionals (pythonAtLeast "3.9" && pythonOlder "3.10") [
|
||||
# https://github.com/python/cpython/issues/98366
|
||||
(fetchpatch {
|
||||
url = "https://github.com/python/cpython/commit/5612471501b05518287ed61c1abcb9ed38c03942.patch";
|
||||
hash = "sha256-p41hJwAiyRgyVjCVQokMSpSFg/VDDrqkCSxsodVb6vY=";
|
||||
})
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -114,8 +114,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pcre2
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [
|
||||
bash gnum4 # install glib-gettextize and m4 macros for other apps to use
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
|
||||
elfutils
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libselinux
|
||||
util-linuxMinimal # for libmount
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
|
|
@ -158,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-Dgtk_doc=${lib.boolToString buildDocs}"
|
||||
"-Dnls=enabled"
|
||||
"-Ddevbindir=${placeholder "dev"}/bin"
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
] ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [
|
||||
"-Dlibelf=disabled"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
"-Dman=true" # broken on Darwin
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "borb";
|
||||
version = "2.1.21";
|
||||
version = "2.1.22";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gnsPsvchvcUlWwmhDIazuc8/83ZRKc29VKhIDFSoFlE=";
|
||||
hash = "sha256-T+uSq/KF3p4zJJhQeompJIJ6BWhYFK9Ko9w0sZFtFhE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,10 +2,16 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
, pytestCheckHook
|
||||
|
||||
, pythonOlder
|
||||
|
||||
, setuptools
|
||||
, cython_3
|
||||
|
||||
, symspellpy
|
||||
, numpy
|
||||
, editdistpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -27,9 +33,27 @@ buildPythonPackage rec {
|
|||
cython_3
|
||||
];
|
||||
|
||||
# for tests need symspellpy package, symspellpy is not in nixpkgs...
|
||||
# error: infinite recursion encountered
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
symspellpy
|
||||
numpy
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
rm -r editdistpy
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
check = editdistpy.overridePythonAttrs (
|
||||
_: {
|
||||
doCheck = true;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"editdistpy"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -79,6 +79,14 @@ buildPythonPackage rec {
|
|||
"tests/cover"
|
||||
];
|
||||
|
||||
disabledTests = if (pythonOlder "3.10") then [
|
||||
# not sure why these tests fail with only 3.9
|
||||
# FileNotFoundError: [Errno 2] No such file or directory: 'git'
|
||||
"test_observability"
|
||||
"test_assume_has_status_reason"
|
||||
"test_observability_captures_stateful_reprs"
|
||||
] else null;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"hypothesis"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "heroku";
|
||||
version = "8.10.0";
|
||||
version = "8.11.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cli-assets.heroku.com/versions/8.10.0/25f0948/heroku-v8.10.0-25f0948-linux-x64.tar.xz";
|
||||
hash = "sha256-t2EQeOc6gi5lb7xrAc3WSqwUaczXN5pZXl0QkZ0Gk74=";
|
||||
url = "https://cli-assets.heroku.com/versions/8.11.0/a525d5e/heroku-v8.11.0-a525d5e-linux-x64.tar.xz";
|
||||
hash = "sha256-0G/ZRffPUHQy5iU64x92pjLd6pFCfEABugnSfYiUXHQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,39 +1,74 @@
|
|||
{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
|
||||
{ lib
|
||||
, darwin
|
||||
, fetchCrate
|
||||
, openssl
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "cargo-pgrx";
|
||||
version = "0.11.2";
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
inherit version pname;
|
||||
generic =
|
||||
{ version
|
||||
, hash
|
||||
, cargoHash
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-pgrx";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM=";
|
||||
inherit version;
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname hash;
|
||||
};
|
||||
|
||||
inherit cargoHash;
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PGRX_HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
# requires pgrx to be properly initialized with cargo pgrx init
|
||||
"--skip=command::schema::tests::test_parse_managed_postmasters"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Build Postgres Extensions with Rust";
|
||||
homepage = "https://github.com/pgcentralfoundation/pgrx";
|
||||
changelog = "https://github.com/pgcentralfoundation/pgrx/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
mainProgram = "cargo-pgrx";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
cargo-pgrx_0_10_2 = generic {
|
||||
version = "0.10.2";
|
||||
hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls=";
|
||||
cargoHash = "sha256-syZ3cQq8qDHBLvqmNDGoxeK6zXHJ47Jwkw3uhaXNCzI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI=";
|
||||
cargo-pgrx_0_11_2 = generic {
|
||||
version = "0.11.2";
|
||||
hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM=";
|
||||
cargoHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
preCheck = ''
|
||||
export PGRX_HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
# requires pgrx to be properly initialized with cargo pgrx init
|
||||
"--skip=command::schema::tests::test_parse_managed_postmasters"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Build Postgres Extensions with Rust!";
|
||||
mainProgram = "cargo-pgrx";
|
||||
homepage = "https://github.com/tcdi/pgrx";
|
||||
changelog = "https://github.com/tcdi/pgrx/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
cargo-pgrx_0_11_3 = generic {
|
||||
version = "0.11.3";
|
||||
hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU=";
|
||||
cargoHash = "sha256-j4HnD8Zt9uhlV5N7ldIy9564o9qFEqs5KfXHmnQ1WEw=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
|
||||
|
||||
# configuration items have to be part of a subattrs
|
||||
flattenKConf = nested: mapAttrs (_: head) (zipAttrs (attrValues nested));
|
||||
flattenKConf = nested: mapAttrs (name: values: if length values == 1 then head values else throw "duplicate kernel configuration option: ${name}") (zipAttrs (attrValues nested));
|
||||
|
||||
whenPlatformHasEBPFJit =
|
||||
mkIf (stdenv.hostPlatform.isAarch32 ||
|
||||
|
|
@ -111,9 +111,6 @@ let
|
|||
# Enable CPU energy model for scheduling
|
||||
ENERGY_MODEL = whenAtLeast "5.0" yes;
|
||||
|
||||
# Enable scheduling stats collection
|
||||
SCHEDSTATS = yes;
|
||||
|
||||
# Enable thermal interface netlink API
|
||||
THERMAL_NETLINK = whenAtLeast "5.9" yes;
|
||||
|
||||
|
|
@ -413,7 +410,6 @@ let
|
|||
whenHasDevicePrivate = mkIf (!stdenv.isx86_32 && versionAtLeast version "5.1");
|
||||
in {
|
||||
DRM_LEGACY = whenOlder "6.8" no;
|
||||
DRM_SIMPLEDRM = yes;
|
||||
|
||||
NOUVEAU_LEGACY_CTX_SUPPORT = whenBetween "5.2" "6.3" no;
|
||||
|
||||
|
|
@ -890,7 +886,6 @@ let
|
|||
NOTIFIER_ERROR_INJECTION = option no;
|
||||
RCU_PERF_TEST = whenOlder "5.9" no;
|
||||
RCU_SCALE_TEST = whenAtLeast "5.10" no;
|
||||
RCU_TORTURE_TEST = option no;
|
||||
TEST_ASYNC_DRIVER_PROBE = option no;
|
||||
WW_MUTEX_SELFTEST = option no;
|
||||
XZ_DEC_TEST = option no;
|
||||
|
|
@ -999,7 +994,6 @@ let
|
|||
# Removed on 5.17 as it was unused
|
||||
# upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0a4ee518185e902758191d968600399f3bc2be31
|
||||
CLEANCACHE = whenOlder "5.17" (option yes);
|
||||
CRASH_DUMP = option no;
|
||||
|
||||
FSCACHE_STATS = yes;
|
||||
|
||||
|
|
|
|||
|
|
@ -60,13 +60,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openvscode-server";
|
||||
version = "1.84.0";
|
||||
version = "1.85.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitpod-io";
|
||||
repo = "openvscode-server";
|
||||
rev = "openvscode-server-v${finalAttrs.version}";
|
||||
hash = "sha256-kYKvJrHWKHDIqJsN0j1WFN3OBWwEyNgY5hjNHBg+kKQ=";
|
||||
hash = "sha256-+q338VbHQouBE7UZN7jpBLzZsGmkWR6Da3GuntAQFbY=";
|
||||
};
|
||||
|
||||
yarnCache = stdenv.mkDerivation {
|
||||
|
|
@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-oW/JngHpXb8kscikscI7N9csSyZsZQgG75jOdWll6dw=";
|
||||
outputHash = "sha256-0lEeFT3SscFFqHwpQveJDzI8Q/KumcK+A3CHLBAhXkk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,7 +8,7 @@
|
|||
, nix-update-script
|
||||
}:
|
||||
|
||||
let version = "1.6.2";
|
||||
let version = "1.7.3";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "meilisearch";
|
||||
|
|
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
|
|||
owner = "meilisearch";
|
||||
repo = "MeiliSearch";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-D8KAleYaeMv3rCwhGE0IteuDUVk4RiOxsTBe7LhLAKg=";
|
||||
hash = "sha256-2kwogur6hS7/xjUhH9aRJevWbtgg5xQkvB/aIj7wyJ8=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [
|
||||
|
|
@ -29,10 +29,9 @@ rustPlatform.buildRustPackage {
|
|||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII=";
|
||||
"arroy-0.1.0" = "sha256-ybKdB0eP8AdxLMNM7Si9onWITNc2SPNTXMgKdWdy34E=";
|
||||
"candle-core-0.3.1" = "sha256-KlkjTUcbnP+uZoA0fDZlEPT5qKC2ogMAuR8X14xRFgA=";
|
||||
"candle-core-0.3.3" = "sha256-umWvG+82B793PQtY9VeHjPTtTVmSPdts25buw4v4TQc=";
|
||||
"candle-kernels-0.3.1" = "sha256-KlkjTUcbnP+uZoA0fDZlEPT5qKC2ogMAuR8X14xRFgA=";
|
||||
"hf-hub-0.3.2" = "sha256-tsn76b+/HRvPnZ7cWd8SBcEdnMPtjUEIRJipOJUbz54=";
|
||||
"nelson-0.1.0" = "sha256-eF672quU576wmZSisk7oDR7QiDafuKlSg0BTQkXnzqY=";
|
||||
"tokenizers-0.14.1" = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0=";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, buildPgrxExtension
|
||||
, cargo-pgrx
|
||||
, cargo-pgrx_0_11_2
|
||||
, clang_16
|
||||
, fetchCrate
|
||||
, fetchFromGitHub
|
||||
|
|
@ -23,27 +23,11 @@ let
|
|||
bindgenHook = rustPlatform.bindgenHook.override { inherit clang; };
|
||||
};
|
||||
|
||||
in
|
||||
(buildPgrxExtension.override {
|
||||
# Upstream only works with a fixed version of cargo-pgrx for each release,
|
||||
# so we're pinning it here to avoid future incompatibility.
|
||||
# See https://docs.pgvecto.rs/developers/development.html#environment, step 6
|
||||
cargo-pgrx_0_11_2 = cargo-pgrx.overrideAttrs (old: rec {
|
||||
pname = "cargo-pgrx";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "cargo-pgrx";
|
||||
inherit version;
|
||||
hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM=";
|
||||
};
|
||||
|
||||
cargoDeps = old.cargoDeps.overrideAttrs (_: {
|
||||
inherit src;
|
||||
outputHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI=";
|
||||
});
|
||||
});
|
||||
|
||||
in
|
||||
(buildPgrxExtension.override {
|
||||
cargo-pgrx = cargo-pgrx_0_11_2;
|
||||
rustPlatform = rustPlatform';
|
||||
}) rec {
|
||||
|
|
|
|||
|
|
@ -3,31 +3,12 @@
|
|||
, buildPgrxExtension
|
||||
, postgresql
|
||||
, nixosTests
|
||||
, cargo-pgrx
|
||||
, cargo-pgrx_0_10_2
|
||||
, fetchCrate
|
||||
, nix-update-script
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
cargo-pgrx_0_10_2 = cargo-pgrx.overrideAttrs (old: rec {
|
||||
name = "cargo-pgrx-${version}";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "cargo-pgrx";
|
||||
inherit version;
|
||||
hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls=";
|
||||
};
|
||||
|
||||
cargoDeps = old.cargoDeps.overrideAttrs (_: {
|
||||
inherit src;
|
||||
outputHash = "sha256-XyI3RaPI3Edm/tCP2xoZemib2d2n2cAhobgk9Oafg6s=";
|
||||
});
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_10_2; }) rec {
|
||||
inherit postgresql;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tar2ext4";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "hcsshim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Zpcv3sSO1iQGgoy6PYfhf165BgGi2mkS9s+y8Ewhxa8=";
|
||||
sha256 = "sha256-p0sNdCC8T5MDVimkS2DJusfuM788QxEtgKJNGlqrkAU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cmd/tar2ext4";
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crowdin-cli";
|
||||
version = "3.18.0";
|
||||
version = "3.19.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
|
||||
hash = "sha256-wktEg9JPokKeyEOdK9j55XSefj4rleU1ig5exP83j/g=";
|
||||
hash = "sha256-E8I5yWOEGZwiM3oHhmZhvppuCAWLDFx7X7DVfo29W+U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vale";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
subPackages = [ "cmd/vale" ];
|
||||
outputs = [ "out" "data" ];
|
||||
|
|
@ -11,7 +11,7 @@ buildGoModule rec {
|
|||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Mh0JKbQrsP45Bn9EdTJCuSPC13vCsnuOtoi68Z6fttc=";
|
||||
hash = "sha256-6hj8fm2eCGQeWY3+eaJlKeZglJUSMY4/Yz2ySGp6m58=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HMzFLSmO6sBDNU89UoIvHcPPd3ubpti2ii4sFMKUDmI=";
|
||||
|
|
|
|||
|
|
@ -15542,7 +15542,7 @@ with pkgs;
|
|||
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
|
||||
};
|
||||
|
||||
inherit (coqPackages_8_17) compcert;
|
||||
inherit (coqPackages) compcert;
|
||||
|
||||
computecpp-unwrapped = callPackage ../development/compilers/computecpp { };
|
||||
computecpp = wrapCCWith rec {
|
||||
|
|
@ -16829,9 +16829,13 @@ with pkgs;
|
|||
buildPgxExtension = callPackage ../development/tools/rust/cargo-pgx/buildPgxExtension.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-pgrx = callPackage ../development/tools/rust/cargo-pgrx/default.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
inherit (callPackages ../development/tools/rust/cargo-pgrx { })
|
||||
cargo-pgrx_0_10_2
|
||||
cargo-pgrx_0_11_2
|
||||
cargo-pgrx_0_11_3
|
||||
;
|
||||
cargo-pgrx = cargo-pgrx_0_11_2;
|
||||
|
||||
buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue