Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3e74d24806
@ -90,7 +90,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.6";
|
||||
version = "13.0.7";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@ -102,7 +102,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-+CLMAXdyqp0HLe68lzp7p54n2HGZQPwZGckwVxOg4Pw=";
|
||||
hash = "sha256-8x0Qa+NasMq1JdrVnCWlCyPb+5UpJXK1VLFoY9lx+8Q=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.6";
|
||||
version = "13.0.8";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-7T+PJEsGIge+JJOz6GiG8971lnnbQL2jdHfldNmT4jQ=";
|
||||
hash = "sha256-eD+c4ACgWajmfMiqqk5HC30uJiqfNqvASepVoO7ox2w=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-nPhzUu1BYNij3toNRUFFxNVLZ2JnzDBFVlzo4cyskjY=";
|
||||
hash = "sha256-ZQ0tSPyfzBWy27lX5+zI3Nuqqz5ZUv1T6lzapvYHc7A=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfoundry-cli";
|
||||
version = "8.7.6";
|
||||
version = "8.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QvQqFl8RcVO+oNKhAeKkX0bmjv8qrtiR2gQ5ufpfMBo=";
|
||||
sha256 = "sha256-WPZLINtjH+VuWlXX1XNeSuasxn+UI89Klrehg806kvI=";
|
||||
};
|
||||
vendorHash = "sha256-MBV8GIxgAHFEturqlQgBuzGUQcRdMsYU7c1kcTlZf9I=";
|
||||
vendorHash = "sha256-ZQSbupcY+Uc8tYWZY/hYBaeaNxYuSOOIo0v9e5Ax0m0=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.2.1";
|
||||
sha256 = "12zhg5j77jhn8v0c5mz6232bcx8dqn4dg32x89kqx8znkygd5a42";
|
||||
manifestsSha256 = "1hwcy64i6fg0qq0gzsxba6k7hak0ngqgi627680pk1daykfic7wv";
|
||||
version = "2.2.2";
|
||||
sha256 = "0d4sf1b0dddcarngr4dllhbbyjajpf1byv9cf7nx9040i80vk56p";
|
||||
manifestsSha256 = "1ixdzgaw3mrkwbazfbx0vc04z4rsyyyj5dsck15dv5kkvhi304lg";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@ -29,7 +29,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QElnhoWNp17SdRJJFZ+FpLS1NzGjIXaP0dYefzwBNkI=";
|
||||
vendorHash = "sha256-jbhxSeLjgNmj2wCZao4DkQ57GvpYKlUyy7xdNKN1nWc=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pluto";
|
||||
version = "5.19.0";
|
||||
version = "5.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "pluto";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sudq7HILNZSGTwQgggSovrXAaY7VSTw6IJn+mIYwjv8=";
|
||||
hash = "sha256-6TOHDjR5sFaIeR6Zuf4azQAIgUyev7vdlAKB7YNk8R0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8ZOYp/vM16PugmE+3QK7ZRDwIwRCMEwD0NRyiOBlh14=";
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
{ lib
|
||||
, buildLua
|
||||
, mpv-unwrapped
|
||||
}:
|
||||
|
||||
buildLua {
|
||||
inherit (mpv-unwrapped) src version;
|
||||
pname = "mpv-acompressor";
|
||||
scriptPath = "TOOLS/lua/acompressor.lua";
|
||||
|
||||
meta = with lib; {
|
||||
inherit (mpv-unwrapped.meta) license;
|
||||
description = "Script to toggle and control ffmpeg's dynamic range compression filter.";
|
||||
homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/acompressor.lua";
|
||||
maintainers = with maintainers; [ nicoo ];
|
||||
};
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
{ stdenvNoCC, mpv-unwrapped, lib }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpv-autocrop";
|
||||
version = mpv-unwrapped.version;
|
||||
src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autocrop.lua";
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
install -Dm644 ${src} $out/share/mpv/scripts/autocrop.lua
|
||||
'';
|
||||
passthru.scriptName = "autocrop.lua";
|
||||
|
||||
meta = {
|
||||
description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video.";
|
||||
homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autocrop.lua";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
{ stdenvNoCC, mpv-unwrapped, lib }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpv-autodeint";
|
||||
version = mpv-unwrapped.version;
|
||||
src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autodeint.lua";
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
install -Dm644 ${src} $out/share/mpv/scripts/autodeint.lua
|
||||
'';
|
||||
passthru.scriptName = "autodeint.lua";
|
||||
|
||||
meta = {
|
||||
description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video.";
|
||||
homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autodeint.lua";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
{ stdenvNoCC, mpv-unwrapped, lib }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpv-autoload";
|
||||
version = mpv-unwrapped.version;
|
||||
src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autoload.lua";
|
||||
dontBuild = true;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
install -Dm644 ${src} $out/share/mpv/scripts/autoload.lua
|
||||
'';
|
||||
passthru.scriptName = "autoload.lua";
|
||||
|
||||
meta = {
|
||||
description = "This script automatically loads playlist entries before and after the currently played file";
|
||||
homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autoload.lua";
|
||||
maintainers = [ lib.maintainers.dawidsowa ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
@ -58,10 +58,6 @@ in
|
||||
|
||||
lib.recurseIntoAttrs
|
||||
(lib.mapAttrs addTests ({
|
||||
acompressor = callPackage ./acompressor.nix { inherit buildLua; };
|
||||
autocrop = callPackage ./autocrop.nix { };
|
||||
autodeint = callPackage ./autodeint.nix { };
|
||||
autoload = callPackage ./autoload.nix { };
|
||||
chapterskip = callPackage ./chapterskip.nix { inherit buildLua; };
|
||||
convert = callPackage ./convert.nix { inherit buildLua; };
|
||||
cutter = callPackage ./cutter.nix { inherit buildLua; };
|
||||
@ -81,6 +77,7 @@ lib.recurseIntoAttrs
|
||||
vr-reversal = callPackage ./vr-reversal.nix { };
|
||||
webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };
|
||||
}
|
||||
// (callPackage ./mpv.nix { inherit buildLua; })
|
||||
// (callPackage ./occivink.nix { inherit buildLua; })))
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14
|
||||
|
||||
35
pkgs/applications/video/mpv/scripts/mpv.nix
Normal file
35
pkgs/applications/video/mpv/scripts/mpv.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildLua
|
||||
, mpv-unwrapped
|
||||
}:
|
||||
|
||||
let mkBuiltin = name: args:
|
||||
let srcPath = "TOOLS/lua/${name}.lua";
|
||||
in buildLua (lib.attrsets.recursiveUpdate rec {
|
||||
inherit (mpv-unwrapped) src version;
|
||||
pname = "mpv-${name}";
|
||||
|
||||
dontUnpack = true;
|
||||
scriptPath = "${src}/${srcPath}";
|
||||
|
||||
meta = with lib; {
|
||||
inherit (mpv-unwrapped.meta) license;
|
||||
homepage = "https://github.com/mpv-player/mpv/blob/v${version}/${srcPath}";
|
||||
};
|
||||
} args);
|
||||
|
||||
in lib.mapAttrs (name: lib.makeOverridable (mkBuiltin name)) {
|
||||
acompressor.meta = {
|
||||
description = "Script to toggle and control ffmpeg's dynamic range compression filter.";
|
||||
maintainers = with lib.maintainers; [ nicoo ];
|
||||
};
|
||||
|
||||
autocrop.meta.description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video.";
|
||||
|
||||
autodeint.meta.description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video.";
|
||||
|
||||
autoload.meta = {
|
||||
description = "This script automatically loads playlist entries before and after the currently played file";
|
||||
maintainers = [ lib.maintainers.dawidsowa ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RSQcpodippp4B4FM0yr+YFseoofas1M6xBqqtFD1BB0=";
|
||||
hash = "sha256-DXodgpa/oWDBlJYTXcJb8cBkG1DCjFv8vKEzLhu0pN4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -1,22 +1,70 @@
|
||||
{ lib, appimageTools, fetchurl, pkgs }:
|
||||
{ lib
|
||||
, pkgs
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
, undmg
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "spacedrive";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg";
|
||||
hash = "sha256-gKboB5W0vW6ssZHRRivqbVPE0d0FCUdiNCsP0rKKtNo=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg";
|
||||
hash = "sha256-KD1hw6aDyqCsXLYM8WrOTI2AfFx7t++UWV7SaCmtypI=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.AppImage";
|
||||
hash = "sha256-iBdW8iPuvztP0L5xLyVs7/K8yFe7kD7QwdTuKJLhB+c=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
meta = {
|
||||
description = "An open source file manager, powered by a virtual distributed filesystem";
|
||||
homepage = "https://www.spacedrive.com";
|
||||
changelog = "https://github.com/spacedriveapp/spacedrive/releases/tag/${version}";
|
||||
platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
|
||||
license = lib.licenses.agpl3Plus;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ heisfer mikaelfangel stepbrobd ];
|
||||
mainProgram = "spacedrive";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
in
|
||||
if stdenv.isDarwin then stdenv.mkDerivation
|
||||
{
|
||||
inherit pname version src meta passthru;
|
||||
|
||||
sourceRoot = "Spacedrive.app";
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/Applications/Spacedrive.app"
|
||||
cp -r . "$out/Applications/Spacedrive.app"
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "$out/Applications/Spacedrive.app/Contents/MacOS/Spacedrive" "$out/bin/spacedrive"
|
||||
'';
|
||||
}
|
||||
else appimageTools.wrapType2 {
|
||||
inherit pname version src meta passthru;
|
||||
|
||||
extraPkgs = pkgs:
|
||||
(appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
extraInstallCommands =
|
||||
let
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
''
|
||||
# Remove version from entrypoint
|
||||
mv $out/bin/spacedrive-"${version}" $out/bin/spacedrive
|
||||
|
||||
@ -26,14 +74,4 @@ in appimageTools.wrapType2 {
|
||||
substituteInPlace $out/share/applications/spacedrive.desktop \
|
||||
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=spacedrive'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source file manager, powered by a virtual distributed filesystem";
|
||||
homepage = "https://www.spacedrive.com/";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.agpl3Plus;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ mikaelfangel heisfer ];
|
||||
mainProgram = "spacedrive";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sketchybar-app-font";
|
||||
version = "1.0.20";
|
||||
version = "1.0.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf";
|
||||
hash = "sha256-pf3SSxzlNIdbXXHfRauFCnrVUMOd5J9sSUE9MsfWrwo=";
|
||||
hash = "sha256-k3Ok5qizXQvRCzW0oRilLWNJelYI0BGQ6qLbjhxosTA=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -23,7 +23,10 @@ stdenv.mkDerivation rec {
|
||||
# Since it has only two source files, the best course of action to support
|
||||
# cross compilation is to create a small meson.build file.
|
||||
# Relevant upstream issue: https://github.com/cesanta/frozen/pull/71
|
||||
# We also remove the GN BUILD file to prevent conflicts on case-insesitive
|
||||
# file systems.
|
||||
preConfigure = ''
|
||||
rm BUILD
|
||||
cp ${./meson.build} meson.build
|
||||
'';
|
||||
|
||||
|
||||
@ -43,6 +43,15 @@ stdenv.mkDerivation {
|
||||
|
||||
substituteInPlace src/wl_init.c \
|
||||
--replace "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0"
|
||||
|
||||
substituteInPlace src/wl_init.c \
|
||||
--replace "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0"
|
||||
|
||||
substituteInPlace src/wl_init.c \
|
||||
--replace "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0"
|
||||
|
||||
substituteInPlace src/wl_init.c \
|
||||
--replace "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uthenticode";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trailofbits";
|
||||
repo = "uthenticode";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XGKROp+1AJWUjCwMOikh+yvNMGuENJGb/kzJsEOEFeY=";
|
||||
hash = "sha256-NGVOGXMRlgpSRw56jr63rJc/5/qCmPjtAFa0D21ogd4=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone-cloud";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = "aioairzone-cloud";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-K2/q4JQV6GkNXJ6pKDPfhwKvftdezMp5VdOa5iabmvk=";
|
||||
hash = "sha256-7QFtWAgLnVX9bS4u/2mV0pga/72G237AWxga6V3vLXY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elgato";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "frenck";
|
||||
repo = "python-elgato";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g0po3BtY2uiOmuyWVA+o08c3I86SE4zmvo1ps8HpNNw=";
|
||||
hash = "sha256-NAU4tr0oaAPPrOUZYl9WoGOM68MlrBqGewHBIiIv2XY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "youtube-transcript-api";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "jdepoix";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7s2qzmfYkaQ7xAi/U+skOEVTAj2gp+2WnODu9k1ojJY=";
|
||||
hash = "sha256-xCB1XhXRq4jxyfst/n2wXj2k4dERm+/bVUJwP8b70gQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.108";
|
||||
version = "0.0.109";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tn6ZI8lanQhWallvi/NwAWYPuSea+SlJX/6D1VdXRxM=";
|
||||
hash = "sha256-fkE44j+wXdIJekJJNoO67YzsghalTUpyNx9R/B2Vn1Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.1.44";
|
||||
version = "3.1.46";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dh52+MSaF3f0XWYQLeIzWrn29YUduplhXj2z+4yAOr4=";
|
||||
hash = "sha256-scGZtqAdAjRD0bNq9pWp699I9rxPh2CFP4lCz+1yAZ8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svlint";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PfevtQpbJeo2U/qeYcJP4Et/HUASOZssRu2IXtOLWKw=";
|
||||
sha256 = "sha256-5fPra4kgvykeQnvRtO3enbMIzbh5+nDJ2x0aHYMGiww=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1nPXyFzRmum1CvOFdcqNOQzFVcFFKwPdt2qzXxMssf0=";
|
||||
cargoHash = "sha256-R7jqFgMj4YjUbEObdRxxvataYMXe9wq8B8k+t7+Dv30=";
|
||||
|
||||
cargoBuildFlags = [ "--bin" "svlint" ];
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-copilot-intellij-agent";
|
||||
version = "1.2.18.2908";
|
||||
version = "1.4.5.4049";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}-plugin.zip";
|
||||
url = "https://plugins.jetbrains.com/plugin/download?updateId=373346";
|
||||
hash = "sha256-ErSj4ckPSaEkOeGTRS27yFKDlj2iZfoPdjbZleSIL1s=";
|
||||
url = "https://plugins.jetbrains.com/plugin/download?updateId=454005";
|
||||
hash = "sha256-ibu3OcmtyLHuumhJQ6QipsNEIdEhvLUS7sb3xmnaR0U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svls";
|
||||
version = "0.2.10";
|
||||
version = "0.2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dalance";
|
||||
repo = "svls";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ylTiyqFVdT95a5DP4YYtoAIGThA+TacAE8ft0mcuolI=";
|
||||
sha256 = "sha256-pvvtJOwb9N7CzCXoLG19iuLQjABABaOUe6wKfYizgQc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+h2lxIbfHCGKCWX8ly9NXskMkeRGIpujkX3Zep1WhrE=";
|
||||
cargoHash = "sha256-sMprdvBSfCIzoTHyUC447pyZWGgZkKa9t3A9BiGbQvY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "SystemVerilog language server";
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sea-orm-cli";
|
||||
version = "0.12.2";
|
||||
version = "0.12.10";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-mg0PkWxlfwo4eAtbU1ZOphEUBB1P6VsSpODyJZhvwQs=";
|
||||
hash = "sha256-BVQbzP/+TJFqhnBeerYiLMpJJ8q9x582DR5X10K027U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
|
||||
|
||||
cargoHash = "sha256-6LXJtY844CyR6H0/IkEJrpSj4UNWcpO/XoTzUthcTUc=";
|
||||
cargoHash = "sha256-qCcWReo72eHN9MoTVAmSHYVhpqw0kZ9VU/plYRcirVA=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sea-ql.org/SeaORM";
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{ lib
|
||||
, buildGo121Module
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildGo121Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "ferretdb";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FerretDB";
|
||||
repo = "FerretDB";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Oh8VHWsV7jD2HgG2IVDV2krTBSCz4dyCENej1m6xnM4=";
|
||||
hash = "sha256-GHUIr43rcA+H9FLQrrnTKLggyujGE0Is0VisLkL/EQI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -20,7 +20,7 @@ buildGo121Module rec {
|
||||
echo nixpkgs > build/version/package.txt
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-iDPZ3DG/aWOHz61gVd56KhB7/RvsWOS+gfzk6Rx5c4o=";
|
||||
vendorHash = "sha256-Mgc+TpK7XnRCT/CLDyW7fIs6jB2LbYlTceiytErIj+U=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@ -26,14 +26,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dwarfs";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhx";
|
||||
repo = "dwarfs";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-lFJW9rmUhiHyu+unGuONcgbsJg9h9MSvNyECmarRF/M=";
|
||||
hash = "sha256-wclUyATUZmF7EEkrK9nWASmfiB+MBrvEzc73ngOrhZ0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.flameeyes.eu/projects/unpaper";
|
||||
changelog = "https://github.com/unpaper/unpaper/blob/unpaper-${version}/NEWS";
|
||||
description = "Post-processing tool for scanned sheets of paper";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -11,6 +11,7 @@ let
|
||||
"bin-x86_64-efi/ipxe.efi" = null;
|
||||
"bin-x86_64-efi/ipxe.efirom" = null;
|
||||
"bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb";
|
||||
"bin-x86_64-efi/snp.efi" = null;
|
||||
} // lib.optionalAttrs stdenv.hostPlatform.isx86 {
|
||||
"bin/ipxe.dsk" = null;
|
||||
"bin/ipxe.usb" = null;
|
||||
@ -21,10 +22,12 @@ let
|
||||
"bin-arm32-efi/ipxe.efi" = null;
|
||||
"bin-arm32-efi/ipxe.efirom" = null;
|
||||
"bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb";
|
||||
"bin-arm32-efi/snp.efi" = null;
|
||||
} // lib.optionalAttrs stdenv.isAarch64 {
|
||||
"bin-arm64-efi/ipxe.efi" = null;
|
||||
"bin-arm64-efi/ipxe.efirom" = null;
|
||||
"bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb";
|
||||
"bin-arm64-efi/snp.efi" = null;
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rtx";
|
||||
version = "2023.12.18";
|
||||
version = "2023.12.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "rtx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RjILdhH0Gg9VRvyVFukUrreYHnwtC+5MfXT+v4cT7/Y=";
|
||||
hash = "sha256-vzMjC6qIPhZm80hzYQRpF3j+s85B0nwTcgSGRATQEIg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1/Te4JfPDE0gbMysnQbF2SH/oMq+b3fyVgIHaQx1m5E=";
|
||||
cargoHash = "sha256-LvW5xGVggzuXlFPhbrc93Dht3S9zaQyx9Nm+Mx/Mjh0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ooniprobe-cli";
|
||||
version = "3.20.0";
|
||||
version = "3.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ooni";
|
||||
repo = "probe-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kOARV3tnRyOAScc3Vn96TFQFgqvTgi6NFHWM7ZbpciU=";
|
||||
hash = "sha256-XjIrae4HPFB1Rv8yIAUh6Xj9UVU55Wx7SuyKJ0BvmXY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c922VpxtpNfua3Sx3vXKz4x1FsLMwbaSvRH4dyFrr9s=";
|
||||
vendorHash = "sha256-HYU+oS+iqdl2jQJc3h9T+MSc/Hq2W6UqP+oPSEyfcOU=";
|
||||
|
||||
subPackages = [ "cmd/ooniprobe" ];
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nfpm";
|
||||
version = "2.35.0";
|
||||
version = "2.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WYLXhRoB8+a5zhTs1qxJVrDjor5orCw6UJrqEt+fBBQ=";
|
||||
hash = "sha256-ew0iXtOKQIYxpyeNFBHD2F7KflTEQ7qHQMHYaL35Rvw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-P9jSQG6EyVGMZKtThy8Q7Y/pV7mbMl2eGrylea0VHRc=";
|
||||
|
||||
@ -5,18 +5,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "9.12.0";
|
||||
version = "9.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-d2S9qEm0jvXvpU7IHpurDJ7A21bvjuM3HrdRPaujzTU=";
|
||||
hash = "sha256-ezk9HgNf4FBW/PEaNUhsb3/l1ChTC42F3slXXa8ZJp4=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-vEJcdGgev9C/3vGx+SMmD9dLMau5Jyx2TjHiiQQ+16A=";
|
||||
vendorHash = "sha256-iycKyidVpdWeccK4RxENUxEFUmQKkIyyW1c3JFZ3gx4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "cloud-native, graph-based asset inventory";
|
||||
|
||||
@ -4,16 +4,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "amber";
|
||||
version = "0.5.9";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dalance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mmgJCD7kJjvpxyagsoe5CSzqIEZcIiYMAMP3axRphv4=";
|
||||
sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-opRinhTmhZxpAwHNiVOLXL8boQf09Y1NXrWQ6HWQYQ0=";
|
||||
cargoHash = "sha256-nBSgP30Izskq9RbhVIyqWzZgG5ZWHVdiukldw+Q0rco=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user