mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a110f38d21
@ -866,7 +866,7 @@ let
|
||||
{ name = "limits"; enable = cfg.limits != []; control = "required"; modulePath = "${package}/lib/security/pam_limits.so"; settings = {
|
||||
conf = "${makeLimitsConf cfg.limits}";
|
||||
}; }
|
||||
{ name = "motd"; enable = cfg.showMotd && (config.users.motd != null || config.users.motdFile != null); control = "optional"; modulePath = "${package}/lib/security/pam_motd.so"; settings = {
|
||||
{ name = "motd"; enable = cfg.showMotd && (config.users.motd != "" || config.users.motdFile != null); control = "optional"; modulePath = "${package}/lib/security/pam_motd.so"; settings = {
|
||||
inherit motd;
|
||||
}; }
|
||||
{ name = "apparmor"; enable = cfg.enableAppArmor && config.security.apparmor.enable; control = "optional"; modulePath = "${pkgs.apparmor-pam}/lib/security/pam_apparmor.so"; settings = {
|
||||
@ -1478,9 +1478,9 @@ in
|
||||
'';
|
||||
|
||||
users.motd = mkOption {
|
||||
default = null;
|
||||
default = "";
|
||||
example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178.";
|
||||
type = types.nullOr types.lines;
|
||||
type = types.lines;
|
||||
description = "Message of the day shown to users when they log in.";
|
||||
};
|
||||
|
||||
@ -1498,7 +1498,7 @@ in
|
||||
config = {
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.users.motd == null || config.users.motdFile == null;
|
||||
assertion = config.users.motd == "" || config.users.motdFile == null;
|
||||
message = ''
|
||||
Only one of users.motd and users.motdFile can be set.
|
||||
'';
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
tag ? "",
|
||||
|
||||
# build time
|
||||
@ -46,9 +45,9 @@
|
||||
xvfb-run,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "quodlibet${tag}";
|
||||
version = "4.6.0";
|
||||
version = "4.6.0-unstable-2024-08-08";
|
||||
pyproject = true;
|
||||
|
||||
outputs = [
|
||||
@ -59,24 +58,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "quodlibet";
|
||||
repo = "quodlibet";
|
||||
rev = "refs/tags/release-${version}";
|
||||
hash = "sha256-dkO/CFN7Dk72xhtmcSDcwUciOPMeEjQS2mch+jSfiII=";
|
||||
rev = "3dcf31dfc8db9806d1f73a47fdabc950d35ded1d";
|
||||
hash = "sha256-8qWuxTvMF6ksDkbZ6wRLPCJK1cSqgGMPac/ht6qVpnA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "python-3.12-startup.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/quodlibet/quodlibet/pull/4358.patch";
|
||||
hash = "sha256-3IjtAX2mKO/Xi/iTwT5WBD5CMTRYFED7XMm/cx+29Zc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "more-python-3.12-fixes.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/quodlibet/quodlibet/pull/4364.patch";
|
||||
hash = "sha256-VRIQ+4e+X0kjZYuxV2wEjrFr+x5biwBtIR50K6hSfCY=";
|
||||
excludes = [ "poetry.lock" ];
|
||||
})
|
||||
./fix-gdist-python-3.12.patch
|
||||
];
|
||||
patches = [ ./fix-gdist-python-3.12.patch ];
|
||||
|
||||
build-system = [ python3.pkgs.setuptools ];
|
||||
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tageditor";
|
||||
version = "3.9.1";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martchus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FX0wb6GVTB/Y0m6qmoMbaeXPf8bA3+JqbGE8PPS6vAA=";
|
||||
hash = "sha256-Bmi1U/SmYENlwsysAHsgFODU7R1RnU3xqbwhPEwsGcM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, rustc
|
||||
, wasm-bindgen-cli
|
||||
, wasm-pack
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
@ -32,7 +33,15 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-pcgcu9zylSTjj5rxNff+afFBWVpN5sGtlpadG1wb93M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-E4gjG5GrVWkMKgjQiAvEiSy2/tx/yHKe+5isveMZ9tU=";
|
||||
cargoPatches = [
|
||||
(fetchpatch { # https://github.com/CloudCannon/pagefind/pull/680
|
||||
name = "cargo-update-time.patch";
|
||||
url = "https://github.com/CloudCannon/pagefind/commit/e6778572d225316803180db822f5cc12a936acd2.patch";
|
||||
hash = "sha256-XHpHA1hPIe+wjDQ6LE9hn2jn3eMBOK9Yoo920jfH9do=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-KWWln7QCRo02cOgHy5JNERGS0CvvgsPISwkTZeeNEkg=";
|
||||
|
||||
env.npmDeps_web_js = fetchNpmDeps {
|
||||
name = "npm-deps-web-js";
|
||||
|
||||
@ -33,10 +33,17 @@ setupMpiCheck() {
|
||||
|
||||
case $mpiType in
|
||||
openmpi)
|
||||
# make sure the test starts even if we have less than the requested amount of cores
|
||||
# Note, that openmpi-5 switched to using PRRTE.
|
||||
# Thus we need to set PRTE_MCA_* instead of OMPI_MCA_*.
|
||||
# We keep the openmpi-4 parameters for backward compatability.
|
||||
|
||||
# Make sure the test starts even if we have less than the requested amount of cores
|
||||
export OMPI_MCA_rmaps_base_oversubscribe=1
|
||||
export PRTE_MCA_rmaps_default_mapping_policy=node:oversubscribe
|
||||
|
||||
# Disable CPU pinning
|
||||
export OMPI_MCA_hwloc_base_binding_policy=none
|
||||
export PRTE_MCA_hwloc_default_binding_policy=none
|
||||
;;
|
||||
MPICH)
|
||||
# Fix to make mpich run in a sandbox
|
||||
|
||||
@ -20,15 +20,15 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "bcc";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
|
||||
disabled = !stdenv.isLinux;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "bcc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ngGLGfLv2prnjhgaRPf8ea3oyy4129zGodR0Yz1QtCw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ludgmHFOyBu1CwUiaqczmNui0J8bUBAA5QGBiado8yw=";
|
||||
};
|
||||
format = "other";
|
||||
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flatpak";
|
||||
version = "1.14.8";
|
||||
version = "1.14.10";
|
||||
|
||||
# TODO: split out lib once we figure out what to do with triggerdir
|
||||
outputs = [
|
||||
@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-EBa3Mn96+HiW+VRl9+WBN1DTtwSaN0ChpN3LX6jFNI4=";
|
||||
hash = "sha256-a73HkIEnNQrYWkpH1wKSyi9MRul3sysf0jHCpxnYIc0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -9,17 +9,17 @@ let
|
||||
|
||||
in buildGoModule rec {
|
||||
pname = "go-ethereum";
|
||||
version = "1.14.6";
|
||||
version = "1.14.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X9XwVZpRnkp7oVKwyvQbs8ZaWwLkuLEEHNfV5BvfVvI=";
|
||||
sha256 = "sha256-y831v6ar1RdDvGQMZf2lZKgq2IQzAAQrNwDCL0xbj24=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-UP+bQM8ydfbILlVhuNPVIKLyXZFTzGmHizn2hYgNE4Y=";
|
||||
vendorHash = "sha256-CLGf64Fftu4u8Vaj66Q4xuRKBEMNZmpltUyaUMVyVJk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -41,7 +41,6 @@ in buildGoModule rec {
|
||||
"cmd/ethkey"
|
||||
"cmd/evm"
|
||||
"cmd/geth"
|
||||
"cmd/p2psim"
|
||||
"cmd/rlpdump"
|
||||
"cmd/utils"
|
||||
];
|
||||
|
||||
@ -7,19 +7,19 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.3.12";
|
||||
version = "0.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ot8QsRgRbe0l37C9KGlREDCjq5nTTvcJ1TJaeBe2oxw=";
|
||||
hash = "sha256-7OGUlyBvxX/wra4GYnhmSni/7xloCXUKEu0xa2bbn2A=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
inherit pname version src;
|
||||
|
||||
npmDepsHash = "sha256-fr+IA6I1pE+vJ+uGE1sf2++s65rPzK//ZL+xT3QoLOA=";
|
||||
npmDepsHash = "sha256-hQOpkbw8RDATnORh8Z1ziUhBcXb5xVplVOvueC/3RwA=";
|
||||
|
||||
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
|
||||
# Until this is solved, running python packages from the browser will not work.
|
||||
|
||||
@ -38,8 +38,11 @@ stdenv.mkDerivation {
|
||||
runHook preInstall
|
||||
|
||||
for exe in "pdf-sign" "pdf-create-empty" "pdf-from-text"; do
|
||||
install -Dm755 $exe -t $out/bin
|
||||
wrapProgram $out/bin/$exe --prefix PATH : ${binPath}
|
||||
# Install wrapped programs into $out/lib so that they are not renamed.
|
||||
# Renaming them, like wrapProgram does, would produce the wrong output
|
||||
# from `--help`.
|
||||
install -Dm755 $exe -t $out/lib
|
||||
makeWrapper $out/lib/$exe $out/bin/$exe --prefix PATH : ${binPath}
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shapelib";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/shapelib/shapelib-${version}.tar.gz";
|
||||
sha256 = "sha256-GVKLJDdyQXBWNzIMNnlDAxrVCIZl0fsOHqpSpxJkpsQ=";
|
||||
sha256 = "sha256-XakKYOJUQPEI9OjpVzK/qD7eE8jgwrz4CuQQBsyOvCA=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://shapelib.maptools.org/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; teams.geospatial.members ++ [ ehmry ];
|
||||
changelog = "http://shapelib.maptools.org/release.html";
|
||||
};
|
||||
}
|
||||
@ -160,7 +160,7 @@ stdenv.mkDerivation(finalAttrs: {
|
||||
# source code is not easily obtainable
|
||||
(lib.mesonEnable "bluez5-codec-lc3plus" false)
|
||||
(lib.mesonEnable "bluez5-codec-lc3" true)
|
||||
(lib.mesonEnable "bluez5-codec-ldac" true)
|
||||
(lib.mesonEnable "bluez5-codec-ldac" (lib.meta.availableOn stdenv.hostPlatform ldacbt))
|
||||
(lib.mesonEnable "opus" true)
|
||||
(lib.mesonOption "sysconfdir" "/etc")
|
||||
(lib.mesonEnable "raop" raopSupport)
|
||||
|
||||
@ -5,31 +5,26 @@
|
||||
pytestCheckHook,
|
||||
setuptools-scm,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygmars";
|
||||
version = "0.8.0";
|
||||
format = "setuptools";
|
||||
version = "0.8.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
repo = pname;
|
||||
repo = "pygmars";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PiH1lV1Vt9VTSOB+jep8FHIdk8qnauxj4nP3CIi/m7o=";
|
||||
hash = "sha256-RwAZ1ZLh0zgGshSv7LleBHMotKapDFtD69ptqQnr0EA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/nexB/pygmars/pull/9
|
||||
substituteInPlace setup.cfg \
|
||||
--replace ">=3.6.*" ">=3.6"
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
|
||||
@ -5,22 +5,27 @@
|
||||
setuptools-scm,
|
||||
pyyaml,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "saneyaml";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sjCfeDZiPNbbkyV067xD4/ZcdD52NReeZL7ssNFibkQ=";
|
||||
hash = "sha256-Gc+9i/lNcwmYFix5D+XOyau1MAzFiQ/jfcbbyqj7Frs=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ pyyaml ];
|
||||
dependencies = [ pyyaml ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -29,6 +34,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "PyYaml wrapper with sane behaviour to read and write readable YAML safely";
|
||||
homepage = "https://github.com/nexB/saneyaml";
|
||||
changelog = "https://github.com/aboutcode-org/saneyaml/blob/v${version}/CHANGELOG.rst";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schwifty";
|
||||
version = "2024.6.1";
|
||||
version = "2024.8.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-32+YpDIXcgldwtxU5s9V6cong70EiyEgf9QCNYdEvp0=";
|
||||
hash = "sha256-XWdB0yGYKxz2PJVNbXpNnsG/SaF3ysZn8JjrDn/rZ7w=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
37
pkgs/development/python-modules/senf/default.nix
Normal file
37
pkgs/development/python-modules/senf/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
lib,
|
||||
hypothesis,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "senf";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kFlFEOqYVBM47YWmwUOPuiCqoqSW+I3y0tNlSFZjjNE=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Both don't work even with HOME specified...
|
||||
"test_getuserdir"
|
||||
"test_expanduser_user"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "senf" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Consistent filename handling for all Python versions and platforms";
|
||||
homepage = "https://senf.readthedocs.io/en/latest/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cab404 ];
|
||||
};
|
||||
|
||||
}
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.33.0";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E9jEZXD7nY90v35y4Wv1cUp2aoKzC7dR9bFOTI+2fqo=";
|
||||
hash = "sha256-U7ykTLEuREe2GTVswcAw3R3h4zbkWxuI2dt/2689xSA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1lHF8S0Xf5iOLQyARoYeWGGC9i68GVpk3EvSHo21Q2w=";
|
||||
cargoHash = "sha256-NoxYHwY5XpRiqrOjQsaSWQCXFalNAS9SchaKwHbB2uU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -31,22 +31,17 @@ rustPlatform.buildRustPackage rec {
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# requires nightly version of cargo-rustdoc
|
||||
"--skip=both_passing_manifest_path_and_directory_works"
|
||||
"--skip=verify_binary_contains_lints"
|
||||
|
||||
# requires internet access
|
||||
"--skip=detects_target_dependencies"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs scripts/regenerate_test_rustdocs.sh
|
||||
git init
|
||||
substituteInPlace scripts/regenerate_test_rustdocs.sh \
|
||||
--replace-fail \
|
||||
'TOPLEVEL="$(git rev-parse --show-toplevel)"' \
|
||||
"TOPLEVEL=$PWD"
|
||||
scripts/regenerate_test_rustdocs.sh
|
||||
'';
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
"testing": {
|
||||
"version": "6.11-rc2",
|
||||
"hash": "sha256:1ssw0cfzssczykg47gvvnpkzk2nvq3sl258nvxgypk3an1xc4xzs"
|
||||
"version": "6.11-rc3",
|
||||
"hash": "sha256:12434r4y6gwjykwbjzp2chqlkdvl8449a9mrhn3wlr6ixazfg9fm"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.104",
|
||||
"hash": "sha256:0xlrfm15c7cx1r3lndjgcwv29dyzr79wq09nbkhrf4r4j9j35yjw"
|
||||
"version": "6.1.105",
|
||||
"hash": "sha256:162yz32jqd2xkswsd1jxmjq4yhzmhzn17snicad35x51k3vaigr3"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.164",
|
||||
@ -24,8 +24,8 @@
|
||||
"hash": "sha256:0c7bhb31hpbbw1is1ykppk9lm0x025yyd4hrmlg1s6yg75rxqkal"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.45",
|
||||
"hash": "sha256:0ygiqh4zdg9ndqgyv9fiv4h0cgmgxa7ff28nkjas1r370wjfs6qj"
|
||||
"version": "6.6.46",
|
||||
"hash": "sha256:1wj5vn8dj0ln85n1xr5xi0hw35zpirm254fsxr6diiyrjqir6bq5"
|
||||
},
|
||||
"6.8": {
|
||||
"version": "6.8.12",
|
||||
@ -36,7 +36,7 @@
|
||||
"hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"
|
||||
},
|
||||
"6.10": {
|
||||
"version": "6.10.4",
|
||||
"hash": "sha256:1y2m2pqrvsgr9ng72nnh4yvsprkvkznhnmn4p8g78350bzyrvip2"
|
||||
"version": "6.10.5",
|
||||
"hash": "sha256:02yckkh6sxvcrwzbqgmw4jhqhxmbvz87xn9wm6bwwka3w2r9x41h"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,20 +1,26 @@
|
||||
{ fetchurl
|
||||
, lib, stdenv
|
||||
, perl
|
||||
, libxml2
|
||||
, postgresql
|
||||
, geos
|
||||
, proj
|
||||
, gdalMinimal
|
||||
, json_c
|
||||
, pkg-config
|
||||
, file
|
||||
, protobufc
|
||||
, libiconv
|
||||
, pcre2
|
||||
, nixosTests
|
||||
, jitSupport
|
||||
, llvm
|
||||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
perl,
|
||||
libxml2,
|
||||
postgresql,
|
||||
postgresqlTestHook,
|
||||
geos,
|
||||
proj,
|
||||
gdalMinimal,
|
||||
json_c,
|
||||
pkg-config,
|
||||
file,
|
||||
protobufc,
|
||||
libiconv,
|
||||
libxslt,
|
||||
docbook_xml_dtd_45,
|
||||
cunit,
|
||||
pcre2,
|
||||
nixosTests,
|
||||
jitSupport,
|
||||
llvm,
|
||||
}:
|
||||
|
||||
let
|
||||
@ -24,22 +30,44 @@ stdenv.mkDerivation rec {
|
||||
pname = "postgis";
|
||||
version = "3.4.2";
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
|
||||
sha256 = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI=";
|
||||
hash = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI=";
|
||||
};
|
||||
|
||||
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ]
|
||||
++ lib.optional stdenv.isDarwin libiconv;
|
||||
nativeBuildInputs = [ perl pkg-config ] ++ lib.optional jitSupport llvm;
|
||||
buildInputs = [
|
||||
libxml2
|
||||
postgresql
|
||||
geos
|
||||
proj
|
||||
gdal
|
||||
json_c
|
||||
protobufc
|
||||
pcre2.dev
|
||||
] ++ lib.optional stdenv.isDarwin libiconv;
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
pkg-config
|
||||
] ++ lib.optional jitSupport llvm;
|
||||
dontDisableStatic = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
postgresqlTestHook
|
||||
cunit
|
||||
libxslt
|
||||
];
|
||||
|
||||
postgresqlTestUserOptions = "LOGIN SUPERUSER";
|
||||
failureHook = "postgresqlStop";
|
||||
|
||||
# postgis config directory assumes /include /lib from the same root for json-c library
|
||||
env.NIX_LDFLAGS = "-L${lib.getLib json_c}/lib";
|
||||
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
|
||||
configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev} --disable-extension-upgrades-install"
|
||||
@ -61,6 +89,15 @@ stdenv.mkDerivation rec {
|
||||
ln -s ${postgresql}/bin/postgres $out/bin/postgres
|
||||
'';
|
||||
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
preCheck = ''
|
||||
substituteInPlace regress/run_test.pl --replace-fail "/share/contrib/postgis" "$out/share/postgresql/contrib/postgis"
|
||||
substituteInPlace regress/Makefile --replace-fail 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' "s,\\$\$libdir,$PWD/regress/00-regress-install$out/lib,g" \
|
||||
--replace-fail '$(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql' "$PWD/regress/00-regress-install$out/share/postgresql/contrib/postgis/*.sql"
|
||||
substituteInPlace doc/postgis-out.xml --replace-fail "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd"
|
||||
'';
|
||||
|
||||
# create aliases for all commands adding version information
|
||||
postInstall = ''
|
||||
# Teardown the illusory postgres used for building; see postConfigure.
|
||||
@ -81,7 +118,13 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://postgis.net/";
|
||||
changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; teams.geospatial.members ++ [ marcweber wolfgangwalther ];
|
||||
maintainers =
|
||||
with maintainers;
|
||||
teams.geospatial.members
|
||||
++ [
|
||||
marcweber
|
||||
wolfgangwalther
|
||||
];
|
||||
inherit (postgresql.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "auth0-cli";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "auth0";
|
||||
repo = "auth0-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-j7HT57/4rrrVkx9Zz+XuWD6UL0spdej+U5gWtFo1FSI=";
|
||||
hash = "sha256-C4zKWMrWGrnamlcugrOUUUdCUwYDgiD6XKdBQ3bBWFI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bWAneCRsQbPRxEM/3jr1/Lov6NV67MRycOgrlj3bKF8=";
|
||||
vendorHash = "sha256-VeH7EDMNrdJSWHioz2O29NiGtC59IdWYww3WoABO4LY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bubblewrap";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "bubblewrap";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dfr6MiBdCHVscrS6XE0pT67q18NxrtqJliVbbQDFl5g=";
|
||||
hash = "sha256-HYJoX7DnAwHCgxCzTYGJlc4RodbVP6hutK065AmGSl0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "papeer";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lapwat";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nEt2rxI9slrEkbpMpXQM6+jO0QWQsuLdOswXPCSozJs=";
|
||||
hash = "sha256-wUlvv7kXDr33tJuaMm+V68qQZMWEHyXPBkwRKQhqthY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3QRSdkx9p0H+zPB//bpWCBKKjKjrx0lHMk5lFm+U7pA=";
|
||||
|
||||
@ -23689,8 +23689,6 @@ with pkgs;
|
||||
};
|
||||
csfml = callPackage ../development/libraries/csfml { };
|
||||
|
||||
shapelib = callPackage ../development/libraries/shapelib { };
|
||||
|
||||
sharness = callPackage ../development/libraries/sharness { };
|
||||
|
||||
shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { };
|
||||
@ -27112,7 +27110,11 @@ with pkgs;
|
||||
prototool = callPackage ../development/tools/prototool { };
|
||||
|
||||
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
|
||||
qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; });
|
||||
qemu_full = lowPrio (qemu.override {
|
||||
smbdSupport = lib.meta.availableOn stdenv.hostPlatform samba;
|
||||
cephSupport = lib.meta.availableOn stdenv.hostPlatform ceph;
|
||||
glusterfsSupport = lib.meta.availableOn stdenv.hostPlatform glusterfs && lib.meta.availableOn stdenv.hostPlatform libuuid;
|
||||
});
|
||||
|
||||
# See `xenPackages` source for explanations.
|
||||
# Building with `xen` instead of `xen-slim` is possible, but makes no sense.
|
||||
|
||||
@ -14228,6 +14228,8 @@ self: super: with self; {
|
||||
|
||||
sendgrid = callPackage ../development/python-modules/sendgrid { };
|
||||
|
||||
senf = callPackage ../development/python-modules/senf { };
|
||||
|
||||
sense-energy = callPackage ../development/python-modules/sense-energy { };
|
||||
|
||||
sensirion-ble = callPackage ../development/python-modules/sensirion-ble { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user