Merge staging-next into staging
This commit is contained in:
@@ -17,6 +17,11 @@
|
||||
|
||||
- `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`.
|
||||
|
||||
- The packaging of Mesa graphics drivers has been significantly reworked, in particular:
|
||||
- applications linked against different Mesa versions than installed on the system should now work correctly going forward (however, applications against older Mesa, e.g. from Nixpkgs releases before 25.05, remain broken)
|
||||
- the global Mesa version can now be managed without a mass rebuild by setting `hardware.graphics.package`
|
||||
- packages that used to depend on Mesa for libgbm or libdri should use `libgbm` or `dri-pkgconfig-stub` as inputs, respectively
|
||||
|
||||
- The `intel` video driver for X.org (from the xf86-video-intel package) which was previously removed because it was non-functional has been fixed and the driver has been re-introduced.
|
||||
|
||||
- The Mattermost module ({option}`services.mattermost`) and packages (`mattermost` and `mmctl`) have been substantially updated:
|
||||
|
||||
@@ -2,16 +2,13 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
cmake,
|
||||
pkg-config,
|
||||
installShellFiles,
|
||||
util-linux,
|
||||
hexdump,
|
||||
autoSignDarwinBinariesHook,
|
||||
wrapQtAppsHook ? null,
|
||||
boost,
|
||||
libevent,
|
||||
miniupnpc,
|
||||
zeromq,
|
||||
zlib,
|
||||
db48,
|
||||
@@ -35,24 +32,22 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
version = "28.1";
|
||||
version = "29.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz"
|
||||
];
|
||||
# hash retrieved from signed SHA256SUMS
|
||||
sha256 = "c5ae2dd041c7f9d9b7c722490ba5a9d624f7e9a089c67090615e1ba4ad0883ba";
|
||||
sha256 = "882c782c34a3bf2eacd1fae5cdc58b35b869883512f197f7d6dc8f195decfdaa";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
autoreconfHook
|
||||
cmake
|
||||
pkg-config
|
||||
installShellFiles
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
autoSignDarwinBinariesHook
|
||||
]
|
||||
@@ -62,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
[
|
||||
boost
|
||||
libevent
|
||||
miniupnpc
|
||||
zeromq
|
||||
zlib
|
||||
]
|
||||
@@ -77,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postInstall =
|
||||
''
|
||||
cd ..
|
||||
installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash
|
||||
installShellCompletion --bash contrib/completions/bash/bitcoind.bash
|
||||
installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash
|
||||
@@ -95,21 +90,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
cmakeFlags =
|
||||
[
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-bench"
|
||||
(lib.cmakeBool "BUILD_BENCH" false)
|
||||
]
|
||||
++ lib.optionals (!finalAttrs.doCheck) [
|
||||
"--disable-tests"
|
||||
"--disable-gui-tests"
|
||||
(lib.cmakeBool "BUILD_TESTS" false)
|
||||
(lib.cmakeBool "BUILD_FUZZ_BINARY" false)
|
||||
(lib.cmakeBool "BUILD_GUI_TESTS" false)
|
||||
]
|
||||
++ lib.optionals (!withWallet) [
|
||||
"--disable-wallet"
|
||||
(lib.cmakeBool "ENABLE_WALLET" false)
|
||||
]
|
||||
++ lib.optionals withGui [
|
||||
"--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
(lib.cmakeBool "BUILD_GUI" true)
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
|
||||
@@ -11831,6 +11831,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
persistent-breakpoints-nvim = buildVimPlugin {
|
||||
pname = "persistent-breakpoints.nvim";
|
||||
version = "2025-03-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "weissle";
|
||||
repo = "persistent-breakpoints.nvim";
|
||||
rev = "d1656221836207787b8a7969cc2dc72668c4742a";
|
||||
sha256 = "ed958d4725406d0b8cff2de316e67941f9af23ea53e099a8e645b61f08c34b56";
|
||||
};
|
||||
meta.homepage = "https://github.com/Weissle/persistent-breakpoints.nvim";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
pest-vim = buildVimPlugin {
|
||||
pname = "pest.vim";
|
||||
version = "2024-04-25";
|
||||
|
||||
@@ -2725,6 +2725,12 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
persistent-breakpoints-nvim = super.persistent-breakpoints-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
nvim-dap
|
||||
];
|
||||
};
|
||||
|
||||
phpactor = buildVimPlugin {
|
||||
inherit (phpactor)
|
||||
pname
|
||||
|
||||
@@ -908,6 +908,7 @@ https://github.com/tmsvg/pear-tree/,,
|
||||
https://github.com/steelsojka/pears.nvim/,,
|
||||
https://github.com/olimorris/persisted.nvim/,HEAD,
|
||||
https://github.com/folke/persistence.nvim/,,
|
||||
https://github.com/Weissle/persistent-breakpoints.nvim/,,
|
||||
https://github.com/pest-parser/pest.vim/,HEAD,
|
||||
https://github.com/lifepillar/pgsql.vim/,,
|
||||
https://github.com/phha/zenburn.nvim/,,phha-zenburn
|
||||
|
||||
@@ -110,11 +110,20 @@ stdenv.mkDerivation rec {
|
||||
wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC"
|
||||
'';
|
||||
|
||||
# See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/src/browser/NativeMessageInstaller.cpp#L317
|
||||
postInstall = lib.optionalString withKeePassBrowser ''
|
||||
mkdir -p "$out/lib/mozilla/native-messaging-hosts"
|
||||
substituteAll "${./firefox-native-messaging-host.json}" "$out/lib/mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json"
|
||||
'';
|
||||
postInstall = lib.concatLines [
|
||||
(lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p "$out/bin"
|
||||
for program in keepassxc-cli keepassxc-proxy; do
|
||||
ln -s "$out/Applications/KeePassXC.app/Contents/MacOS/$program" "$out/bin/$program"
|
||||
done
|
||||
'')
|
||||
|
||||
# See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/src/browser/NativeMessageInstaller.cpp#L317
|
||||
(lib.optionalString withKeePassBrowser ''
|
||||
mkdir -p "$out/lib/mozilla/native-messaging-hosts"
|
||||
substituteAll "${./firefox-native-messaging-host.json}" "$out/lib/mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json"
|
||||
'')
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
buildGo123Module,
|
||||
buildGo124Module,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
go_1_23,
|
||||
go_1_24,
|
||||
kconfig,
|
||||
kcoreaddons,
|
||||
kdbusaddons,
|
||||
@@ -26,21 +26,21 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f-koehler";
|
||||
repo = "KTailctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BgxWsT/s5Hv5cvzcSjfrgAmZhcoquaydSZKdPmld4Rg=";
|
||||
hash = "sha256-8vtNAqCDXbzEuGXqUZL26EMmVLJqSFu+E/zhK8VafLE=";
|
||||
};
|
||||
|
||||
goDeps =
|
||||
(buildGo123Module {
|
||||
(buildGo124Module {
|
||||
pname = "ktailctl-go-wrapper";
|
||||
inherit src version;
|
||||
modRoot = "src/wrapper";
|
||||
vendorHash = "sha256-ntk4WyJYEi6ZX2MyXMGgsYVqhAUQSGJLHWiNLkCwMEY=";
|
||||
vendorHash = "sha256-F0fY9ZqibZNIUQSIlLRO3rX4gYAFHWMdFtwRNigpGZE=";
|
||||
}).goModules;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
git
|
||||
go_1_23
|
||||
go_1_24
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
|
||||
@@ -167,9 +167,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Multi-backend implementation of SYCL for CPUs and GPUs";
|
||||
mainProgram = "acpp";
|
||||
maintainers = with maintainers; [ yboettcher ];
|
||||
# Broken with current nixpkgs ROCm 6.0.2
|
||||
# Works with updated ROCm, see https://github.com/NixOS/nixpkgs/pull/367695
|
||||
broken = rocmSupport && strings.versionOlder rocmPackages.clr.version "6.3.1";
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -154,6 +154,11 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
# ModuleNotFoundError: No module named 'azure.mgmt.compute.v2024_07_01'
|
||||
azure-mgmt-compute =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-compute "33.0.0" "tar.gz"
|
||||
"sha256-o8wP5PCcjh01I8G/uSYg3+JjoKiTsKwToz1wV+nd3dI=";
|
||||
|
||||
# ImportError: cannot import name 'ResourceSku' from 'azure.mgmt.eventgrid.models'
|
||||
azure-mgmt-eventgrid =
|
||||
overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "charmcraft";
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "canonical";
|
||||
repo = "charmcraft";
|
||||
tag = version;
|
||||
hash = "sha256-TCr6iZHUIJ/dZhj8pWsCYKAfqv9LXD3fGP432UQh/Lo=";
|
||||
hash = "sha256-EdpnTKbSDo2ZF4J/bWlcBYWuPSkxW3dmrQYjBeIyTzo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "cljfmt";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/weavejester/cljfmt/releases/download/${version}/cljfmt-${version}-standalone.jar";
|
||||
hash = "sha256-gPIDaFb8mmJyoAIOUWV7ZNNi/rSnuRkYN16Grqly0/c=";
|
||||
hash = "sha256-Dj1g6hMzRhqm0pJggODVFgEkayB2Wdh3d0z6RglHbgY=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
||||
@@ -48,26 +48,26 @@
|
||||
}:
|
||||
let
|
||||
pname = "cursor";
|
||||
version = "0.48.7";
|
||||
version = "0.48.8";
|
||||
|
||||
inherit (stdenvNoCC) hostPlatform;
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/1d623c4cc1d3bb6e0fe4f1d5434b47b958b05876/linux/x64/Cursor-0.48.7-x86_64.AppImage";
|
||||
hash = "sha256-LxAUhmEM02qCaeUUsHgjv0upAF7eerX+/QiGeKzRY4M=";
|
||||
url = "https://downloads.cursor.com/production/7801a556824585b7f2721900066bc87c4a09b743/linux/x64/Cursor-0.48.8-x86_64.AppImage";
|
||||
hash = "sha256-/5mwElzN0uURppWCLYPPECs6GzXtB54v2+jQD1RHcJE=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/1d623c4cc1d3bb6e0fe4f1d5434b47b958b05876/linux/arm64/Cursor-0.48.7-aarch64.AppImage";
|
||||
hash = "sha256-l1T0jLX7oWjq4KzxO4QniUAjzVbBu4SWA1r5aXGpDS4=";
|
||||
url = "https://downloads.cursor.com/production/7801a556824585b7f2721900066bc87c4a09b743/linux/arm64/Cursor-0.48.8-aarch64.AppImage";
|
||||
hash = "sha256-OXGUjTNwc0VZ8Q7arMyhfhN/bPTOCYS9Bfi1I4TJCXY=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/1d623c4cc1d3bb6e0fe4f1d5434b47b958b05876/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-h9zcmZRpOcfBRK5Xw/AdY/rwlINEHYiUgpCoGXg6hSY=";
|
||||
url = "https://downloads.cursor.com/production/7801a556824585b7f2721900066bc87c4a09b743/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-uLKOjo4aYK0r69a0jFevzE4bJJ0mqg0pJEPYdtlo8tU=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/1d623c4cc1d3bb6e0fe4f1d5434b47b958b05876/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-FsXabTXN1Bkn1g4ZkQVqa+sOx4JkSG9c09tp8lAcPKM=";
|
||||
url = "https://downloads.cursor.com/production/7801a556824585b7f2721900066bc87c4a09b743/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-xSmBSK9pum6RlvXnyhNA1HM6Y88R2bRASJkLTHfxzMY=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname;
|
||||
version = "25.1.2";
|
||||
version = "25.1.3";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
in
|
||||
fetchurl {
|
||||
url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz";
|
||||
hash = "sha256-bEvC0cd/slgddXDiLaArri3+hA3CRHBy9vhrJ8m1Jrg=";
|
||||
hash = "sha256-K9RbQPCqU9t6i0zKl2P1aRhgfAs69GORtVA2KU6fqLw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -29,17 +29,18 @@
|
||||
lerc,
|
||||
doxygen,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deskflow";
|
||||
version = "1.20.1";
|
||||
version = "1.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deskflow";
|
||||
repo = "deskflow";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lX8K7HuC/Sxa5M0h+r5NmdFf032nVrE9JF6H+IBWPUA=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gXFBn8hlI8MZ9Vy3goPjosn0JgvaAgZaFIGh/3rFdx8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -106,15 +107,17 @@ stdenv.mkDerivation rec {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/deskflow/deskflow";
|
||||
description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux";
|
||||
mainProgram = "deskflow";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ flacks ];
|
||||
license = with lib; [
|
||||
licenses.gpl2Plus
|
||||
licenses.openssl
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -65,6 +65,7 @@ buildFHSEnv {
|
||||
lz4.dev
|
||||
tbb
|
||||
libxkbcommon
|
||||
librealsense
|
||||
boost
|
||||
glew
|
||||
])
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.203.0";
|
||||
version = "0.203.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-rrpYa73Rl+pLQ3FhnDF+t1uHT7SJJcrx6kjdxXsOfM8=";
|
||||
hash = "sha256-TdEK63F7LQwyj6aPA1NKqZLUn2cnP0XgS51vqfzNVJ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TqtJlsT/uaqQe/mAh1hw92N3uw6GLkdwh9aIMmdNbkY=";
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "feather";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "feather-wallet";
|
||||
repo = "feather";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-c7qa6MmENCEjZz8b/xyCcCO2+iI5dI8hJynBW3haSWE=";
|
||||
hash = "sha256-DZBRZBcoba32Z/bFThn/9siC8VESg5gdfoFO4Nw8JqM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,45 +1,62 @@
|
||||
{
|
||||
buildGo123Module,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildGo123Module,
|
||||
|
||||
nodejs_22,
|
||||
pnpm_9,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.31.0";
|
||||
version = "2.32.0";
|
||||
|
||||
pnpm = pnpm_9;
|
||||
nodejs = nodejs_22;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filebrowser";
|
||||
repo = "filebrowser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zLM1fLrucIhzGdTTDu81ZnTIipK+iRnPhgfMiT1P+yg=";
|
||||
hash = "sha256-jckwk45pIRrlzZaG3jH8aLq08L5xnrbt4OdwKNS6+nI=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
frontend = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "filebrowser-frontend";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/frontend";
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm.configHook
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-5/yEMWkNPAS8/PkaHlPBGFLiJu7xK2GHYo5dYqHAfCE=";
|
||||
pnpmRoot = "frontend";
|
||||
|
||||
NODE_OPTIONS = "--openssl-legacy-provider";
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
sourceRoot = "${src.name}/frontend";
|
||||
hash = "sha256-L3cKAp0vvLW5QPz6vYTtZwzuIN70EObU3SyJOlA0Ehc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
pnpm install -C frontend --frozen-lockfile
|
||||
pnpm run -C frontend build
|
||||
|
||||
mkdir $out
|
||||
mv dist $out
|
||||
mv frontend/dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
buildGo123Module {
|
||||
pname = "filebrowser";
|
||||
inherit version src;
|
||||
|
||||
vendorHash = "sha256-N5aUs8rgTYXeb0qJhPQBCa6lUDkT6lH1bh+1u4bixos=";
|
||||
vendorHash = "sha256-Jce90mvNzjElCtEMQSSU3IQPz+WLhyEol1ktW4FG7yk=";
|
||||
|
||||
excludedPackages = [ "tools" ];
|
||||
|
||||
@@ -47,6 +64,10 @@ buildGo123Module {
|
||||
cp -r ${frontend}/dist frontend/
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/filebrowser/filebrowser/v2/version.Version=v${version}"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit frontend;
|
||||
};
|
||||
|
||||
@@ -3,46 +3,41 @@
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
fetchurl,
|
||||
runCommand,
|
||||
lndir,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "flaca";
|
||||
version = "3.2.3";
|
||||
version = "3.3.2";
|
||||
|
||||
src =
|
||||
let
|
||||
source = fetchFromGitHub {
|
||||
owner = "Blobfolio";
|
||||
repo = "flaca";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GpxOTu7yjJ9IFMKVkgjLeKGNEUiKw0ZeWQorfhaOTsg=";
|
||||
};
|
||||
lockFile = fetchurl {
|
||||
url = "https://github.com/Blobfolio/flaca/releases/download/v${version}/Cargo.lock";
|
||||
hash = "sha256-SaqQ4U8JXTFlp1EqkNZ6VV8KyPXHYtEycfZn/68SeHY=";
|
||||
};
|
||||
in
|
||||
runCommand "source-with-lock" { nativeBuildInputs = [ lndir ]; } ''
|
||||
mkdir -p $out
|
||||
ln -s ${lockFile} $out/Cargo.lock
|
||||
lndir -silent ${source} $out
|
||||
'';
|
||||
lockFile = fetchurl {
|
||||
url = "https://github.com/Blobfolio/flaca/releases/download/v${finalAttrs.version}/Cargo.lock";
|
||||
hash = "sha256-AFEuJQAz+cXUuyLefqsV2VyytJ+sfLrJQSArITqQZZU=";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blobfolio";
|
||||
repo = "flaca";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sxBP3L9Abk3/NYkE1UeFFulGEhDe4wKqS71wrX6mA9c=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
ln -s ${finalAttrs.lockFile} ${finalAttrs.src.name}/Cargo.lock
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-MdPPLv0836rVxVrl8PXMDufHdTtmBBhJ/EuG4qcK3Kk=";
|
||||
cargoHash = "sha256-i4eYyS3s7q/1PaqwawpWeDbUHUGEvIfN65xfvpLkOpY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool to losslessly compress JPEG and PNG images";
|
||||
longDescription = "A CLI tool for x86-64 Linux machines that simplifies the task of maximally, losslessly compressing JPEG and PNG images for use in production web environments";
|
||||
homepage = "https://github.com/Blobfolio/flaca";
|
||||
changelog = "https://github.com/Blobfolio/flaca/releases/tag/v${version}";
|
||||
changelog = "https://github.com/Blobfolio/flaca/releases/tag/v${finalAttrs.version}";
|
||||
maintainers = with maintainers; [ zzzsy ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.wtfpl;
|
||||
mainProgram = "flaca";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -22,19 +22,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flare";
|
||||
version = "0.15.12";
|
||||
version = "0.15.16";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "flare";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-qj34x/e5Nc3wPdFaHFZHQ8uCMHIlxfVNyvlp7eb3tSo=";
|
||||
hash = "sha256-oG5RHCOk/VPCUAdg/+gfw9/cErnaZBKnwzLzdaboSyY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-Nri3GOq7aaY3yIVQESMPUck3z8++FnAmIbIdkTe+GXw=";
|
||||
hash = "sha256-Id08JgFbeuGrMrBFyXF/ke/LfkqvT+biEgDOyW8sZh0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
--- a/share/info/porting.info
|
||||
+++ b/share/info/porting.info
|
||||
@@ -16,9 +16,7 @@ a permission notice identical to this one.
|
||||
manual into another language, under the above conditions for modified
|
||||
versions.
|
||||
START-INFO-DIR-ENTRY
|
||||
-START-INFO-DIR-ENTRY
|
||||
* Embed with GNU: (porting-). Embed with GNU
|
||||
-END-INFO-DIR-ENTRY
|
||||
END-INFO-DIR-ENTRY
|
||||
|
||||
Copyright (C) 1993, 1994, 1995 Cygnus Support
|
||||
@@ -32,6 +32,12 @@ stdenv.mkDerivation rec {
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix double entry in share/info/porting.info
|
||||
# https://github.com/NixOS/nixpkgs/issues/363902
|
||||
./info-fix.patch
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
--- a/share/info/porting.info
|
||||
+++ b/share/info/porting.info
|
||||
@@ -16,9 +16,7 @@ a permission notice identical to this one.
|
||||
manual into another language, under the above conditions for modified
|
||||
versions.
|
||||
START-INFO-DIR-ENTRY
|
||||
-START-INFO-DIR-ENTRY
|
||||
* Embed with GNU: (porting-). Embed with GNU
|
||||
-END-INFO-DIR-ENTRY
|
||||
END-INFO-DIR-ENTRY
|
||||
|
||||
Copyright (C) 1993, 1994, 1995 Cygnus Support
|
||||
@@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix double entry in share/info/porting.info
|
||||
# https://github.com/NixOS/nixpkgs/issues/363902
|
||||
./info-fix.patch
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
@@ -42,325 +42,325 @@ in
|
||||
{
|
||||
app-schema = mkGeoserverExtension {
|
||||
name = "app-schema";
|
||||
version = "2.26.2"; # app-schema
|
||||
hash = "sha256-pFjKgEuAFiEN6FJkooKqMHzkbZnQWchzzLFPsA9TDH4="; # app-schema
|
||||
version = "2.27.0"; # app-schema
|
||||
hash = "sha256-S7WtIbmn9RF0mmTRiOH5zFsjZ6y0mvVu0H8jKCdTPHM="; # app-schema
|
||||
};
|
||||
|
||||
authkey = mkGeoserverExtension {
|
||||
name = "authkey";
|
||||
version = "2.26.2"; # authkey
|
||||
hash = "sha256-u1/dbTHZPIImVq46YGWpdsO60wg6jWmc4ttAzasKpcU="; # authkey
|
||||
version = "2.27.0"; # authkey
|
||||
hash = "sha256-GwA/f5wMf701TEs04Dgx/zcEA/jBHgw0JuJMKqTuRTU="; # authkey
|
||||
};
|
||||
|
||||
cas = mkGeoserverExtension {
|
||||
name = "cas";
|
||||
version = "2.26.2"; # cas
|
||||
hash = "sha256-KagmWS+VNsC1wtasa9UwNZsaUzmbZKG/SPBq91pW4R8="; # cas
|
||||
version = "2.27.0"; # cas
|
||||
hash = "sha256-poD8OBeR7txtM1nJDy5MV6GVREVonLvx3TUY3a1V2Mc="; # cas
|
||||
};
|
||||
|
||||
charts = mkGeoserverExtension {
|
||||
name = "charts";
|
||||
version = "2.26.2"; # charts
|
||||
hash = "sha256-TDv+7JFe5N8HtxjNOFYcfdJ9kdCLBKigdvqzb9p3dow="; # charts
|
||||
version = "2.27.0"; # charts
|
||||
hash = "sha256-8FoaN9EoFZ56YPev//IphMjce1iJQnMbP6xCdVSwMiU="; # charts
|
||||
};
|
||||
|
||||
control-flow = mkGeoserverExtension {
|
||||
name = "control-flow";
|
||||
version = "2.26.2"; # control-flow
|
||||
hash = "sha256-QQowtOOUKJCm1C7VkDHWbIscCal3PsxFMTfi5JUZqi8="; # control-flow
|
||||
version = "2.27.0"; # control-flow
|
||||
hash = "sha256-DyZp/dcRm/xuvxv49qvepcDJPyHGiG4wMbEzKNhNcH0="; # control-flow
|
||||
};
|
||||
|
||||
css = mkGeoserverExtension {
|
||||
name = "css";
|
||||
version = "2.26.2"; # css
|
||||
hash = "sha256-MgAwSWpSVrGJYRxGt1gCiLXj8uXQ8hvCkfI+yGtZU34="; # css
|
||||
version = "2.27.0"; # css
|
||||
hash = "sha256-PKRgGbDlTjrFkhrDpbjDjAl+Q/gjWXFw9C0QpKB8+Ro="; # css
|
||||
};
|
||||
|
||||
csw = mkGeoserverExtension {
|
||||
name = "csw";
|
||||
version = "2.26.2"; # csw
|
||||
hash = "sha256-i3ObMkSOnCGihZm8CcMj90jG3B8pYRTX9Yd4uuholKY="; # csw
|
||||
version = "2.27.0"; # csw
|
||||
hash = "sha256-sddOghBd8OVjKmaF3PqM/G+RkpsUk6vmCZv7uQJTJnU="; # csw
|
||||
};
|
||||
|
||||
csw-iso = mkGeoserverExtension {
|
||||
name = "csw-iso";
|
||||
version = "2.26.2"; # csw-iso
|
||||
hash = "sha256-zEVkldjEsI+sBbMDvvL2b6DciwwUacsufXgvIDfLYX4="; # csw-iso
|
||||
version = "2.27.0"; # csw-iso
|
||||
hash = "sha256-WVKVoQWIusgpAZUWPybBBIMbtWB56uNix3T50hy0x5w="; # csw-iso
|
||||
};
|
||||
|
||||
db2 = mkGeoserverExtension {
|
||||
name = "db2";
|
||||
version = "2.26.2"; # db2
|
||||
hash = "sha256-g9J/KZ3ET2HSs1fhVFW8cRe409vfZddBaXoXOgVZrcE="; # db2
|
||||
version = "2.27.0"; # db2
|
||||
hash = "sha256-jlyRGOGBFJ0+sArKXqchITlS6swE/v4ScdxPKWANFaE="; # db2
|
||||
};
|
||||
|
||||
# Needs wps extension.
|
||||
dxf = mkGeoserverExtension {
|
||||
name = "dxf";
|
||||
version = "2.26.2"; # dxf
|
||||
hash = "sha256-Ninuw1npfy3lND0O8Tu87hv/gXPQFC3vU8H1oE8aLdc="; # dxf
|
||||
version = "2.27.0"; # dxf
|
||||
hash = "sha256-hdn5X7T5/H7Ti0UK3MdG0TFGInwu7S7Z4VghcWx+hdQ="; # dxf
|
||||
};
|
||||
|
||||
excel = mkGeoserverExtension {
|
||||
name = "excel";
|
||||
version = "2.26.2"; # excel
|
||||
hash = "sha256-Lqkbr6KTtiKUmW5A3Uqem0C81oNnLd6eVzm/MwvnYjg="; # excel
|
||||
version = "2.27.0"; # excel
|
||||
hash = "sha256-EH1TZeYPk+sb9+7ZfjbaEsNgQJ+/57XCc2+CvELsY88="; # excel
|
||||
};
|
||||
|
||||
feature-pregeneralized = mkGeoserverExtension {
|
||||
name = "feature-pregeneralized";
|
||||
version = "2.26.2"; # feature-pregeneralized
|
||||
hash = "sha256-T6NiDBOIpqQKEAm58558seSpHSA84w9K1C9l2Xy/sWQ="; # feature-pregeneralized
|
||||
version = "2.27.0"; # feature-pregeneralized
|
||||
hash = "sha256-0389xo0NjTREGQLMrqJesl/XrFOrjFjjFBL7GSUMl/Y="; # feature-pregeneralized
|
||||
};
|
||||
|
||||
# Note: The extension name ("gdal") clashes with pkgs.gdal.
|
||||
gdal = mkGeoserverExtension {
|
||||
name = "gdal";
|
||||
version = "2.26.2"; # gdal
|
||||
version = "2.27.0"; # gdal
|
||||
buildInputs = [ pkgs.gdal ];
|
||||
hash = "sha256-OgkoB2VY4x+6kfDDbOMKUzyd6/Q1m9YMC6sZU17qRsE="; # gdal
|
||||
hash = "sha256-oTSEk+AmgXydSF4TZD9m5ViyeWh5HpAprMZAPMdP2LI="; # gdal
|
||||
};
|
||||
|
||||
# Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box.
|
||||
#geofence = mkGeoserverExtension {
|
||||
# name = "geofence";
|
||||
# version = "2.26.2"; # geofence
|
||||
# hash = "sha256-gXJYk64qO78hQhEmmJU98mrSYIKK/DlRPptdS6rFDD0="; # geofence
|
||||
# version = "2.27.0"; # geofence
|
||||
# hash = "sha256-P7ZHvC4qv1meziqPmBfOgQ+Y06Ico0N1trUi9LMZUJQ="; # geofence
|
||||
#};
|
||||
|
||||
#geofence-server = mkGeoserverExtension {
|
||||
# name = "geofence-server";
|
||||
# version = "2.26.2"; # geofence-server
|
||||
# hash = "sha256-tyxIjQNmATtLy1X9dmaLugsbMyg7+2+NMx8a5jvVvDU="; # geofence-server
|
||||
# version = "2.27.0"; # geofence-server
|
||||
# hash = ""; # geofence-server
|
||||
#};
|
||||
|
||||
#geofence-wps = mkGeoserverExtension {
|
||||
# name = "geofence-wps";
|
||||
# version = "2.26.2"; # geofence-wps
|
||||
# hash = "sha256-ZU5E5SsYBpOvguYhHXLrm5IJzYtSggcF+iqB76LB05g="; # geofence-wps
|
||||
# version = "2.27.0"; # geofence-wps
|
||||
# hash = "sha256-8Wvb/elunsYTFD1GgEQunM8i0eDyOA/W52KZ9+7uvvk="; # geofence-wps
|
||||
#};
|
||||
|
||||
geopkg-output = mkGeoserverExtension {
|
||||
name = "geopkg-output";
|
||||
version = "2.26.2"; # geopkg-output
|
||||
hash = "sha256-XzzT6g5G26/NZzdCl4wqtQUbNfMGrc5/lI/HRN+x8BU="; # geopkg-output
|
||||
version = "2.27.0"; # geopkg-output
|
||||
hash = "sha256-VUqBTt0XfSY2Q8cfeCpVmr398PK+Sb74APSrBODJNlw="; # geopkg-output
|
||||
};
|
||||
|
||||
grib = mkGeoserverExtension {
|
||||
name = "grib";
|
||||
version = "2.26.2"; # grib
|
||||
hash = "sha256-9onvPoSFOLODqedOLW3Bf0IJLE3UtuMSF8l4dGysMDs="; # grib
|
||||
version = "2.27.0"; # grib
|
||||
hash = "sha256-xX9LAgo5exeD2UxZ8/LROZWobLHLw33jcpwERGUGPys="; # grib
|
||||
buildInputs = [ netcdf ];
|
||||
};
|
||||
|
||||
gwc-s3 = mkGeoserverExtension {
|
||||
name = "gwc-s3";
|
||||
version = "2.26.2"; # gwc-s3
|
||||
hash = "sha256-3z7DfkY/NP9ESfZWI+/ubHwHmBJM0SYyJGNVz7oAuVc="; # gwc-s3
|
||||
version = "2.27.0"; # gwc-s3
|
||||
hash = "sha256-/koF00Rki1xiY/g4ahhvFZNQxGnvIbbnqNmYHBqArBI="; # gwc-s3
|
||||
};
|
||||
|
||||
h2 = mkGeoserverExtension {
|
||||
name = "h2";
|
||||
version = "2.26.2"; # h2
|
||||
hash = "sha256-7wsbxACFtmtL1ApQy1DT2yYzOF51nfi7CWYlUGfYoKY="; # h2
|
||||
version = "2.27.0"; # h2
|
||||
hash = "sha256-lfWu3812AMv0bB2dllNlcOSyN+IMASI/nkjLaStvUtw="; # h2
|
||||
};
|
||||
|
||||
iau = mkGeoserverExtension {
|
||||
name = "iau";
|
||||
version = "2.26.2"; # iau
|
||||
hash = "sha256-j8Z5q0w6iqC++KScWoRTMOf4o7ADPN7IfPccc8A4A1M="; # iau
|
||||
version = "2.27.0"; # iau
|
||||
hash = "sha256-9PhWejZILq1hcWBdvWh9SdtfLOlpFcaIU9TeJ8z7UUw="; # iau
|
||||
};
|
||||
|
||||
importer = mkGeoserverExtension {
|
||||
name = "importer";
|
||||
version = "2.26.2"; # importer
|
||||
hash = "sha256-4BObAg/3BuP8UH4yodClBJsSlTE4S2tyPtqDHqOGRYg="; # importer
|
||||
version = "2.27.0"; # importer
|
||||
hash = "sha256-oqlNcUkO7XlcI6QQF+44kt69ZWtPSdcpyuA5xGtVrAQ="; # importer
|
||||
};
|
||||
|
||||
inspire = mkGeoserverExtension {
|
||||
name = "inspire";
|
||||
version = "2.26.2"; # inspire
|
||||
hash = "sha256-NZ5oMXpakPfdJZg8J9Y3D/8j09H0P9CQgnpeObrGkNE="; # inspire
|
||||
version = "2.27.0"; # inspire
|
||||
hash = "sha256-irSJm3gDJAiDHczkS84OW+noOIryCOmSwiIU4GAKqoQ="; # inspire
|
||||
};
|
||||
|
||||
# Needs Kakadu plugin from
|
||||
# https://github.com/geosolutions-it/imageio-ext
|
||||
#jp2k = mkGeoserverExtension {
|
||||
# name = "jp2k";
|
||||
# version = "2.26.2"; # jp2k
|
||||
# hash = "sha256-W+nx7PeEksyjA2iuN75qvWqDSdSnF0eNHAPqwce3amA="; # jp2k
|
||||
# version = "2.27.0"; # jp2k
|
||||
# hash = "sha256-WKWtNKv1sQrdrraCj9jmEODtIhCVF25HFbQNROdlyxg="; # jp2k
|
||||
#};
|
||||
|
||||
libjpeg-turbo = mkGeoserverExtension {
|
||||
name = "libjpeg-turbo";
|
||||
version = "2.26.2"; # libjpeg-turbo
|
||||
hash = "sha256-EYZQOQ1rAqTbRHh7cewkvJT4l1cmyFxNUwEFW2/8ezQ="; # libjpeg-turbo
|
||||
version = "2.27.0"; # libjpeg-turbo
|
||||
hash = "sha256-tMov4w8Kfbrr7hkNK4o+XFUuenyidCem7Z36KXinfTE="; # libjpeg-turbo
|
||||
buildInputs = [ libjpeg.out ];
|
||||
};
|
||||
|
||||
mapml = mkGeoserverExtension {
|
||||
name = "mapml";
|
||||
version = "2.26.2"; # mapml
|
||||
hash = "sha256-RHTPzy0f3DP6ye94Slw/Tz/GIleAgW1DMiMkkneT7kk="; # mapml
|
||||
version = "2.27.0"; # mapml
|
||||
hash = "sha256-HONocKWnjkGqGRmtDxcJSwnDHwVouY6YeORRBjAbu4M="; # mapml
|
||||
};
|
||||
|
||||
mbstyle = mkGeoserverExtension {
|
||||
name = "mbstyle";
|
||||
version = "2.26.2"; # mbstyle
|
||||
hash = "sha256-vJB9wFiMJtu16JuJ+vESYG07U/Hs7NmMo3kqMkjV0k4="; # mbstyle
|
||||
version = "2.27.0"; # mbstyle
|
||||
hash = "sha256-c1QijJj/WfbTxc4vM55lz+wx2PW4BY3tXneSM+3zXRA="; # mbstyle
|
||||
};
|
||||
|
||||
metadata = mkGeoserverExtension {
|
||||
name = "metadata";
|
||||
version = "2.26.2"; # metadata
|
||||
hash = "sha256-CVp2KVHmqeIXPf031HBnvilcgfEKOpyv9Pc/yNpCFM8="; # metadata
|
||||
version = "2.27.0"; # metadata
|
||||
hash = "sha256-5b9gtSzP9DOyhwoNdFVnv08WjlH+m0ZFPO+jqtbUJ1A="; # metadata
|
||||
};
|
||||
|
||||
mongodb = mkGeoserverExtension {
|
||||
name = "mongodb";
|
||||
version = "2.26.2"; # mongodb
|
||||
hash = "sha256-Ndo0/r0maxZ7GcGQFY8ZNgtmxXaDJ1Gtj4oDRN7qzWM="; # mongodb
|
||||
version = "2.27.0"; # mongodb
|
||||
hash = "sha256-Y9KQ7lqfCnPfTdPUzidi9wNZPeiTTqB+4lf5q7mSQ88="; # mongodb
|
||||
};
|
||||
|
||||
monitor = mkGeoserverExtension {
|
||||
name = "monitor";
|
||||
version = "2.26.2"; # monitor
|
||||
hash = "sha256-1/yqmzFaPbntgxB1zXqJIrKCdKJpPzHm30v+Ww/kgXE="; # monitor
|
||||
version = "2.27.0"; # monitor
|
||||
hash = "sha256-uAkOudY7yACJ9A+FxcKSDUhGiID+uTvBibCejFwEiT0="; # monitor
|
||||
};
|
||||
|
||||
mysql = mkGeoserverExtension {
|
||||
name = "mysql";
|
||||
version = "2.26.2"; # mysql
|
||||
hash = "sha256-QOlAUhXyzpazYk/JJr9IcU1gIVS7iGB6Ly2HgbER8dA="; # mysql
|
||||
version = "2.27.0"; # mysql
|
||||
hash = "sha256-qA3l9gx4AuqqbPHfQkbvJNYfURrBSnmq4S4nEPrFpO4="; # mysql
|
||||
};
|
||||
|
||||
netcdf = mkGeoserverExtension {
|
||||
name = "netcdf";
|
||||
version = "2.26.2"; # netcdf
|
||||
hash = "sha256-cwe518kyk5vMjjBvHhzmTdZ/G0nT0KEDoQK7GbiAnfQ="; # netcdf
|
||||
version = "2.27.0"; # netcdf
|
||||
hash = "sha256-3pxGeIWcsBnJMdZjupOR/GmglxYWJp8KjJsmZSCRK00="; # netcdf
|
||||
buildInputs = [ netcdf ];
|
||||
};
|
||||
|
||||
netcdf-out = mkGeoserverExtension {
|
||||
name = "netcdf-out";
|
||||
version = "2.26.2"; # netcdf-out
|
||||
hash = "sha256-/u9cOOT0/FvEt39VXO3l4Vv01Qpiqg9qJnNH4nnUxa0="; # netcdf-out
|
||||
version = "2.27.0"; # netcdf-out
|
||||
hash = "sha256-GfwJqdoO1Z265OmfAvjoKy0/DLX8e06Mu58o4Zps4q0="; # netcdf-out
|
||||
buildInputs = [ netcdf ];
|
||||
};
|
||||
|
||||
ogr-wfs = mkGeoserverExtension {
|
||||
name = "ogr-wfs";
|
||||
version = "2.26.2"; # ogr-wfs
|
||||
version = "2.27.0"; # ogr-wfs
|
||||
buildInputs = [ pkgs.gdal ];
|
||||
hash = "sha256-4Lp9ffQVgug2zP6ikDyDSITqrq8K5wADjNm3ArpJz1s="; # ogr-wfs
|
||||
hash = "sha256-FX3sojRnR6FQSFSK4n62w/lrPbHTdbLn9NtR2nE/3dU="; # ogr-wfs
|
||||
};
|
||||
|
||||
# Needs ogr-wfs extension.
|
||||
ogr-wps = mkGeoserverExtension {
|
||||
name = "ogr-wps";
|
||||
version = "2.26.2"; # ogr-wps
|
||||
version = "2.27.0"; # ogr-wps
|
||||
# buildInputs = [ pkgs.gdal ];
|
||||
hash = "sha256-57rQgsdwXI7eQFhbL+ieP8uOlfeOJqUVWibBNZiPb9E="; # ogr-wps
|
||||
hash = "sha256-Nb7rkbZPw85+EAcR+ist4iW16HVfsH9cSYwplHyO4RY="; # ogr-wps
|
||||
};
|
||||
|
||||
oracle = mkGeoserverExtension {
|
||||
name = "oracle";
|
||||
version = "2.26.2"; # oracle
|
||||
hash = "sha256-23/lMh1L3zzwUk3cJCxQhdLdQoghhkK1JAoet9nmN1M="; # oracle
|
||||
version = "2.27.0"; # oracle
|
||||
hash = "sha256-4KnZ48oKmgap3qZiJE4TSCQZpMvCQd4PULWponW5f1c="; # oracle
|
||||
};
|
||||
|
||||
params-extractor = mkGeoserverExtension {
|
||||
name = "params-extractor";
|
||||
version = "2.26.2"; # params-extractor
|
||||
hash = "sha256-mEKf4riqzSlwra71jY4MO1BM2/fCfikW1CKAB02ntF8="; # params-extractor
|
||||
version = "2.27.0"; # params-extractor
|
||||
hash = "sha256-0NnL87Cn/DcLXTnBJhgcGHNmC6SYKRc7TY+4r7VcYJQ="; # params-extractor
|
||||
};
|
||||
|
||||
printing = mkGeoserverExtension {
|
||||
name = "printing";
|
||||
version = "2.26.2"; # printing
|
||||
hash = "sha256-/R4MX73aiTGbqDNK+2rthcBUwJesc3j96UDqmpTZpxk="; # printing
|
||||
version = "2.27.0"; # printing
|
||||
hash = "sha256-10uBc9ZI9M9m5vmKMXfB1TieJBr7cx/SeD1AiXNVJo8="; # printing
|
||||
};
|
||||
|
||||
pyramid = mkGeoserverExtension {
|
||||
name = "pyramid";
|
||||
version = "2.26.2"; # pyramid
|
||||
hash = "sha256-6FIDk62d45ctmwhaW/XpdHziiPFyhsKm36l5BpZa4/w="; # pyramid
|
||||
version = "2.27.0"; # pyramid
|
||||
hash = "sha256-K38fYjM0Oh+FHT5Wadjuc3KIhFP2x5q5cxW5aucZNNw="; # pyramid
|
||||
};
|
||||
|
||||
querylayer = mkGeoserverExtension {
|
||||
name = "querylayer";
|
||||
version = "2.26.2"; # querylayer
|
||||
hash = "sha256-sM9OmWKJwOjxqzuhOEF+6j01r3+lvvZmaOIxBnmsUbo="; # querylayer
|
||||
version = "2.27.0"; # querylayer
|
||||
hash = "sha256-5OPfTUB0d08jWjxWd77BxffZgx+eM5eJX9bX0kt/WpM="; # querylayer
|
||||
};
|
||||
|
||||
sldservice = mkGeoserverExtension {
|
||||
name = "sldservice";
|
||||
version = "2.26.2"; # sldservice
|
||||
hash = "sha256-aKRy0wbx5XRdXPGZFsf+bdxmU0ILAPiMI2Zqg2nu52E="; # sldservice
|
||||
version = "2.27.0"; # sldservice
|
||||
hash = "sha256-rWIbWCsX4Hkank0L02sluTF137Y6Pex15Gobiwv2pNM="; # sldservice
|
||||
};
|
||||
|
||||
sqlserver = mkGeoserverExtension {
|
||||
name = "sqlserver";
|
||||
version = "2.26.2"; # sqlserver
|
||||
hash = "sha256-Sacng3WZ+bbljlnYQfP9RWk96kVeiJlGFFgudNheg9g="; # sqlserver
|
||||
version = "2.27.0"; # sqlserver
|
||||
hash = "sha256-ghf3z9b586RUgvicyOXlW2K8Uq9TolRb7CrcKT1Jt1M="; # sqlserver
|
||||
};
|
||||
|
||||
vectortiles = mkGeoserverExtension {
|
||||
name = "vectortiles";
|
||||
version = "2.26.2"; # vectortiles
|
||||
hash = "sha256-6hC8YfGbgUC6Mxx5/0qfbKOaO7UmHEhcrY9q1U/Q3Us="; # vectortiles
|
||||
version = "2.27.0"; # vectortiles
|
||||
hash = "sha256-ho/Vp1cFq2/xY9fIaQUR+vBQ6Vfdf+Z2eYvL7eI1qMY="; # vectortiles
|
||||
};
|
||||
|
||||
wcs2_0-eo = mkGeoserverExtension {
|
||||
name = "wcs2_0-eo";
|
||||
version = "2.26.2"; # wcs2_0-eo
|
||||
hash = "sha256-u433otfuIdCOPON8mGcyDgVoHstXV4tKClRopN+yJHE="; # wcs2_0-eo
|
||||
version = "2.27.0"; # wcs2_0-eo
|
||||
hash = "sha256-GcoOT3JNQPUN8ETX4spJXteJvbNM9+YO85FH+dw3oSg="; # wcs2_0-eo
|
||||
};
|
||||
|
||||
web-resource = mkGeoserverExtension {
|
||||
name = "web-resource";
|
||||
version = "2.26.2"; # web-resource
|
||||
hash = "sha256-C8+8Ri7RLz8UhsMuhINF2p7SriHV6+lU/DBMBo75fUw="; # web-resource
|
||||
version = "2.27.0"; # web-resource
|
||||
hash = "sha256-4TGt9MklLWbJexY7kjT+ijIX/V4OLw7U6mDkBoVXuwk="; # web-resource
|
||||
};
|
||||
|
||||
wmts-multi-dimensional = mkGeoserverExtension {
|
||||
name = "wmts-multi-dimensional";
|
||||
version = "2.26.2"; # wmts-multi-dimensional
|
||||
hash = "sha256-6Wnf4im1fZULjoSOu2V3Phn4/6A3UGnCP8BvZDtaKUU="; # wmts-multi-dimensional
|
||||
version = "2.27.0"; # wmts-multi-dimensional
|
||||
hash = "sha256-8I3XbAToqTgwf4y+C3ulAhCY7axyS739GV4+jxwO33g="; # wmts-multi-dimensional
|
||||
};
|
||||
|
||||
wps = mkGeoserverExtension {
|
||||
name = "wps";
|
||||
version = "2.26.2"; # wps
|
||||
hash = "sha256-ocFmcaWsEq7iothnc7/7DIPpbCo5z5WwI3F1tbDX8dA="; # wps
|
||||
version = "2.27.0"; # wps
|
||||
hash = "sha256-9OrjyVaf9JzDPXyqHqqg51aAllhcAf4bOvQQyV1dHpI="; # wps
|
||||
};
|
||||
|
||||
# Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not
|
||||
# available in nixpgs as of 2024/01.
|
||||
#wps-cluster-hazelcast = mkGeoserverExtension {
|
||||
# name = "wps-cluster-hazelcast";
|
||||
# version = "2.26.2"; # wps-cluster-hazelcast
|
||||
# hash = "sha256-GoSeXKd4wBhYdnGlHgoHiaVxnb4VNEg1TG5IXG0qJzA="; # wps-cluster-hazelcast
|
||||
# version = "2.27.0"; # wps-cluster-hazelcast
|
||||
# hash = "sha256-amHfS5eBRoiMdj3wJzRNg9krYo5DJrCvCvhtj/Z9mUw="; # wps-cluster-hazelcast
|
||||
#};
|
||||
|
||||
wps-download = mkGeoserverExtension {
|
||||
name = "wps-download";
|
||||
version = "2.26.2"; # wps-download
|
||||
hash = "sha256-FBVt/B2nuf0PY4o1yuJ997sjWdsWYYxDgC94yOKQH/8="; # wps-download
|
||||
version = "2.27.0"; # wps-download
|
||||
hash = "sha256-vQpSGiOUh9N4PDQ4w/mTNjooz0lYDXwwRpZsq9VhEMA="; # wps-download
|
||||
};
|
||||
|
||||
# Needs Postrgres configuration or similar.
|
||||
# See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html
|
||||
wps-jdbc = mkGeoserverExtension {
|
||||
name = "wps-jdbc";
|
||||
version = "2.26.2"; # wps-jdbc
|
||||
hash = "sha256-w3pzprk4UG4vE6K7tB/41U66OGSpB9uNUafKmKZ5uWY="; # wps-jdbc
|
||||
version = "2.27.0"; # wps-jdbc
|
||||
hash = "sha256-YWBOLL3X6Ztv+9EWmHKd5N020+qkVNtXXbObSlBhp2s="; # wps-jdbc
|
||||
};
|
||||
|
||||
ysld = mkGeoserverExtension {
|
||||
name = "ysld";
|
||||
version = "2.26.2"; # ysld
|
||||
hash = "sha256-guaTT3S0lU6nSaw90gNCHm5Gsdc27jX+XE/92vVfVQI="; # ysld
|
||||
version = "2.27.0"; # ysld
|
||||
hash = "sha256-fPF4LM0WC4YaAMnPhz3A/XXOoMu+v8TsO6XIcXHWRi4="; # ysld
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "geoserver";
|
||||
version = "2.26.2";
|
||||
version = "2.27.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
|
||||
hash = "sha256-K4OeMGnczKXVl+nxyd9unuCdoEpyF7j364Vxe49EOxo=";
|
||||
hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "krep";
|
||||
version = "0.3.6";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davidesantangelo";
|
||||
repo = "krep";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wfMNyqZgqoEkp51gompWUn65kaeVZIMfvo0VStW4EPA=";
|
||||
hash = "sha256-lg1nwBV/lfPVoMWmVh4iFElr5Qv+YA5HRKZOS3jd+6U=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
ninja,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kuzu";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kuzudb";
|
||||
repo = "kuzu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3B2E51PluPKl0OucmTPZYEa9BzYoU0Y8G1PQY86ynFA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
"dev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
python3
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/kuzudb/kuzu/releases/tag/v${finalAttrs.version}";
|
||||
description = "Embeddable property graph database management system";
|
||||
homepage = "https://kuzudb.com/";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "kuzu";
|
||||
maintainers = with lib.maintainers; [ sdht0 ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ltex-ls-plus";
|
||||
version = "18.5.0";
|
||||
version = "18.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ltex-plus/ltex-ls-plus/releases/download/${version}/ltex-ls-plus-${version}.tar.gz";
|
||||
sha256 = "sha256-rtRDfsZUwhH2sXJxUWKBBt0KNIrM85IobYBJtxML5Wc=";
|
||||
sha256 = "sha256-kSs/0Hi9G5l632+dqxGhlvMJCizzKFY/dq7UyAr3uss=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "macpm";
|
||||
version = "0.24-unstable-2024-11-19";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "visualcjy";
|
||||
repo = "macpm";
|
||||
rev = "7882d4c86c84bb23a8966ca57990de9b11397bd4";
|
||||
hash = "sha256-jqaPPvYbuL8q6grmBLyZLf8aDmjugYxMOWAh1Ix82jc=";
|
||||
};
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
# backwards compatibility for users still expecting 'asitop'
|
||||
postInstall = ''
|
||||
ln -rs $out/bin/macpm $out/bin/asitop
|
||||
'';
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
dashing
|
||||
humanize
|
||||
psutil
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Perf monitoring CLI tool for Apple Silicon; previously named 'asitop'";
|
||||
homepage = "https://github.com/visualcjy/macpm";
|
||||
mainProgram = "macpm";
|
||||
platforms = [ "aarch64-darwin" ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
juliusrickert
|
||||
siriobalmelli
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -159,9 +159,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
# swagger-ui will once more be copied in the target directory during the check phase
|
||||
# See https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-7.1.0/utoipa-swagger-ui/build.rs#L168
|
||||
# Not deleting the existing unpacked archive leads to a `PermissionDenied` error
|
||||
preCheck = ''
|
||||
rm -rf target/${hostPlatform.config}/release/build/
|
||||
rm -rf target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/build/
|
||||
'';
|
||||
|
||||
# Prevent checkFeatures from inheriting buildFeatures because
|
||||
|
||||
Generated
+5946
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,141 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
pkg-config,
|
||||
python3,
|
||||
autoPatchelfHook,
|
||||
autoAddDriverRunpath,
|
||||
|
||||
# buildInputs
|
||||
libopus,
|
||||
openssl,
|
||||
sentencepiece,
|
||||
alsa-lib,
|
||||
|
||||
# passthru
|
||||
moshi,
|
||||
nix-update-script,
|
||||
|
||||
config,
|
||||
cudaPackages,
|
||||
cudaCapability ? null,
|
||||
}:
|
||||
|
||||
let
|
||||
minRequiredCudaCapability = "6.1"; # build fails with 6.0
|
||||
inherit (cudaPackages.cudaFlags) cudaCapabilities;
|
||||
cudaCapabilityString =
|
||||
if cudaCapability == null then
|
||||
(builtins.head (
|
||||
(builtins.filter (cap: lib.versionAtLeast cap minRequiredCudaCapability) cudaCapabilities)
|
||||
++ [
|
||||
(lib.warn "moshi doesn't support ${lib.concatStringsSep " " cudaCapabilities}" minRequiredCudaCapability)
|
||||
]
|
||||
))
|
||||
else
|
||||
cudaCapability;
|
||||
cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString);
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "moshi";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyutai-labs";
|
||||
repo = "moshi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tQQTMwvJauzF24S1N2m2slZAHZvklCkPOTrhLvlsNVg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/rust";
|
||||
|
||||
# Upstream does not track their Cargo.lock
|
||||
# https://github.com/kyutai-labs/moshi/issues/256
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
pkg-config
|
||||
python3
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Unable to find libclang: "couldn't find any valid shared libraries matching: ['libclang.dylib']
|
||||
rustPlatform.bindgenHook
|
||||
]
|
||||
++ lib.optionals config.cudaSupport [
|
||||
# WARNING: autoAddDriverRunpath must run AFTER autoPatchelfHook
|
||||
# Otherwise, autoPatchelfHook removes driverLink from RUNPATH
|
||||
autoPatchelfHook
|
||||
autoAddDriverRunpath
|
||||
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
libopus
|
||||
openssl
|
||||
sentencepiece
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
]
|
||||
++ lib.optionals config.cudaSupport [
|
||||
cudaPackages.cuda_cccl
|
||||
cudaPackages.cuda_cudart
|
||||
cudaPackages.cuda_nvrtc
|
||||
cudaPackages.libcublas
|
||||
cudaPackages.libcurand
|
||||
];
|
||||
|
||||
buildFeatures =
|
||||
lib.optionals stdenv.hostPlatform.isDarwin [ "metal" ]
|
||||
++ lib.optionals config.cudaSupport [ "cuda" ];
|
||||
|
||||
env = lib.optionalAttrs config.cudaSupport {
|
||||
CUDA_COMPUTE_CAP = cudaCapability';
|
||||
|
||||
# We already list CUDA dependencies in buildInputs
|
||||
# We only set CUDA_TOOLKIT_ROOT_DIR to satisfy some redundant checks from upstream
|
||||
CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart;
|
||||
};
|
||||
|
||||
appendRunpaths = lib.optionals config.cudaSupport [
|
||||
(lib.makeLibraryPath [
|
||||
cudaPackages.libcublas
|
||||
cudaPackages.libcurand
|
||||
])
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
withCuda = lib.optionalAttrs stdenv.hostPlatform.isLinux (
|
||||
moshi.override { config.cudaSupport = true; }
|
||||
);
|
||||
};
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [ "--generate-lockfile" ];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Rust implementation of moshi, a real-time voice AI";
|
||||
homepage = "https://github.com/kyutai-labs/moshi";
|
||||
# The rust implementation is licensed under Apache
|
||||
# https://github.com/kyutai-labs/moshi/tree/main/rust#license
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "moshi-cli";
|
||||
};
|
||||
})
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitea,
|
||||
rustPlatform,
|
||||
dbus,
|
||||
networkmanager,
|
||||
@@ -9,16 +9,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "nm-file-secret-agent";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lilioid";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "lilly";
|
||||
repo = "nm-file-secret-agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xQWgNxrbpHOfnKXa57cV1F3JmtJcvQsqUfgwfWg5Ni4=";
|
||||
hash = "sha256-FZef9qMJeQkoLvCHcsGMqr0riC98WVXntQtbt76Iev4=";
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Q2RQ6pWYKOr/6nD7PLpTonVldOfyUu2lvwNRAc8zkLg=";
|
||||
cargoHash = "sha256-HYyL0r9YrDL22uQdypJQ7Xep9Uqt4b16bhl0D9kRByU=";
|
||||
buildInputs = [ dbus ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -27,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "NetworkManager secret agent that responds with the content of preconfigured files";
|
||||
mainProgram = "nm-file-secret-agent";
|
||||
homepage = "https://github.com/lilioid/nm-file-secret-agent/";
|
||||
homepage = "https://codeberg.org/lilly/nm-file-secret-agent";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lilioid ];
|
||||
platforms = lib.lists.intersectLists dbus.meta.platforms networkmanager.meta.platforms;
|
||||
|
||||
@@ -21,7 +21,8 @@
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
substituteInPlace gyp/pylib/gyp/**.py --replace-fail sys.platform '"${stdenv.targetPlatform.parsed.kernel.name}"'
|
||||
substituteInPlace gyp/pylib/gyp/**.py \
|
||||
--replace-quiet sys.platform '"${stdenv.targetPlatform.parsed.kernel.name}"'
|
||||
'';
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
@@ -43,13 +43,13 @@ assert builtins.elem acceleration [
|
||||
let
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-d8TPVa/kujFDrHbjwv++bUe2txMlkOxAn34t7wXg4qE=";
|
||||
hash = "sha256-l+JYQjl6A0fKONxtgCtc0ztT18rmArGKcO2o+p4H95M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://opencore-amr.sourceforge.io/";
|
||||
homepage = "https://sourceforge.net/projects/opencore-amr/";
|
||||
description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec.
|
||||
Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "peazip";
|
||||
version = "10.3.0";
|
||||
version = "10.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peazip";
|
||||
repo = "peazip";
|
||||
rev = version;
|
||||
hash = "sha256-rEddDg2sS/4+HK3UqPEWudWnwjMPNjA2+v4CKtFtZYM=";
|
||||
hash = "sha256-tA2JLO4KIqFOVZyt7CPMRJTojQFQVQqGGOeh3sU/FuQ=";
|
||||
};
|
||||
sourceRoot = "${src.name}/peazip-sources";
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "12.1.0";
|
||||
version = "12.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-1nxhutWHaIVTlmf1N2vDjCFdRS0EIyR2cErf2SkUkos=";
|
||||
hash = "sha256-ug4fi+PJbtwbxL3qS2dzaVTdKr0o4hwFA3+Us7JCFIY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-D583XaLEAsLcN8C6QIhUWD0bbWk7tvNIIF/nvTpitws=";
|
||||
vendorHash = "sha256-EN9iYbFht77/N5Ull/+TS3BjzMR7YCujz9p5Rgqos6g=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "pocket-casts";
|
||||
version = "0.9.0";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "felicianotech";
|
||||
repo = "pocket-casts-desktop-app";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5xn2uAjqIyWKQAruHLyho72HCYpbxyWlcTQ3LXXZy6M=";
|
||||
hash = "sha256-qXwLnAp8GxOBnPy5uM/Y4dKlALRLo9Hs2p8/WSJcAyE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-nfTn2rs0XGraebI0rKlTECccc7KpRXf/+qOjj/5GPAw=";
|
||||
npmDepsHash = "sha256-HU+jfp+Rmw78wTSA0m9Q6EW6+bw84+MEnnSaPnKqqIo=";
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
@@ -44,8 +44,8 @@ buildNpmPackage rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 $out/lib/node_modules/pocket-casts/icon.png $out/share/pixmaps/pocket-casts.png
|
||||
install -Dm644 $out/lib/node_modules/pocket-casts/icon-x360.png $out/share/pixmaps/pocket-casts-x360.png
|
||||
install -Dm444 $out/lib/node_modules/pocket-casts/img/icon-x512.png $out/share/icons/hicolor/512x512/apps/pocket-casts.png
|
||||
install -Dm444 $out/lib/node_modules/pocket-casts/img/icon-x360.png $out/share/icons/hicolor/360x360/apps/pocket-casts.png
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/pocket-casts \
|
||||
--add-flags $out/lib/node_modules/pocket-casts/main.js
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "revanced-cli";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar";
|
||||
hash = "sha256-KxxdMDybGBEgu2O0wozFDMszIDz4lHrdOQ2QD5/n8tg=";
|
||||
hash = "sha256-tq+DSWAPVupR2W1Jqk0vKI4ox5zWSTSbpwyLcs4EXa8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
xz,
|
||||
man,
|
||||
openssl,
|
||||
pcre,
|
||||
pcre2,
|
||||
nlohmann_json,
|
||||
pkg-config,
|
||||
procps,
|
||||
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
||||
patchRcPathCsh
|
||||
patchRcPathFish
|
||||
patchRcPathPosix
|
||||
pcre
|
||||
pcre2
|
||||
python3.pkgs.numpy
|
||||
tbb
|
||||
xrootd
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vuetorrent";
|
||||
version = "2.23.1";
|
||||
version = "2.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VueTorrent";
|
||||
repo = "VueTorrent";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cOt/JxceEET8g8hyQbhz9tYf4zH2i5YYG7eQ9/EjA0M=";
|
||||
hash = "sha256-KvEjxo+ejXoGmeY2NsRBJHyn7yuBI3YK3tcqysy7v8E=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-gjvJEY+XZeRJNwVi0hSfbdFnuIJbY8CVsJqyMqi7wD0=";
|
||||
npmDepsHash = "sha256-HdRZ5LKFrHZJeMI2GaQytEuzZYsDT/xTH9KDlDzz8Lk=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "zinit";
|
||||
version = "3.13.1";
|
||||
version = "3.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zdharma-continuum";
|
||||
repo = "zinit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fnBV0LmC/wJm0pOITJ1mhiBqsg2F8AQJWvn0p/Bgo5Q=";
|
||||
hash = "sha256-cBMGmFrveBes30aCSLMBO8WrtoPZeMNjcEQoQEzBNvM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zwave-js-ui";
|
||||
version = "10.1.2";
|
||||
version = "10.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zwave-js";
|
||||
repo = "zwave-js-ui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-j56kDnMw/YX6ONkIjPjopsu6xE2Kt1cZV5u+tX2TqlM=";
|
||||
hash = "sha256-z0uLX8tVL5g9Vnneu4r35iucRi3mDOJXC3mx9Xwz5So=";
|
||||
};
|
||||
npmDepsHash = "sha256-hkfDztDtLug9qdxi9NRWnzCN6Parv27stVknZ0cSYpo=";
|
||||
npmDepsHash = "sha256-mO+PJFbhj8n/HRpBc9YyJHnvcXHnC3gT4pQM91PbL3M=";
|
||||
|
||||
passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
|
||||
|
||||
|
||||
@@ -1,36 +1,35 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
fetchgit,
|
||||
fetchHex,
|
||||
rebar3Relx,
|
||||
buildRebar3,
|
||||
writeScript,
|
||||
fetchFromGitHub,
|
||||
fetchHex,
|
||||
fetchgit,
|
||||
lib,
|
||||
rebar3Relx,
|
||||
writeScript,
|
||||
}:
|
||||
|
||||
let
|
||||
owner = "inaka";
|
||||
repo = "elvis";
|
||||
in
|
||||
rebar3Relx rec {
|
||||
releaseType = "escript";
|
||||
# The package name "elvis" is already taken
|
||||
pname = "elvis-erlang";
|
||||
version = "3.2.6";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "13QM6UbH+1PxzhY/ufi5PEP2pKqSl5+g6tMvKmOUMb0=";
|
||||
rev = version;
|
||||
owner = "inaka";
|
||||
repo = "elvis";
|
||||
hash = "sha256-HJH/p8EHE4zor0LOczpOlDy6sPSI+WVWIS22hGhjQ0s=";
|
||||
tag = version;
|
||||
};
|
||||
|
||||
beamDeps = builtins.attrValues (
|
||||
import ./rebar-deps.nix {
|
||||
inherit fetchHex fetchgit fetchFromGitHub;
|
||||
builder = buildRebar3;
|
||||
}
|
||||
);
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bash common-updater-scripts git nix-prefetch-git gnutar gzip "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}"
|
||||
#!nix-shell -i bash -p bash common-updater-scripts git nix-prefetch-git gnutar gzip "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" nixfmt-rfc-style
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
@@ -42,15 +41,17 @@ rebar3Relx rec {
|
||||
tmpdir=$(mktemp -d)
|
||||
cp -R $(nix-build $nixpkgs --no-out-link -A elvis-erlang.src)/* "$tmpdir"
|
||||
(cd "$tmpdir" && HOME=. rebar3 nix lock -o "$nix_path/rebar-deps.nix")
|
||||
nixfmt "$nix_path/rebar-deps.nix"
|
||||
else
|
||||
echo "${repo} is already up-to-date"
|
||||
echo "elvis-erlang is already up-to-date"
|
||||
fi
|
||||
'';
|
||||
meta = with lib; {
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/inaka/elvis";
|
||||
description = "Erlang Style Reviewer";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dlesl ];
|
||||
mainProgram = "elvis";
|
||||
};
|
||||
|
||||
@@ -84,11 +84,11 @@ let
|
||||
};
|
||||
zipper = builder {
|
||||
name = "zipper";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
src = fetchHex {
|
||||
pkg = "zipper";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0=";
|
||||
version = "1.1.0";
|
||||
sha256 = "sha256-RkTIOug+88CYYMte1Zewx1n7vNZK1bAKYvUa5IrvdTU=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
@@ -104,11 +104,11 @@ let
|
||||
};
|
||||
katana_code = builder {
|
||||
name = "katana_code";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
src = fetchHex {
|
||||
pkg = "katana_code";
|
||||
version = "2.1.0";
|
||||
sha256 = "sha256-rju6yhh1EViPaWlan/IiUcssxnL9zMGAKJd5vdJRde8=";
|
||||
version = "2.1.1";
|
||||
sha256 = "sha256-BoDzNSW5qILm9NMCJRixXEb2SL17Db6GkAmA/hwpFAQ=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
@@ -152,21 +152,21 @@ let
|
||||
};
|
||||
getopt = builder {
|
||||
name = "getopt";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
src = fetchHex {
|
||||
pkg = "getopt";
|
||||
version = "1.0.2";
|
||||
sha256 = "sha256-oAKa6kMi+4KmH2h2ptnGbcmHi2y2H6oT3zGHOE/U6iY=";
|
||||
version = "1.0.3";
|
||||
sha256 = "sha256-fgHekKxUDyFJT/cnkrHjFi05mWbrv8Z0tM5Sy49JMk8=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
elvis_core = builder {
|
||||
name = "elvis_core";
|
||||
version = "3.2.3";
|
||||
version = "4.0.0";
|
||||
src = fetchHex {
|
||||
pkg = "elvis_core";
|
||||
version = "3.2.3";
|
||||
sha256 = "sha256-oPDWgczZNVoWXDWXNnVVHxAhaHz5kvFcW/9mtmZO3gQ=";
|
||||
version = "4.0.0";
|
||||
sha256 = "sha256-+i7jDyRkRm01mfsfz6phXImVn8UBmkVhnvett+1CC+U=";
|
||||
};
|
||||
beamDeps = [
|
||||
katana_code
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gleam";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6vYVUdQST49TNctO9Y/XrRFyJ6hXng85SsO+4JBn1GA=";
|
||||
hash = "sha256-0qK9dWkKnoXbIIBMN3p5noPEke/bgC8Bjtmf6lwtyr4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-arVtNxcYDVKRTGe9won6zb30wCxMD6MtsGs25UmOPjM=";
|
||||
cargoHash = "sha256-EoRu8p6cUe1li54nVUkf+3qywIsDXh4ptIVLluJ3eFs=";
|
||||
|
||||
checkFlags = [
|
||||
# Makes a network request
|
||||
|
||||
@@ -177,11 +177,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://yosyshq.net/yosys/";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.all;
|
||||
badPlatforms = [
|
||||
# Tests fail
|
||||
# https://github.com/NixOS/nixpkgs/issues/398121
|
||||
lib.systems.inspect.patterns.isDarwin
|
||||
];
|
||||
maintainers = with maintainers; [
|
||||
shell
|
||||
thoughtpolice
|
||||
|
||||
@@ -254,11 +254,6 @@ stdenv.mkDerivation {
|
||||
|| !(cudaSupport || rocmSupport) # At least one back-end enabled
|
||||
|| (cudaSupport && rocmSupport) # Mutually exclusive
|
||||
|| (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null)
|
||||
|| (rocmSupport && strings.versionOlder version "2.8.0" && rocmPackages_5 == null)
|
||||
|| (
|
||||
rocmSupport
|
||||
&& strings.versionAtLeast version "2.8.0"
|
||||
&& strings.versionOlder rocmPackages.clr.version "6.3"
|
||||
);
|
||||
|| (rocmSupport && strings.versionOlder version "2.8.0" && rocmPackages_5 == null);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
pyyaml,
|
||||
requests,
|
||||
requests-unixsocket,
|
||||
pyfakefs,
|
||||
pytestCheckHook,
|
||||
pytest-check,
|
||||
pytest-mock,
|
||||
@@ -28,7 +29,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-parts";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -36,7 +37,7 @@ buildPythonPackage rec {
|
||||
owner = "canonical";
|
||||
repo = "craft-parts";
|
||||
tag = version;
|
||||
hash = "sha256-Diu8cHy3tRWsyI7mPsAcYREK9nUG7tzasmZYAARzpXU=";
|
||||
hash = "sha256-1SnT/yB6vJm82yhszBRjeph13B91KYap8/KR4L9VcjM=";
|
||||
};
|
||||
|
||||
patches = [ ./bash-path.patch ];
|
||||
@@ -67,6 +68,7 @@ buildPythonPackage rec {
|
||||
jdk
|
||||
jsonschema
|
||||
maven
|
||||
pyfakefs
|
||||
pytest-check
|
||||
pytest-mock
|
||||
pytest-subprocess
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-platforms";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "canonical";
|
||||
repo = "craft-platforms";
|
||||
tag = version;
|
||||
hash = "sha256-BFs+LqcJWqKMgEr7IzyP5qME+zaV6EFc79ustOB1Cno=";
|
||||
hash = "sha256-+7uaN+ePu+88goPCj9KM3dKhTwV2erP0/Fg05LqOWPg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -47,6 +47,12 @@ buildPythonPackage rec {
|
||||
|
||||
pytestFlagsArray = [ "tests/unit" ];
|
||||
|
||||
disabledTests = [
|
||||
# Attempts to get distro information, and expects "ubuntu-ish"
|
||||
# information to be returned, which doesn't work under NixOS
|
||||
"test_fuzz_get_platforms_build_plan_single_base"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,28 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
bidict,
|
||||
packaging,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
dbus-fast,
|
||||
rubicon-objc,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "desktop-notifier";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SamSchott";
|
||||
repo = "desktop-notifier";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HynREkiPxv/1y1/ICVwqANIe9tAkIvdpDy4oXxQarec=";
|
||||
hash = "sha256-cSeEekjX9NeoEoe9mDokCanK5zrawyvdHK1c4RJ9kSk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -31,6 +32,7 @@ buildPythonPackage rec {
|
||||
[
|
||||
bidict
|
||||
packaging
|
||||
typing-extensions
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ dbus-fast ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ];
|
||||
@@ -40,11 +42,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "desktop_notifier" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Python library for cross-platform desktop notifications";
|
||||
homepage = "https://github.com/samschott/desktop-notifier";
|
||||
changelog = "https://github.com/samschott/desktop-notifier/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sfrijters ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flowmc";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kazewong";
|
||||
repo = "flowMC";
|
||||
tag = "flowMC-${version}";
|
||||
hash = "sha256-Qsh5nvLdJeIx3EHACdhRE4GDdI31MHYvUDHephMs+2Y=";
|
||||
hash = "sha256-M0FrIe7q0YI6f+IwQeMsZKahw9wcQd42hf/dmXJp2Fk=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -48,7 +48,6 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [
|
||||
chex
|
||||
coveralls
|
||||
equinox
|
||||
jax
|
||||
jaxtyping
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools-scm,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kuzu";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Llnz1NH8OF6ekNeuCfBy7C9M/v9QhYJSOgA0zrB29us=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
cmake
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
pythonImportsCheck = [ "kuzu" ];
|
||||
|
||||
meta = {
|
||||
description = "Python bindings for Kuzu, an embeddable property graph database management system";
|
||||
homepage = "https://kuzudb.com/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sdht0 ];
|
||||
};
|
||||
}
|
||||
@@ -18,6 +18,7 @@
|
||||
setuptools,
|
||||
sshtunnel,
|
||||
mock,
|
||||
tzlocal,
|
||||
}:
|
||||
|
||||
# this is a pythonPackage because of the ipython line magics in pgcli.magic
|
||||
@@ -47,6 +48,7 @@ buildPythonPackage rec {
|
||||
keyring
|
||||
pendulum
|
||||
sshtunnel
|
||||
tzlocal
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -44,11 +44,23 @@ pnpmConfigHook() {
|
||||
|
||||
runHook prePnpmInstall
|
||||
|
||||
pnpm install \
|
||||
if ! pnpm install \
|
||||
--offline \
|
||||
--ignore-scripts \
|
||||
"${pnpmInstallFlags[@]}" \
|
||||
--frozen-lockfile
|
||||
then
|
||||
echo
|
||||
echo "ERROR: pnpm failed to install dependencies"
|
||||
echo
|
||||
echo "If you see ERR_PNPM_NO_OFFLINE_TARBALL above this, follow these to fix the issue:"
|
||||
echo '1. Set pnpmDeps.hash to "" (empty string)'
|
||||
echo "2. Build the derivation and wait for it to fail with a hash mismatch"
|
||||
echo "3. Copy the 'got: sha256-' value back into the pnpmDeps.hash field"
|
||||
echo
|
||||
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
echo "Patching scripts"
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
zlib,
|
||||
stdenv,
|
||||
CoreServices,
|
||||
Security,
|
||||
@@ -27,7 +28,10 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
[
|
||||
openssl
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
CoreServices
|
||||
Security
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "asitop";
|
||||
version = "0.0.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = python3.pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Xfe1kwRXKpSPcc+UuHrcYThpqKh6kzWVsbPia/QsPjc=";
|
||||
};
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dashing
|
||||
psutil
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tlkh/asitop";
|
||||
description = "Perf monitoring CLI tool for Apple Silicon";
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ juliusrickert ];
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,9 @@
|
||||
generic: {
|
||||
v72 = generic {
|
||||
version = "7.2.5";
|
||||
hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54=";
|
||||
vendorHash = null;
|
||||
};
|
||||
v70 = generic {
|
||||
version = "7.0.11";
|
||||
hash = "sha256-r9VNy3bRuFvJAL+ZQEbKjCAS3+AvetnWAwFjLxFVuGU=";
|
||||
|
||||
@@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
usb-monitor
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "pynitrokey" ];
|
||||
pythonRelaxDeps = [ "nitrokey" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nitrokeyapp"
|
||||
|
||||
@@ -301,6 +301,7 @@ mapAliases {
|
||||
aria = aria2; # Added 2024-03-26
|
||||
armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
|
||||
aseprite-unfree = aseprite; # Added 2023-08-26
|
||||
asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility
|
||||
async = throw "'async' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
|
||||
atlassian-bamboo = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
|
||||
atlassian-confluence = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
|
||||
|
||||
@@ -282,8 +282,6 @@ with pkgs;
|
||||
extraPackages = [ jdk17 ];
|
||||
};
|
||||
|
||||
asitop = callPackage ../os-specific/darwin/asitop { };
|
||||
|
||||
cve = with python3Packages; toPythonApplication cvelib;
|
||||
|
||||
apko = callPackage ../development/tools/apko {
|
||||
@@ -2678,7 +2676,7 @@ with pkgs;
|
||||
patool = with python3Packages; toPythonApplication patool;
|
||||
|
||||
pocket-casts = callPackage ../by-name/po/pocket-casts/package.nix {
|
||||
electron = electron_33;
|
||||
electron = electron_34;
|
||||
};
|
||||
|
||||
pueue = darwin.apple_sdk_11_0.callPackage ../applications/misc/pueue {
|
||||
@@ -12690,6 +12688,7 @@ with pkgs;
|
||||
server = server-pgsql;
|
||||
};
|
||||
|
||||
zabbix72 = recurseIntoAttrs (zabbixFor "v72");
|
||||
zabbix70 = recurseIntoAttrs (zabbixFor "v70");
|
||||
zabbix60 = recurseIntoAttrs (zabbixFor "v60");
|
||||
zabbix64 = recurseIntoAttrs (zabbixFor "v64");
|
||||
|
||||
@@ -7439,6 +7439,8 @@ self: super: with self; {
|
||||
|
||||
kurbopy = callPackage ../development/python-modules/kurbopy { };
|
||||
|
||||
kuzu = callPackage ../development/python-modules/kuzu { };
|
||||
|
||||
l18n = callPackage ../development/python-modules/l18n { };
|
||||
|
||||
labelbox = callPackage ../development/python-modules/labelbox { };
|
||||
|
||||
Reference in New Issue
Block a user