mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
88140ced6d
@ -117,5 +117,5 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ drupol ];
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@ in
|
||||
{
|
||||
name = "private-gpt";
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ drupol ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwig-studio";
|
||||
version = "5.1.8";
|
||||
version = "5.1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||
sha256 = "sha256-KxNLae/uTYL1m/X+/7wr7hhKfw31NpB9Mw9RzfrTuus=";
|
||||
url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
|
||||
hash = "sha256-J5kLqXCMnGb0ZMhES6PQIPjN51ptlBGj4Fy8qSzJ6Qg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lndhub-go";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getAlby";
|
||||
repo = "lndhub.go";
|
||||
rev = version;
|
||||
sha256 = "sha256-PHBzM/lYYu6hXa5jiFQR/K5j+vmxaYH7xuoxOhFbhMk=";
|
||||
sha256 = "sha256-YOLqMIfZSGD+AOng1XWCBlzaHkPnQc+2kmDXF2fh+ps=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Vo29w04cRW0syD2tjieKVeZ3srFNuEC3T17birVWn6k=";
|
||||
|
||||
@ -10894,6 +10894,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/Marskey/telescope-sg/";
|
||||
};
|
||||
|
||||
telescope-smart-history-nvim = buildVimPlugin {
|
||||
pname = "telescope-smart-history.nvim";
|
||||
version = "2022-12-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-smart-history.nvim";
|
||||
rev = "81a4cceaa54d65d5f7c7c26178ee63b634d3e26d";
|
||||
sha256 = "sha256-riBl0vSkRtM9Gtw/FNSKodSmqgGUpDnH7d5w+uU4ReQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-smart-history.nvim/";
|
||||
};
|
||||
|
||||
telescope-symbols-nvim = buildVimPlugin {
|
||||
pname = "telescope-symbols.nvim";
|
||||
version = "2023-11-24";
|
||||
|
||||
@ -449,6 +449,8 @@
|
||||
|
||||
doInstallCheck = true;
|
||||
nvimRequireCheck = "codesnap";
|
||||
|
||||
meta.homepage = "https://github.com/mistricky/codesnap.nvim/";
|
||||
};
|
||||
|
||||
command-t = super.command-t.overrideAttrs {
|
||||
|
||||
@ -915,6 +915,7 @@ https://github.com/MrcJkb/telescope-manix/,HEAD,
|
||||
https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,
|
||||
https://github.com/nvim-telescope/telescope-project.nvim/,,
|
||||
https://github.com/Marskey/telescope-sg/,HEAD,
|
||||
https://github.com/nvim-telescope/telescope-smart-history.nvim/,HEAD,
|
||||
https://github.com/nvim-telescope/telescope-symbols.nvim/,,
|
||||
https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
|
||||
https://github.com/fhill2/telescope-ultisnips.nvim/,,
|
||||
|
||||
@ -41,6 +41,7 @@
|
||||
, python3
|
||||
, SDL2
|
||||
, shaderc
|
||||
, tracy
|
||||
, udev
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
@ -80,6 +81,8 @@ stdenv.mkDerivation {
|
||||
cmakeFlags = [
|
||||
"-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}"
|
||||
"-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON"
|
||||
"-DXRT_HAVE_TRACY=ON"
|
||||
"-DXRT_FEATURE_TRACING=ON"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -117,6 +120,7 @@ stdenv.mkDerivation {
|
||||
pcre2
|
||||
SDL2
|
||||
shaderc
|
||||
tracy
|
||||
udev
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sosreport";
|
||||
version = "4.7.1";
|
||||
version = "4.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sosreport";
|
||||
repo = "sos";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-usa4xSNAv0AaML7qv5kCQDA3VMz4IneLFDVyv7uPUcQ=";
|
||||
sha256 = "sha256-67YRmD3kaJbRR7g3w57EwFg7duhcI6zov7gQ4H1MkR8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lscolors";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
hash = "sha256-efkSiwxL7sZIwFXJZunddAb4lTOfhj8oOEOUW3kyRXI=";
|
||||
hash = "sha256-m9S8fG0c+67/msdWaN8noazEdsdLk1aswUJ+8hkjhxo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1Cyg4WT4xYqc3s5AOXR9GfcS3qKOgscYujGXR9fzuCA=";
|
||||
cargoHash = "sha256-6d/v89Yqn9FioWQTb5513kPbO9lnzBxaubfcdCzwUP4=";
|
||||
|
||||
buildFeatures = [ "nu-ansi-term" ];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "24.6.2";
|
||||
sha256 = "0qghp8v4lz51yv5j5k8dps4qv58hjdjdc3jzrrq3g239x8b2h6ys";
|
||||
vendorHash = "sha256-7Q6V9DKROkSTxU7n511aOpaMDRfhP88p6PJ89Sr6kOQ=";
|
||||
version = "24.6.3";
|
||||
sha256 = "1mlbb8qkx71anwqi027p9lv10kfck811ikfvc5gpnavfaaiwrrd1";
|
||||
vendorHash = "sha256-nIDbwUvu1e/1ImVQMj4eOaPeFHM7HCcJMFk/ackdJSE=";
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@ rec {
|
||||
|
||||
thunderbird-115 = (buildMozillaMach rec {
|
||||
pname = "thunderbird";
|
||||
version = "115.12.0";
|
||||
version = "115.12.2";
|
||||
application = "comm/mail";
|
||||
applicationName = "Mozilla Thunderbird";
|
||||
binaryName = pname;
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||
sha512 = "d262ec2cea3fd003e66974b0bd8d61fb268ad2a233e54a6aea4803c5520e235ea308267f0484581ce235063c4fb90e621cdc1eea3f62212574b90427ede1c289";
|
||||
sha512 = "182f35e8e5ece98d18dfefe106c73bc97fbc619f59772d9b3455b7c8af412021ecc5eae97a12515224e91deb814abb7a6ef7f538c450e9e77fdfd84078678038";
|
||||
};
|
||||
extraPatches = [
|
||||
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper, nixosTests }:
|
||||
|
||||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
writeText,
|
||||
jdk,
|
||||
makeWrapper,
|
||||
nixosTests,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "soapui";
|
||||
version = "5.7.0";
|
||||
version = "5.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz";
|
||||
sha256 = "sha256-qzhy4yHmOk13dFUd2KEZhXtWY86QwyjJgYxx9GGoN80=";
|
||||
url = "https://dl.eviware.com/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz";
|
||||
sha256 = "sha256-pT0ZANVC7Sv7zxMDPY86aclIUGZeazOZadiVVsmEjtw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jdk ];
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
buildInputs = [jdk];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -46,15 +53,15 @@ stdenv.mkDerivation rec {
|
||||
'')
|
||||
];
|
||||
|
||||
passthru.tests = { inherit (nixosTests) soapui; };
|
||||
passthru.tests = {inherit (nixosTests) soapui;};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Most Advanced REST & SOAP Testing Tool in the World";
|
||||
homepage = "https://www.soapui.org/";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
sourceProvenance = with sourceTypes; [binaryBytecode];
|
||||
license = "SoapUI End User License Agreement";
|
||||
maintainers = with maintainers; [ gerschtli ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [gerschtli];
|
||||
platforms = platforms.linux; # we don't fetch the dmg yet
|
||||
mainProgram = "soapui";
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "advanced-scene-switcher";
|
||||
version = "1.26.2";
|
||||
version = "1.26.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WarmUpTill";
|
||||
repo = "SceneSwitcher";
|
||||
rev = version;
|
||||
hash = "sha256-x9wk4tqCXufHSb/ssUxjm0o6JrZzXnIk+adIn/YI9Qk=";
|
||||
hash = "sha256-qUKywOfUiGKBmyREns2LnWECGeFhdA4ecpgGJQAIKpU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "obs-teleport";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzwoch";
|
||||
repo = "obs-teleport";
|
||||
rev = version;
|
||||
sha256 = "sha256-vT5GhZQFunQURgnFI3RSGVlwvcWEW588MuJ+Ev7IZ7w=";
|
||||
sha256 = "sha256-71fvaqjesLhCdK3dHodAtMNYhU6LGX4wkHSPgQJPYqo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Po7Oj+wdBOOFI2Ws9MLZQxk4N6mE58M+3q+qNlUrqOY=";
|
||||
vendorHash = "sha256-INJvecUwHMauoqqyd6S2JvZ/oqnwonbdbGhV8hdqiH8=";
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
|
||||
@ -2,20 +2,14 @@
|
||||
|
||||
buildNpmPackage {
|
||||
pname = "webtorrent-desktop";
|
||||
version = "0.25-pre-1eb612";
|
||||
version = "0.25-pre-ac7f16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "webtorrent";
|
||||
repo = "webtorrent-desktop";
|
||||
rev = "1eb61201d6360698a2cc4ea72bf0fa7ee78b457c";
|
||||
sha256 = "sha256-DBEFOamncyidMXypvKNnUmDIPUq1LzYjDgox7fa4+Gg=";
|
||||
rev = "ac7f16e71c96c5ad670bfcb8728df5af78ae21a1";
|
||||
sha256 = "sha256-UEN5NhLVSQEO8rsiTW1hJPjNFL9KobW/Bho98FzKaf4=";
|
||||
};
|
||||
patches = [
|
||||
# electron 27 fix
|
||||
(fetchpatch {
|
||||
name = "2388.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2388
|
||||
url = "https://github.com/webtorrent/webtorrent-desktop/compare/ebaf9cf8487dbd9e14a9a0c5adc3eab23b199e58...0c3e55d1f091bf66a342e2732550ebeccc2e4169.patch";
|
||||
hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM=";
|
||||
})
|
||||
# startup fix
|
||||
(fetchpatch {
|
||||
name = "2389.patch"; # https://github.com/webtorrent/webtorrent-desktop/pull/2389
|
||||
@ -23,7 +17,7 @@ buildNpmPackage {
|
||||
hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI=";
|
||||
})
|
||||
];
|
||||
npmDepsHash = "sha256-tqhp3jDb1xtyV/n9kJtzkiznLQfqeYWeZiTnTVV0ibE=";
|
||||
npmDepsHash = "sha256-otAes6GkqoAVvfeWhWgyY4IVZIZxw3WtkrVdEWIk1Lk=";
|
||||
makeCacheWritable = true;
|
||||
npmRebuildFlags = [ "--ignore-scripts" ];
|
||||
installPhase = ''
|
||||
|
||||
@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "atlauncher";
|
||||
version = "3.4.36.6";
|
||||
version = "3.4.36.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar";
|
||||
hash = "sha256-uux5m9GI+F5yCLF4nk5tk6FJjF4Wc81Uw8xfvt2TE4c=";
|
||||
hash = "sha256-2kO7CRkA3RlWcNqv2d5sJIaLPupUU0ox2wc3T16i7e8=";
|
||||
};
|
||||
|
||||
env.ICON = fetchurl {
|
||||
|
||||
@ -9,23 +9,23 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "boxbuddy";
|
||||
version = "2.2.5";
|
||||
version = "2.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dvlv";
|
||||
repo = "BoxBuddyRS";
|
||||
rev = version;
|
||||
hash = "sha256-Dy7mSBraMHAno8cIk9f6/Ofsm2ZGSb7VS5Wy1o+ZoC8=";
|
||||
hash = "sha256-AW2RKtxvF4WxCyb6QEDuTEAOy/DqBxoZrtc2JGeKFtk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NB93bw2mMCVmZWpxCJGusXp2DgotjrlHUlsd0mb+fBA=";
|
||||
cargoHash = "sha256-J7VJSOY7Cj9Dsq0jj9uVTGJOessyx3WOlDbg7dS+1dg=";
|
||||
|
||||
# The software assumes it is installed either in flatpak or in the home directory
|
||||
# so the xdg data path needs to be patched here
|
||||
postPatch = ''
|
||||
substituteInPlace src/utils.rs \
|
||||
--replace-fail '{data_home}/locale' "$out/share/locale" \
|
||||
--replace-fail '{data_home}/icons/boxbuddy/{}' "$out/share/icons/boxbuddy/{}"
|
||||
--replace-fail '{data_home}/icons/boxbuddy/{icon}' "$out/share/icons/boxbuddy/{icon}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -66,6 +66,6 @@ in rustPlatform.buildRustPackage {
|
||||
homepage = "https://github.com/cachix/devenv";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "devenv";
|
||||
maintainers = with lib.maintainers; [ domenkozar drupol ];
|
||||
maintainers = with lib.maintainers; [ domenkozar ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -43,6 +43,22 @@ let
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
# FIXME: check if this downgrade is still required when bumping gerbolyze
|
||||
# https://github.com/jaseg/gerbolyze/issues/47
|
||||
resvg' = resvg.overrideAttrs (old: rec {
|
||||
version = "0.41.0";
|
||||
src = old.src.override {
|
||||
rev = "v${version}";
|
||||
hash = "sha256-plZiyEiBWeV2mwTsNK5Je8Axs/hcHH8aV2VpOix6QCY=";
|
||||
};
|
||||
cargoDeps = old.cargoDeps.overrideAttrs (lib.const {
|
||||
name = "${old.pname}-${version}-vendor.tar.gz";
|
||||
inherit src;
|
||||
outputHash = "sha256-U7xzb9e9wh9XbLvlYQ0ofIjH8FuSzVcrXnrehQmZgww=";
|
||||
});
|
||||
});
|
||||
|
||||
in python3Packages.buildPythonApplication rec {
|
||||
inherit version src;
|
||||
pname = "gerbolyze";
|
||||
@ -61,7 +77,7 @@ in python3Packages.buildPythonApplication rec {
|
||||
python3Packages.python-slugify
|
||||
python3Packages.lxml
|
||||
python3Packages.gerbonara
|
||||
resvg
|
||||
resvg'
|
||||
svg-flatten
|
||||
];
|
||||
|
||||
@ -79,7 +95,7 @@ in python3Packages.buildPythonApplication rec {
|
||||
|
||||
pythonImportsCheck = [ "gerbolyze" ];
|
||||
|
||||
nativeCheckInputs = [ python3Packages.pytestCheckHook resvg svg-flatten ];
|
||||
nativeCheckInputs = [ python3Packages.pytestCheckHook resvg' svg-flatten ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Directly render SVG overlays into Gerber and Excellon files";
|
||||
|
||||
@ -79,6 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/nomic-ai/gpt4all";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "gpt4all";
|
||||
maintainers = with lib.maintainers; [ drupol polygon ];
|
||||
maintainers = with lib.maintainers; [ polygon ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -29,7 +29,7 @@ appimageTools.wrapType2 {
|
||||
homepage = "https://github.com/janhq/jan";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
mainProgram = "jan";
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, nix-update-script
|
||||
}:
|
||||
let
|
||||
version = "0.0.3";
|
||||
version = "0.0.4";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit version;
|
||||
@ -14,7 +14,7 @@ buildGoModule {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kubectl-validate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k2+2QIPjNw6C/Do1WhPN39VZhZX4PZ6ZsKDKGJ9E5QA=";
|
||||
hash = "sha256-0r3ffrZSRtSe5CgvocRhoJz0zqUsx9vtABP2h1o9vCw=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@ -24,6 +24,9 @@ buildGoModule {
|
||||
preBuild = ''
|
||||
mv cmd/download-builtin-schemas/main.go cmd/download-builtin-schemas/_main.go
|
||||
mv pkg/openapiclient/github_builtins_test.go pkg/openapiclient/_github_builtins_test.go
|
||||
|
||||
# https://github.com/kubernetes-sigs/kubectl-validate/issues/134
|
||||
mv pkg/openapiclient/hardcoded_builtins_test.go pkg/openapiclient/_hardcoded_builtins_test.go
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
50
pkgs/by-name/pa/panvimdoc/package.nix
Normal file
50
pkgs/by-name/pa/panvimdoc/package.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenvNoCC,
|
||||
pandoc,
|
||||
vim,
|
||||
neovim-unwrapped,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "panvimdoc";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kdheepak";
|
||||
repo = "panvimdoc";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-HmEBPkNELHC7Xy0v730sQWZyPPwFdIBUcELzNtrWwzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
install -Dm444 scripts/* -t $out/share/scripts
|
||||
install -Dm444 lib/* -t $out/share/lib
|
||||
install -Dm755 panvimdoc.sh -t $out/share
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper $out/share/panvimdoc.sh $out/bin/panvimdoc --prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
pandoc
|
||||
vim
|
||||
neovim-unwrapped
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Write documentation in pandoc markdown. Generate documentation in vimdoc";
|
||||
homepage = "https://github.com/kdheepak/panvimdoc";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ mrcjkb ];
|
||||
mainProgram = "panvimdoc";
|
||||
};
|
||||
})
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quarkus-cli";
|
||||
version = "3.11.1";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-eR3/DDO50KYVI14iX+IvALK4YLx0hmd9Z4rToPQTBGE=";
|
||||
hash = "sha256-z8mQo9Kl7HvIl+8GDEcuPdRkVmKUX5/V6X4qvRTe6t4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,4 +1,12 @@
|
||||
{ stdenv, writeScript, coreutils, gnugrep, gnused, common-updater-scripts, nix }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, common-updater-scripts
|
||||
, coreutils
|
||||
, gnugrep
|
||||
, gnused
|
||||
, nix
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
{ name ? null
|
||||
, pname ? null
|
||||
@ -15,6 +23,9 @@ let
|
||||
# where to print git commands and debugging messages
|
||||
fileForGitCommands = "update-git-commits.txt";
|
||||
|
||||
grep = lib.getExe gnugrep;
|
||||
sed = lib.getExe gnused;
|
||||
|
||||
# shell script to update package
|
||||
updateScript = writeScript "generic-update-script.sh" ''
|
||||
#! ${stdenv.shell}
|
||||
@ -41,20 +52,20 @@ let
|
||||
|
||||
function version_is_ignored() {
|
||||
local tag="$1"
|
||||
[ -n "$ignored_versions" ] && grep -E "$ignored_versions" <<< "$tag"
|
||||
[ -n "$ignored_versions" ] && ${grep} -E "$ignored_versions" <<< "$tag"
|
||||
}
|
||||
|
||||
function version_is_unstable() {
|
||||
local tag="$1"
|
||||
local enforce="$2"
|
||||
if [ -n "$odd_unstable" -o -n "$enforce" ]; then
|
||||
local minor=$(echo "$tag" | ${gnused}/bin/sed -rne 's,^[0-9]+\.([0-9]+).*,\1,p')
|
||||
local minor=$(echo "$tag" | ${sed} -rne 's,^[0-9]+\.([0-9]+).*,\1,p')
|
||||
if [ $((minor % 2)) -eq 1 ]; then
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
if [ -n "$patchlevel_unstable" -o -n "$enforce" ]; then
|
||||
local patchlevel=$(echo "$tag" | ${gnused}/bin/sed -rne 's,^[0-9]+\.[0-9]+\.([0-9]+).*$,\1,p')
|
||||
local patchlevel=$(echo "$tag" | ${sed} -rne 's,^[0-9]+\.[0-9]+\.([0-9]+).*$,\1,p')
|
||||
if ((patchlevel >= 90)); then
|
||||
return 0
|
||||
fi
|
||||
@ -71,10 +82,10 @@ let
|
||||
|
||||
# cut any revision prefix not used in the NixOS package version
|
||||
if [ -n "$rev_prefix" ]; then
|
||||
tags=$(echo "$tags" | ${gnugrep}/bin/grep "^$rev_prefix")
|
||||
tags=$(echo "$tags" | ${gnused}/bin/sed -e "s,^$rev_prefix,,")
|
||||
tags=$(echo "$tags" | ${grep} "^$rev_prefix")
|
||||
tags=$(echo "$tags" | ${sed} -e "s,^$rev_prefix,,")
|
||||
fi
|
||||
tags=$(echo "$tags" | ${gnugrep}/bin/grep "^[0-9]")
|
||||
tags=$(echo "$tags" | ${grep} "^[0-9]")
|
||||
|
||||
# sort the tags in decreasing order
|
||||
tags=$(echo "$tags" | ${coreutils}/bin/sort --reverse --version-sort)
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
}:
|
||||
clojure.overrideAttrs (previousAttrs: {
|
||||
pname = "babashka-clojure-tools";
|
||||
version = "1.11.2.1446";
|
||||
version = "1.11.3.1463";
|
||||
|
||||
src = fetchurl {
|
||||
url = previousAttrs.src.url;
|
||||
hash = "sha256-qn7/sPyVDfjZPLeWxlUBBljAW/d8cCw6lEm3/deS73E=";
|
||||
hash = "sha256-26QZ3j54XztpW2WJ1xg0Gc+OwrsvmfK4iv0GsLV8FIc=";
|
||||
};
|
||||
})
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
let
|
||||
babashka-unwrapped = buildGraalvmNativeImage rec {
|
||||
pname = "babashka-unwrapped";
|
||||
version = "1.3.190";
|
||||
version = "1.3.191";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";
|
||||
sha256 = "sha256-zGWUuFyCOZXrcAOJ2sGvzvfJbFti1IlDS1gx9Oye9fg=";
|
||||
sha256 = "sha256-xF0u2VO0xdNvRElhUb7atpvy2Y5T9/V1b92ffaOMga8=";
|
||||
};
|
||||
|
||||
graalvmDrv = graalvmCEPackages.graalvm-ce;
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
pythonOlder,
|
||||
iso4217,
|
||||
pyserial,
|
||||
pyserial-asyncio,
|
||||
pyserial-asyncio-fast,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioraven";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "cottsay";
|
||||
repo = "aioraven";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kGCFwpMaLWxLUp8k5H5AnL21KrwohbUYLswLcLqmc3M=";
|
||||
hash = "sha256-RU2DRDjxl0EVmnNLADawEB/x6Zc3/IWH015xig5AIJY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
iso4217
|
||||
pyserial
|
||||
pyserial-asyncio
|
||||
pyserial-asyncio-fast
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -3,8 +3,12 @@
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
|
||||
# dependencies
|
||||
aiohttp,
|
||||
awkward,
|
||||
cachetools,
|
||||
@ -28,6 +32,8 @@
|
||||
toml,
|
||||
tqdm,
|
||||
uproot,
|
||||
|
||||
# checks
|
||||
distributed,
|
||||
pyinstrument,
|
||||
pytestCheckHook,
|
||||
@ -35,7 +41,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coffea";
|
||||
version = "2024.6.0";
|
||||
version = "2024.6.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -44,7 +50,7 @@ buildPythonPackage rec {
|
||||
owner = "CoffeaTeam";
|
||||
repo = "coffea";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MnAGtoev20Cn1WUmX8imUNQCJftU4jw+hInYI7dhb4M=";
|
||||
hash = "sha256-Z6c8R8B8IrDkXVDx89XVtg3eRgORuHPfUyAPRGwAlrg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-expr";
|
||||
version = "1.1.3";
|
||||
version = "1.1.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "dask";
|
||||
repo = "dask-expr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-20gVzmOnVWoPGrGcLp8nhAoiHWunaYZIXOxYho7ZhUs=";
|
||||
hash = "sha256-ON2Fyyq5fa0TgS28v6FAbR6MpI1k8EOS8HWchfZyT+g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "2024.6.0";
|
||||
version = "2024.6.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -50,7 +50,7 @@ let
|
||||
owner = "dask";
|
||||
repo = "dask";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HtWxVWMk0G2OeBnZKLF5tuOohPbg20Ufl+VH/MX8vK0=";
|
||||
hash = "sha256-5jG9hx1tZkqLwjWF73Fm2oJBuejbq4a7GP9fMd8hRJg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@ -69,7 +69,7 @@ let
|
||||
toolz
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = lib.fix (self: {
|
||||
optional-dependencies = lib.fix (self: {
|
||||
array = [ numpy ];
|
||||
complete = [
|
||||
pyarrow
|
||||
@ -97,8 +97,8 @@ let
|
||||
hypothesis
|
||||
pytest-asyncio
|
||||
]
|
||||
++ passthru.optional-dependencies.array
|
||||
++ passthru.optional-dependencies.dataframe
|
||||
++ self.optional-dependencies.array
|
||||
++ self.optional-dependencies.dataframe
|
||||
++ lib.optionals (!arrow-cpp.meta.broken) [
|
||||
# support is sparse on aarch64
|
||||
pyarrow
|
||||
@ -111,15 +111,15 @@ let
|
||||
echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
|
||||
|
||||
substituteInPlace setup.py \
|
||||
--replace "import versioneer" "" \
|
||||
--replace "version=versioneer.get_version()," "version='${version}'," \
|
||||
--replace "cmdclass=versioneer.get_cmdclass()," ""
|
||||
--replace-fail "import versioneer" "" \
|
||||
--replace-fail "version=versioneer.get_version()," "version='${version}'," \
|
||||
--replace-fail "cmdclass=versioneer.get_cmdclass()," ""
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace ', "versioneer[toml]==0.29"' "" \
|
||||
--replace " --durations=10" "" \
|
||||
--replace " --cov-config=pyproject.toml" "" \
|
||||
--replace "\"-v" "\" "
|
||||
--replace-fail ', "versioneer[toml]==0.29"' "" \
|
||||
--replace-fail " --durations=10" "" \
|
||||
--replace-fail " --cov-config=pyproject.toml" "" \
|
||||
--replace-fail "\"-v" "\" "
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "distributed";
|
||||
version = "2024.6.0";
|
||||
version = "2024.6.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -34,13 +34,13 @@ buildPythonPackage rec {
|
||||
owner = "dask";
|
||||
repo = "distributed";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8TShbpH+DB73G7D4pz8MHC/SPd3RaRttML0S4WaCE4k=";
|
||||
hash = "sha256-GgW9BtTqjac+olAGg+LOO+lTopuUukVUmQ0ZWsMJOc8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "versioneer[toml]==" "versioneer[toml]>=" \
|
||||
--replace 'dynamic = ["version"]' 'version = "${version}"'
|
||||
--replace-fail "versioneer[toml]==" "versioneer[toml]>=" \
|
||||
--replace-fail 'dynamic = ["version"]' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drawsvg";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "cduck";
|
||||
repo = "drawsvg";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LoA5yYeHO4GqS3dk7EMg1ZC42HBgmM6rSfigWMc4yUQ=";
|
||||
hash = "sha256-JC7u6bEB7RCJVLeYnNqACmddLI5F5PyaaBxaAZ+N/5s=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -91,6 +91,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/zylon-ai/private-gpt";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "private-gpt";
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
40
pkgs/development/python-modules/rfc8785/default.nix
Normal file
40
pkgs/development/python-modules/rfc8785/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rfc8785";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trailofbits";
|
||||
repo = "rfc8785.py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hMH//DpxgNoNLZJ8XL8SikcTfj0w0FvlBMfnPCkqzZ4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "rfc8785" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for RFC8785 (JSON Canonicalization Scheme)";
|
||||
homepage = "https://github.com/trailofbits/rfc8785.py";
|
||||
changelog = "https://github.com/trailofbits/rfc8785.py/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs";
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = "yalexs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-b5R80l3+5mnxMFtISUxToufhSDoRmmCRAyoP5hbk08o=";
|
||||
hash = "sha256-lCRil1SeYXZeXT0SJielJg2Ma8voBXPgij+RK/oT1iU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,21 +13,21 @@ let
|
||||
|
||||
channels = {
|
||||
stable = {
|
||||
version = "2.11.2";
|
||||
version = "2.11.3";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-kvQPrYGDkfzTOb3c9f3VNdg3oltKmm1Z4pXeHJ9LIyo=";
|
||||
x86_64-darwin = "sha256-AUfbdJNBK2fCJ6Pq4gkH4+y/undu6Nx64wcejVAB7iU=";
|
||||
aarch64-linux = "sha256-FWgTLE3fW/6j1W1FNDqyVOTMGuFqc4e3Eq2tj8IEcWk=";
|
||||
aarch64-darwin = "sha256-oM+dEUYNUcYHemDWYBf5mqUo3aHXEu6LUuLOboGfTrQ=";
|
||||
x86_64-linux = "sha256-TaEl7J/Zo/K+j8EGpIauQYR5UucALviuSk0/jgiK83U=";
|
||||
x86_64-darwin = "sha256-qM2YTvHGeAi1F4V79YoDdsp1NbHFah8L0bppUhmzZyY=";
|
||||
aarch64-linux = "sha256-gLaxi3h2JrnVecS/k3YHuWM1R1oLXKg5R1aeh3GVREY=";
|
||||
aarch64-darwin = "sha256-SochFDBspdKfw1xd2FiyI9bp2Y3SbdgbGtzwUDyMsLE=";
|
||||
};
|
||||
};
|
||||
mainline = {
|
||||
version = "2.12.1";
|
||||
version = "2.12.2";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-YOm2qpw9c5L0bwcodR0quUO2d0eRqDBeUfGB6bZNC9I=";
|
||||
x86_64-darwin = "sha256-ePpwnXoVQby0l4Az8OtygPBpXumjIR8MaDVPH4FzrwM=";
|
||||
aarch64-linux = "sha256-ZPAWzLjtJsgtcMT+w2n8o4cQtQ7HXrL+EejOib/Ab3c=";
|
||||
aarch64-darwin = "sha256-ZcJiLLcZcge0MXiuQH4slAqxXLuytdHL+LZfUNx25jY=";
|
||||
x86_64-linux = "sha256-UJnJ64zwuDKzc/yKLQnj//3tXZ/GJpzUUw8KoH3Uf14=";
|
||||
x86_64-darwin = "sha256-d+BWUEMvta7ZkCOqMTafuR5suIDWPauwTzGOpPDF+ck=";
|
||||
aarch64-linux = "sha256-ayZZhqL3YLjaUDmHOiY4yXg/+tGR7HpLcwojuagqkKg=";
|
||||
aarch64-darwin = "sha256-EYB7YLScshBInLBOXVfYs+f+OWC7OF9tEmhhG25pPSo=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "codespell";
|
||||
version = "2.2.6";
|
||||
version = "2.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codespell-project";
|
||||
repo = "codespell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-esewCJw4o4SfSst5ALZ90X3XgOuOAsaxytpotvFeHB0=";
|
||||
sha256 = "sha256-X3Pueu0E7Q57sbKSXqCZki4/PUb1WyWk/Zmj+lhVTM8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -39,9 +39,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
disabledTests = [
|
||||
# tries to run not fully installed script
|
||||
"test_command"
|
||||
# error 'dateset' should not be in aspell dictionaries (en, en_GB, en_US, en_CA, en_AU) for dictionary /build/source/codespell_lib/tests/../data/dictionary.txt
|
||||
"test_dictionary_formatting"
|
||||
"test_basic"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "codespell_lib" ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neocmakelsp";
|
||||
version = "0.7.4";
|
||||
version = "0.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Decodetalkers";
|
||||
repo = "neocmakelsp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oYvjMpZcXIpOA/osVCOy2NxkFnEQePGf4le22M1bFPA=";
|
||||
hash = "sha256-V8bbJg7h/TCv0y8Kwz3h6XMKtxKjJKduCj9e1vcd6AQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kcqq4xnCxGIGCFlmm4EDc9ZfQHBi6k/xrhIyZ+eKs34=";
|
||||
cargoHash = "sha256-kR4QJ1QFewI5jKPX9/P1z5J9hnWBIhWExF6JgmDzoJw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cmake lsp based on tower-lsp and treesitter";
|
||||
|
||||
@ -17,6 +17,8 @@ buildDartApplication rec {
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Protobuf plugin for generating Dart code";
|
||||
mainProgram = "protoc-gen-dart";
|
||||
|
||||
33
pkgs/development/tools/protoc-gen-dart/update.sh
Executable file
33
pkgs/development/tools/protoc-gen-dart/update.sh
Executable file
@ -0,0 +1,33 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p yq ripgrep common-updater-scripts dart
|
||||
|
||||
set -xeu -o pipefail
|
||||
|
||||
PACKAGE_DIR="$(realpath "$(dirname "$0")")"
|
||||
cd "$PACKAGE_DIR/.."
|
||||
while ! test -f flake.nix; do cd .. ; done
|
||||
NIXPKGS_DIR="$PWD"
|
||||
|
||||
version="$(
|
||||
list-git-tags --url=https://github.com/google/protobuf.dart \
|
||||
| rg '^protobuf-v(.*)' -r '$1' \
|
||||
| sort --version-sort \
|
||||
| tail -n1
|
||||
)"
|
||||
|
||||
cd "$NIXPKGS_DIR"
|
||||
update-source-version protoc-gen-dart "$version"
|
||||
|
||||
TMPDIR="$(mktemp -d)"
|
||||
cd "$TMPDIR"
|
||||
|
||||
src="$(nix-build --no-link "$NIXPKGS_DIR" -A protoc-gen-dart.src)/protoc_plugin"
|
||||
cp $src/pubspec.* .
|
||||
|
||||
if ! test -f pubspec.lock; then
|
||||
dart pub update
|
||||
fi
|
||||
|
||||
yq . pubspec.lock > "$PACKAGE_DIR/pubspec.lock.json"
|
||||
|
||||
rm -rf "$TMPDIR"
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epson-inkjet-printer-escpr2";
|
||||
version = "1.2.10";
|
||||
version = "1.2.11";
|
||||
|
||||
src = fetchurl {
|
||||
# To find new versions, visit
|
||||
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
|
||||
# some printer like for instance "WF-7210" to get to the most recent
|
||||
# version.
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/15/87/52/84d8972472981a5337b96610c39c8c7586256b55/epson-inkjet-printer-escpr2-1.2.10-1.src.rpm";
|
||||
sha256 = "sha256-vrAVarGBp8eI07WMtQSmuNpX5iS26+B2iP/b7U8mJmo=";
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/15/93/07/6926ce2857b2e0f563eecfd6a877b7b71898ad46/epson-inkjet-printer-escpr2-1.2.11-1.src.rpm";
|
||||
sha256 = "sha256-WMjtYYuMGMPf6222rvrP5Ep6fMRwebPTUXeQ6CbwEt4=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -16,13 +16,13 @@ let
|
||||
|
||||
in package.override rec {
|
||||
pname = "bookstack";
|
||||
version = "24.05.1";
|
||||
version = "24.05.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bookstackapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1m20435sp4n3dg7am4lh73yw1wdmnsf15wdl554lrklhg7f21s0w";
|
||||
sha256 = "13yln6b5j9plkcrp1mwfvgcv67gm2ayb2l2grhw2h4ncqnvmxhwv";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -15,10 +15,10 @@ let
|
||||
"aws/aws-sdk-php" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "aws-aws-sdk-php-cc79f16e1a1bd3feee421401ba2f21915abfdf91";
|
||||
name = "aws-aws-sdk-php-731cd73062909594c5f7443413c4c4c40ed1c25c";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc79f16e1a1bd3feee421401ba2f21915abfdf91";
|
||||
sha256 = "1dg6g31hwn8b0drsvg077im9bnp5x0zhqsdwck6qq02kzyimjsy2";
|
||||
url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/731cd73062909594c5f7443413c4c4c40ed1c25c";
|
||||
sha256 = "1bs6l34j3r1nr7750ssrannbi8x5pdwknlzhmqx84xajm9imiqcp";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -105,10 +105,10 @@ let
|
||||
"doctrine/event-manager" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "doctrine-event-manager-750671534e0241a7c50ea5b43f67e23eb5c96f32";
|
||||
name = "doctrine-event-manager-b680156fa328f1dfd874fd48c7026c41570b9c6e";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32";
|
||||
sha256 = "1inhh3k8ai8d6rhx5xsbdx0ifc3yjjfrahi0cy1npz9nx3383cfh";
|
||||
url = "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e";
|
||||
sha256 = "135zcwnlfijxzv3x5qn1zs3jmybs1n2q64pbs5gbjwmsdgrxhzsi";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -245,10 +245,10 @@ let
|
||||
"intervention/image" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "intervention-image-193324ec88bc5ad4039e57ce9b926ae28dfde813";
|
||||
name = "intervention-image-d428433aa74836ab75e8d4a5241628bebb7f4077";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/Intervention/image/zipball/193324ec88bc5ad4039e57ce9b926ae28dfde813";
|
||||
sha256 = "18p2xgbvdzyx9wjid5iviyfx81k7za73b729ar3fyjd646x8niwi";
|
||||
url = "https://api.github.com/repos/Intervention/image/zipball/d428433aa74836ab75e8d4a5241628bebb7f4077";
|
||||
sha256 = "0qglsydy5672kl1f12pp185zw4vk30jh151bgjvyakggwiabds57";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -265,20 +265,20 @@ let
|
||||
"laravel/framework" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "laravel-framework-91e2b9e218afa4e5c377510faa11957042831ba3";
|
||||
name = "laravel-framework-590afea38e708022662629fbf5184351fa82cf08";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/laravel/framework/zipball/91e2b9e218afa4e5c377510faa11957042831ba3";
|
||||
sha256 = "05rzgsvqlyjbpwx69vq5vlk4fqwi7vxs5qacizyqnrihck9laahs";
|
||||
url = "https://api.github.com/repos/laravel/framework/zipball/590afea38e708022662629fbf5184351fa82cf08";
|
||||
sha256 = "0gnp0khw8a1rydrv06pi4sssx6fyvdwvcqsgjh8rjcbcs39f1ii5";
|
||||
};
|
||||
};
|
||||
};
|
||||
"laravel/prompts" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "laravel-prompts-23ea808e8a145653e0ab29e30d4385e49f40a920";
|
||||
name = "laravel-prompts-9bc4df7c699b0452c6b815e64a2d84b6d7f99400";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/laravel/prompts/zipball/23ea808e8a145653e0ab29e30d4385e49f40a920";
|
||||
sha256 = "0ysyqn1xivinv4lrqd1vifk50ccrxfjyv7ndsh433hb2961n3r52";
|
||||
url = "https://api.github.com/repos/laravel/prompts/zipball/9bc4df7c699b0452c6b815e64a2d84b6d7f99400";
|
||||
sha256 = "05hf1r10l8fbxy4wy4g4sjwqvd28liq5n4gjyhsc54kj2jp5bba0";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -335,30 +335,30 @@ let
|
||||
"league/flysystem" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "league-flysystem-4729745b1ab737908c7d055148c9a6b3e959832f";
|
||||
name = "league-flysystem-e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/thephpleague/flysystem/zipball/4729745b1ab737908c7d055148c9a6b3e959832f";
|
||||
sha256 = "13kf4l7mp4mifm09av0w7vfcwnmpvjpsic836xh8a8rlfczgjym2";
|
||||
url = "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c";
|
||||
sha256 = "18sackbf9pfbpr03dd5z8vfcqsqhz1sajj2pp2wddz3srcf3zxk5";
|
||||
};
|
||||
};
|
||||
};
|
||||
"league/flysystem-aws-s3-v3" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "league-flysystem-aws-s3-v3-3e6ce2f972f1470db779f04d29c289dcd2c32837";
|
||||
name = "league-flysystem-aws-s3-v3-22071ef1604bc776f5ff2468ac27a752514665c8";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/3e6ce2f972f1470db779f04d29c289dcd2c32837";
|
||||
sha256 = "01l7nbdmrh1vb59m7xhc1kjfz6xrp5871ghrb6c1anwcsh20l9r3";
|
||||
url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/22071ef1604bc776f5ff2468ac27a752514665c8";
|
||||
sha256 = "1yhrnw4alf5cf3bwyd3nxcrmwcih6hkmc2l3f6nmhksiza89b9cv";
|
||||
};
|
||||
};
|
||||
};
|
||||
"league/flysystem-local" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "league-flysystem-local-61a6a90d6e999e4ddd9ce5adb356de0939060b92";
|
||||
name = "league-flysystem-local-13f22ea8be526ea58c2ddff9e158ef7c296e4f40";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92";
|
||||
sha256 = "0mkcqhmxgq5pwbfzqc26z06384v7plva5s71pqyqdaayb1hlyg1f";
|
||||
url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40";
|
||||
sha256 = "1cpi818r6nizp965hiba9zhrfjr9gbyqms3f4r4hzd19d73p6l60";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -435,10 +435,10 @@ let
|
||||
"nesbot/carbon" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "nesbot-carbon-0c6fd108360c562f6e4fd1dedb8233b423e91c83";
|
||||
name = "nesbot-carbon-afd46589c216118ecd48ff2b95d77596af1e57ed";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83";
|
||||
sha256 = "1qwdzf2jgppj2r8jpxxd1q08aycyvj17azy2ixlw4cnmwhcqzgnh";
|
||||
url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed";
|
||||
sha256 = "17sz76kydaf5n74qgqz36yxbmg4lwcbcv6kpjxrqfqfrb65sz5b6";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -485,10 +485,10 @@ let
|
||||
"onelogin/php-saml" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "onelogin-php-saml-b22a57ebd13e838b90df5d3346090bc37056409d";
|
||||
name = "onelogin-php-saml-d3b5172f137db2f412239432d77253ceaaa1e939";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/onelogin/php-saml/zipball/b22a57ebd13e838b90df5d3346090bc37056409d";
|
||||
sha256 = "1bi65bi04a26zmaz7ms0qyg6i86k4cd9g8qs7dp1pphpvflgz461";
|
||||
url = "https://api.github.com/repos/SAML-Toolkits/php-saml/zipball/d3b5172f137db2f412239432d77253ceaaa1e939";
|
||||
sha256 = "0hhsww74494bh7xk1d0cyr04yr2fggsscfs9z522k6md780pz85m";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -805,20 +805,20 @@ let
|
||||
"symfony/console" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-console-a170e64ae10d00ba89e2acbb590dc2e54da8ad8f";
|
||||
name = "symfony-console-be5854cee0e8c7b110f00d695d11debdfa1a2a91";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f";
|
||||
sha256 = "16fnydlalcv3ihj2z7b0nyp6cc260k5apxpx7q1vb0hdx8b7wl6a";
|
||||
url = "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91";
|
||||
sha256 = "018il5dccpnk2988sgxp26440wrx25j064gns7plnidmx7byxjpw";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/css-selector" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-css-selector-1c5d5c2103c3762aff27a27e1e2409e30a79083b";
|
||||
name = "symfony-css-selector-4b61b02fe15db48e3687ce1c45ea385d1780fe08";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/css-selector/zipball/1c5d5c2103c3762aff27a27e1e2409e30a79083b";
|
||||
sha256 = "0glngr70w1kx1gqliv1w0zk23pblc993i3apdlmb68gp04b8gd3f";
|
||||
url = "https://api.github.com/repos/symfony/css-selector/zipball/4b61b02fe15db48e3687ce1c45ea385d1780fe08";
|
||||
sha256 = "066gmgxy8228kxfqgirmilil172q61i6fc0vnxxpmcyz6b7xxfai";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -835,20 +835,20 @@ let
|
||||
"symfony/error-handler" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-error-handler-667a072466c6a53827ed7b119af93806b884cbb3";
|
||||
name = "symfony-error-handler-ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/error-handler/zipball/667a072466c6a53827ed7b119af93806b884cbb3";
|
||||
sha256 = "077xdy196mbcaqx6kv7p2sx2ygbmnja0xa9mn34d9b1gjmz7kkvj";
|
||||
url = "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc";
|
||||
sha256 = "0r29dqwxs2xmv404rfcidf83rycfm9fqv7hsqaz3jwms00y770gg";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/event-dispatcher" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-event-dispatcher-d84384f3f67de3cb650db64d685d70395dacfc3f";
|
||||
name = "symfony-event-dispatcher-8d7507f02b06e06815e56bb39aa0128e3806208b";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/d84384f3f67de3cb650db64d685d70395dacfc3f";
|
||||
sha256 = "1d22vxp7fnjd9chl0yd1gnnfdbcgxkcxzl2fynkdf5b1rsx5vly3";
|
||||
url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b";
|
||||
sha256 = "162p2x4vxwvljdrqq481sccspzyky2g53pmmnqg4hvg76g5yajj8";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -865,40 +865,40 @@ let
|
||||
"symfony/finder" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-finder-511c48990be17358c23bf45c5d71ab85d40fb764";
|
||||
name = "symfony-finder-3ef977a43883215d560a2cecb82ec8e62131471c";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/finder/zipball/511c48990be17358c23bf45c5d71ab85d40fb764";
|
||||
sha256 = "0m3cm549cnk893dx8dzggbjy49qyx9zln82xi4w4m8rf93pc2ph9";
|
||||
url = "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c";
|
||||
sha256 = "1ibv2sk2bfg6hymxhs6p6g62h7ycw1w2lg1w1q78pql1nxvrp7ks";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/http-foundation" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-http-foundation-b4db6b833035477cb70e18d0ae33cb7c2b521759";
|
||||
name = "symfony-http-foundation-27de8cc95e11db7a50b027e71caaab9024545947";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/http-foundation/zipball/b4db6b833035477cb70e18d0ae33cb7c2b521759";
|
||||
sha256 = "1wwa9ib2imrdq7qrplf2lkbzs2irhjdfrhwdxff5dvcpkvd80qgj";
|
||||
url = "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947";
|
||||
sha256 = "11bf0fhb7pf5jp5kpd7nm8sil9mnnvhihj4l23gx514m81anzfi0";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/http-kernel" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-http-kernel-b7b5e6cdef670a0c82d015a966ffc7e855861a98";
|
||||
name = "symfony-http-kernel-6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/http-kernel/zipball/b7b5e6cdef670a0c82d015a966ffc7e855861a98";
|
||||
sha256 = "0ggvbn2qiydv0qcp5rsa5dpjqffj239zcyxiplv5vk4gnc2jy4qr";
|
||||
url = "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1";
|
||||
sha256 = "0y2qsnymkagnds6qwgfv2lbf9i3jf0f4frs1psa35mkb64c58hkg";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/mime" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-mime-decadcf3865918ecfcbfa90968553994ce935a5e";
|
||||
name = "symfony-mime-618597ab8b78ac86d1c75a9d0b35540cda074f33";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/mime/zipball/decadcf3865918ecfcbfa90968553994ce935a5e";
|
||||
sha256 = "0piaiwigyjvy9mn2464ka3cvzkylw3i1b8by5qr52z0mhm6sv7g5";
|
||||
url = "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33";
|
||||
sha256 = "1rklzg8j8s6ls770l8rqz7mb10nrifr228zmqpxdqkpfrs8j0w3z";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -995,20 +995,20 @@ let
|
||||
"symfony/process" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-process-cdb1c81c145fd5aa9b0038bab694035020943381";
|
||||
name = "symfony-process-8d92dd79149f29e89ee0f480254db595f6a6a2c5";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381";
|
||||
sha256 = "1dlqa0fivwr3q7z2k7n657dzdwywh4ilv88fiwh3n8r09iblnc65";
|
||||
url = "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5";
|
||||
sha256 = "1fvyj71vdnbm56xp167svigax6q562j92i309wqikprdyakdqmyy";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/routing" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-routing-276e06398f71fa2a973264d94f28150f93cfb907";
|
||||
name = "symfony-routing-8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/routing/zipball/276e06398f71fa2a973264d94f28150f93cfb907";
|
||||
sha256 = "1a9g57sdny5sph2w1i7wizssg90k50msalk7nhcy0p9q584r61g6";
|
||||
url = "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58";
|
||||
sha256 = "1ayhdyvc503xjjaaz6vclsxbm568l73zybcbxiz6g1625cg4g8gb";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -1025,20 +1025,20 @@ let
|
||||
"symfony/string" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-string-ffeb9591c61f65a68d47f77d12b83fa530227a69";
|
||||
name = "symfony-string-a147c0f826c4a1f3afb763ab8e009e37c877a44d";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69";
|
||||
sha256 = "0mw6issgmncy1xnnszwy0xa8cxqin41k4idk3wv6crdsywzylxkx";
|
||||
url = "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d";
|
||||
sha256 = "1fkpq4lw9rp3wccdjj8qhpl02asp1izvji53sd0gzq4z3djq0y7p";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/translation" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-translation-7495687c58bfd88b7883823747b0656d90679123";
|
||||
name = "symfony-translation-a002933b13989fc4bd0b58e04bf7eec5210e438a";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123";
|
||||
sha256 = "1s9kxq8nhiwg235jhfg00gzlixnxhcclw3wvmfdn6ijww4s62rqi";
|
||||
url = "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a";
|
||||
sha256 = "0a6rw66b6yysafkyhgzpqq147cm38id3v1kksnzgna528d5cac87";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -1055,20 +1055,20 @@ let
|
||||
"symfony/uid" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-uid-a66efcb71d8bc3a207d9d78e0bd67f3321510355";
|
||||
name = "symfony-uid-35904eca37a84bb764c560cbfcac9f0ac2bcdbdf";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/uid/zipball/a66efcb71d8bc3a207d9d78e0bd67f3321510355";
|
||||
sha256 = "0aajisswwd938xkjci1nsz6ypmqidf4dhq2xjy55x1l1jpg4vkji";
|
||||
url = "https://api.github.com/repos/symfony/uid/zipball/35904eca37a84bb764c560cbfcac9f0ac2bcdbdf";
|
||||
sha256 = "1xwvr4lp9cxr7s065xidqw9k3abdj6npd54flp7smgb4npl67s13";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/var-dumper" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-var-dumper-7a9cd977cd1c5fed3694bee52990866432af07d7";
|
||||
name = "symfony-var-dumper-ad23ca4312395f0a8a8633c831ef4c4ee542ed25";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7";
|
||||
sha256 = "1fsiwhrhgzhj8ncv8vz0dsd1s5v4dgphy71j8jqx814s8rb4xd0s";
|
||||
url = "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25";
|
||||
sha256 = "077ppd7v37qh6rfrv76apa1hm4apaqj5iskbfwlm32cndv0bnxk1";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -4,15 +4,15 @@
|
||||
, enableActiveSync ? false
|
||||
, libwbxml }:
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "SOGo";
|
||||
version = "5.9.1";
|
||||
pname = "sogo";
|
||||
version = "5.10.0";
|
||||
|
||||
# always update the sope package as well, when updating sogo
|
||||
src = fetchFromGitHub {
|
||||
owner = "inverse-inc";
|
||||
owner = "Alinto";
|
||||
repo = pname;
|
||||
rev = "SOGo-${version}";
|
||||
hash = "sha256-b6BZZ61wY0Akt1Q6+Bq6JXAx/67MwBNbzHr3sB0NuRg=";
|
||||
hash = "sha256-ZmpOI1zk/TkRNFmwTXugVb9IvxYSP4LgNrApSytdI7s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ];
|
||||
@ -45,7 +45,7 @@ gnustep.stdenv.mkDerivation rec {
|
||||
"--enable-mfa"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-error=implicit-int";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-error=implicit-int -Wno-error=return-type";
|
||||
|
||||
preFixup = ''
|
||||
# Create gnustep.conf
|
||||
|
||||
@ -25,13 +25,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "whisper-cpp";
|
||||
version = "1.5.4";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "whisper.cpp";
|
||||
rev = "refs/tags/v${finalAttrs.version}" ;
|
||||
hash = "sha256-9H2Mlua5zx2WNXbz2C5foxIteuBgeCNALdq5bWyhQCk=";
|
||||
hash = "sha256-hIEIu7feOZWqxRskf6Ej7l653/9KW8B3cnpPLoCRBAc=";
|
||||
};
|
||||
|
||||
# The upstream download script tries to download the models to the
|
||||
@ -80,6 +80,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
env = lib.optionalAttrs stdenv.isDarwin {
|
||||
WHISPER_COREML = "1";
|
||||
WHISPER_COREML_ALLOW_FALLBACK = "1";
|
||||
WHISPER_METAL_EMBED_LIBRARY = "1";
|
||||
} // lib.optionalAttrs cudaSupport {
|
||||
WHISPER_CUBLAS = "1";
|
||||
};
|
||||
@ -99,15 +100,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
wrapProgram $out/bin/whisper-cpp-download-ggml-model \
|
||||
--prefix PATH : ${lib.makeBinPath [wget]}
|
||||
|
||||
${lib.optionalString stdenv.isDarwin ''
|
||||
install -Dt $out/share/whisper-cpp ggml-metal.metal
|
||||
|
||||
for bin in whisper-cpp whisper-cpp-stream whisper-cpp-command; do
|
||||
wrapProgram $out/bin/$bin \
|
||||
--set-default GGML_METAL_PATH_RESOURCES $out/share/whisper-cpp
|
||||
done
|
||||
''}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -1,51 +1,53 @@
|
||||
diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh
|
||||
index 1f1075b..7476c8e 100755
|
||||
--- a/models/download-ggml-model.sh
|
||||
+++ b/models/download-ggml-model.sh
|
||||
@@ -9,18 +9,6 @@
|
||||
src="https://huggingface.co/ggerganov/whisper.cpp"
|
||||
pfx="resolve/main/ggml"
|
||||
@@ -12,18 +12,6 @@ pfx="resolve/main/ggml"
|
||||
BOLD="\033[1m"
|
||||
RESET='\033[0m'
|
||||
|
||||
-# get the path of this script
|
||||
-function get_script_path() {
|
||||
-get_script_path() {
|
||||
- if [ -x "$(command -v realpath)" ]; then
|
||||
- echo "$(dirname "$(realpath "$0")")"
|
||||
- dirname "$(realpath "$0")"
|
||||
- else
|
||||
- local ret="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)"
|
||||
- echo "$ret"
|
||||
- _ret="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 || exit ; pwd -P)"
|
||||
- echo "$_ret"
|
||||
- fi
|
||||
-}
|
||||
-
|
||||
-models_path="${2:-$(get_script_path)}"
|
||||
-
|
||||
# Whisper models
|
||||
models=(
|
||||
"tiny.en"
|
||||
@@ -56,8 +44,8 @@ function list_models {
|
||||
models="tiny
|
||||
tiny.en
|
||||
@@ -64,8 +52,8 @@ list_models() {
|
||||
printf "\n\n"
|
||||
}
|
||||
|
||||
-if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then
|
||||
- printf "Usage: $0 <model> [models_path]\n"
|
||||
- printf "Usage: %s <model> [models_path]\n" "$0"
|
||||
+if [ "$#" -ne 1 ]; then
|
||||
+ printf "Usage: $0 <model>\n"
|
||||
+ printf "Usage: %s <model>\n" "$0"
|
||||
list_models
|
||||
printf "___________________________________________________________\n"
|
||||
printf "${BOLD}.en${RESET} = english-only ${BOLD}-q5_[01]${RESET} = quantized ${BOLD}-tdrz${RESET} = tinydiarize\n"
|
||||
@@ -94,8 +82,6 @@ echo "$model" | grep -q '^"tdrz"*$'
|
||||
|
||||
exit 1
|
||||
@@ -82,8 +70,6 @@ fi
|
||||
printf "Downloading ggml model %s from '%s' ...\n" "$model" "$src"
|
||||
|
||||
printf "Downloading ggml model $model from '$src' ...\n"
|
||||
|
||||
-cd "$models_path"
|
||||
-cd "$models_path" || exit
|
||||
-
|
||||
if [ -f "ggml-$model.bin" ]; then
|
||||
printf "Model $model already exists. Skipping download.\n"
|
||||
printf "Model %s already exists. Skipping download.\n" "$model"
|
||||
exit 0
|
||||
@@ -105,7 +91,7 @@ if [ $? -ne 0 ]; then
|
||||
@@ -116,7 +102,7 @@ if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-printf "Done! Model '$model' saved in '$models_path/ggml-$model.bin'\n"
|
||||
+printf "Done! Model '$model' saved in 'ggml-$model.bin'\n"
|
||||
-printf "Done! Model '%s' saved in '%s/ggml-%s.bin'\n" "$model" "$models_path" "$model"
|
||||
+printf "Done! Model '%s' saved in 'ggml-%s.bin'\n" "$model" "$model"
|
||||
printf "You can now use it like this:\n\n"
|
||||
-printf " $ ./main -m $models_path/ggml-$model.bin -f samples/jfk.wav\n"
|
||||
+printf " $ whisper-cpp -m ggml-$model.bin -f samples/jfk.wav\n"
|
||||
-printf " $ ./main -m %s/ggml-%s.bin -f samples/jfk.wav\n" "$models_path" "$model"
|
||||
+printf " $ whisper-cpp -m ggml-%s.bin -f samples/jfk.wav\n" "$model"
|
||||
printf "\n"
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerlab";
|
||||
version = "0.55.0";
|
||||
version = "0.55.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "srl-labs";
|
||||
repo = "containerlab";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g+42nvNR1sWrkeU/oOajtmqeDVjRiwp7i+hrZU+FE00=";
|
||||
hash = "sha256-Dk1so6CXAbnfyWfqHne/mMc8LYS3JqXj6XM53fQKANk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -1391,6 +1391,7 @@ mapAliases ({
|
||||
v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10
|
||||
vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26
|
||||
vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
|
||||
vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
|
||||
vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
|
||||
vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
|
||||
ventoy-bin = ventoy; # Added 2023-04-12
|
||||
|
||||
@ -20408,8 +20408,8 @@ with pkgs;
|
||||
intel-media-driver
|
||||
intel-vaapi-driver
|
||||
mesa
|
||||
libva-vdpau-driver
|
||||
libvdpau-va-gl
|
||||
vaapiVdpau
|
||||
glxinfo
|
||||
vdpauinfo;
|
||||
};
|
||||
@ -24631,7 +24631,7 @@ with pkgs;
|
||||
|
||||
vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };
|
||||
|
||||
vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { };
|
||||
libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { };
|
||||
|
||||
vale = callPackage ../tools/text/vale { };
|
||||
|
||||
@ -35239,9 +35239,7 @@ with pkgs;
|
||||
|
||||
webssh = with python3Packages; toPythonApplication webssh;
|
||||
|
||||
webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {
|
||||
electron = electron_27;
|
||||
};
|
||||
webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { };
|
||||
|
||||
wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
|
||||
|
||||
|
||||
@ -13413,6 +13413,8 @@ self: super: with self; {
|
||||
|
||||
rfc7464 = callPackage ../development/python-modules/rfc7464 { };
|
||||
|
||||
rfc8785 = callPackage ../development/python-modules/rfc8785 { };
|
||||
|
||||
rfcat = callPackage ../development/python-modules/rfcat { };
|
||||
|
||||
rflink = callPackage ../development/python-modules/rflink { };
|
||||
|
||||
@ -12,12 +12,6 @@
|
||||
nixpkgsArgs ? { config = {
|
||||
allowUnfree = false;
|
||||
inHydra = true;
|
||||
permittedInsecurePackages = [
|
||||
# Keep evaluating home-assistant, which is transitively affected
|
||||
# by home-assistant-chip-core consuming OpenSSL 1.1. Affects roughly
|
||||
# 800 jobs.
|
||||
"openssl-1.1.1w"
|
||||
];
|
||||
}; }
|
||||
}:
|
||||
|
||||
|
||||
@ -29,14 +29,6 @@
|
||||
, nixpkgsArgs ? { config = {
|
||||
allowUnfree = false;
|
||||
inHydra = true;
|
||||
permittedInsecurePackages = [
|
||||
# *Exceptionally*, those packages will be cached with their *secure* dependents
|
||||
# because they will reach EOL in the middle of the 23.05 release
|
||||
# and it will be too much painful for our users to recompile them
|
||||
# for no real reason.
|
||||
# Remove them for 23.11.
|
||||
"openssl-1.1.1w"
|
||||
];
|
||||
}; }
|
||||
|
||||
# This flag, if set to true, will inhibit the use of `mapTestOn`
|
||||
|
||||
Loading…
Reference in New Issue
Block a user