Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c222aba0b8
2
.github/workflows/backport.yml
vendored
2
.github/workflows/backport.yml
vendored
|
|
@ -24,7 +24,7 @@ jobs:
|
|||
with:
|
||||
ref: ${{ github.event.pull_request.head.sha }}
|
||||
- name: Create backport PRs
|
||||
uses: korthout/backport-action@08bafb375e6e9a9a2b53a744b987e5d81a133191 # v2.1.1
|
||||
uses: korthout/backport-action@e8161d6a0dbfa2651b7daa76cbb75bc7c925bbf3 # v2.4.1
|
||||
with:
|
||||
# Config README: https://github.com/korthout/backport-action#backport-action
|
||||
copy_labels_pattern: 'severity:\ssecurity'
|
||||
|
|
|
|||
|
|
@ -6653,6 +6653,11 @@
|
|||
githubId = 46672819;
|
||||
name = "Frido Friedemann";
|
||||
};
|
||||
friedrichaltheide = {
|
||||
github = "friedrichaltheide";
|
||||
githubId = 11352905;
|
||||
name = "Friedrich Altheide";
|
||||
};
|
||||
frlan = {
|
||||
email = "frank@frank.uvena.de";
|
||||
github = "frlan";
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ self: super: {
|
|||
Here's a recipe on how to override a particular plugin through an overlay:
|
||||
```
|
||||
self: super: {
|
||||
postgresql_15 = super.postgresql_15.override { this = self.postgresql_15; } // {
|
||||
postgresql_15 = super.postgresql_15// {
|
||||
pkgs = super.postgresql_15.pkgs // {
|
||||
pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: {
|
||||
name = "pg_repack-v20181024";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ let
|
|||
# package = pkgs.postgresql_<major>;
|
||||
# };
|
||||
# works.
|
||||
base = if cfg.enableJIT && !cfg.package.jitSupport then cfg.package.withJIT else cfg.package;
|
||||
base = if cfg.enableJIT then cfg.package.withJIT else cfg.package;
|
||||
in
|
||||
if cfg.extraPlugins == []
|
||||
then base
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ in {
|
|||
serif = ["Noto Serif"];
|
||||
};
|
||||
|
||||
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
|
||||
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
|
||||
programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass";
|
||||
|
||||
# Enable helpful DBus services.
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ in
|
|||
services.upower.enable = mkDefault config.powerManagement.enable;
|
||||
networking.networkmanager.enable = mkDefault true;
|
||||
programs.dconf.enable = mkDefault true;
|
||||
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
|
||||
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
|
||||
|
||||
fonts.packages = with pkgs; [ noto-fonts ];
|
||||
xdg.mime.enable = true;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ in
|
|||
# Link some extra directories in /run/current-system/software/share
|
||||
environment.pathsToLink = [ "/share" ];
|
||||
|
||||
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
|
||||
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
|
||||
|
||||
# virtual file systems support for PCManFM-QT
|
||||
services.gvfs.enable = true;
|
||||
|
|
|
|||
|
|
@ -336,7 +336,7 @@ in
|
|||
serif = [ "Noto Serif" ];
|
||||
};
|
||||
|
||||
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
|
||||
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
|
||||
programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";
|
||||
|
||||
# Enable helpful DBus services.
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ in
|
|||
xfdesktop
|
||||
] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
|
||||
|
||||
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;
|
||||
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
|
||||
programs.xfconf.enable = true;
|
||||
programs.thunar.enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dns-stats";
|
||||
repo = pname;
|
||||
repo = "compactor";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";
|
||||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Tools to capture DNS traffic and record it in C-DNS files";
|
||||
homepage = "https://dns-stats.org/";
|
||||
changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt";
|
||||
changelog = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ fdns ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ in stdenv.mkDerivation {
|
|||
];
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://www.virtualbox.org/";
|
||||
maintainers = with maintainers; [ sander ];
|
||||
maintainers = with maintainers; [ sander friedrichaltheide ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "VirtualBox";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ fetchurl rec {
|
|||
description = "Oracle Extension pack for VirtualBox";
|
||||
license = licenses.virtualbox-puel;
|
||||
homepage = "https://www.virtualbox.org/";
|
||||
maintainers = with maintainers; [ sander ];
|
||||
maintainers = with maintainers; [ sander friedrichaltheide ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = "GPL";
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10");
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
}:
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "srm-cuarzo";
|
||||
version = "0.5.4-1";
|
||||
version = "0.5.5-1";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-nmYMhX3XtyIyv6Kxi7s+ahkOHfnuLcjpwSU58HcPNeU=";
|
||||
hash = "sha256-4aeKzvhfVmimz4Df7wnyZESAZa7RMjYUqbhFhqPJ59o=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit (self) rev hash;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-unite";
|
||||
version = "77";
|
||||
version = "78";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hardpixel";
|
||||
repo = "unite-shell";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5PClGWOxqwTVaqBySu5I+qavaV1vcKHUvoYJ3Qgcq2o=";
|
||||
hash = "sha256-4fOCgStMPzUg2QxYeX6tU/WUaGOn1YUyheZp6YNeODA=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, uthash
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -19,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
sha256 = "sha256-9n0Gp9+fmTM/shgWC8zpwt1pic9BrvDubOt7f+ZDMeE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2024-24793.CVE-2024-24794.patch";
|
||||
url = "https://github.com/ImagingDataCommons/libdicom/commit/3661aa4cdbe9c39f67d38ae87520f9e3ed50ab16.patch";
|
||||
excludes = [ "CHANGELOG.md" ];
|
||||
hash = "sha256-/KTp0nKYk6jX4phNHY+nzjEptUBHKM2JkOftS5vHsEw=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ uthash ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ]
|
||||
|
|
|
|||
|
|
@ -1,26 +1,19 @@
|
|||
{ boost, cmake, fetchFromGitHub, fetchpatch, gtest, libpcap, openssl, lib, stdenv }:
|
||||
{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtins";
|
||||
version = "4.4";
|
||||
version = "4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfontanini";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw=";
|
||||
sha256 = "sha256-zL4C2Cgs9Y3NebL8MPQBO5j8Bm6xhl8ZggQBPJLRn0o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull gcc-13 fixes:
|
||||
# https://github.com/mfontanini/libtins/pull/496
|
||||
# TODO: remove when upgrade to the next version.
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/mfontanini/libtins/commit/812be7966d445ec56e88eab512f8fd2d57152427.patch";
|
||||
hash = "sha256-5RCFPe95r1CBrAocjTPR2SvUlgaGa1aBc8RazyxUj3M=";
|
||||
})
|
||||
# Required for gtest 1.13+.
|
||||
# Required for gtest 1.13+, see also upstream report at:
|
||||
# https://github.com/mfontanini/libtins/issues/529
|
||||
./0001-force-cpp-14.patch
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,28 +2,33 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, async-timeout
|
||||
, pysnmplib
|
||||
, pysnmp-lextudio
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "atenpdu";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
version = "0.6.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Of7tQJNqaLDgO8nie6rSd1saMbauXJBp8vWfXYAziEE=";
|
||||
hash = "sha256-KzRoE4tE/tQkKYroq5PbWKREmEl8AwbIOg3IHRZZtsQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
pysnmplib
|
||||
pysnmp-lextudio
|
||||
];
|
||||
|
||||
# Project has no test
|
||||
# Module has no test
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -33,6 +38,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python interface to control ATEN PE PDUs";
|
||||
homepage = "https://github.com/mtdcr/pductl";
|
||||
changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, pillow
|
||||
, unittestCheckHook
|
||||
, pythonAtLeast
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -21,7 +22,10 @@ buildPythonPackage rec {
|
|||
# fix offered to upstream https://github.com/nicolashahn/diffimg/pull/6
|
||||
postPatch = ''
|
||||
substituteInPlace diffimg/test.py \
|
||||
--replace "from diff import diff" "from diffimg.diff import diff"
|
||||
--replace-warn "from diff import diff" "from diffimg.diff import diff"
|
||||
'' + lib.optionalString (pythonAtLeast "3.12") ''
|
||||
substituteInPlace diffimg/test.py \
|
||||
--replace-warn "3503192421617232" "3503192421617233"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
31
pkgs/development/python-modules/jsonformatter/default.nix
Normal file
31
pkgs/development/python-modules/jsonformatter/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonformatter";
|
||||
version = "0.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MyColorfulDays";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oK419J/MIxRT+1j/5Yklj1F+4d3wuMXR8IVqJAMKPNw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jsonformatter"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "jsonformatter is a formatter for python output json log, e.g. output LogStash needed log";
|
||||
homepage = "https://github.com/MyColorfulDays/jsonformatter";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
}
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.31.14";
|
||||
version = "1.32.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
|||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/K8LhKr7TpOPk1CMqNoFJCF+C0N6A8pDkBmS6JZ0sb0=";
|
||||
hash = "sha256-qIEAtgfzTiUK+HzsocIH3L7z0Wfah3C4GByaA89wvso=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "paste";
|
||||
version = "3.7.1";
|
||||
version = "3.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "cdent";
|
||||
repo = "paste";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xp8FU4MR79/leBSJvSk8J2GdWW32AW2I5i3Y6DsRPLw=";
|
||||
hash = "sha256-T9VG91Y8hap1nt3FkuCGsv8nglWNlRajvsvljXexH3Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysnmp-lextudio";
|
||||
version = "6.0.10";
|
||||
version = "6.0.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lextudio";
|
||||
repo = "pysnmp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zxv/+IhIAnnn6gTyulPCuKainUcGMwRqw6ktYXR+d4Q=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-h/FxiGjBZqO82omkVqz+fws398Iz1EkHbZPMYIzG+t0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -57,6 +57,8 @@ buildPythonPackage rec {
|
|||
# pysnmp.smi.error.MibNotFoundError
|
||||
"test_send_v3_trap_notification"
|
||||
"test_addAsn1MibSource"
|
||||
"test_v1_walk"
|
||||
"test_v2_walk"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "5.13.0";
|
||||
version = "5.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "texlab";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-k/Hfl9SZxjdNLzvGrMMu/DPQpXsW21FC/WvJbz1IhSY=";
|
||||
hash = "sha256-fmtNalpOOPEiMO5zDD6m01cDfFuaLQsYPk6cc7yvjog=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tM/y1A/aCkcpU/1nZfUrNYDI0jiGn8qzvmP244tEJac=";
|
||||
cargoHash = "sha256-5ojXplzkBwchnSZLkwR5jz8WgyEA14Y1iVQ+Q19U8Tg=";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
|
|||
# generate the man page
|
||||
postInstall = lib.optionalString (!isCross) ''
|
||||
# TexLab builds man page separately in CI:
|
||||
# https://github.com/latex-lsp/texlab/blob/v5.13.0/.github/workflows/publish.yml#L117-L121
|
||||
# https://github.com/latex-lsp/texlab/blob/v5.13.1/.github/workflows/publish.yml#L117-L121
|
||||
help2man --no-info "$out/bin/texlab" > texlab.1
|
||||
installManPage texlab.1
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@
|
|||
tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json;
|
||||
tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json;
|
||||
tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json;
|
||||
tree-sitter-talon = lib.importJSON ./tree-sitter-talon.json;
|
||||
tree-sitter-templ = lib.importJSON ./tree-sitter-templ.json;
|
||||
tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json;
|
||||
tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"url": "https://github.com/wenkokke/tree-sitter-talon",
|
||||
"rev": "dafc9fabf7acc1a46d51cce379cec00c07661aa7",
|
||||
"date": "2023-11-05T13:07:41+00:00",
|
||||
"path": "/nix/store/df67djinw8sjwf6lbfv6gdckxckv0y65-tree-sitter-talon",
|
||||
"sha256": "1clmmb3pgvc54fsp83f2jmz6n21pmmjkb15yk9bfqlkzdm12sirw",
|
||||
"hash": "sha256-PEctQm1/UuxWmr6ENWWtNwhrfpXCDXS1I4Xtd8eqlbI=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
|
|
@ -157,6 +157,10 @@ let
|
|||
repo = "tree-sitter-sql";
|
||||
branch = "gh-pages";
|
||||
};
|
||||
"tree-sitter-talon" = {
|
||||
orga = "wenkokke";
|
||||
repo = "tree-sitter-talon";
|
||||
};
|
||||
"tree-sitter-typst" = {
|
||||
orga = "uben0";
|
||||
repo = "tree-sitter-typst";
|
||||
|
|
|
|||
|
|
@ -1,27 +1,18 @@
|
|||
{ stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xone";
|
||||
version = "0.3";
|
||||
version = "0.3-unstable-2024-03-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "medusalix";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE=";
|
||||
repo = "xone";
|
||||
rev = "948d2302acdd6333295eaba4da06d96677290ad3";
|
||||
hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build on kernel 6.3
|
||||
(fetchpatch {
|
||||
name = "kernel-6.3.patch";
|
||||
url = "https://github.com/medusalix/xone/commit/bbf0dcc484c3f5611f4e375da43e0e0ef08f3d18.patch";
|
||||
hash = "sha256-A2OzRRk4XT++rS6k6EIyiPy/LJptvVRUxoP7CIGrPWU=";
|
||||
})
|
||||
];
|
||||
|
||||
setSourceRoot = ''
|
||||
export sourceRoot=$(pwd)/${src.name}
|
||||
export sourceRoot=$(pwd)/${finalAttrs.src.name}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
|
@ -30,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
"-C"
|
||||
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"M=$(sourceRoot)"
|
||||
"VERSION=${version}"
|
||||
"VERSION=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
buildFlags = [ "modules" ];
|
||||
|
|
@ -45,4 +36,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
)
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2024-02-17";
|
||||
version = "unstable-2024-03-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "28f06a104bc0cfe3a7d36db343ade5a805b3e132";
|
||||
sha256 = "sha256-v2nv4g3dQTMbUKIrEJo8s66WRWXnSkWO8K+12fK/cZw=";
|
||||
rev = "bfb71bc2dc63f2911a11ebf580f82b1e8b2706c4";
|
||||
sha256 = "sha256-djF1IOcMCBcsmVV0hgn6QMwDVClxSSithgiRvss9KQc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/klippy";
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.10.5";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bn9nUTtpaEkzF2SEdCcKG27WQDL7xsgfgA/72wElQqA=";
|
||||
hash = "sha256-foYmHJk25SOCv+o6eiJTeD2VP8vi6PpeeDm845Lq43Y=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorHash = "sha256-PDUSjza+0SDanQwKYQRuLzsiA/sHjRnG0xpzlzhkm+U=";
|
||||
vendorHash = "sha256-2xHgGBVFzEnOFiZrg1ClgjUrzKVD3CLxPsvRO2iQBC4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.40.0.7998-c29d4c0c8";
|
||||
version = "1.40.1.8227-c0dd5a73e";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "sha256-uVsOI6sItfq7wLP+xPOYSC9ueOv/lcDeL+vnrx1WdRA=";
|
||||
sha256 = "16gc8fwb29x3l9s263xs9c7nb0i1rzgaps2wlx0cil8bs2a9izz8";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "sha256-ucxDtnGpfTpQURaGvLwohHeIZPE3aulXtoITRZCYA9c=";
|
||||
sha256 = "03sx5fvwy2njpfh7k4xvkqscrxnafdvzh42g4hsn2hqxp0bqkl51";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
|||
10
pkgs/servers/sql/postgresql/12.nix
Normal file
10
pkgs/servers/sql/postgresql/12.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
import ./generic.nix {
|
||||
version = "12.18";
|
||||
hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";
|
||||
muslPatches = {
|
||||
icu-collations-hack = {
|
||||
url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174";
|
||||
hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
|
||||
};
|
||||
};
|
||||
}
|
||||
14
pkgs/servers/sql/postgresql/13.nix
Normal file
14
pkgs/servers/sql/postgresql/13.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
import ./generic.nix {
|
||||
version = "13.14";
|
||||
hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";
|
||||
muslPatches = {
|
||||
icu-collations-hack = {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
|
||||
hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
|
||||
};
|
||||
disable-test-collate-icu-utf8 = {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
|
||||
hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y=";
|
||||
};
|
||||
};
|
||||
}
|
||||
14
pkgs/servers/sql/postgresql/14.nix
Normal file
14
pkgs/servers/sql/postgresql/14.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
import ./generic.nix {
|
||||
version = "14.11";
|
||||
hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";
|
||||
muslPatches = {
|
||||
icu-collations-hack = {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
|
||||
hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
|
||||
};
|
||||
disable-test-collate-icu-utf8 = {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
|
||||
hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM=";
|
||||
};
|
||||
};
|
||||
}
|
||||
10
pkgs/servers/sql/postgresql/15.nix
Normal file
10
pkgs/servers/sql/postgresql/15.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
import ./generic.nix {
|
||||
version = "15.6";
|
||||
hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";
|
||||
muslPatches = {
|
||||
icu-collations-hack = {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c";
|
||||
hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I=";
|
||||
};
|
||||
};
|
||||
}
|
||||
10
pkgs/servers/sql/postgresql/16.nix
Normal file
10
pkgs/servers/sql/postgresql/16.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
import ./generic.nix {
|
||||
version = "16.2";
|
||||
hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";
|
||||
muslPatches = {
|
||||
icu-collations-hack = {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e";
|
||||
hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,412 +1,24 @@
|
|||
self:
|
||||
let
|
||||
versions = {
|
||||
postgresql_12 = ./12.nix;
|
||||
postgresql_13 = ./13.nix;
|
||||
postgresql_14 = ./14.nix;
|
||||
postgresql_15 = ./15.nix;
|
||||
postgresql_16 = ./16.nix;
|
||||
};
|
||||
|
||||
generic =
|
||||
# dependencies
|
||||
{ stdenv, lib, fetchurl, makeWrapper, fetchpatch
|
||||
, glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid
|
||||
, pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin
|
||||
, linux-pam
|
||||
|
||||
# This is important to obtain a version of `libpq` that does not depend on systemd.
|
||||
, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic
|
||||
, gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
|
||||
|
||||
# for postgresql.pkgs
|
||||
, this, self, newScope, buildEnv
|
||||
|
||||
# source specification
|
||||
, version, hash, psqlSchema
|
||||
|
||||
# for tests
|
||||
, testers, nixosTests, thisAttr
|
||||
|
||||
# JIT
|
||||
, jitSupport ? false
|
||||
, nukeReferences, patchelf, llvmPackages
|
||||
, makeRustPlatform, buildPgxExtension, cargo, rustc
|
||||
|
||||
# PL/Python
|
||||
, pythonSupport ? false
|
||||
, python3
|
||||
|
||||
# detection of crypt fails when using llvm stdenv, so we add it manually
|
||||
# for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca)
|
||||
, libxcrypt
|
||||
}:
|
||||
let
|
||||
atLeast = lib.versionAtLeast version;
|
||||
olderThan = lib.versionOlder version;
|
||||
lz4Enabled = atLeast "14";
|
||||
zstdEnabled = atLeast "15";
|
||||
|
||||
pname = "postgresql";
|
||||
|
||||
stdenv' = if jitSupport then llvmPackages.stdenv else stdenv;
|
||||
in stdenv'.mkDerivation (finalAttrs: {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ];
|
||||
|
||||
outputs = [ "out" "lib" "doc" "man" ];
|
||||
setOutputFlags = false; # $out retains configureFlags :-/
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
readline
|
||||
openssl
|
||||
libxml2
|
||||
icu
|
||||
]
|
||||
++ lib.optionals (olderThan "13") [ libxcrypt ]
|
||||
++ lib.optionals jitSupport [ llvmPackages.llvm ]
|
||||
++ lib.optionals lz4Enabled [ lz4 ]
|
||||
++ lib.optionals zstdEnabled [ zstd ]
|
||||
++ lib.optionals enableSystemd [ systemd ]
|
||||
++ lib.optionals pythonSupport [ python3 ]
|
||||
++ lib.optionals gssSupport [ libkrb5 ]
|
||||
++ lib.optionals stdenv'.isLinux [ linux-pam ]
|
||||
++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences patchelf ];
|
||||
|
||||
enableParallelBuilding = !stdenv'.isDarwin;
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
buildFlags = [ "world" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
|
||||
|
||||
# Otherwise it retains a reference to compiler and fails; see #44767. TODO: better.
|
||||
preConfigure = "CC=${stdenv'.cc.targetPrefix}cc";
|
||||
|
||||
configureFlags = [
|
||||
"--with-openssl"
|
||||
"--with-libxml"
|
||||
"--with-icu"
|
||||
"--sysconfdir=/etc"
|
||||
"--libdir=$(lib)/lib"
|
||||
"--with-system-tzdata=${tzdata}/share/zoneinfo"
|
||||
"--enable-debug"
|
||||
(lib.optionalString enableSystemd "--with-systemd")
|
||||
(if stdenv'.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid")
|
||||
] ++ lib.optionals lz4Enabled [ "--with-lz4" ]
|
||||
++ lib.optionals zstdEnabled [ "--with-zstd" ]
|
||||
++ lib.optionals gssSupport [ "--with-gssapi" ]
|
||||
++ lib.optionals pythonSupport [ "--with-python" ]
|
||||
++ lib.optionals stdenv'.hostPlatform.isRiscV [ "--disable-spinlocks" ]
|
||||
++ lib.optionals jitSupport [ "--with-llvm" ]
|
||||
++ lib.optionals stdenv'.isLinux [ "--with-pam" ];
|
||||
|
||||
patches = [
|
||||
(if atLeast "16" then ./patches/disable-normalize_exec_path.patch
|
||||
else ./patches/disable-resolve_symlinks.patch)
|
||||
./patches/less-is-more.patch
|
||||
./patches/hardcode-pgxs-path.patch
|
||||
./patches/specify_pkglibdir_at_runtime.patch
|
||||
./patches/findstring.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./locale-binary-path.patch;
|
||||
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
|
||||
})
|
||||
|
||||
] ++ lib.optionals stdenv'.hostPlatform.isMusl (
|
||||
mkAttributes = jitSupport:
|
||||
self.lib.mapAttrs' (version: path:
|
||||
let
|
||||
self = {
|
||||
"12" = {
|
||||
icu-collations-hack = fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174";
|
||||
hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
|
||||
};
|
||||
};
|
||||
"13" = {
|
||||
inherit (self."14") icu-collations-hack;
|
||||
disable-test-collate-icu-utf8 = fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";
|
||||
hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y=";
|
||||
};
|
||||
};
|
||||
"14" = {
|
||||
icu-collations-hack = fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
|
||||
hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";
|
||||
};
|
||||
disable-test-collate-icu-utf8 = fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";
|
||||
hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM=";
|
||||
};
|
||||
};
|
||||
"15" = {
|
||||
icu-collations-hack = fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/icu-collations-hack.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c";
|
||||
hash = "sha256-HgtmhF4OJYU9macGJbTB9PjQi/yW7c3Akm3U0niWs8I=";
|
||||
};
|
||||
};
|
||||
"16" = {
|
||||
icu-collations-hack = fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/icu-collations-hack.patch?id=08a24be262339fd093e641860680944c3590238e";
|
||||
hash = "sha256-+urQdVIlADLdDPeT68XYv5rljhbK8M/7mPZn/cF+FT0=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
patchesForVersion = self.${lib.versions.major version} or (throw "no musl patches for postgresql ${version}");
|
||||
attrName = if jitSupport then "${version}_jit" else version;
|
||||
in
|
||||
lib.attrValues patchesForVersion
|
||||
) ++ lib.optionals stdenv'.isLinux [
|
||||
(if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch)
|
||||
];
|
||||
self.lib.nameValuePair attrName (import path {
|
||||
inherit jitSupport self;
|
||||
thisAttr = attrName;
|
||||
})
|
||||
) versions;
|
||||
|
||||
installTargets = [ "install-world" ];
|
||||
|
||||
LC_ALL = "C";
|
||||
|
||||
postPatch = ''
|
||||
# Hardcode the path to pgxs so pg_config returns the path in $out
|
||||
substituteInPlace "src/common/config_info.c" --replace HARDCODED_PGXS_PATH "$out/lib"
|
||||
'' + lib.optionalString jitSupport ''
|
||||
# Force lookup of jit stuff in $out instead of $lib
|
||||
substituteInPlace src/backend/jit/jit.c --replace pkglib_path \"$out/lib\"
|
||||
substituteInPlace src/backend/jit/llvm/llvmjit.c --replace pkglib_path \"$out/lib\"
|
||||
substituteInPlace src/backend/jit/llvm/llvmjit_inline.cpp --replace pkglib_path \"$out/lib\"
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
''
|
||||
moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it
|
||||
moveToOutput "lib/libpgcommon*.a" "$out"
|
||||
moveToOutput "lib/libpgport*.a" "$out"
|
||||
moveToOutput "lib/libecpg*" "$out"
|
||||
|
||||
# Prevent a retained dependency on gcc-wrapper.
|
||||
substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/ld ld
|
||||
|
||||
if [ -z "''${dontDisableStatic:-}" ]; then
|
||||
# Remove static libraries in case dynamic are available.
|
||||
for i in $out/lib/*.a $lib/lib/*.a; do
|
||||
name="$(basename "$i")"
|
||||
ext="${stdenv'.hostPlatform.extensions.sharedLibrary}"
|
||||
if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then
|
||||
rm "$i"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
'' + lib.optionalString jitSupport ''
|
||||
# Move the bitcode and libllvmjit.so library out of $lib; otherwise, every client that
|
||||
# depends on libpq.so will also have libLLVM.so in its closure too, bloating it
|
||||
moveToOutput "lib/bitcode" "$out"
|
||||
moveToOutput "lib/llvmjit*" "$out"
|
||||
|
||||
# In the case of JIT support, prevent a retained dependency on clang-wrapper
|
||||
substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${self.llvmPackages.stdenv.cc}/bin/clang clang
|
||||
nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f)
|
||||
|
||||
# Stop out depending on the default output of llvm
|
||||
substituteInPlace $out/lib/pgxs/src/Makefile.global \
|
||||
--replace ${self.llvmPackages.llvm.out}/bin "" \
|
||||
--replace '$(LLVM_BINPATH)/' ""
|
||||
|
||||
# Stop out depending on the -dev output of llvm
|
||||
substituteInPlace $out/lib/pgxs/src/Makefile.global \
|
||||
--replace ${self.llvmPackages.llvm.dev}/bin/llvm-config llvm-config \
|
||||
--replace -I${self.llvmPackages.llvm.dev}/include ""
|
||||
|
||||
${lib.optionalString (!stdenv'.isDarwin) ''
|
||||
# Stop lib depending on the -dev output of llvm
|
||||
rpath=$(patchelf --print-rpath $out/lib/llvmjit.so)
|
||||
nuke-refs -e $out $out/lib/llvmjit.so
|
||||
# Restore the correct rpath
|
||||
patchelf $out/lib/llvmjit.so --set-rpath "$rpath"
|
||||
''}
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (!stdenv'.isDarwin && stdenv'.hostPlatform.libc == "glibc")
|
||||
''
|
||||
# initdb needs access to "locale" command from glibc.
|
||||
wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
|
||||
'';
|
||||
|
||||
doCheck = !stdenv'.isDarwin;
|
||||
# autodetection doesn't seem to able to find this, but it's there.
|
||||
checkTarget = "check";
|
||||
|
||||
preCheck =
|
||||
# On musl, comment skip the following tests, because they break due to
|
||||
# ! ERROR: could not load library "/build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so": Error loading shared library libpq.so.5: No such file or directory (needed by /build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so)
|
||||
# See also here:
|
||||
# https://git.alpinelinux.org/aports/tree/main/postgresql/disable-broken-tests.patch?id=6d7d32c12e073a57a9e5946e55f4c1fbb68bd442
|
||||
if stdenv'.hostPlatform.isMusl then ''
|
||||
substituteInPlace src/test/regress/parallel_schedule \
|
||||
--replace "subscription" "" \
|
||||
--replace "object_address" ""
|
||||
'' else null;
|
||||
|
||||
doInstallCheck = false; # needs a running daemon?
|
||||
|
||||
disallowedReferences = [ stdenv'.cc ];
|
||||
|
||||
passthru = let
|
||||
jitToggle = this.override {
|
||||
jitSupport = !jitSupport;
|
||||
this = jitToggle;
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit readline psqlSchema jitSupport;
|
||||
|
||||
withJIT = if jitSupport then this else jitToggle;
|
||||
withoutJIT = if jitSupport then jitToggle else this;
|
||||
|
||||
dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
pkgs = let
|
||||
scope = {
|
||||
postgresql = this;
|
||||
stdenv = stdenv';
|
||||
buildPgxExtension = buildPgxExtension.override {
|
||||
stdenv = stdenv';
|
||||
rustPlatform = makeRustPlatform {
|
||||
stdenv = stdenv';
|
||||
inherit rustc cargo;
|
||||
};
|
||||
};
|
||||
};
|
||||
newSelf = self // scope;
|
||||
newSuper = { callPackage = newScope (scope // this.pkgs); };
|
||||
in import ./packages.nix newSelf newSuper;
|
||||
|
||||
withPackages = postgresqlWithPackages {
|
||||
inherit makeWrapper buildEnv;
|
||||
postgresql = this;
|
||||
}
|
||||
this.pkgs;
|
||||
|
||||
tests = {
|
||||
postgresql = nixosTests.postgresql-wal-receiver.${thisAttr};
|
||||
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
} // lib.optionalAttrs jitSupport {
|
||||
postgresql-jit = nixosTests.postgresql-jit.${thisAttr};
|
||||
};
|
||||
} // lib.optionalAttrs jitSupport {
|
||||
inherit (llvmPackages) llvm;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.postgresql.org";
|
||||
description = "A powerful, open source object-relational database system";
|
||||
license = licenses.postgresql;
|
||||
changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/";
|
||||
maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ma27 ];
|
||||
pkgConfigModules = [ "libecpg" "libecpg_compat" "libpgtypes" "libpq" ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
# JIT support doesn't work with cross-compilation. It is attempted to build LLVM-bytecode
|
||||
# (`%.bc` is the corresponding `make(1)`-rule) for each sub-directory in `backend/` for
|
||||
# the JIT apparently, but with a $(CLANG) that can produce binaries for the build, not the
|
||||
# host-platform.
|
||||
#
|
||||
# I managed to get a cross-build with JIT support working with
|
||||
# `depsBuildBuild = [ llvmPackages.clang ] ++ buildInputs`, but considering that the
|
||||
# resulting LLVM IR isn't platform-independent this doesn't give you much.
|
||||
# In fact, I tried to test the result in a VM-test, but as soon as JIT was used to optimize
|
||||
# a query, postgres would coredump with `Illegal instruction`.
|
||||
broken = jitSupport && (stdenv.hostPlatform != stdenv.buildPlatform);
|
||||
};
|
||||
});
|
||||
|
||||
postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv {
|
||||
name = "postgresql-and-plugins-${postgresql.version}";
|
||||
paths = f pkgs ++ [
|
||||
postgresql
|
||||
postgresql.lib
|
||||
postgresql.man # in case user installs this into environment
|
||||
];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
# We include /bin to ensure the $out/bin directory is created, which is
|
||||
# needed because we'll be removing the files from that directory in postBuild
|
||||
# below. See #22653
|
||||
pathsToLink = ["/" "/bin"];
|
||||
|
||||
# Note: the duplication of executables is about 4MB size.
|
||||
# So a nicer solution was patching postgresql to allow setting the
|
||||
# libdir explicitly.
|
||||
postBuild = ''
|
||||
mkdir -p $out/bin
|
||||
rm $out/bin/{pg_config,postgres,pg_ctl}
|
||||
cp --target-directory=$out/bin ${postgresql}/bin/{postgres,pg_config,pg_ctl}
|
||||
wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib
|
||||
'';
|
||||
|
||||
passthru.version = postgresql.version;
|
||||
passthru.psqlSchema = postgresql.psqlSchema;
|
||||
};
|
||||
|
||||
mkPackages = self: {
|
||||
postgresql_12 = self.callPackage generic {
|
||||
version = "12.18";
|
||||
psqlSchema = "12";
|
||||
hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";
|
||||
this = self.postgresql_12;
|
||||
thisAttr = "postgresql_12";
|
||||
inherit self;
|
||||
};
|
||||
|
||||
postgresql_13 = self.callPackage generic {
|
||||
version = "13.14";
|
||||
psqlSchema = "13";
|
||||
hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";
|
||||
this = self.postgresql_13;
|
||||
thisAttr = "postgresql_13";
|
||||
inherit self;
|
||||
};
|
||||
|
||||
postgresql_14 = self.callPackage generic {
|
||||
version = "14.11";
|
||||
psqlSchema = "14";
|
||||
hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";
|
||||
this = self.postgresql_14;
|
||||
thisAttr = "postgresql_14";
|
||||
inherit self;
|
||||
};
|
||||
|
||||
postgresql_15 = self.callPackage generic {
|
||||
version = "15.6";
|
||||
psqlSchema = "15";
|
||||
hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs=";
|
||||
this = self.postgresql_15;
|
||||
thisAttr = "postgresql_15";
|
||||
inherit self;
|
||||
};
|
||||
|
||||
postgresql_16 = self.callPackage generic {
|
||||
version = "16.2";
|
||||
psqlSchema = "16";
|
||||
hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI=";
|
||||
this = self.postgresql_16;
|
||||
thisAttr = "postgresql_16";
|
||||
inherit self;
|
||||
};
|
||||
};
|
||||
|
||||
in self:
|
||||
let packages = mkPackages self; in
|
||||
packages
|
||||
// self.lib.mapAttrs'
|
||||
(attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec {
|
||||
jitSupport = true;
|
||||
thisAttr = "${attrName}_jit";
|
||||
this = self.${thisAttr};
|
||||
}))
|
||||
packages
|
||||
in
|
||||
# variations without and with JIT
|
||||
(mkAttributes false) // (mkAttributes true)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell }:
|
||||
{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "postgresql_anonymizer";
|
||||
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (pg-dump-anon) version src passthru;
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
nativeBuildInputs = [ postgresql ] ++ lib.optional postgresql.jitSupport postgresql.llvm;
|
||||
nativeBuildInputs = [ postgresql ] ++ lib.optional jitSupport llvm;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
|
|||
107
pkgs/servers/sql/postgresql/ext/default.nix
Normal file
107
pkgs/servers/sql/postgresql/ext/default.nix
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
self: super: {
|
||||
|
||||
age = super.callPackage ./age.nix { };
|
||||
|
||||
anonymizer = super.callPackage ./anonymizer.nix { };
|
||||
|
||||
apache_datasketches = super.callPackage ./apache_datasketches.nix { };
|
||||
|
||||
citus = super.callPackage ./citus.nix { };
|
||||
|
||||
h3-pg = super.callPackage ./h3-pg.nix { };
|
||||
|
||||
hypopg = super.callPackage ./hypopg.nix { };
|
||||
|
||||
jsonb_deep_sum = super.callPackage ./jsonb_deep_sum.nix { };
|
||||
|
||||
lantern = super.callPackage ./lantern.nix { };
|
||||
|
||||
periods = super.callPackage ./periods.nix { };
|
||||
|
||||
postgis = super.callPackage ./postgis.nix { };
|
||||
|
||||
pg_auto_failover = super.callPackage ./pg_auto_failover.nix { };
|
||||
|
||||
pg_bigm = super.callPackage ./pg_bigm.nix { };
|
||||
|
||||
pg_ed25519 = super.callPackage ./pg_ed25519.nix { };
|
||||
|
||||
pg_embedding = super.callPackage ./pg_embedding.nix { };
|
||||
|
||||
pg_hint_plan = super.callPackage ./pg_hint_plan.nix { };
|
||||
|
||||
pg_ivm = super.callPackage ./pg_ivm.nix { };
|
||||
|
||||
pg_rational = super.callPackage ./pg_rational.nix { };
|
||||
|
||||
pg_repack = super.callPackage ./pg_repack.nix { };
|
||||
|
||||
pg_similarity = super.callPackage ./pg_similarity.nix { };
|
||||
|
||||
pgaudit = super.callPackage ./pgaudit.nix { };
|
||||
|
||||
pgroonga = super.callPackage ./pgroonga.nix { };
|
||||
|
||||
pgsodium = super.callPackage ./pgsodium.nix { };
|
||||
|
||||
pgsql-http = super.callPackage ./pgsql-http.nix { };
|
||||
|
||||
pgvecto-rs = super.callPackage ./pgvecto-rs { };
|
||||
|
||||
pgvector = super.callPackage ./pgvector.nix { };
|
||||
|
||||
plpgsql_check = super.callPackage ./plpgsql_check.nix { };
|
||||
|
||||
plr = super.callPackage ./plr.nix { };
|
||||
|
||||
plv8 = super.callPackage ./plv8 { };
|
||||
|
||||
pgjwt = super.callPackage ./pgjwt.nix { };
|
||||
|
||||
cstore_fdw = super.callPackage ./cstore_fdw.nix { };
|
||||
|
||||
pg_hll = super.callPackage ./pg_hll.nix { };
|
||||
|
||||
pg_cron = super.callPackage ./pg_cron.nix { };
|
||||
|
||||
pg_topn = super.callPackage ./pg_topn.nix { };
|
||||
|
||||
pg_net = super.callPackage ./pg_net.nix { };
|
||||
|
||||
pgtap = super.callPackage ./pgtap.nix { };
|
||||
|
||||
smlar = super.callPackage ./smlar.nix { };
|
||||
|
||||
temporal_tables = super.callPackage ./temporal_tables.nix { };
|
||||
|
||||
timescaledb = super.callPackage ./timescaledb.nix { };
|
||||
timescaledb-apache = super.callPackage ./timescaledb.nix { enableUnfree = false; };
|
||||
|
||||
timescaledb_toolkit = super.callPackage ./timescaledb_toolkit.nix { };
|
||||
|
||||
tsearch_extras = super.callPackage ./tsearch_extras.nix { };
|
||||
|
||||
tds_fdw = super.callPackage ./tds_fdw.nix { };
|
||||
|
||||
pgrouting = super.callPackage ./pgrouting.nix { };
|
||||
|
||||
pg_partman = super.callPackage ./pg_partman.nix { };
|
||||
|
||||
pg_relusage = super.callPackage ./pg_relusage.nix { };
|
||||
|
||||
pg_safeupdate = super.callPackage ./pg_safeupdate.nix { };
|
||||
|
||||
pg_squeeze = super.callPackage ./pg_squeeze.nix { };
|
||||
|
||||
pg_uuidv7 = super.callPackage ./pg_uuidv7.nix { };
|
||||
|
||||
promscale_extension = super.callPackage ./promscale_extension.nix { };
|
||||
|
||||
repmgr = super.callPackage ./repmgr.nix { };
|
||||
|
||||
rum = super.callPackage ./rum.nix { };
|
||||
|
||||
tsja = super.callPackage ./tsja.nix { };
|
||||
|
||||
wal2json = super.callPackage ./wal2json.nix { };
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
, v8
|
||||
, perl
|
||||
, postgresql
|
||||
, jitSupport
|
||||
# For test
|
||||
, runCommand
|
||||
, coreutils
|
||||
|
|
@ -138,6 +139,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
maintainers = with maintainers; [ marsam ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
license = licenses.postgresql;
|
||||
broken = postgresql.jitSupport;
|
||||
broken = jitSupport;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@
|
|||
, libiconv
|
||||
, pcre2
|
||||
, nixosTests
|
||||
, jitSupport
|
||||
, llvm
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ]
|
||||
++ lib.optional stdenv.isDarwin libiconv;
|
||||
nativeBuildInputs = [ perl pkg-config ] ++ lib.optional postgresql.jitSupport postgresql.llvm;
|
||||
nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm;
|
||||
dontDisableStatic = true;
|
||||
|
||||
# postgis config directory assumes /include /lib from the same root for json-c library
|
||||
|
|
|
|||
322
pkgs/servers/sql/postgresql/generic.nix
Normal file
322
pkgs/servers/sql/postgresql/generic.nix
Normal file
|
|
@ -0,0 +1,322 @@
|
|||
let
|
||||
|
||||
generic =
|
||||
# dependencies
|
||||
{ stdenv, lib, fetchurl, makeWrapper, fetchpatch
|
||||
, glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid
|
||||
, pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin
|
||||
, linux-pam
|
||||
|
||||
# This is important to obtain a version of `libpq` that does not depend on systemd.
|
||||
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic
|
||||
, enableSystemd ? null
|
||||
, gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic
|
||||
|
||||
# for postgresql.pkgs
|
||||
, self, newScope, buildEnv
|
||||
|
||||
# source specification
|
||||
, version, hash, muslPatches
|
||||
|
||||
# for tests
|
||||
, testers, nixosTests, thisAttr
|
||||
|
||||
# JIT
|
||||
, jitSupport
|
||||
, nukeReferences, patchelf, llvmPackages
|
||||
, makeRustPlatform, buildPgxExtension, cargo, rustc
|
||||
|
||||
# PL/Python
|
||||
, pythonSupport ? false
|
||||
, python3
|
||||
|
||||
# detection of crypt fails when using llvm stdenv, so we add it manually
|
||||
# for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca)
|
||||
, libxcrypt
|
||||
} @args:
|
||||
let
|
||||
atLeast = lib.versionAtLeast version;
|
||||
olderThan = lib.versionOlder version;
|
||||
lz4Enabled = atLeast "14";
|
||||
zstdEnabled = atLeast "15";
|
||||
|
||||
systemdSupport' = if enableSystemd == null then systemdSupport else (lib.warn "postgresql: argument enableSystemd is deprecated, please use systemdSupport instead." enableSystemd);
|
||||
|
||||
pname = "postgresql";
|
||||
|
||||
stdenv' = if jitSupport then llvmPackages.stdenv else stdenv;
|
||||
in stdenv'.mkDerivation (finalAttrs: {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ];
|
||||
|
||||
outputs = [ "out" "lib" "doc" "man" ];
|
||||
setOutputFlags = false; # $out retains configureFlags :-/
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
readline
|
||||
openssl
|
||||
libxml2
|
||||
icu
|
||||
]
|
||||
++ lib.optionals (olderThan "13") [ libxcrypt ]
|
||||
++ lib.optionals jitSupport [ llvmPackages.llvm ]
|
||||
++ lib.optionals lz4Enabled [ lz4 ]
|
||||
++ lib.optionals zstdEnabled [ zstd ]
|
||||
++ lib.optionals systemdSupport' [ systemd ]
|
||||
++ lib.optionals pythonSupport [ python3 ]
|
||||
++ lib.optionals gssSupport [ libkrb5 ]
|
||||
++ lib.optionals stdenv'.isLinux [ linux-pam ]
|
||||
++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences patchelf ];
|
||||
|
||||
enableParallelBuilding = !stdenv'.isDarwin;
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
buildFlags = [ "world" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
|
||||
|
||||
# Otherwise it retains a reference to compiler and fails; see #44767. TODO: better.
|
||||
preConfigure = "CC=${stdenv'.cc.targetPrefix}cc";
|
||||
|
||||
configureFlags = [
|
||||
"--with-openssl"
|
||||
"--with-libxml"
|
||||
"--with-icu"
|
||||
"--sysconfdir=/etc"
|
||||
"--libdir=$(lib)/lib"
|
||||
"--with-system-tzdata=${tzdata}/share/zoneinfo"
|
||||
"--enable-debug"
|
||||
(lib.optionalString systemdSupport' "--with-systemd")
|
||||
(if stdenv'.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid")
|
||||
] ++ lib.optionals lz4Enabled [ "--with-lz4" ]
|
||||
++ lib.optionals zstdEnabled [ "--with-zstd" ]
|
||||
++ lib.optionals gssSupport [ "--with-gssapi" ]
|
||||
++ lib.optionals pythonSupport [ "--with-python" ]
|
||||
++ lib.optionals stdenv'.hostPlatform.isRiscV [ "--disable-spinlocks" ]
|
||||
++ lib.optionals jitSupport [ "--with-llvm" ]
|
||||
++ lib.optionals stdenv'.isLinux [ "--with-pam" ];
|
||||
|
||||
patches = [
|
||||
(if atLeast "16" then ./patches/disable-normalize_exec_path.patch
|
||||
else ./patches/disable-resolve_symlinks.patch)
|
||||
./patches/less-is-more.patch
|
||||
./patches/hardcode-pgxs-path.patch
|
||||
./patches/specify_pkglibdir_at_runtime.patch
|
||||
./patches/findstring.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./patches/locale-binary-path.patch;
|
||||
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
|
||||
})
|
||||
|
||||
] ++ lib.optionals stdenv'.hostPlatform.isMusl (
|
||||
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
|
||||
map fetchurl (lib.attrValues muslPatches)
|
||||
) ++ lib.optionals stdenv'.isLinux [
|
||||
(if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch)
|
||||
];
|
||||
|
||||
installTargets = [ "install-world" ];
|
||||
|
||||
LC_ALL = "C";
|
||||
|
||||
postPatch = ''
|
||||
# Hardcode the path to pgxs so pg_config returns the path in $out
|
||||
substituteInPlace "src/common/config_info.c" --replace HARDCODED_PGXS_PATH "$out/lib"
|
||||
'' + lib.optionalString jitSupport ''
|
||||
# Force lookup of jit stuff in $out instead of $lib
|
||||
substituteInPlace src/backend/jit/jit.c --replace pkglib_path \"$out/lib\"
|
||||
substituteInPlace src/backend/jit/llvm/llvmjit.c --replace pkglib_path \"$out/lib\"
|
||||
substituteInPlace src/backend/jit/llvm/llvmjit_inline.cpp --replace pkglib_path \"$out/lib\"
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
''
|
||||
moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it
|
||||
moveToOutput "lib/libpgcommon*.a" "$out"
|
||||
moveToOutput "lib/libpgport*.a" "$out"
|
||||
moveToOutput "lib/libecpg*" "$out"
|
||||
|
||||
# Prevent a retained dependency on gcc-wrapper.
|
||||
substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/ld ld
|
||||
|
||||
if [ -z "''${dontDisableStatic:-}" ]; then
|
||||
# Remove static libraries in case dynamic are available.
|
||||
for i in $out/lib/*.a $lib/lib/*.a; do
|
||||
name="$(basename "$i")"
|
||||
ext="${stdenv'.hostPlatform.extensions.sharedLibrary}"
|
||||
if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then
|
||||
rm "$i"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
'' + lib.optionalString jitSupport ''
|
||||
# Move the bitcode and libllvmjit.so library out of $lib; otherwise, every client that
|
||||
# depends on libpq.so will also have libLLVM.so in its closure too, bloating it
|
||||
moveToOutput "lib/bitcode" "$out"
|
||||
moveToOutput "lib/llvmjit*" "$out"
|
||||
|
||||
# In the case of JIT support, prevent a retained dependency on clang-wrapper
|
||||
substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/clang clang
|
||||
nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f)
|
||||
|
||||
# Stop out depending on the default output of llvm
|
||||
substituteInPlace $out/lib/pgxs/src/Makefile.global \
|
||||
--replace ${llvmPackages.llvm.out}/bin "" \
|
||||
--replace '$(LLVM_BINPATH)/' ""
|
||||
|
||||
# Stop out depending on the -dev output of llvm
|
||||
substituteInPlace $out/lib/pgxs/src/Makefile.global \
|
||||
--replace ${llvmPackages.llvm.dev}/bin/llvm-config llvm-config \
|
||||
--replace -I${llvmPackages.llvm.dev}/include ""
|
||||
|
||||
${lib.optionalString (!stdenv'.isDarwin) ''
|
||||
# Stop lib depending on the -dev output of llvm
|
||||
rpath=$(patchelf --print-rpath $out/lib/llvmjit.so)
|
||||
nuke-refs -e $out $out/lib/llvmjit.so
|
||||
# Restore the correct rpath
|
||||
patchelf $out/lib/llvmjit.so --set-rpath "$rpath"
|
||||
''}
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (!stdenv'.isDarwin && stdenv'.hostPlatform.libc == "glibc")
|
||||
''
|
||||
# initdb needs access to "locale" command from glibc.
|
||||
wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
|
||||
'';
|
||||
|
||||
doCheck = !stdenv'.isDarwin;
|
||||
# autodetection doesn't seem to able to find this, but it's there.
|
||||
checkTarget = "check";
|
||||
|
||||
preCheck =
|
||||
# On musl, comment skip the following tests, because they break due to
|
||||
# ! ERROR: could not load library "/build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so": Error loading shared library libpq.so.5: No such file or directory (needed by /build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so)
|
||||
# See also here:
|
||||
# https://git.alpinelinux.org/aports/tree/main/postgresql/disable-broken-tests.patch?id=6d7d32c12e073a57a9e5946e55f4c1fbb68bd442
|
||||
if stdenv'.hostPlatform.isMusl then ''
|
||||
substituteInPlace src/test/regress/parallel_schedule \
|
||||
--replace "subscription" "" \
|
||||
--replace "object_address" ""
|
||||
'' else null;
|
||||
|
||||
disallowedReferences = [ stdenv'.cc ];
|
||||
|
||||
passthru = let
|
||||
this = self.callPackage generic args;
|
||||
jitToggle = this.override {
|
||||
jitSupport = !jitSupport;
|
||||
};
|
||||
in
|
||||
{
|
||||
psqlSchema = lib.versions.major version;
|
||||
|
||||
withJIT = if jitSupport then this else jitToggle;
|
||||
withoutJIT = if jitSupport then jitToggle else this;
|
||||
|
||||
dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
pkgs = let
|
||||
scope = {
|
||||
inherit jitSupport;
|
||||
inherit (llvmPackages) llvm;
|
||||
postgresql = this;
|
||||
stdenv = stdenv';
|
||||
buildPgxExtension = buildPgxExtension.override {
|
||||
stdenv = stdenv';
|
||||
rustPlatform = makeRustPlatform {
|
||||
stdenv = stdenv';
|
||||
inherit rustc cargo;
|
||||
};
|
||||
};
|
||||
};
|
||||
newSelf = self // scope;
|
||||
newSuper = { callPackage = newScope (scope // this.pkgs); };
|
||||
in import ./ext newSelf newSuper;
|
||||
|
||||
withPackages = postgresqlWithPackages {
|
||||
inherit makeWrapper buildEnv;
|
||||
postgresql = this;
|
||||
}
|
||||
this.pkgs;
|
||||
|
||||
tests = {
|
||||
postgresql = nixosTests.postgresql-wal-receiver.${thisAttr};
|
||||
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
} // lib.optionalAttrs jitSupport {
|
||||
postgresql-jit = nixosTests.postgresql-jit.${thisAttr};
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.postgresql.org";
|
||||
description = "A powerful, open source object-relational database system";
|
||||
license = licenses.postgresql;
|
||||
changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/";
|
||||
maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ma27 ];
|
||||
pkgConfigModules = [ "libecpg" "libecpg_compat" "libpgtypes" "libpq" ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
# JIT support doesn't work with cross-compilation. It is attempted to build LLVM-bytecode
|
||||
# (`%.bc` is the corresponding `make(1)`-rule) for each sub-directory in `backend/` for
|
||||
# the JIT apparently, but with a $(CLANG) that can produce binaries for the build, not the
|
||||
# host-platform.
|
||||
#
|
||||
# I managed to get a cross-build with JIT support working with
|
||||
# `depsBuildBuild = [ llvmPackages.clang ] ++ buildInputs`, but considering that the
|
||||
# resulting LLVM IR isn't platform-independent this doesn't give you much.
|
||||
# In fact, I tried to test the result in a VM-test, but as soon as JIT was used to optimize
|
||||
# a query, postgres would coredump with `Illegal instruction`.
|
||||
broken = jitSupport && (stdenv.hostPlatform != stdenv.buildPlatform);
|
||||
};
|
||||
});
|
||||
|
||||
postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv {
|
||||
name = "postgresql-and-plugins-${postgresql.version}";
|
||||
paths = f pkgs ++ [
|
||||
postgresql
|
||||
postgresql.lib
|
||||
postgresql.man # in case user installs this into environment
|
||||
];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
# We include /bin to ensure the $out/bin directory is created, which is
|
||||
# needed because we'll be removing the files from that directory in postBuild
|
||||
# below. See #22653
|
||||
pathsToLink = ["/" "/bin"];
|
||||
|
||||
# Note: the duplication of executables is about 4MB size.
|
||||
# So a nicer solution was patching postgresql to allow setting the
|
||||
# libdir explicitly.
|
||||
postBuild = ''
|
||||
mkdir -p $out/bin
|
||||
rm $out/bin/{pg_config,postgres,pg_ctl}
|
||||
cp --target-directory=$out/bin ${postgresql}/bin/{postgres,pg_config,pg_ctl}
|
||||
wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib
|
||||
'';
|
||||
|
||||
passthru.version = postgresql.version;
|
||||
passthru.psqlSchema = postgresql.psqlSchema;
|
||||
};
|
||||
|
||||
in
|
||||
# passed by <major>.nix
|
||||
versionArgs:
|
||||
# passed by default.nix
|
||||
{ self, ... } @defaultArgs:
|
||||
self.callPackage generic (defaultArgs // versionArgs)
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
self: super: {
|
||||
|
||||
age = super.callPackage ./ext/age.nix { };
|
||||
|
||||
anonymizer = super.callPackage ./ext/anonymizer.nix { };
|
||||
|
||||
apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { };
|
||||
|
||||
citus = super.callPackage ./ext/citus.nix { };
|
||||
|
||||
h3-pg = super.callPackage ./ext/h3-pg.nix { };
|
||||
|
||||
hypopg = super.callPackage ./ext/hypopg.nix { };
|
||||
|
||||
jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { };
|
||||
|
||||
lantern = super.callPackage ./ext/lantern.nix { };
|
||||
|
||||
periods = super.callPackage ./ext/periods.nix { };
|
||||
|
||||
postgis = super.callPackage ./ext/postgis.nix { };
|
||||
|
||||
pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { };
|
||||
|
||||
pg_bigm = super.callPackage ./ext/pg_bigm.nix { };
|
||||
|
||||
pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { };
|
||||
|
||||
pg_embedding = super.callPackage ./ext/pg_embedding.nix { };
|
||||
|
||||
pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { };
|
||||
|
||||
pg_ivm = super.callPackage ./ext/pg_ivm.nix { };
|
||||
|
||||
pg_rational = super.callPackage ./ext/pg_rational.nix { };
|
||||
|
||||
pg_repack = super.callPackage ./ext/pg_repack.nix { };
|
||||
|
||||
pg_similarity = super.callPackage ./ext/pg_similarity.nix { };
|
||||
|
||||
pgaudit = super.callPackage ./ext/pgaudit.nix { };
|
||||
|
||||
pgroonga = super.callPackage ./ext/pgroonga.nix { };
|
||||
|
||||
pgsodium = super.callPackage ./ext/pgsodium.nix { };
|
||||
|
||||
pgsql-http = super.callPackage ./ext/pgsql-http.nix { };
|
||||
|
||||
pgvecto-rs = super.callPackage ./ext/pgvecto-rs { };
|
||||
|
||||
pgvector = super.callPackage ./ext/pgvector.nix { };
|
||||
|
||||
plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { };
|
||||
|
||||
plr = super.callPackage ./ext/plr.nix { };
|
||||
|
||||
plv8 = super.callPackage ./ext/plv8 { };
|
||||
|
||||
pgjwt = super.callPackage ./ext/pgjwt.nix { };
|
||||
|
||||
cstore_fdw = super.callPackage ./ext/cstore_fdw.nix { };
|
||||
|
||||
pg_hll = super.callPackage ./ext/pg_hll.nix { };
|
||||
|
||||
pg_cron = super.callPackage ./ext/pg_cron.nix { };
|
||||
|
||||
pg_topn = super.callPackage ./ext/pg_topn.nix { };
|
||||
|
||||
pg_net = super.callPackage ./ext/pg_net.nix { };
|
||||
|
||||
pgtap = super.callPackage ./ext/pgtap.nix { };
|
||||
|
||||
smlar = super.callPackage ./ext/smlar.nix { };
|
||||
|
||||
temporal_tables = super.callPackage ./ext/temporal_tables.nix { };
|
||||
|
||||
timescaledb = super.callPackage ./ext/timescaledb.nix { };
|
||||
timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; };
|
||||
|
||||
timescaledb_toolkit = super.callPackage ./ext/timescaledb_toolkit.nix { };
|
||||
|
||||
tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { };
|
||||
|
||||
tds_fdw = super.callPackage ./ext/tds_fdw.nix { };
|
||||
|
||||
pgrouting = super.callPackage ./ext/pgrouting.nix { };
|
||||
|
||||
pg_partman = super.callPackage ./ext/pg_partman.nix { };
|
||||
|
||||
pg_relusage = super.callPackage ./ext/pg_relusage.nix { };
|
||||
|
||||
pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { };
|
||||
|
||||
pg_squeeze = super.callPackage ./ext/pg_squeeze.nix { };
|
||||
|
||||
pg_uuidv7 = super.callPackage ./ext/pg_uuidv7.nix { };
|
||||
|
||||
promscale_extension = super.callPackage ./ext/promscale_extension.nix { };
|
||||
|
||||
repmgr = super.callPackage ./ext/repmgr.nix { };
|
||||
|
||||
rum = super.callPackage ./ext/rum.nix { };
|
||||
|
||||
tsja = super.callPackage ./ext/tsja.nix { };
|
||||
|
||||
wal2json = super.callPackage ./ext/wal2json.nix { };
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-zsh-completions";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-zsh-completions";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DKvCpjAeCiUwD5l6PUW7WlEvM0cNZEOk41IiVXoh9D8=";
|
||||
hash = "sha256-bgbMc4HqigqgdkvUe/CWbUclwxpl17ESLzCIP8Sz+F8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
|
|||
description = "ZSH completions for Nix, NixOS, and NixOps";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ olejorgenb hedning ma27 ];
|
||||
maintainers = with maintainers; [ olejorgenb hedning ma27 sebtm ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
let
|
||||
pname = "pgadmin";
|
||||
version = "8.3";
|
||||
yarnHash = "sha256-nhHss4YOFu2cGkIhA909lIdnf3H3pD9BQx4PvP9+9c0=";
|
||||
version = "8.4";
|
||||
yarnHash = "sha256-Wizgb3WgNPYOLytEj7hBVMV/U3RqW9vhNnhQU4k+j+8=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgadmin-org";
|
||||
repo = "pgadmin4";
|
||||
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
|
||||
hash = "sha256-2L/JLkuyjx1oD9akQULmzW0FlSq8/MQlZ1HmlO81jj0=";
|
||||
hash = "sha256-kj/a1JjSDFnLY/UQNBqYdhs3J5wi0mlDyJ1jD/L12FM=";
|
||||
};
|
||||
|
||||
# keep the scope, as it is used throughout the derivation and tests
|
||||
|
|
@ -54,20 +54,23 @@ pythonPackages.buildPythonApplication rec {
|
|||
# patching Makefile, so it doesn't try to build sphinx documentation here
|
||||
# (will do so later)
|
||||
substituteInPlace Makefile \
|
||||
--replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"
|
||||
--replace-fail 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"
|
||||
|
||||
# fix document which refers a non-existing document and fails
|
||||
substituteInPlace docs/en_US/contributions.rst \
|
||||
--replace "code_snippets" ""
|
||||
--replace-fail "code_snippets" ""
|
||||
# relax dependencies
|
||||
sed 's|==|>=|g' -i requirements.txt
|
||||
# fix extra_require error with "*" in match
|
||||
sed 's|*|0|g' -i requirements.txt
|
||||
# remove packageManager from package.json so we can work without corepack
|
||||
substituteInPlace web/package.json \
|
||||
--replace-fail "\"packageManager\": \"yarn@3.6.4\"" "\"\": \"\""
|
||||
substituteInPlace pkg/pip/setup_pip.py \
|
||||
--replace "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
|
||||
--replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
|
||||
${lib.optionalString (!server-mode) ''
|
||||
substituteInPlace web/config.py \
|
||||
--replace "SERVER_MODE = True" "SERVER_MODE = False"
|
||||
--replace-fail "SERVER_MODE = True" "SERVER_MODE = False"
|
||||
''}
|
||||
'';
|
||||
|
||||
|
|
@ -182,6 +185,7 @@ pythonPackages.buildPythonApplication rec {
|
|||
keyring
|
||||
typer
|
||||
rich
|
||||
jsonformatter
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
|
|
@ -209,8 +213,8 @@ pythonPackages.buildPythonApplication rec {
|
|||
# in /var/lib/pgadmin and /var/log/pgadmin
|
||||
# see https://github.com/pgadmin-org/pgadmin4/blob/fd1c26408bbf154fa455a49ee5c12895933833a3/web/regression/runtests.py#L217-L226
|
||||
cp -v regression/test_config.json.in regression/test_config.json
|
||||
substituteInPlace regression/test_config.json --replace "localhost" "$PGHOST"
|
||||
substituteInPlace regression/runtests.py --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False"
|
||||
substituteInPlace regression/test_config.json --replace-fail "localhost" "$PGHOST"
|
||||
substituteInPlace regression/runtests.py --replace-fail "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False"
|
||||
|
||||
## Browser test ##
|
||||
|
||||
|
|
|
|||
|
|
@ -1715,6 +1715,82 @@
|
|||
resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||
|
||||
"@codemirror/autocomplete@^6.0.0":
|
||||
version "6.12.0"
|
||||
resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.12.0.tgz#3fa620a8a3f42ded7751749916e8375f6bbbb333"
|
||||
integrity sha512-r4IjdYFthwbCQyvqnSlx0WBHRHi8nBvU+WjJxFUij81qsBfhNudf/XKKmmC2j3m0LaOYUQTf3qiEK1J8lO1sdg==
|
||||
dependencies:
|
||||
"@codemirror/language" "^6.0.0"
|
||||
"@codemirror/state" "^6.0.0"
|
||||
"@codemirror/view" "^6.17.0"
|
||||
"@lezer/common" "^1.0.0"
|
||||
|
||||
"@codemirror/commands@^6.0.0":
|
||||
version "6.3.3"
|
||||
resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz#03face5bf5f3de0fc4e09b177b3c91eda2ceb7e9"
|
||||
integrity sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==
|
||||
dependencies:
|
||||
"@codemirror/language" "^6.0.0"
|
||||
"@codemirror/state" "^6.4.0"
|
||||
"@codemirror/view" "^6.0.0"
|
||||
"@lezer/common" "^1.1.0"
|
||||
|
||||
"@codemirror/lang-sql@^6.5.5":
|
||||
version "6.5.5"
|
||||
resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.5.5.tgz#85619f4ea6738c07c0241b19c62d8ef86678e672"
|
||||
integrity sha512-DvOaP2RXLb2xlxJxxydTFfwyYw5YDqEFea6aAfgh9UH0kUD6J1KFZ0xPgPpw1eo/5s2w3L6uh5PVR7GM23GxkQ==
|
||||
dependencies:
|
||||
"@codemirror/autocomplete" "^6.0.0"
|
||||
"@codemirror/language" "^6.0.0"
|
||||
"@codemirror/state" "^6.0.0"
|
||||
"@lezer/common" "^1.2.0"
|
||||
"@lezer/highlight" "^1.0.0"
|
||||
"@lezer/lr" "^1.0.0"
|
||||
|
||||
"@codemirror/language@^6.0.0":
|
||||
version "6.10.0"
|
||||
resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.0.tgz#2d0e818716825ee2ed0dacd04595eaa61bae8f23"
|
||||
integrity sha512-2vaNn9aPGCRFKWcHPFksctzJ8yS5p7YoaT+jHpc0UGKzNuAIx4qy6R5wiqbP+heEEdyaABA582mNqSHzSoYdmg==
|
||||
dependencies:
|
||||
"@codemirror/state" "^6.0.0"
|
||||
"@codemirror/view" "^6.23.0"
|
||||
"@lezer/common" "^1.1.0"
|
||||
"@lezer/highlight" "^1.0.0"
|
||||
"@lezer/lr" "^1.0.0"
|
||||
style-mod "^4.0.0"
|
||||
|
||||
"@codemirror/lint@^6.0.0":
|
||||
version "6.4.2"
|
||||
resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.2.tgz#c13be5320bde9707efdc94e8bcd3c698abae0b92"
|
||||
integrity sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==
|
||||
dependencies:
|
||||
"@codemirror/state" "^6.0.0"
|
||||
"@codemirror/view" "^6.0.0"
|
||||
crelt "^1.0.5"
|
||||
|
||||
"@codemirror/search@^6.0.0":
|
||||
version "6.5.5"
|
||||
resolved "https://registry.npmjs.org/@codemirror/search/-/search-6.5.5.tgz#cf97e201da364da2285c2a250167af25bbd2a4a2"
|
||||
integrity sha512-PIEN3Ke1buPod2EHbJsoQwlbpkz30qGZKcnmH1eihq9+bPQx8gelauUwLYaY4vBOuBAuEhmpDLii4rj/uO0yMA==
|
||||
dependencies:
|
||||
"@codemirror/state" "^6.0.0"
|
||||
"@codemirror/view" "^6.0.0"
|
||||
crelt "^1.0.5"
|
||||
|
||||
"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0":
|
||||
version "6.4.0"
|
||||
resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz#8bc3e096c84360b34525a84696a84f86b305363a"
|
||||
integrity sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A==
|
||||
|
||||
"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0":
|
||||
version "6.23.1"
|
||||
resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.23.1.tgz#1ce3039a588d6b93f153b7c4c035c2075ede34a6"
|
||||
integrity sha512-J2Xnn5lFYT1ZN/5ewEoMBCmLlL71lZ3mBdb7cUEuHhX2ESoSrNEucpsDXpX22EuTGm9LOgC9v4Z0wx+Ez8QmGA==
|
||||
dependencies:
|
||||
"@codemirror/state" "^6.4.0"
|
||||
style-mod "^4.1.0"
|
||||
w3c-keyname "^2.2.4"
|
||||
|
||||
"@date-io/core@1.x", "@date-io/core@^1.3.13", "@date-io/core@^1.3.6":
|
||||
version "1.3.13"
|
||||
resolved "https://registry.npmjs.org/@date-io/core/-/core-1.3.13.tgz#90c71da493f20204b7a972929cc5c482d078b3fa"
|
||||
|
|
@ -2286,6 +2362,25 @@
|
|||
"@jridgewell/resolve-uri" "3.1.0"
|
||||
"@jridgewell/sourcemap-codec" "1.4.14"
|
||||
|
||||
"@lezer/common@^1.0.0", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0":
|
||||
version "1.2.1"
|
||||
resolved "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz#198b278b7869668e1bebbe687586e12a42731049"
|
||||
integrity sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==
|
||||
|
||||
"@lezer/highlight@^1.0.0":
|
||||
version "1.2.0"
|
||||
resolved "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz#e5898c3644208b4b589084089dceeea2966f7780"
|
||||
integrity sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==
|
||||
dependencies:
|
||||
"@lezer/common" "^1.0.0"
|
||||
|
||||
"@lezer/lr@^1.0.0":
|
||||
version "1.4.0"
|
||||
resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz#ed52a75dbbfbb0d1eb63710ea84c35ee647cb67e"
|
||||
integrity sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==
|
||||
dependencies:
|
||||
"@lezer/common" "^1.0.0"
|
||||
|
||||
"@material-ui/core@4.12.4":
|
||||
version "4.12.4"
|
||||
resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73"
|
||||
|
|
@ -4527,10 +4622,18 @@ co@^4.6.0:
|
|||
resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
|
||||
integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
|
||||
|
||||
codemirror@^5.59.2:
|
||||
version "5.65.13"
|
||||
resolved "https://registry.npmjs.org/codemirror/-/codemirror-5.65.13.tgz#c098a6f409db8b5a7c5722788bd9fa3bb2367f2e"
|
||||
integrity sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg==
|
||||
codemirror@^6.0.1:
|
||||
version "6.0.1"
|
||||
resolved "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz#62b91142d45904547ee3e0e0e4c1a79158035a29"
|
||||
integrity sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==
|
||||
dependencies:
|
||||
"@codemirror/autocomplete" "^6.0.0"
|
||||
"@codemirror/commands" "^6.0.0"
|
||||
"@codemirror/language" "^6.0.0"
|
||||
"@codemirror/lint" "^6.0.0"
|
||||
"@codemirror/search" "^6.0.0"
|
||||
"@codemirror/state" "^6.0.0"
|
||||
"@codemirror/view" "^6.0.0"
|
||||
|
||||
collect-v8-coverage@^1.0.0:
|
||||
version "1.0.2"
|
||||
|
|
@ -4797,6 +4900,11 @@ create-ecdh@^4.0.0:
|
|||
safe-buffer "^5.0.1"
|
||||
sha.js "^2.4.8"
|
||||
|
||||
crelt@^1.0.5:
|
||||
version "1.0.6"
|
||||
resolved "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72"
|
||||
integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==
|
||||
|
||||
cross-env@^7.0.3:
|
||||
version "7.0.3"
|
||||
resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
|
||||
|
|
@ -6837,6 +6945,11 @@ hosted-git-info@^4.0.1:
|
|||
dependencies:
|
||||
lru-cache "^6.0.0"
|
||||
|
||||
hotkeys-js@^3.13.3:
|
||||
version "3.13.3"
|
||||
resolved "https://registry.npmjs.org/hotkeys-js/-/hotkeys-js-3.13.3.tgz#b0a9f243bb1e9cacb93d3772a9e1f6013c0698a3"
|
||||
integrity sha512-IEiMBNRJZMhWyNDsvww8LYC8vZYyj2/w2GgXPg0ljq/K3SYvOJH6NRMqzF7z2Fwaq2AzKSvmvECREzFleKSeow==
|
||||
|
||||
html-dom-parser@5.0.4:
|
||||
version "5.0.4"
|
||||
resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.4.tgz#2941a762317d088e747db31c8cf290987ec30a55"
|
||||
|
|
@ -8918,11 +9031,6 @@ moo@^0.5.0:
|
|||
resolved "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
|
||||
integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
|
||||
|
||||
mousetrap@^1.6.3:
|
||||
version "1.6.5"
|
||||
resolved "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9"
|
||||
integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==
|
||||
|
||||
mozjpeg@^8.0.0:
|
||||
version "8.0.0"
|
||||
resolved "https://registry.npmjs.org/mozjpeg/-/mozjpeg-8.0.0.tgz#cd990d96581626ca64b877146ce22ba00b3b308c"
|
||||
|
|
@ -11619,6 +11727,11 @@ style-loader@^3.3.2:
|
|||
resolved "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff"
|
||||
integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==
|
||||
|
||||
"style-mod@^4.0.0", "style-mod@^4.1.0":
|
||||
version "4.1.0"
|
||||
resolved "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz#a313a14f4ae8bb4d52878c0053c4327fb787ec09"
|
||||
integrity sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==
|
||||
|
||||
style-to-js@1.1.9:
|
||||
version "1.1.9"
|
||||
resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.9.tgz#5bdc23ba7624016094a19d6ea90fa3f98bee34c4"
|
||||
|
|
@ -12354,6 +12467,11 @@ vm-browserify@^1.0.0:
|
|||
resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
|
||||
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
|
||||
|
||||
w3c-keyname@^2.2.4:
|
||||
version "2.2.8"
|
||||
resolved "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5"
|
||||
integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==
|
||||
|
||||
w3c-xmlserializer@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
outputs = [ "out" "mu4e" ];
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JnKvMbgkaZ1MO7cZMb2PGZsNMjV1M+dnaDpsBDsT0L4=";
|
||||
hash = "sha256-ab5nTB7mp9zB53JsPS2aPhbnW4O+56+cWunqTVENMPA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lact";
|
||||
version = "0.5.0";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ilya-zlobintsev";
|
||||
repo = "LACT";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B3YAlEKELbHGIQ8AIvortYZsHY6wsuaFxm9lC9Uh+Zg=";
|
||||
hash = "sha256-Ts2byWYn1MwQCJPQfwTxezsa/fnwlgVOZyNDUXWgZ0s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MbE6OrYJGPoQPQggxa9dssx8Nc6/5w53V58E1yLLeq0=";
|
||||
cargoHash = "sha256-7zGZu3q2CF/xzWjbicEb/JOt6pXEC2Skg7eR2syvUmY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
blueprint-compiler
|
||||
|
|
|
|||
|
|
@ -26703,8 +26703,8 @@ with pkgs;
|
|||
postgresql_15_jit
|
||||
postgresql_16_jit
|
||||
;
|
||||
postgresql = postgresql_15.override { this = postgresql; };
|
||||
postgresql_jit = postgresql_15_jit.override { this = postgresql_jit; };
|
||||
postgresql = postgresql_15;
|
||||
postgresql_jit = postgresql_15_jit;
|
||||
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
|
||||
postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs;
|
||||
postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;
|
||||
|
|
|
|||
|
|
@ -6023,6 +6023,8 @@ self: super: with self; {
|
|||
|
||||
jsonable = callPackage ../development/python-modules/jsonable { };
|
||||
|
||||
jsonformatter = callPackage ../development/python-modules/jsonformatter { };
|
||||
|
||||
jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; };
|
||||
|
||||
jsonpatch = callPackage ../development/python-modules/jsonpatch { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user