mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-15 09:23:37 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
fe0f06b2f5
@ -12,7 +12,7 @@ let
|
||||
cfg = config.programs.bash;
|
||||
|
||||
bashAliases = concatStringsSep "\n" (
|
||||
mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
|
||||
mapAttrsFlatten (k: v: "alias -- ${k}=${escapeShellArg v}")
|
||||
(filterAttrs (k: v: v != null) cfg.shellAliases)
|
||||
);
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
opt = options.programs.zsh;
|
||||
|
||||
zshAliases = concatStringsSep "\n" (
|
||||
mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
|
||||
mapAttrsFlatten (k: v: "alias -- ${k}=${escapeShellArg v}")
|
||||
(filterAttrs (k: v: v != null) cfg.shellAliases)
|
||||
);
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "5.1.1";
|
||||
version = "5.1.3";
|
||||
kde-channel = "stable";
|
||||
sha256 = "sha256-Tdv4l6+nsYcTFpfRKiO6OYlGOAaLLq4Ss7Q0/kKtjiQ=";
|
||||
sha256 = "sha256-69+P0wMIciGxuc6tmWG1OospmvvwcZl6zHNQygEngo0=";
|
||||
})
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2
|
||||
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols2
|
||||
, qtsvg, qttools, qtquick1, qtcharts
|
||||
, qmake
|
||||
}:
|
||||
|
||||
let
|
||||
breakpad_lss = fetchFromGitiles {
|
||||
url = "https://chromium.googlesource.com/linux-syscall-support";
|
||||
rev = "08056836f2b4a5747daff75435d10d649bed22f6";
|
||||
sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "redis-desktop-manager";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uglide";
|
||||
repo = "RedisDesktopManager";
|
||||
fetchSubmodules = true;
|
||||
rev = version;
|
||||
sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
buildInputs = [
|
||||
libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
|
||||
qtquick1 qtquickcontrols2 qtsvg qttools qtcharts
|
||||
];
|
||||
|
||||
dontUseQmakeConfigure = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ];
|
||||
|
||||
# Disable annoying update reminder
|
||||
postPatch = ''
|
||||
sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
srcdir=$PWD
|
||||
|
||||
cat <<EOF > src/version.h
|
||||
#ifndef RDM_VERSION
|
||||
#define RDM_VERSION "${version}-120"
|
||||
#endif // !RDM_VERSION
|
||||
EOF
|
||||
|
||||
cd $srcdir/3rdparty/gbreakpad
|
||||
cp -r ${breakpad_lss} src/third_party/lss
|
||||
chmod +w -R src/third_party/lss
|
||||
touch README
|
||||
|
||||
cd $srcdir/3rdparty/crashreporter
|
||||
qmake CONFIG+=release DESTDIR="$srcdir/rdm/bin/linux/release" QMAKE_LFLAGS_RPATH=""
|
||||
make
|
||||
|
||||
cd $srcdir/3rdparty/gbreakpad
|
||||
./configure
|
||||
make
|
||||
|
||||
cd $srcdir/src
|
||||
qmake
|
||||
make
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
instdir="$srcdir/bin/linux/release"
|
||||
cp $instdir/rdm $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "Cross-platform open source Redis DB management tool";
|
||||
homepage = "https://redisdesktop.com/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
};
|
||||
}
|
||||
103
pkgs/applications/misc/resp-app/default.nix
Normal file
103
pkgs/applications/misc/resp-app/default.nix
Normal file
@ -0,0 +1,103 @@
|
||||
{ stdenv
|
||||
, mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, brotli
|
||||
, lz4
|
||||
, pyotherside
|
||||
, python3
|
||||
, python3Packages
|
||||
, qtbase
|
||||
, qtcharts
|
||||
, qmake
|
||||
, qttools
|
||||
, rdbtools
|
||||
, snappy
|
||||
, wrapQtAppsHook
|
||||
, zstd
|
||||
}:
|
||||
|
||||
let
|
||||
rdbtools-patched = rdbtools.overridePythonAttrs (oldAttrs: {
|
||||
# Add required additional flag for resp-app
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "Add-flag-to-parse-only-key-names.patch";
|
||||
url = "https://github.com/uglide/redis-rdb-tools/commit/b74946e6fbca589947ef0186429d5ce45a074b87.patch";
|
||||
hash = "sha256-1gjqB/IDSsAbrwzWSezlAW/2SYr6BFm1QJ2HAHK2fFs=";
|
||||
})
|
||||
];
|
||||
});
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "RESP.app";
|
||||
version = "2022.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedisInsight";
|
||||
repo = "RedisDesktopManager";
|
||||
fetchSubmodules = true;
|
||||
rev = version;
|
||||
sha256 = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.wrapPython
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
brotli
|
||||
lz4
|
||||
pyotherside
|
||||
python3
|
||||
qtbase
|
||||
qtcharts
|
||||
qttools
|
||||
snappy
|
||||
zstd
|
||||
] ++ pythonPath;
|
||||
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
bitstring
|
||||
cbor
|
||||
msgpack
|
||||
phpserialize
|
||||
rdbtools-patched
|
||||
python-lzf
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/resp.pro \
|
||||
--replace 'which ccache' "false" \
|
||||
--replace 'target.files = $$DESTDIR/resp' "${placeholder "src"}/bin/linux/release/resp" \
|
||||
--replace '/opt/resp_app' "${placeholder "out"}" \
|
||||
--replace 'target.path = $$LINUX_INSTALL_PATH' 'target.path = $$LINUX_INSTALL_PATH/bin' \
|
||||
--replace '/usr/' "$out/"
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
"SYSTEM_LZ4=1"
|
||||
"SYSTEM_ZSTD=1"
|
||||
"SYSTEM_SNAPPY=1"
|
||||
"SYSTEM_BROTLI=1"
|
||||
"VERSION=${version}"
|
||||
"src/resp.pro"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
buildPythonPath "$pythonPath"
|
||||
qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform Developer GUI for Redis";
|
||||
homepage = "https://resp.app/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "106.0.3-1",
|
||||
"packageVersion": "107.0-1",
|
||||
"source": {
|
||||
"rev": "106.0.3-1",
|
||||
"sha256": "0f0nz7fbp9k1pz7i8lh3fq3218crwqw2fdy9ia9hi9nlnybh114f"
|
||||
"rev": "107.0-1",
|
||||
"sha256": "1fm4z3s0z9shxj8667pnz3gly7jv1kmm1arbn52hq7n52ywykrv7"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "106.0.3",
|
||||
"sha512": "226bde9082330abe134d1726cec59b473d4d6839ea55ca20faddb901f032d89eb9d2bd5d887ccd4ba515c6b1a44817420cfee2e9f4f8a79ed46a38287083d28d"
|
||||
"version": "107.0",
|
||||
"sha512": "4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e"
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,23 +2,23 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubecolor";
|
||||
version = "0.0.20";
|
||||
version = "0.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hidetatz";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bKHEp9AxH1CcObhNzD3BkNOdyWZu7JrEdsXpo49wEcI=";
|
||||
sha256 = "sha256-d1gtbpeK9vp8bwhsMOPVKmohfyEZtQuvRB36VZCB3sY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-C1K7iEugA4HBLthcOI7EZ6H4YHW6el8X6FjVN1BeJR0=";
|
||||
vendorSha256 = "sha256-g5bLi0HQ7LQM+DKn5x8enXn8/9j3LFhgDjQ+YN0M7dM=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Colorizes kubectl output";
|
||||
homepage = "https://github.com/hidetatz/kubecolor";
|
||||
changelog = "https://github.com/hidetatz/kubecolor/releases/tag/v${version}";
|
||||
homepage = "https://github.com/kubecolor/kubecolor";
|
||||
changelog = "https://github.com/kubecolor/kubecolor/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 ];
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ clangStdenv, fetchFromGitHub, catch2, rang, fmt, libyamlcpp, cmake
|
||||
{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, libyamlcpp, cmake
|
||||
, eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }:
|
||||
|
||||
clangStdenv.mkDerivation rec {
|
||||
@ -12,6 +12,13 @@ clangStdenv.mkDerivation rec {
|
||||
sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "use_newer_cxxopts_which_builds_with_clang11.patch";
|
||||
url = "https://github.com/d-SEAMS/seams-core/commit/f6156057e43d0aa1a0df9de67d8859da9c30302d.patch";
|
||||
hash = "sha256-PLbT1lqdw+69lIHH96MPcGRjfIeZyb88vc875QLYyqw=";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ];
|
||||
buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ];
|
||||
|
||||
|
||||
@ -14,15 +14,13 @@
|
||||
, libGLU
|
||||
, mpfr
|
||||
, proj
|
||||
# build with Python 3.10 fails, because boost <= 1.78 can't find
|
||||
# pythons with double digits in minor versions, like X.YZ
|
||||
, python39
|
||||
, python3
|
||||
, qtxmlpatterns
|
||||
, qwt
|
||||
}:
|
||||
|
||||
let
|
||||
python = python39.withPackages (ps: with ps; [
|
||||
python = python3.withPackages (ps: with ps; [
|
||||
numpy
|
||||
]);
|
||||
boost' = boost.override {
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
|
||||
, vulkanSupport ? stdenv.isLinux
|
||||
, libplacebo
|
||||
, shaderc
|
||||
, shaderc # instead of spirv-cross
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
|
||||
@ -55,11 +55,13 @@
|
||||
, cacaSupport ? true, libcaca
|
||||
, cmsSupport ? true, lcms2
|
||||
, dvdnavSupport ? stdenv.isLinux, libdvdnav
|
||||
, dvbinSupport ? stdenv.isLinux
|
||||
, jackaudioSupport ? false, libjack2
|
||||
, javascriptSupport ? true, mujs
|
||||
, libpngSupport ? true, libpng
|
||||
, openalSupport ? true, openalSoft
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
|
||||
, pipewireSupport ? stdenv.isLinux, pipewire
|
||||
, rubberbandSupport ? true, rubberband
|
||||
, screenSaverSupport ? true, libXScrnSaver
|
||||
, sdl2Support ? true, SDL2
|
||||
@ -75,14 +77,12 @@
|
||||
, zimgSupport ? true, zimg
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mpv";
|
||||
version = "0.34.1";
|
||||
version = "0.35.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
@ -90,11 +90,11 @@ in stdenv.mkDerivation rec {
|
||||
owner = "mpv-player";
|
||||
repo = "mpv";
|
||||
rev = "v${version}";
|
||||
sha256 = "12qxwm1ww5vhjddl8yvj1xa0n1fi9z3lmzwhaiday2v59ca0qgsk";
|
||||
sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./TOOLS/
|
||||
patchShebangs version.* ./TOOLS/
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "
|
||||
@ -119,13 +119,13 @@ in stdenv.mkDerivation rec {
|
||||
(lib.enableFeature sixelSupport "sixel")
|
||||
(lib.enableFeature vaapiSupport "vaapi")
|
||||
(lib.enableFeature waylandSupport "wayland")
|
||||
(lib.enableFeature stdenv.isLinux "dvbin")
|
||||
(lib.enableFeature dvbinSupport "dvbin")
|
||||
] # Disable whilst Swift isn't supported
|
||||
++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb";
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
docutils
|
||||
docutils # for rst2man
|
||||
perl
|
||||
pkg-config
|
||||
python3
|
||||
@ -154,6 +154,7 @@ in stdenv.mkDerivation rec {
|
||||
++ lib.optionals javascriptSupport [ mujs ]
|
||||
++ lib.optionals libpngSupport [ libpng ]
|
||||
++ lib.optionals openalSupport [ openalSoft ]
|
||||
++ lib.optionals pipewireSupport [ pipewire ]
|
||||
++ lib.optionals pulseSupport [ libpulseaudio ]
|
||||
++ lib.optionals rubberbandSupport [ rubberband ]
|
||||
++ lib.optionals screenSaverSupport [ libXScrnSaver ]
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.6.9";
|
||||
version = "1.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KvQdYQLzgt/MKPsA/mO5un6nE3/xcvVYwIveNn/uDnU=";
|
||||
sha256 = "sha256-kz2UuWzVK5lu/d6K0LHauu2yhBF6Hl83P/a/HCCSObc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -489,7 +489,8 @@ rec {
|
||||
let
|
||||
entries' =
|
||||
if (lib.isAttrs entries) then entries
|
||||
else if (lib.isList entries) then lib.listToAttrs (map (x: lib.nameValuePair x.name x.path) entries)
|
||||
# We do this foldl to have last-wins semantics in case of repeated entries
|
||||
else if (lib.isList entries) then lib.foldl (a: b: a // { "${b.name}" = b.path; }) { } entries
|
||||
else throw "linkFarm entries must be either attrs or a list!";
|
||||
|
||||
linkCommands = lib.mapAttrsToList (name: path: ''
|
||||
|
||||
45
pkgs/build-support/trivial-builders/test/link-farm.nix
Normal file
45
pkgs/build-support/trivial-builders/test/link-farm.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ linkFarm, hello, writeTextFile, runCommand }:
|
||||
let
|
||||
foo = writeTextFile {
|
||||
name = "foo";
|
||||
text = "foo";
|
||||
};
|
||||
|
||||
linkFarmFromList = linkFarm "linkFarmFromList" [
|
||||
{ name = "foo"; path = foo; }
|
||||
{ name = "hello"; path = hello; }
|
||||
];
|
||||
|
||||
linkFarmWithRepeats = linkFarm "linkFarmWithRepeats" [
|
||||
{ name = "foo"; path = foo; }
|
||||
{ name = "hello"; path = hello; }
|
||||
{ name = "foo"; path = hello; }
|
||||
];
|
||||
|
||||
linkFarmFromAttrs = linkFarm "linkFarmFromAttrs" {
|
||||
inherit foo hello;
|
||||
};
|
||||
in
|
||||
runCommand "test-linkFarm" { } ''
|
||||
function assertPathEquals() {
|
||||
local a b;
|
||||
a="$(realpath "$1")"
|
||||
b="$(realpath "$2")"
|
||||
if [ "$a" != "$b" ]; then
|
||||
echo "path mismatch!"
|
||||
echo "a: $1 -> $a"
|
||||
echo "b: $2 -> $b"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
assertPathEquals "${linkFarmFromList}/foo" "${foo}"
|
||||
assertPathEquals "${linkFarmFromList}/hello" "${hello}"
|
||||
|
||||
assertPathEquals "${linkFarmWithRepeats}/foo" "${hello}"
|
||||
assertPathEquals "${linkFarmWithRepeats}/hello" "${hello}"
|
||||
|
||||
assertPathEquals "${linkFarmFromAttrs}/foo" "${foo}"
|
||||
assertPathEquals "${linkFarmFromAttrs}/hello" "${hello}"
|
||||
touch $out
|
||||
''
|
||||
@ -186,6 +186,10 @@
|
||||
"volume-scroller": [
|
||||
"volume_scroller@trflynn89.pm.me",
|
||||
"volume_scroller@noskoski"
|
||||
],
|
||||
"auto-activities": [
|
||||
"auto-activities@acedron.github.io",
|
||||
"auto-activities@CleoMenezesJr.github.io"
|
||||
]
|
||||
},
|
||||
"43": {
|
||||
|
||||
@ -34,6 +34,9 @@
|
||||
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
|
||||
"wireguard-indicator@atareao.es" = "wireguard-indicator";
|
||||
|
||||
"auto-activities@acedron.github.io" = "auto-activities-2";
|
||||
"auto-activities@CleoMenezesJr.github.io" = "auto-activities";
|
||||
|
||||
# ####### GNOME 41 #######
|
||||
|
||||
"floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -3,15 +3,15 @@
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jwasm";
|
||||
version = "2.15";
|
||||
version = "2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Baron-von-Riedesel";
|
||||
repo = "JWasm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ef4uEtEpnqYGhFmxuefJ40zyOuHsiPOLpH/52i7a7KI=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-X2qqS4ev0+PeA1Gcsi8nivKAGZv7jxThxmQL/Jf5oB0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
@ -32,12 +32,13 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://github.com/Baron-von-Riedesel/JWasm/";
|
||||
description = "A MASM-compatible x86 assembler";
|
||||
changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
# TODO: generalize for Windows builds
|
||||
|
||||
56
pkgs/development/libraries/brunsli/default.nix
Normal file
56
pkgs/development/libraries/brunsli/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, brotli
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brunsli";
|
||||
version = "0.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "brunsli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZcrRz2xSoRepgG8KZYY/JzgONerItW0e6mH1PYsko98=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# unvendor brotli
|
||||
(fetchpatch {
|
||||
url = "https://cgit.freebsd.org/ports/plain/graphics/brunsli/files/patch-CMakeLists.txt";
|
||||
extraPrefix = "";
|
||||
hash = "sha256-/WPOG9OcEDj9ObBSXEM8Luq4Rix+PS2MvsYyHhK5mns=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://cgit.freebsd.org/ports/plain/graphics/brunsli/files/patch-brunsli.cmake";
|
||||
extraPrefix = "";
|
||||
hash = "sha256-+HXA9Tin+l2St7rRUEBM0AfhAjSoFxz8UX7hsg12aFg=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -r third_party
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
rm -r build
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
brotli
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Lossless JPEG repacking library";
|
||||
homepage = "https://github.com/google/brunsli";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A D-Bus API for the dLeyna services";
|
||||
homepage = "https://github.com/phako/dleyna-connector-dbus";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Library of utility functions that are used by the higher level dLeyna";
|
||||
homepage = "https://github.com/phako/dleyna-core";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Library to discover and manipulate Digital Media Renderers";
|
||||
homepage = "https://github.com/phako/dleyna-renderer";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Library to discover, browse and manipulate Digital Media Servers";
|
||||
homepage = "https://github.com/phako/dleyna-server";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,84 +1,152 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
|
||||
, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng
|
||||
, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2
|
||||
, autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl, pkg-config }:
|
||||
|
||||
with lib;
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, bison
|
||||
, cmake
|
||||
, doxygen
|
||||
, graphviz
|
||||
, pkg-config
|
||||
, python3
|
||||
, swig
|
||||
, armadillo
|
||||
, arrow-cpp
|
||||
, c-blosc
|
||||
, brunsli
|
||||
, cfitsio
|
||||
, crunch
|
||||
, curl
|
||||
, cryptopp
|
||||
, libdeflate
|
||||
, expat
|
||||
, libgeotiff
|
||||
, geos
|
||||
, giflib
|
||||
, libheif
|
||||
, dav1d
|
||||
, libaom
|
||||
, libde265
|
||||
, rav1e
|
||||
, x265
|
||||
, hdf4
|
||||
, hdf5-cpp
|
||||
, libiconv
|
||||
, libjpeg
|
||||
, json_c
|
||||
, libjxl
|
||||
, libhwy
|
||||
, lerc
|
||||
, xz
|
||||
, libxml2
|
||||
, lz4
|
||||
, libmysqlclient
|
||||
, netcdf
|
||||
, openexr
|
||||
, openjpeg
|
||||
, openssl
|
||||
, pcre2
|
||||
, libpng
|
||||
, poppler
|
||||
, postgresql
|
||||
, proj
|
||||
, qhull
|
||||
, libspatialite
|
||||
, sqlite
|
||||
, libtiff
|
||||
, tiledb
|
||||
, libwebp
|
||||
, xercesc
|
||||
, zlib
|
||||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
version = "3.4.2";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bE55VV0SrG8nxCLdpODRalnuAkn+olRdMLUjduavj6M=";
|
||||
sha256 = "sha256-jtAFI1J64ZaTqIljqQL1xOiTGC79AZWcIgidozWczMM=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/gdal";
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
doxygen
|
||||
graphviz
|
||||
pkg-config
|
||||
python3.pkgs.setuptools
|
||||
python3.pkgs.wrapPython
|
||||
swig
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config unzip ];
|
||||
cmakeFlags = [
|
||||
"-DGDAL_USE_INTERNAL_LIBS=OFF"
|
||||
"-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include"
|
||||
"-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
"-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql"
|
||||
"-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/mysql/libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
libtiff
|
||||
libpng
|
||||
proj
|
||||
openssl
|
||||
sqlite
|
||||
libspatialite
|
||||
libgeotiff
|
||||
poppler
|
||||
hdf4
|
||||
qhull
|
||||
giflib
|
||||
armadillo
|
||||
c-blosc
|
||||
brunsli
|
||||
cfitsio
|
||||
crunch
|
||||
curl
|
||||
cryptopp
|
||||
libdeflate
|
||||
expat
|
||||
libgeotiff
|
||||
geos
|
||||
giflib
|
||||
libheif
|
||||
dav1d # required by libheif
|
||||
libaom # required by libheif
|
||||
libde265 # required by libheif
|
||||
rav1e # required by libheif
|
||||
x265 # required by libheif
|
||||
hdf4
|
||||
hdf5-cpp
|
||||
libjpeg
|
||||
json_c
|
||||
libjxl
|
||||
libhwy # required by libjxl
|
||||
lerc
|
||||
xz
|
||||
libxml2
|
||||
lz4
|
||||
libmysqlclient
|
||||
netcdf
|
||||
openjpeg
|
||||
openssl
|
||||
pcre2
|
||||
libpng
|
||||
poppler
|
||||
postgresql
|
||||
] ++ (with pythonPackages; [ python setuptools numpy wrapPython ])
|
||||
++ lib.optional stdenv.isDarwin libiconv
|
||||
++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-expat=${expat.dev}"
|
||||
"--with-jpeg=${libjpeg.dev}"
|
||||
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
|
||||
"--with-png=${libpng.dev}" # optional
|
||||
"--with-poppler=${poppler.dev}" # optional
|
||||
"--with-libz=${zlib.dev}" # optional
|
||||
"--with-pg=yes" # since gdal 3.0 doesn't use ${postgresql}/bin/pg_config
|
||||
"--with-mysql=${getDev libmysqlclient}/bin/mysql_config"
|
||||
"--with-geotiff=${libgeotiff}"
|
||||
"--with-sqlite3=${sqlite.dev}"
|
||||
"--with-spatialite=${libspatialite.dev}"
|
||||
"--with-python" # optional
|
||||
"--with-proj=${proj.dev}" # optional
|
||||
"--with-geos=${geos}/bin/geos-config" # optional
|
||||
"--with-hdf4=${hdf4.dev}" # optional
|
||||
"--with-xml2=yes" # optional
|
||||
(if netcdfSupport then "--with-netcdf=${netcdf}" else "")
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
CXXFLAGS = lib.concatStringsSep " " [
|
||||
"-fpermissive"
|
||||
# poppler uses std::optional
|
||||
"-std=c++17"
|
||||
];
|
||||
|
||||
# - Unset CC and CXX as they confuse libtool.
|
||||
# - teach gdal that libdf is the legacy name for libhdf
|
||||
preConfigure = ''
|
||||
substituteInPlace configure \
|
||||
--replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace swig/python/GNUmakefile \
|
||||
--replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)"
|
||||
'';
|
||||
proj
|
||||
qhull
|
||||
libspatialite
|
||||
sqlite
|
||||
libtiff
|
||||
tiledb
|
||||
libwebp
|
||||
zlib
|
||||
zstd
|
||||
python3
|
||||
python3.pkgs.numpy
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
# tests for formats enabled by these packages fail on macos
|
||||
arrow-cpp
|
||||
openexr
|
||||
xercesc
|
||||
] ++ lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
postInstall = ''
|
||||
wrapPythonPrograms
|
||||
@ -91,13 +159,11 @@ stdenv.mkDerivation rec {
|
||||
# calls (coming from the python world)
|
||||
preCheck = ''
|
||||
pushd ../autotest
|
||||
# something has made files here read-only by this point
|
||||
chmod -R u+w .
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
export PYTHONPATH="$out/${pythonPackages.python.sitePackages}:$PYTHONPATH"
|
||||
export PYTHONPATH="$out/${python3.sitePackages}:$PYTHONPATH"
|
||||
'';
|
||||
installCheckInputs = with pythonPackages; [
|
||||
installCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
pytest-env
|
||||
lxml
|
||||
@ -115,12 +181,16 @@ stdenv.mkDerivation rec {
|
||||
# https://github.com/OSGeo/gdal/issues/5523
|
||||
"test_transformer_dem_overrride_srs"
|
||||
"test_osr_ct_options_area_of_interest"
|
||||
# ZIP does not support timestamps before 1980
|
||||
" test_sentinel2_zipped"
|
||||
] ++ lib.optionals (!stdenv.isx86_64) [
|
||||
# likely precision-related expecting x87 behaviour
|
||||
"test_jp2openjpeg_22"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# flaky on macos
|
||||
"test_rda_download_queue"
|
||||
] ++ lib.optionals (lib.versionOlder proj.version "8") [
|
||||
"test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members"
|
||||
];
|
||||
postCheck = ''
|
||||
popd # ../autotest
|
||||
@ -129,8 +199,9 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Translator library for raster geospatial data formats";
|
||||
homepage = "https://www.gdal.org/";
|
||||
changelog = "https://docs.unidata.ucar.edu/netcdf-c/${src.rev}/RELEASE_NOTES.html";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = with lib.maintainers; [ marcweber dotlambda ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A GObject to SQLite object mapper";
|
||||
homepage = "https://wiki.gnome.org/Projects/Gom";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -94,6 +94,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A collection of plugins for the Grilo framework";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, mesonEmulatorHook
|
||||
, ninja
|
||||
@ -34,6 +35,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "81Ks9zZlZpk0JwY2/t5mtS2mgB/iD2OMQEirJnhXey0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/b0d75be00b06cb0163dabbedecf9122a55273349.patch";
|
||||
sha256 = "sha256-Hwnc3TLN6n3w/MAFcprHv7nbTcwRfI0cmfDriNLnAvQ=";
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable-gtk-doc=true"
|
||||
];
|
||||
@ -73,6 +81,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -50,7 +50,8 @@ stdenv.mkDerivation rec {
|
||||
"-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
|
||||
# Move developer documentation to devdoc output.
|
||||
@ -73,7 +74,6 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "GObject-based API for handling resource discovery and announcement over SSDP";
|
||||
homepage = "http://www.gupnp.org/";
|
||||
license = licenses.lgpl2Plus;
|
||||
|
||||
@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://gupnp.org/";
|
||||
description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://wiki.gnome.org/Projects/GUPnP/";
|
||||
description = "Library to ease DLNA-related bits for applications using GUPnP";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Library to handle UPnP IGD port mapping";
|
||||
homepage = "http://www.gupnp.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -67,7 +67,8 @@ stdenv.mkDerivation rec {
|
||||
"-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Bail out! ERROR:../tests/test-bugs.c:168:test_on_timeout: code should not be reached
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
@ -80,6 +81,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.gupnp.org/";
|
||||
description = "An implementation of the UPnP specification";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
|
||||
# then stops downstream builds (mariadb in particular) from detecting it. This
|
||||
# option should remove the prefix and give us a working jemalloc.
|
||||
@ -19,6 +20,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-LbgtHnEZ3z5xt2QCGbbf6EeJvAU3mDw7esT3GJrs/qo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix tests under --with-jemalloc-prefix=, see https://github.com/jemalloc/jemalloc/pull/2340
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jemalloc/jemalloc/commit/d00ecee6a8dfa90afcb1bbc0858985c17bef6559.patch";
|
||||
hash = "sha256-N5i4IxGJ4SSAgFiq5oGRnrNeegdk2flw9Sh2mP0yl4c=";
|
||||
})
|
||||
];
|
||||
|
||||
# see the comment on stripPrefix
|
||||
configureFlags = []
|
||||
++ lib.optional stripPrefix "--with-jemalloc-prefix="
|
||||
|
||||
30
pkgs/development/libraries/lerc/default.nix
Normal file
30
pkgs/development/libraries/lerc/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lerc";
|
||||
version = "3.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esri";
|
||||
repo = "lerc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QO5+ouQy5nOcAgvxMeBDoSBP+G3ClDjXipnkuSIDcP0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "C++ library for Limited Error Raster Compression";
|
||||
homepage = "https://github.com/esri/lerc";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -1,14 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libtiff, libjpeg, proj, zlib, autoreconfHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, libjpeg
|
||||
, libtiff
|
||||
, proj
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.1";
|
||||
version = "1.7.1";
|
||||
pname = "libgeotiff";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "libgeotiff";
|
||||
rev = version;
|
||||
sha256 = "081ag23pn2n5y4fkb2rnh4hmcnq92siqiqv0s20jmx0j3s2nvfxy";
|
||||
hash = "sha256-bE6UAUKiorriTgYrqhxbMAN2NEtmV/8IIfF02RUghSI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
@ -20,15 +29,19 @@ stdenv.mkDerivation rec {
|
||||
"--with-zlib=${zlib.dev}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ libtiff proj ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
#hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
|
||||
homepage = "https://github.com/OSGeo/libgeotiff";
|
||||
changelog = "https://github.com/OSGeo/libgeotiff/blob/${src.rev}/libgeotiff/NEWS";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [lib.maintainers.marcweber];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
|
||||
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Library tasked with managing, extracting and handling media art caches";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
14
pkgs/development/libraries/mapnik/catch2-src.patch
Normal file
14
pkgs/development/libraries/mapnik/catch2-src.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 0705ddce1..771291b88 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -7,8 +7,7 @@ include(FetchContent)
|
||||
|
||||
FetchContent_Declare(
|
||||
Catch2
|
||||
- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
||||
- GIT_TAG v2.13.7)
|
||||
+ SOURCE_DIR @catch2_src@)
|
||||
FetchContent_MakeAvailable(Catch2)
|
||||
|
||||
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0")
|
||||
26
pkgs/development/libraries/mapnik/cmake-harfbuzz.patch
Normal file
26
pkgs/development/libraries/mapnik/cmake-harfbuzz.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d87a7052d..837867551 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -153,19 +153,8 @@ endif()
|
||||
|
||||
mapnik_find_package(Freetype REQUIRED)
|
||||
|
||||
-# try to find harfbuzz with the native configuration and fallback to our "own" FindHarfBuzz
|
||||
-mapnik_find_package(harfbuzz CONFIG QUIET)
|
||||
-if(harfbuzz_FOUND)
|
||||
- message(STATUS "Found harfbuzz native cmake")
|
||||
- list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz)
|
||||
-else()
|
||||
- # Use pkg-config when harfbuzz is not found.
|
||||
- # It might be possible that in future version harfbuzz could only be found via pkg-config.
|
||||
- # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653
|
||||
- message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...")
|
||||
- pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION})
|
||||
- list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
|
||||
-endif()
|
||||
+pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz)
|
||||
+list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
|
||||
|
||||
if(USE_EXTERNAL_MAPBOX_GEOMETRY)
|
||||
# this is used to provide a way to specify include dirs with CACHE VARIABLES
|
||||
@ -1,111 +1,110 @@
|
||||
{ lib, stdenv, fetchzip
|
||||
, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
|
||||
, libwebp, libxml2, proj, python3, python ? python3, sqlite, zlib
|
||||
, sconsPackages
|
||||
|
||||
# supply a postgresql package to enable the PostGIS input plugin
|
||||
, postgresql ? null
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildPackages
|
||||
, cmake
|
||||
, pkg-config
|
||||
, substituteAll
|
||||
, boost
|
||||
, cairo
|
||||
, freetype
|
||||
, gdal
|
||||
, harfbuzz
|
||||
, icu
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, libwebp
|
||||
, libxml2
|
||||
, proj
|
||||
, python3
|
||||
, sqlite
|
||||
, zlib
|
||||
, catch2
|
||||
, postgresql
|
||||
}:
|
||||
|
||||
let
|
||||
scons = sconsPackages.scons_3_0_1;
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mapnik";
|
||||
version = "3.1.0";
|
||||
version = "unstable-2022-10-18";
|
||||
|
||||
src = fetchzip {
|
||||
# this one contains all git submodules and is cheaper than fetchgit
|
||||
url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
|
||||
sha256 = "sha256-qqPqN4vs3ZsqKgnx21yQhX8OzHca/0O+3mvQ/vnC5EY=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapnik";
|
||||
repo = "mapnik";
|
||||
rev = "05661e54392bcbb3367747f97a3ef6e468c105ba";
|
||||
hash = "sha256-96AneLPH1gbh/u880Pdc9OdFq2MniSdaTJoKYqId7sw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure \
|
||||
--replace '$PYTHON scons/scons.py' ${scons}/bin/scons
|
||||
--replace '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons
|
||||
rm -r scons
|
||||
'';
|
||||
|
||||
# a distinct dev output makes python-mapnik fail
|
||||
outputs = [ "out" ];
|
||||
|
||||
nativeBuildInputs = [ scons ];
|
||||
patches = [
|
||||
# The lib/cmake/harfbuzz/harfbuzz-config.cmake file in harfbuzz.dev is faulty,
|
||||
# as it provides the wrong libdir. The workaround is to just rely on
|
||||
# pkg-config to locate harfbuzz shared object files.
|
||||
# Upstream HarfBuzz wants to drop CMake support anyway.
|
||||
# See discussion: https://github.com/mapnik/mapnik/issues/4265
|
||||
./cmake-harfbuzz.patch
|
||||
# prevent CMake from trying to get libraries on the Internet
|
||||
(substituteAll {
|
||||
src = ./catch2-src.patch;
|
||||
catch2_src = catch2.src;
|
||||
})
|
||||
./include.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
|
||||
libwebp proj python sqlite zlib
|
||||
|
||||
# optional inputs
|
||||
boost
|
||||
cairo
|
||||
freetype
|
||||
gdal
|
||||
harfbuzz
|
||||
icu
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
libwebp
|
||||
proj
|
||||
python3
|
||||
sqlite
|
||||
zlib
|
||||
libxml2
|
||||
postgresql
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ libxml2 ];
|
||||
cmakeFlags = [
|
||||
# Would require qt otherwise.
|
||||
"-DBUILD_DEMO_VIEWER=OFF"
|
||||
];
|
||||
|
||||
prefixKey = "PREFIX=";
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./configure
|
||||
# mapnik-config is currently not build with CMake. So we use the SCons for
|
||||
# this one. We can't add SCons to nativeBuildInputs though, as stdenv would
|
||||
# then try to build everything with scons.
|
||||
preBuild = ''
|
||||
cd ..
|
||||
${buildPackages.scons}/bin/scons utils/mapnik-config
|
||||
cd build
|
||||
'';
|
||||
|
||||
# NOTE: 2021-05-06:
|
||||
# Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 for backwards compatibility
|
||||
# with major versions 6 and 7 of proj which are otherwise not compatible
|
||||
# with mapnik 3.1.0. Note that:
|
||||
#
|
||||
# 1. Starting with proj version 8, this workaround will no longer be
|
||||
# supported by the upstream proj project.
|
||||
#
|
||||
# 2. Without the workaround, mapnik configures itself without proj support.
|
||||
#
|
||||
# 3. The master branch of mapnik (after 3.1.0) appears to add native support
|
||||
# for the proj 6 api, so this workaround is not likely to be needed in
|
||||
# subsequent mapnik releases. At that point, this block comment and the
|
||||
# NIX_CFLAGS_COMPILE expression can be removed.
|
||||
|
||||
NIX_CFLAGS_COMPILE =
|
||||
if version != "3.1.0" && lib.versionAtLeast version "3.1.0"
|
||||
then throw "The mapnik compatibility workaround for proj 6 may no longer be required. Remove workaround after checking."
|
||||
else if lib.versionAtLeast (lib.getVersion proj) "8"
|
||||
then throw ("mapnik currently requires a version of proj less than 8, but proj version is: " + (lib.getVersion proj))
|
||||
else "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
|
||||
|
||||
configureFlags = [
|
||||
"BOOST_INCLUDES=${boost.dev}/include"
|
||||
"BOOST_LIBS=${boost.out}/lib"
|
||||
"CAIRO_INCLUDES=${cairo.dev}/include"
|
||||
"CAIRO_LIBS=${cairo.out}/lib"
|
||||
"FREETYPE_INCLUDES=${freetype.dev}/include"
|
||||
"FREETYPE_LIBS=${freetype.out}/lib"
|
||||
"GDAL_CONFIG=${gdal}/bin/gdal-config"
|
||||
"HB_INCLUDES=${harfbuzz.dev}/include"
|
||||
"HB_LIBS=${harfbuzz.out}/lib"
|
||||
"ICU_INCLUDES=${icu.dev}/include"
|
||||
"ICU_LIBS=${icu.out}/lib"
|
||||
"JPEG_INCLUDES=${libjpeg.dev}/include"
|
||||
"JPEG_LIBS=${libjpeg.out}/lib"
|
||||
"PNG_INCLUDES=${libpng.dev}/include"
|
||||
"PNG_LIBS=${libpng.out}/lib"
|
||||
"PROJ_INCLUDES=${proj.dev}/include"
|
||||
"PROJ_LIBS=${proj.out}/lib"
|
||||
"SQLITE_INCLUDES=${sqlite.dev}/include"
|
||||
"SQLITE_LIBS=${sqlite.out}/lib"
|
||||
"TIFF_INCLUDES=${libtiff.dev}/include"
|
||||
"TIFF_LIBS=${libtiff.out}/lib"
|
||||
"WEBP_INCLUDES=${libwebp}/include"
|
||||
"WEBP_LIBS=${libwebp}/lib"
|
||||
"XMLPARSER=libxml2"
|
||||
];
|
||||
|
||||
buildFlags = [
|
||||
"JOBS=$(NIX_BUILD_CORES)"
|
||||
];
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
cp ../utils/mapnik-config/mapnik-config $out/bin/mapnik-config
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source toolkit for developing mapping applications";
|
||||
homepage = "https://mapnik.org";
|
||||
maintainers = with maintainers; [ hrdinka erictapen ];
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.all;
|
||||
# https://github.com/mapnik/mapnik/issues/4232
|
||||
broken = lib.versionAtLeast proj.version "8.0.0";
|
||||
};
|
||||
}
|
||||
|
||||
11
pkgs/development/libraries/mapnik/include.patch
Normal file
11
pkgs/development/libraries/mapnik/include.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff --git a/benchmark/src/test_png_encoding2.cpp b/benchmark/src/test_png_encoding2.cpp
|
||||
index 19897d180..5791b139c 100644
|
||||
--- a/benchmark/src/test_png_encoding2.cpp
|
||||
+++ b/benchmark/src/test_png_encoding2.cpp
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "bench_framework.hpp"
|
||||
#include "compare_images.hpp"
|
||||
+#include <memory>
|
||||
|
||||
class test : public benchmark::test_case
|
||||
{
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, buildPackages
|
||||
@ -9,31 +10,28 @@
|
||||
, curl
|
||||
, gtest
|
||||
, nlohmann_json
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proj";
|
||||
version = "9.0.0";
|
||||
version = "9.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = version;
|
||||
sha256 = "sha256-zMP+WzC65BFz8g8mF5t7toqxmxCJePysd6WJuqpe8yg=";
|
||||
hash = "sha256-Upsp72RorV+5PFPHOK3zCJgVTRZ6fSVVFRope8Bp8/M=";
|
||||
};
|
||||
|
||||
# https://github.com/OSGeo/PROJ/issues/3206
|
||||
postPatch = ''
|
||||
# NB will not apply once https://github.com/OSGeo/PROJ/pull/3150 is released
|
||||
substituteInPlace cmake/ProjUtilities.cmake \
|
||||
--replace '$\{exec_prefix\}/$'{PROJ_LIB_SUBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
|
||||
--replace '$\{prefix\}/$'{PROJ_INCLUDE_SUBDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \
|
||||
--replace '$\{prefix\}/$'{CMAKE_INSTALL_DATAROOTDIR} '$'{CMAKE_INSTALL_FULL_DATAROOTDIR}
|
||||
substituteInPlace cmake/project-config.cmake.in \
|
||||
--replace '$'{_ROOT}/@INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \
|
||||
--replace '$'{_ROOT}/@LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
|
||||
--replace '$'{_ROOT}/@BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@
|
||||
'';
|
||||
patches = [
|
||||
# https://github.com/OSGeo/PROJ/pull/3252
|
||||
(fetchpatch {
|
||||
name = "only-add-find_dependencyCURL-for-static-builds.patch";
|
||||
url = "https://github.com/OSGeo/PROJ/commit/11f4597bbb7069bd5d4391597808703bd96df849.patch";
|
||||
hash = "sha256-4w5Cu2m5VJZr6E2dUVRyWJdED2TyS8cI8G20EwfQ4u0=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -62,6 +60,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
python = python3.pkgs.pyproj;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cartographic Projections Library";
|
||||
homepage = "https://proj.org/";
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopvapi";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "sander76";
|
||||
repo = "aio-powerview-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RBZuYgTySVL1YtyZ4ZJZly2zvWt/5pZ99/aPCwZ91xQ=";
|
||||
hash = "sha256-cghfNi5T343/7GxNLDrE0iAewMlRMycQTP7SvDVpU2M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, sqlite
|
||||
@ -9,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apsw";
|
||||
version = "3.39.3.0";
|
||||
version = "3.39.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = isPyPy;
|
||||
@ -18,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "rogerbinns";
|
||||
repo = "apsw";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rUG6TXGdF+XaRTFn2luffYw+1EEChxtLgQx2Gn+7J6A=";
|
||||
hash = "sha256-vFPvevtAAEHG34G2ZPbETo/Erjem4G9r7xvkEoPBlLQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -16,23 +16,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "basemap";
|
||||
version = "1.3.4";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matplotlib";
|
||||
repo = "basemap";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-F/6xPmdXSJAuASyFaKOP+6Jz8U2JRZdqErEH7PFkr/w=";
|
||||
hash = "sha256-BSWifzh+Y1f+x89oNYMBvttWY9qZ0IM5QYqSgyVb1fE=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/packages/basemap";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "numpy >= 1.21, < 1.23" "numpy >= 1.21, < 1.24" \
|
||||
--replace "pyshp >= 1.2, < 2.2" "pyshp >= 1.2, < 2.4"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
geos
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, buildPythonPackage
|
||||
, dill
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fsspec
|
||||
, huggingface-hub
|
||||
, importlib-metadata
|
||||
@ -32,6 +33,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-5j8HT/DzHH8xssv97g/9kpSgtpaY6daWOGwjasD1psg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Backport support for dill<3.7
|
||||
url = "https://github.com/huggingface/datasets/pull/5166.patch";
|
||||
hash = "sha256-QigpXKHi2B60M/iIWSqvBU9hW5vBu6IHGML22aCMevo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "responses<0.19" "responses"
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, attrs, click, cligj, click-plugins, six, munch, enum34
|
||||
, pytestCheckHook, boto3, mock, giflib, pytz
|
||||
, gdal, certifi
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -14,6 +15,14 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-qCqZzps+eCV0AVfEXJ+yJZ1OkvCohqqsJfDbQP/h7qM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Toblerity/Fiona/pull/1122
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Toblerity/Fiona/commit/fa632130dcd9dfbb982ecaa4911b3fab3459168f.patch";
|
||||
hash = "sha256-IuNHr3yBqS1jY9Swvcq8XPv6BpVlInDx0FVuzEMaYTY=";
|
||||
})
|
||||
];
|
||||
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libsass";
|
||||
version = "0.21.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "libsass-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-4doz3kkRlyfVfeUarYw2tcybeDVeE2jpgmHxFJsPiVc=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-5O4Er3jNUFy83m/K0HzYR+fHcSDqF/3M+fXaFZY8zEg=";
|
||||
};
|
||||
|
||||
buildInputs = [ libsass ];
|
||||
|
||||
@ -2,31 +2,36 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, poetry
|
||||
, rich
|
||||
, typer
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
pname = "pipenv-poetry-migrate";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhino";
|
||||
repo = "pipenv-poetry-migrate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2/e6uGwpUvzxXlz+51gUriE054bgNeJNyLDCIyiGflM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aP8bzWFUzAZrEsz8pYL2y5c7GaUjWG5GA+cc4/tGPZk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
poetry
|
||||
rich
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
poetry
|
||||
typer
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml --replace 'rich = "^9.6.1"' 'rich = ">9"'
|
||||
substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"'
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
diff --git a/pyproj/datadir.py b/pyproj/datadir.py
|
||||
index 9ca1d25..4198490 100644
|
||||
index df625fee..a2beb06c 100644
|
||||
--- a/pyproj/datadir.py
|
||||
+++ b/pyproj/datadir.py
|
||||
@@ -70,7 +70,7 @@ def get_data_dir() -> str:
|
||||
@ -8,23 +8,23 @@ index 9ca1d25..4198490 100644
|
||||
return _VALIDATED_PROJ_DATA
|
||||
- internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
|
||||
+ internal_datadir = Path("@proj@/share/proj")
|
||||
proj_lib_dirs = os.environ.get("PROJ_LIB", "")
|
||||
proj_lib_dirs = os.environ.get("PROJ_DATA", os.environ.get("PROJ_LIB", ""))
|
||||
prefix_datadir = Path(sys.prefix, "share", "proj")
|
||||
|
||||
conda_windows_prefix_datadir = Path(sys.prefix, "Library", "share", "proj")
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 6bb0c6c..b3d0321 100644
|
||||
index 71fb52cd..7984a68a 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -12,7 +12,7 @@ from setuptools import Extension, setup
|
||||
PROJ_MIN_VERSION = parse_version("7.2.0")
|
||||
@@ -13,7 +13,7 @@ from setuptools import Extension, setup
|
||||
PROJ_MIN_VERSION = parse_version("8.2.0")
|
||||
CURRENT_FILE_PATH = Path(__file__).absolute().parent
|
||||
BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
|
||||
-INTERNAL_PROJ_DIR = CURRENT_FILE_PATH / "pyproj" / BASE_INTERNAL_PROJ_DIR
|
||||
+INTERNAL_PROJ_DIR = Path("@proj@")
|
||||
PROJ_VERSION_SEARCH = re.compile(r".*Rel\.\s+(?P<version>\d+\.\d+\.\d+).*")
|
||||
|
||||
|
||||
def get_proj_version(proj_dir: Path) -> str:
|
||||
@@ -155,7 +155,7 @@ def get_extension_modules():
|
||||
@@ -163,7 +163,7 @@ def get_extension_modules():
|
||||
# By default we'll try to get options PROJ_DIR or the local version of proj
|
||||
proj_dir = get_proj_dir()
|
||||
library_dirs = get_proj_libdirs(proj_dir)
|
||||
@ -34,7 +34,7 @@ index 6bb0c6c..b3d0321 100644
|
||||
proj_version = get_proj_version(proj_dir)
|
||||
check_proj_version(proj_version)
|
||||
diff --git a/test/test_cli.py b/test/test_cli.py
|
||||
index 7a696de..1b9b777 100644
|
||||
index 7a696de7..1b9b777b 100644
|
||||
--- a/test/test_cli.py
|
||||
+++ b/test/test_cli.py
|
||||
@@ -14,7 +14,7 @@ from pyproj.sync import _load_grid_geojson
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyproj";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyproj4";
|
||||
repo = "pyproj";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QmpwnOnMjV29Tq+M6FCotDytq6zlhsp0Zgzw3V7nhNQ=";
|
||||
hash = "sha256-EXPeDNGr6eAAsLXCkV9mmkNDO1KScjZYgmBPzt+A1OU=";
|
||||
};
|
||||
|
||||
# force pyproj to use ${proj}
|
||||
@ -53,14 +53,13 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# We need to build extensions locally to run tests
|
||||
${python.interpreter} setup.py build_ext --inplace
|
||||
cd test
|
||||
# import from $out
|
||||
rm -r pyproj
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
"test_doctest_wrapper.py"
|
||||
"test_datadir.py"
|
||||
"test/test_doctest_wrapper.py"
|
||||
"test/test_datadir.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@ -86,9 +85,10 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python interface to PROJ.4 library";
|
||||
description = "Python interface to PROJ library";
|
||||
homepage = "https://github.com/pyproj4/pyproj";
|
||||
license = with lib.licenses; [ isc ];
|
||||
maintainers = with lib.maintainers; [ lsix ];
|
||||
changelog = "https://github.com/pyproj4/pyproj/blob/${src.rev}/docs/history.rst";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lsix dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, isPyPy
|
||||
, python
|
||||
, pillow
|
||||
@ -17,37 +19,45 @@
|
||||
, mapnik
|
||||
, proj
|
||||
, zlib
|
||||
, libxml2
|
||||
, sqlite
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-mapnik";
|
||||
version = "unstable-2020-02-24";
|
||||
version = "unstable-2020-09-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapnik";
|
||||
repo = "python-mapnik";
|
||||
rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b";
|
||||
sha256 = "0snn7q7w1ab90311q8wgd1z64kw1svm5w831q0xd6glqhah86qc8";
|
||||
rev = "a2c2a86eec954b42d7f00093da03807d0834b1b4";
|
||||
hash = "sha256-GwDdrutJOHtW7pIWiUAiu1xucmRvp7YFYB3YSCrDsrY=";
|
||||
# Only needed for test data
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
disabled = isPyPy;
|
||||
doCheck = false; # doesn't find needed test data files
|
||||
preBuild = ''
|
||||
export BOOST_PYTHON_LIB="boost_python${"${lib.versions.major python.version}${lib.versions.minor python.version}"}"
|
||||
export BOOST_THREAD_LIB="boost_thread"
|
||||
export BOOST_SYSTEM_LIB="boost_system"
|
||||
export PYCAIRO=true
|
||||
'';
|
||||
patches = [
|
||||
# https://github.com/mapnik/python-mapnik/issues/239
|
||||
(fetchpatch {
|
||||
url = "https://github.com/koordinates/python-mapnik/commit/318b1edac16f48a7f21902c192c1dd86f6210a44.patch";
|
||||
sha256 = "sha256-cfU8ZqPPGCqoHEyGvJ8Xy/bGpbN2vSDct6A3N5+I8xM=";
|
||||
})
|
||||
./find-pycairo-with-pkg-config.patch
|
||||
# python-mapnik seems to depend on having the mapnik src directory
|
||||
# structure available at build time. We just hardcode the paths.
|
||||
(substituteAll {
|
||||
src = ./find-libmapnik.patch;
|
||||
libmapnik = "${mapnik}/lib";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
mapnik # for mapnik_config
|
||||
pkg-config
|
||||
];
|
||||
|
||||
patches = [
|
||||
./find-pycairo-with-pkg-config.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
mapnik
|
||||
boost
|
||||
@ -60,16 +70,72 @@ buildPythonPackage rec {
|
||||
libwebp
|
||||
proj
|
||||
zlib
|
||||
libxml2
|
||||
sqlite
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pillow pycairo ];
|
||||
|
||||
configureFlags = [
|
||||
"XMLPARSER=libxml2"
|
||||
];
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
preBuild = ''
|
||||
export BOOST_PYTHON_LIB="boost_python${"${lib.versions.major python.version}${lib.versions.minor python.version}"}"
|
||||
export BOOST_THREAD_LIB="boost_thread"
|
||||
export BOOST_SYSTEM_LIB="boost_system"
|
||||
export PYCAIRO=true
|
||||
export XMLPARSER=libxml2
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# import from $out
|
||||
rm -r mapnik
|
||||
'';
|
||||
|
||||
# https://github.com/mapnik/python-mapnik/issues/255
|
||||
disabledTests = [
|
||||
"test_adding_datasource_to_layer"
|
||||
"test_compare_map"
|
||||
"test_dataraster_coloring"
|
||||
"test_dataraster_query_point"
|
||||
"test_good_files"
|
||||
"test_layer_init"
|
||||
"test_load_save_map"
|
||||
"test_loading_fontset_from_map"
|
||||
"test_normalizing_definition"
|
||||
"test_pdf_printing"
|
||||
"test_proj_antimeridian_bbox"
|
||||
"test_proj_transform_between_init_and_literal"
|
||||
"test_pycairo_pdf_surface1"
|
||||
"test_pycairo_svg_surface1"
|
||||
"test_query_tolerance"
|
||||
"test_raster_warping"
|
||||
"test_raster_warping_does_not_overclip_source"
|
||||
"test_render_points"
|
||||
"test_render_with_scale_factor"
|
||||
"test_style_level_image_filter"
|
||||
"test_that_coordinates_do_not_overflow_and_polygon_is_rendered_csv"
|
||||
"test_that_coordinates_do_not_overflow_and_polygon_is_rendered_memory"
|
||||
"test_transparency_levels"
|
||||
"test_visual_zoom_all_rendering1"
|
||||
"test_visual_zoom_all_rendering2"
|
||||
"test_wgs84_inverse_forward"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mapnik" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for Mapnik";
|
||||
maintainers = with maintainers; [ erictapen ];
|
||||
homepage = "https://mapnik.org";
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.lgpl21Plus;
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
diff --git a/build.py b/build.py
|
||||
index 0f94826b6..3cceb4546 100644
|
||||
--- a/build.py
|
||||
+++ b/build.py
|
||||
@@ -110,8 +110,8 @@ py_env.AppendUnique(LIBS='mapnik-wkt')
|
||||
_mapnik = py_env.LoadableModule('mapnik/_mapnik', sources, LDMODULEPREFIX='', LDMODULESUFFIX='.so')
|
||||
|
||||
Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
|
||||
-Depends(_mapnik, env.subst('../../src/json/libmapnik-json${LIBSUFFIX}'))
|
||||
-Depends(_mapnik, env.subst('../../src/wkt/libmapnik-wkt${LIBSUFFIX}'))
|
||||
+Depends(_mapnik, env.subst('@libmapnik@/libmapnikjson${LIBSUFFIX}'))
|
||||
+Depends(_mapnik, env.subst('@libmapnik@/libmapnikwkt${LIBSUFFIX}'))
|
||||
|
||||
if 'uninstall' not in COMMAND_LINE_TARGETS:
|
||||
pymapniklib = env.Install(target_path,_mapnik)
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 9985da5a2..5a03a1ec8 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -118,8 +118,8 @@ linkflags.extend(check_output([mapnik_config, '--libs']).split(' '))
|
||||
linkflags.extend(check_output([mapnik_config, '--ldflags']).split(' '))
|
||||
linkflags.extend(check_output([mapnik_config, '--dep-libs']).split(' '))
|
||||
linkflags.extend([
|
||||
-'-lmapnik-wkt',
|
||||
-'-lmapnik-json',
|
||||
+'-lmapnikwkt',
|
||||
+'-lmapnikjson',
|
||||
] + ['-l%s' % i for i in get_boost_library_names()])
|
||||
|
||||
# Dynamically make the mapnik/paths.py file
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reorder-python-imports";
|
||||
version = "3.8.1";
|
||||
version = "3.9.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = "reorder_python_imports";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CLC9dfNSYqEBZB2fP34jpA/4cxm0HZzjo/e7Yn8XPFc=";
|
||||
hash = "sha256-z8giVbW8+k/y9Kg+O2tMle5MoRAar2Gccx2YCtFQvxw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tox";
|
||||
version = "3.26.0";
|
||||
version = "3.27.1";
|
||||
|
||||
buildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ packaging pluggy py six virtualenv filelock ]
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RPPDR8aMLGh5nX1E8YCPnTlvyKGlAMvGJCUzdceuEH4=";
|
||||
hash = "sha256-sqkg41pmjMBpQv/RzzpPsiGk2QnKchkftthLCxinvgQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wandb";
|
||||
version = "0.13.4";
|
||||
version = "0.13.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+3fLExLQChXKx1LCnNvPLNTUzopP+D+6tOikFrjdysY=";
|
||||
hash = "sha256-1GoFmncG5bUWJOIUDLatopQMxCFsmlcj8aofJMGUTzQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -132,7 +132,6 @@ buildPythonPackage rec {
|
||||
"tests/unit_tests/test_internal_api.py"
|
||||
"tests/unit_tests/test_label_full.py"
|
||||
"tests/unit_tests/test_login.py"
|
||||
"tests/unit_tests/test_meta.py"
|
||||
"tests/unit_tests/test_metric_full.py"
|
||||
"tests/unit_tests/test_metric_internal.py"
|
||||
"tests/unit_tests/test_mode_disabled.py"
|
||||
@ -145,7 +144,6 @@ buildPythonPackage rec {
|
||||
"tests/unit_tests/test_start_method.py"
|
||||
"tests/unit_tests/test_tb_watcher.py"
|
||||
"tests/unit_tests/test_telemetry_full.py"
|
||||
"tests/unit_tests/test_tpu.py"
|
||||
"tests/unit_tests/test_util.py"
|
||||
|
||||
# Tries to access /homeless-shelter
|
||||
|
||||
@ -15,7 +15,7 @@ diff --git a/wandb/cli/cli.py b/wandb/cli/cli.py
|
||||
index 5767e61c..56009fec 100644
|
||||
--- a/wandb/cli/cli.py
|
||||
+++ b/wandb/cli/cli.py
|
||||
@@ -1917,7 +1917,7 @@ def restore(ctx, run, no_git, branch, project, entity):
|
||||
@@ -1919,7 +1919,7 @@ def restore(ctx, run, no_git, branch, project, entity):
|
||||
commit, json_config, patch_content, metadata = api.run_config(
|
||||
project, run=run, entity=entity
|
||||
)
|
||||
@ -24,7 +24,7 @@ index 5767e61c..56009fec 100644
|
||||
image = metadata.get("docker")
|
||||
restore_message = (
|
||||
"""`wandb restore` needs to be run from the same git repository as the original run.
|
||||
@@ -1936,7 +1936,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
|
||||
@@ -1938,7 +1938,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
|
||||
|
||||
if commit and api.git.enabled:
|
||||
wandb.termlog(f"Fetching origin and finding commit: {commit}")
|
||||
@ -33,7 +33,7 @@ index 5767e61c..56009fec 100644
|
||||
try:
|
||||
api.git.repo.commit(commit)
|
||||
except ValueError:
|
||||
@@ -1990,7 +1990,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
|
||||
@@ -1992,7 +1992,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag."""
|
||||
# --reject is necessary or else this fails any time a binary file
|
||||
# occurs in the diff
|
||||
exit_code = subprocess.call(
|
||||
@ -42,19 +42,6 @@ index 5767e61c..56009fec 100644
|
||||
)
|
||||
if exit_code == 0:
|
||||
wandb.termlog("Applied patch")
|
||||
diff --git a/wandb/sdk/internal/meta.py b/wandb/sdk/internal/meta.py
|
||||
index 6c53f750..c385951a 100644
|
||||
--- a/wandb/sdk/internal/meta.py
|
||||
+++ b/wandb/sdk/internal/meta.py
|
||||
@@ -125,7 +125,7 @@ class Meta:
|
||||
logger.debug("save patches")
|
||||
try:
|
||||
root = self._git.root
|
||||
- diff_args = ["git", "diff"]
|
||||
+ diff_args = ["@git@", "diff"]
|
||||
if self._git.has_submodule_diff:
|
||||
diff_args.append("--submodule=diff")
|
||||
|
||||
diff --git a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
|
||||
index 614df9f5..38db460b 100644
|
||||
--- a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "appthreat-depscan";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "dep-scan";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O6RHd7akTuslM+nt+4OilrjZvJs6B3BzkjjlRaty9Tg=";
|
||||
hash = "sha256-9N/PQVglXyHY0La1guvLzTHNq7QFftDWxPPwMN4Pvvo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micronaut";
|
||||
version = "1.3.7";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip";
|
||||
sha256 = "1f9fhp10fdm18g33kxl70l6l3x1k8p81h2c3zahjmhlg0sam78zw";
|
||||
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
|
||||
sha256 = "sha256-CzfS/6MugXhBeoFhRBsrupW8z/K+bl9k3Mm3Po63xhQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.119";
|
||||
version = "0.0.120";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aFyaDp7lghg1AlPB2WD4oJ85Qcj9Wwj07PMF0lbCkI8=";
|
||||
sha256 = "sha256-7rh0xYwoWRY6D2Us6EB+AI5/PAqWqbWmTYnLk1UjYp8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-LkNNKuhmRPZHQWTjfUoJSjgTVXLW6Tgg/yfhfjrEwSg=";
|
||||
cargoSha256 = "sha256-6P1c4U70V/dP8U2K0FBf7P4BkQXf9U5AQ0IT+XEWTkw=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-auditable";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-secure-code";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bRx+a6vzjiS2dglVkTyUm8OASM2Qq05S7LuVkHaIYMU=";
|
||||
sha256 = "sha256-udn/Z+raf/fkJ5M/FSH9Au+J9ASu0rz6ZJSl8P+jLT4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-QZi45U+MV8h4AMcN3QLIfAn/gHzoBWuOsC7gDSBY2jI=";
|
||||
cargoSha256 = "sha256-k3wWdlLYGZZ44IHatXWq8TK2xCia3YES2jX286QkNH0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to make production Rust binaries auditable";
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-edit";
|
||||
version = "0.11.5";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "killercup";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6hiRxVxm9GGss4rLctYiA5ukkyd6V9N47RJ0c/VhqTY=";
|
||||
hash = "sha256-EGClr2HQ11bX6WTvu9ZxPo4hA0Q5Sl9t0Gw8/SltxDI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-+JKBmqtDxi30T5Lw5YOn47gSW7p5fecOxZ8i9smDz/s=";
|
||||
cargoSha256 = "sha256-Ph6W2RyNjVfnkon4YyAi4VvQWt/McKelUzlRD15Yysk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -1,32 +1,36 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform
|
||||
, pkg-config, curl, libgit2, openssl, Security }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, curl
|
||||
, libgit2
|
||||
, openssl
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-raze";
|
||||
version = "0.12.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "161m4y6i4sgqi9mg3f3348f5cr0m45vhix4a4bcw54wnmhiklnnl";
|
||||
hash = "sha256-ip0WuBn1b7uN/pAhOl5tfmToK73ZSHK7rucdtufsbCQ=";
|
||||
};
|
||||
sourceRoot = "source/impl";
|
||||
|
||||
cargoSha256 = "1vlywdq0bx6b1k3w1grisca0hvv2s4s88yxq7bil8nhm5ghjgxdr";
|
||||
cargoHash = "sha256-hNZgQwhm4UPqmANplZGxG0DYHa31tu06nmqYaCA7Vdg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libgit2
|
||||
openssl
|
||||
(curl.override { inherit openssl; })
|
||||
curl
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
# thread 'main' panicked at 'Cannot ping mock server.: "cannot send request to mock server: cannot send request to mock server: failed to resolve host name"'
|
||||
# __darwinAllowLocalNetworking does not fix the panic
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate Bazel BUILD files from Cargo dependencies";
|
||||
homepage = "https://github.com/google/cargo-raze";
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-audit-info";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oxlbtFDQj6nyBXzNczG6ZhSOHvVQjK1FimWm/pSZHtY=";
|
||||
sha256 = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Y+5OUfsmUhDP9Fn8s9nso0W25eTFodDIVEVusn6HRmk=";
|
||||
cargoSha256 = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line tool to extract the dependency trees embedded in binaries by cargo-auditable";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yq-go";
|
||||
version = "4.30.1";
|
||||
version = "4.30.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-S4O/5iqX7P6oCONLHu/PucATVVJf2lgae1YtZmJCuns=";
|
||||
sha256 = "sha256-8tCxmcg2FW8OyYQmsoEkhtLJn0V/1u5uw+Er7kWlqcM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s=";
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "terraria-server";
|
||||
version = "1.4.4.2";
|
||||
version = "1.4.4.8.1";
|
||||
urlVersion = lib.replaceChars [ "." ] [ "" ] version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip";
|
||||
sha256 = "sha256-kRqLnrLuv9hgaGcOaTQmS7auozZcEZmXmE/qcD+wRWA=";
|
||||
sha256 = "sha256-4mM9+iE2HJnzoW4mvet3sy0mngQ62dxhxa1eDJxBGBo=";
|
||||
};
|
||||
|
||||
buildInputs = [ file ];
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "libreddit";
|
||||
version = "0.23.1";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libreddit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qO9AgEAm+wK8LAlUOYIKYTXJYT3yz65UWAFTf711+5w=";
|
||||
hash = "sha256-I/LPCPAZLltb55TBBS3NE2oU97Dx3L/dHLaEVkVBTGA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ApZLYKavYt1Zp7qvdbhBXPBj7qv/D/oZp5lK2sfWnDI=";
|
||||
cargoSha256 = "sha256-0Udwnvf60sumAeGtaxyiHbkWYMvNjwcWX9W1m3CUvb8=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin [
|
||||
Security
|
||||
|
||||
@ -33,6 +33,11 @@ in python.pkgs.buildPythonPackage rec {
|
||||
|
||||
patches = [ ./0001-Re-add-entrypoint.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "asyncpg>=0.20,<0.27" "asyncpg>=0.20"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; ([
|
||||
ruamel-yaml
|
||||
python-magic
|
||||
|
||||
@ -67,6 +67,7 @@ with pkgs;
|
||||
references = callPackage ../build-support/trivial-builders/test/references.nix {};
|
||||
overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {};
|
||||
concat = callPackage ../build-support/trivial-builders/test/concat-test.nix {};
|
||||
linkFarm = callPackage ../build-support/trivial-builders/test/link-farm.nix {};
|
||||
};
|
||||
|
||||
writers = callPackage ../build-support/writers/test.nix {};
|
||||
|
||||
@ -1,19 +1,35 @@
|
||||
{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python3, db
|
||||
, libgcrypt, avahi, libiconv, pam, openssl, acl, ed, libtirpc, libevent
|
||||
, fetchpatch }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, acl
|
||||
, autoreconfHook
|
||||
, avahi
|
||||
, db
|
||||
, ed
|
||||
, libevent
|
||||
, libgcrypt
|
||||
, libiconv
|
||||
, libtirpc
|
||||
, openssl
|
||||
, pam
|
||||
, perl
|
||||
, pkg-config
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netatalk";
|
||||
version = "3.1.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2";
|
||||
sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9";
|
||||
url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-ia2mvP4bOa2U9YwjZlTR2UTyZFw+femLM3TgvTfV4F0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./no-suid.patch
|
||||
./omitLocalstatedirCreation.patch
|
||||
./000-no-suid.patch
|
||||
./001-omit-localstatedir-creation.patch
|
||||
(fetchpatch {
|
||||
name = "make-afpstats-python3-compatible.patch";
|
||||
url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch";
|
||||
@ -84,9 +100,24 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
perl
|
||||
python3
|
||||
python3.pkgs.wrapPython
|
||||
];
|
||||
|
||||
buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ];
|
||||
buildInputs = [
|
||||
acl
|
||||
avahi
|
||||
db
|
||||
libevent
|
||||
libgcrypt
|
||||
libiconv
|
||||
openssl
|
||||
pam
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-bdb=${db.dev}"
|
||||
@ -119,11 +150,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Apple Filing Protocol Server";
|
||||
homepage = "http://netatalk.sourceforge.net/";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ jcumming ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jcumming ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "packwiz";
|
||||
version = "unstable-2022-08-25";
|
||||
version = "unstable-2022-10-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "packwiz";
|
||||
repo = "packwiz";
|
||||
rev = "11671421acff9794b9ca5c7e083a514f8a3f55a4";
|
||||
sha256 = "sha256-A+DVRi0YByF4WP/okqhWrKRmci2ybAvbXYmODScIrYg=";
|
||||
rev = "f00dc9844ffdd6ee5c0526a79b0084429e9cb130";
|
||||
sha256 = "sha256-YpihFWdcKfHJLEs+jHzHH7G+m/E8i5y2yp7IubObNhY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-09S8RFdCvtE50EICLIKCTnTjG/0XsGf+yq9SNObKmRA=";
|
||||
|
||||
@ -1,42 +1,55 @@
|
||||
{ fetchFromGitHub
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, zstd
|
||||
, stdenv
|
||||
, CoreFoundation
|
||||
, libiconv
|
||||
, libresolv
|
||||
, Security
|
||||
, git
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "onefetch";
|
||||
version = "2.12.0";
|
||||
version = "2.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "o2sh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nSvqAXzA/4CSnOMCZri2ks58bW+9v+SoyIIzb+K5S88=";
|
||||
sha256 = "sha256-ydRdnzOI9syfF2ox9vHA9Q0j8C7ZNb0b7CJfqUprPA0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-IprUSNxoojagXUO/I7WDGJMG0U541ioe4qgLT4hqmbY=";
|
||||
|
||||
cargoPatches = [
|
||||
# enable pkg-config feature of zstd
|
||||
./zstd-pkg-config.patch
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-uSef6x5QkXKwajglbwyoIsUFGbz0zntVM1ko0FZqnck=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ zstd ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ];
|
||||
++ lib.optionals stdenv.isDarwin [ CoreFoundation libresolv Security ];
|
||||
|
||||
checkInputs = [
|
||||
git
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
git init
|
||||
git config user.email nixbld@example.com
|
||||
git add .
|
||||
git commit -m test
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Git repository summary on your terminal";
|
||||
homepage = "https://github.com/o2sh/onefetch";
|
||||
changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne kloenk SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ Br1ght0ne figsoda kloenk SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,31 +1,26 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 202cda0..bc864cc 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -872,6 +872,7 @@ dependencies = [
|
||||
@@ -2039,6 +2039,7 @@ dependencies = [
|
||||
"tokei",
|
||||
"toml",
|
||||
"yaml-rust",
|
||||
+ "zstd-sys",
|
||||
+ "zstd",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1678,4 +1679,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7"
|
||||
@@ -3286,4 +3287,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
+ "pkg-config",
|
||||
]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 8e0b5ff..48959b4 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -57,6 +57,8 @@ libc = "0.2.112"
|
||||
[dev-dependencies]
|
||||
more-asserts = "0.2"
|
||||
paste = "1.0.7"
|
||||
+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library
|
||||
+zstd-sys = { version = "1", features = [ "pkg-config" ] }
|
||||
@@ -58,6 +58,7 @@ time-humanize = { version = "0.1.3", features = ["time"] }
|
||||
tokei = "12.1.2"
|
||||
toml = "0.5.9"
|
||||
yaml-rust = "0.4.5"
|
||||
+zstd = { version = "*", features = ["pkg-config"] }
|
||||
|
||||
[features]
|
||||
fail-on-deprecated = []
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
enable-ansi-support = "0.1.2"
|
||||
|
||||
@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://wiki.gnome.org/Projects/GUPnP";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc"
|
||||
# darwin special-casing just causes trouble
|
||||
substituteInPlace ./m4macros/ax_crypto.m4 --replace 'apple-darwin' 'nope'
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
|
||||
@ -1272,6 +1272,7 @@ mapAliases ({
|
||||
readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20
|
||||
readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22
|
||||
redkite = throw "redkite was archived by upstream"; # Added 2021-04-12
|
||||
redis-desktop-manager = throw "'redis-desktop-manager' has been renamed to/replaced by 'resp-app'"; # Added 2022-11-10
|
||||
redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25
|
||||
reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07
|
||||
|
||||
|
||||
@ -15142,7 +15142,6 @@ with pkgs;
|
||||
cargo-profiler = callPackage ../development/tools/rust/cargo-profiler {};
|
||||
cargo-raze = callPackage ../development/tools/rust/cargo-raze {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
cargo-readme = callPackage ../development/tools/rust/cargo-readme {};
|
||||
cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks {
|
||||
@ -18328,6 +18327,8 @@ with pkgs;
|
||||
|
||||
boxfort = callPackage ../development/libraries/boxfort { };
|
||||
|
||||
brunsli = callPackage ../development/libraries/brunsli { };
|
||||
|
||||
buddy = callPackage ../development/libraries/buddy { };
|
||||
|
||||
buildkit-nix = callPackage ../applications/virtualization/buildkit-nix { };
|
||||
@ -19007,10 +19008,7 @@ with pkgs;
|
||||
libXpm = null;
|
||||
};
|
||||
|
||||
gdal = callPackage ../development/libraries/gdal {
|
||||
pythonPackages = python3Packages;
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
gdal = callPackage ../development/libraries/gdal { };
|
||||
|
||||
gdcm = callPackage ../development/libraries/gdcm {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa;
|
||||
@ -19730,11 +19728,7 @@ with pkgs;
|
||||
|
||||
jbigkit = callPackage ../development/libraries/jbigkit { };
|
||||
|
||||
jemalloc = callPackage ../development/libraries/jemalloc {
|
||||
# tests fail with LLVM 11+
|
||||
# https://github.com/jemalloc/jemalloc/issues/2091
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages_10.stdenv else stdenv;
|
||||
};
|
||||
jemalloc = callPackage ../development/libraries/jemalloc { };
|
||||
|
||||
jose = callPackage ../development/libraries/jose { };
|
||||
|
||||
@ -19837,6 +19831,8 @@ with pkgs;
|
||||
|
||||
leptonica = callPackage ../development/libraries/leptonica { };
|
||||
|
||||
lerc = callPackage ../development/libraries/lerc { };
|
||||
|
||||
lib2geom = callPackage ../development/libraries/lib2geom { };
|
||||
|
||||
lib3ds = callPackage ../development/libraries/lib3ds { };
|
||||
@ -21253,13 +21249,9 @@ with pkgs;
|
||||
opencl-clang = callPackage ../development/libraries/opencl-clang { };
|
||||
|
||||
mapnik = callPackage ../development/libraries/mapnik {
|
||||
gdal = gdal.override {
|
||||
libgeotiff = libgeotiff.override { proj = proj_7; };
|
||||
libspatialite = libspatialite.override { proj = proj_7; };
|
||||
proj = proj_7;
|
||||
harfbuzz = harfbuzz.override {
|
||||
withIcu = true;
|
||||
};
|
||||
proj = proj_7;
|
||||
boost = boost175;
|
||||
};
|
||||
|
||||
manticoresearch = callPackage ../servers/search/manticoresearch { };
|
||||
@ -36227,6 +36219,9 @@ with pkgs;
|
||||
|
||||
gplates = libsForQt5.callPackage ../applications/science/misc/gplates {
|
||||
boost = boost175;
|
||||
# build with Python 3.10 fails, because boost <= 1.78 can't find
|
||||
# pythons with double digits in minor versions, like X.YZ
|
||||
python3 = python39;
|
||||
};
|
||||
|
||||
gravit = callPackage ../applications/science/astronomy/gravit { };
|
||||
@ -37009,10 +37004,8 @@ with pkgs;
|
||||
|
||||
mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql80; in {
|
||||
gdal = gdal.override {
|
||||
libmysqlclient = mysql // {
|
||||
lib = { dev = mysql; }
|
||||
;}
|
||||
;};
|
||||
libmysqlclient = mysql;
|
||||
};
|
||||
mysql = mysql;
|
||||
pcre = pcre-cpp;
|
||||
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
@ -37020,7 +37013,7 @@ with pkgs;
|
||||
|
||||
r128gain = callPackage ../applications/audio/r128gain { };
|
||||
|
||||
redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { };
|
||||
resp-app = libsForQt5.callPackage ../applications/misc/resp-app { };
|
||||
|
||||
robin-map = callPackage ../development/libraries/robin-map { };
|
||||
|
||||
|
||||
@ -3599,7 +3599,7 @@ self: super: with self; {
|
||||
|
||||
gcsfs = callPackage ../development/python-modules/gcsfs { };
|
||||
|
||||
gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; });
|
||||
gdal = toPythonModule (pkgs.gdal.override { python3 = python; });
|
||||
|
||||
gdata = callPackage ../development/python-modules/gdata { };
|
||||
|
||||
@ -9068,16 +9068,17 @@ self: super: with self; {
|
||||
|
||||
python-manilaclient = callPackage ../development/python-modules/python-manilaclient { };
|
||||
|
||||
python-mapnik = let
|
||||
boost = pkgs.boost175.override {
|
||||
python-mapnik = callPackage ../development/python-modules/python-mapnik rec {
|
||||
inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib;
|
||||
boost = pkgs.boost.override {
|
||||
enablePython = true;
|
||||
inherit python;
|
||||
};
|
||||
in callPackage ../development/python-modules/python-mapnik {
|
||||
inherit (pkgs) pkg-config cairo harfbuzz icu libjpeg libpng libtiff libwebp proj zlib;
|
||||
inherit boost;
|
||||
harfbuzz = pkgs.harfbuzz.override {
|
||||
withIcu = true;
|
||||
};
|
||||
mapnik = pkgs.mapnik.override {
|
||||
inherit python boost;
|
||||
inherit boost harfbuzz;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user