mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-19 03:14:03 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
b6f9cf5799
@ -44,10 +44,13 @@ let
|
||||
pkgs = import ./.. { system = "x86_64-linux"; };
|
||||
|
||||
|
||||
versionModule =
|
||||
{ system.nixos.versionSuffix = versionSuffix;
|
||||
system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev;
|
||||
};
|
||||
versionModule = { config, ... }: {
|
||||
system.nixos.versionSuffix = versionSuffix;
|
||||
system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev;
|
||||
|
||||
# At creation time we do not have state yet, so just default to latest.
|
||||
system.stateVersion = config.system.nixos.version;
|
||||
};
|
||||
|
||||
makeModules = module: rest: [ configuration versionModule module rest ];
|
||||
|
||||
|
||||
@ -24,6 +24,9 @@
|
||||
, withImage ? true
|
||||
, withNotify ? true
|
||||
, withSixel ? true
|
||||
, stdenv
|
||||
, darwin
|
||||
, makeBinaryWrapper
|
||||
}:
|
||||
|
||||
assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaudio" "rodio" "portaudio" "jackaudio" "rodiojack" "sdl" "gstreamer" ];
|
||||
@ -44,6 +47,9 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
rustPlatform.bindgenHook
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -59,7 +65,13 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ]
|
||||
++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ]
|
||||
++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ]
|
||||
++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
|
||||
++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]
|
||||
++ lib.optionals (stdenv.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ]
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
AppKit
|
||||
AudioUnit
|
||||
Cocoa
|
||||
]);
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
@ -73,6 +85,12 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals withStreaming [ "streaming" ]
|
||||
++ lib.optionals withSixel [ "sixel" ];
|
||||
|
||||
# sixel-sys is dynamically linked to libsixel
|
||||
postInstall = lib.optionals (stdenv.isDarwin && withSixel) ''
|
||||
wrapProgram $out/bin/spotify_player \
|
||||
--prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A terminal spotify player that has feature parity with the official client";
|
||||
homepage = "https://github.com/aome510/spotify-player";
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "transcribe";
|
||||
version = "9.25";
|
||||
version = "9.30.2";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchzip
|
||||
{
|
||||
url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.0.tar.gz";
|
||||
sha256 = "sha256-vgl3BCAC7gOYTviHJzMbgZfHTpP90XUvxpC1IhvEZ8I=";
|
||||
url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz";
|
||||
sha256 = "sha256-EZyQsO3tSedMaZIhJWc7j3f7ikBf6XqXLUgdAiQdr14=";
|
||||
}
|
||||
else throw "Platform not supported";
|
||||
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
let
|
||||
pname = "codux";
|
||||
version = "15.9.0";
|
||||
version = "15.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
|
||||
sha256 = "sha256-bKZShjWs2osyARBZrBgmEN7JZFi/YpXI3p8lM+GrIfc=";
|
||||
sha256 = "sha256-lz1dDbYq7aTGQoED07K8I9E0/XsnSlPL81/4W8Vix3E=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
@ -30,6 +30,6 @@ appimageTools.wrapType2 rec {
|
||||
homepage = "https://www.codux.com";
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
maintainers = with maintainers; [ dit7ya kashw2 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -38,14 +38,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mame";
|
||||
version = "0.257";
|
||||
version = "0.258";
|
||||
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamedev";
|
||||
repo = "mame";
|
||||
rev = "mame${srcVersion}";
|
||||
hash = "sha256-iBLHvdqIgF6XkJQX5hFLrP9KkTGWfVvTCs+DRJhsSp4=";
|
||||
hash = "sha256-5wsPlI3xTCeadxvOjjNSGtaa8F7M6gZobsv2Ks8DSGE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "tools" ];
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, gnome
|
||||
, pkg-config
|
||||
, meson
|
||||
@ -20,6 +19,7 @@
|
||||
, libchamplain
|
||||
, librsvg
|
||||
, libwebp
|
||||
, libX11
|
||||
, json-glib
|
||||
, webkitgtk
|
||||
, lcms2
|
||||
@ -35,29 +35,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gthumb";
|
||||
version = "3.12.2";
|
||||
version = "3.12.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-l/iv5SJTUhZUHrvx47VG0Spr6zio8OuF8m5naTSq1CU=";
|
||||
sha256 = "sha256-k9s11xQCxIoILVDPQIW7a4DkvVyLmxYaH3tRhBsQBxE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with libraw 0.21, can be removed on next update
|
||||
# https://hydra.nixos.org/build/209327709/nixlog/1
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch";
|
||||
sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ=";
|
||||
})
|
||||
|
||||
# Fix build with exiv2 0.28, can be removed on next update
|
||||
# https://gitlab.gnome.org/GNOME/gthumb/-/issues/282
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/3376550ae109286de09ce5f89e05060eb80230a7.patch";
|
||||
sha256 = "sha256-zHX+kV7RaHXFqbR15RTaRcZJPU/P3uUj03tFUv0DR5o=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
desktop-file-utils
|
||||
@ -93,6 +77,7 @@ stdenv.mkDerivation rec {
|
||||
libsoup
|
||||
libtiff
|
||||
libwebp
|
||||
libX11
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
|
||||
669
pkgs/applications/graphics/oculante/Cargo.lock
generated
669
pkgs/applications/graphics/oculante/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -21,13 +21,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oculante";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woelper";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Q4YEBEA+Kt09Se9b03EZ6phm+6Q3fAxXCZRXQeqPA2k=";
|
||||
hash = "sha256-EyGbCOPc+ClsBUQCi9PPXeU7PmiUSANH20DGPuvgfAM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "chatblade";
|
||||
version = "0.2.3";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YXZeqIX8cxNDvM4Pn0or6Lqj2ffX9aQb3b/xMIeBHRk=";
|
||||
sha256 = "sha256-QBURvPfDBbhF+AhQ0SsHYnZzr5RN36Cqa2DrAQZW0gU=";
|
||||
};
|
||||
|
||||
doCheck = false; # there are no tests
|
||||
|
||||
32
pkgs/applications/misc/dict-cc-py/default.nix
Normal file
32
pkgs/applications/misc/dict-cc-py/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "dict.cc.py";
|
||||
version = "3.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rbaron";
|
||||
repo = "dict.cc.py";
|
||||
rev = "a8b469767590fdd15d3aeb0b00e2ae62aa15a918";
|
||||
hash = "sha256-wc0WY1pETBdOT3QUaVGsX8YdcnhxLIHrZ2vt2t5LYKU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
beautifulsoup4
|
||||
colorama
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dictcc" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial command line client for dict.cc";
|
||||
homepage = "https://github.com/rbaron/dict.cc.py";
|
||||
license = with licenses; [ cc0 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
31
pkgs/applications/misc/stepreduce/default.nix
Normal file
31
pkgs/applications/misc/stepreduce/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stepreduce";
|
||||
version = "unstable-2020-04-30";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sethhillbrand";
|
||||
repo = "stepreduce";
|
||||
rev = "e89091c33b67e2a18584e1fe3560bfd48ae98773";
|
||||
hash = "sha256-bCseBQ6J3sWFt0kzaRkV11lwzOGvNPebvQ6w4OJaMBs=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 stepreduce $out/bin/stepreduce
|
||||
|
||||
runHook prostInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reduces STEP file size by removing redundancy";
|
||||
homepage = "https://gitlab.com/sethhillbrand/stepreduce";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ evils ];
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "xlights";
|
||||
version = "2023.11";
|
||||
version = "2023.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
|
||||
hash = "sha256-WUBN/Gjnsj2eUL03sXIYWgzLA7FNN7h+qpWlnXBdnw8=";
|
||||
hash = "sha256-vNauKG7F7AiSMZrkMPwR9C+Mshot4NOf4oIdEr5Pu3Q=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "odo";
|
||||
version = "3.13.0";
|
||||
version = "3.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redhat-developer";
|
||||
repo = "odo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l5WW6Wos/FLxJsyrWnLhb1vAztGT1QYl8tKhiBgNGbw=";
|
||||
sha256 = "sha256-d6C+nOz60CPnEsSf74+WBTaeIXGKtysVELg0+dXM1cU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "quisk";
|
||||
version = "4.2.17";
|
||||
version = "4.2.22";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-eF/3++wRG0JulVTT+GvtqleBPkzLSZeu+RfHDI1xfOY=";
|
||||
sha256 = "sha256-F6xSE1EgWlHlrd4W79tmhTg/FS7QUPH3NWzWIljAAg4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
homepage = "https://james.ahlstrom.name/quisk/";
|
||||
maintainers = with maintainers; [ pulsation ];
|
||||
maintainers = with maintainers; [ pulsation kashw2 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -229,18 +229,9 @@ stdenv.mkDerivation rec {
|
||||
The Programs handle Schematic Capture, and PCB Layout with Gerber output.
|
||||
'';
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ evils kiwi ];
|
||||
# kicad is cross platform
|
||||
maintainers = with lib.maintainers; [ evils ];
|
||||
platforms = lib.platforms.all;
|
||||
broken = stdenv.isDarwin;
|
||||
|
||||
hydraPlatforms = if (with3d) then [ ] else platforms;
|
||||
# We can't download the 3d models on Hydra,
|
||||
# they are a ~1 GiB download and they occupy ~5 GiB in store.
|
||||
# as long as the base and libraries (minus 3d) are build,
|
||||
# this wrapper does not need to get built
|
||||
# the kicad-*small "packages" cause this to happen
|
||||
|
||||
mainProgram = "kicad";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,6 +2,9 @@
|
||||
, cmake
|
||||
, gettext
|
||||
, libSrc
|
||||
, stepreduce
|
||||
, parallel
|
||||
, zip
|
||||
}:
|
||||
let
|
||||
mkLib = name:
|
||||
@ -11,14 +14,20 @@ let
|
||||
|
||||
src = libSrc name;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ]
|
||||
++ lib.optionals (name == "packages3d") [
|
||||
stepreduce
|
||||
parallel
|
||||
zip
|
||||
];
|
||||
|
||||
postInstall = lib.optional (name == "packages3d") ''
|
||||
find $out -type f -name '*.step' | parallel 'stepreduce {} {} && zip -9 {.}.stpZ {} && rm {}'
|
||||
'';
|
||||
|
||||
meta = rec {
|
||||
license = lib.licenses.cc-by-sa-40;
|
||||
platforms = lib.platforms.all;
|
||||
# the 3d models are a ~1 GiB download and occupy ~5 GiB in store.
|
||||
# this would exceed the hydra output limit
|
||||
hydraPlatforms = if (name == "packages3d") then [ ] else platforms;
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tym";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "endaaman";
|
||||
repo = "${pname}";
|
||||
rev = version;
|
||||
sha256 = "sha256-5pXNOuMT2/G+m6XoTrwNTCGNfISLLy0wQpVPhQJzs4s=";
|
||||
sha256 = "sha256-aXV3TNjHxg/9Lb2o+ci5/cCAPbkWhxqOka3wv21ajSA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Lua-configurable terminal emulator";
|
||||
homepage = "https://github.com/endaaman/tym";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.wesleyjrz ];
|
||||
maintainers = with maintainers; [ wesleyjrz kashw2 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,10 +7,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bilibili";
|
||||
version = "1.11.4-1";
|
||||
version = "1.11.4-2";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
|
||||
hash = "sha256-fsHPbugjY9GAWrEFZDTNqVaewXDF/NZRmG+N2Pkc4bY=";
|
||||
hash = "sha256-nUixkNZPIqeMUdjJxaNrHODFbShDqHFHVoKRZKAVjyc=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Electron-based bilibili desktop client";
|
||||
homepage = "https://github.com/msojocs/bilibili-linux";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jedsek ];
|
||||
maintainers = with maintainers; [ jedsek kashw2 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -51,13 +51,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "43.7";
|
||||
version = "43.8";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "NBrLmwNUyytflewz32aZtKAHaNydIi1rYAtW4kKGlmc=";
|
||||
sha256 = "TjTh8XWTS9hJqEvZX6Nb8G6EEuAt8loDbC8RNdUz8oE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -13,12 +13,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.52.0";
|
||||
version = "1.53.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
sha256 = "sha256-ol8inyUrKezv+lhDIq2DhP4LHNJLhZylRbtIfoVAMYk=";
|
||||
sha256 = "sha256-F3pGXZC4jSG9TV2sc5G9bQtKMY6xcPknwO0fqQ6uBoA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "babashka-unwrapped";
|
||||
version = "1.3.181";
|
||||
version = "1.3.184";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";
|
||||
sha256 = "sha256-NzchlHRxOCSyUf9U0Jv8h4bgKd2Jwp+LmxIfeV8+8+M=";
|
||||
sha256 = "sha256-O3pLELYmuuB+Bf1vHTWQ+u7Ymi3qYiMRpCwvEq+GeBQ=";
|
||||
};
|
||||
|
||||
graalvmDrv = graalvmCEPackages.graalvm19-ce;
|
||||
|
||||
@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \
|
||||
--inherit-argv0 \
|
||||
--set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \
|
||||
--set-default DEPS_CLJ_TOOLS_VERSION ${clojure.version} \
|
||||
--set-default JAVA_HOME ${jdkBabashka}
|
||||
|
||||
'' +
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchgit
|
||||
, fetchFromGitLab
|
||||
, autoreconfHook
|
||||
, buildPackages
|
||||
, optimize ? false # impure hardware optimizations
|
||||
@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
|
||||
pname = "gf2x";
|
||||
version = "1.3.0";
|
||||
|
||||
# upstream has plans to move to gitlab:
|
||||
# https://github.com/NixOS/nixpkgs/pull/45299#issuecomment-564477936
|
||||
src = fetchgit {
|
||||
url = "https://scm.gforge.inria.fr/anonscm/git/gf2x/gf2x.git";
|
||||
rev = "gf2x-${version}";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "gf2x";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id";
|
||||
};
|
||||
|
||||
|
||||
@ -4,21 +4,23 @@
|
||||
, esbuild
|
||||
, deno
|
||||
, fetchurl
|
||||
, nodePackages
|
||||
, dart-sass
|
||||
, rWrapper
|
||||
, rPackages
|
||||
, extraRPackages ? []
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, python3
|
||||
, quarto
|
||||
, extraPythonPackages ? ps: with ps; []
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (final: {
|
||||
pname = "quarto";
|
||||
version = "1.2.475";
|
||||
version = "1.3.450";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz";
|
||||
sha256 = "sha256-oyKjDlTKt2fIzirOqgNRrpuM7buNCG5mmgIztPa28rY=";
|
||||
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
|
||||
sha256 = "sha256-bcj7SzEGfQxsw9P8WkcLrKurPupzwpgIGtxoE3KVwAU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
--prefix PATH : ${lib.makeBinPath [ deno ]} \
|
||||
--prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \
|
||||
--prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \
|
||||
--prefix QUARTO_DART_SASS : ${nodePackages.sass}/bin/sass \
|
||||
--prefix QUARTO_DART_SASS : ${dart-sass}/bin/dart-sass \
|
||||
${lib.optionalString (rWrapper != null) "--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R"} \
|
||||
${lib.optionalString (python3 != null) "--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3"}
|
||||
'';
|
||||
@ -61,6 +63,14 @@ stdenv.mkDerivation rec {
|
||||
runHook preInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
quarto-check = runCommand "quarto-check" {} ''
|
||||
export HOME="$(mktemp -d)"
|
||||
${quarto}/bin/quarto check
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source scientific and technical publishing system built on Pandoc";
|
||||
longDescription = ''
|
||||
@ -74,4 +84,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,17 +1,27 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, setuptools
|
||||
, python
|
||||
, antlr4 }:
|
||||
, antlr4
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "antlr4-python3-runtime";
|
||||
inherit (antlr4.runtime.cpp) version src;
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.pythonOlder "3.6";
|
||||
|
||||
sourceRoot = "${src.name}/runtime/Python3";
|
||||
|
||||
# in 4.9, test was renamed to tests
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# We use an asterisk because this expression is used also for old antlr
|
||||
# versions, where there the tests directory is `test` and not `tests`.
|
||||
# See e.g in package `baserow`.
|
||||
checkPhase = ''
|
||||
cd test*
|
||||
${python.interpreter} run.py
|
||||
|
||||
@ -36,14 +36,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-server";
|
||||
version = "2.7.0";
|
||||
version = "2.7.3";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jupyter_server";
|
||||
inherit version;
|
||||
hash = "sha256-NtoKJm0xpBrDNaNmyIkzwX36W7gXpI9cAsFtMDvJR38=";
|
||||
hash = "sha256-1JFshYHE67xTTOvaqOyiR42fO/3Yjq4p/KsBIOrFdkk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "logilab-common";
|
||||
version = "1.9.7";
|
||||
version = "1.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/JlN9RlIRLbi9TL9V6SgO6ddPeKqLzK402DqkLBRuxM=";
|
||||
hash = "sha256-MoXt3tta5OimJUjOkWSMDCmXV0aS8N0W5bcANwAelYY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,6 +27,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
mypy-extensions
|
||||
typing-extensions
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
|
||||
@ -1,22 +1,57 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, logilab-common, six }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, importlib-metadata
|
||||
, logilab-common
|
||||
, pip
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "logilab-constraint";
|
||||
version = "0.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Jk6wvvcDEeHfy7dUcjbnzFIeGBYm5tXzCI26yy+t2qs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
logilab-common six
|
||||
nativeBuildInputs = [
|
||||
importlib-metadata
|
||||
pip
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
logilab-common
|
||||
setuptools
|
||||
six
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# avoid ModuleNotFoundError: No module named 'logilab.common' due to namespace
|
||||
rm -r logilab
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# these tests are abstract test classes intended to be inherited
|
||||
"Abstract"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "logilab.constraint" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "logilab-database provides some classes to make unified access to different";
|
||||
homepage = "https://www.logilab.org/project/logilab-database";
|
||||
homepage = "https://forge.extranet.logilab.fr/open-source/logilab-constraint";
|
||||
changelog = "https://forge.extranet.logilab.fr/open-source/logilab-constraint/-/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
58
pkgs/development/python-modules/openllm-client/default.nix
Normal file
58
pkgs/development/python-modules/openllm-client/default.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, bentoml
|
||||
, hatch-fancy-pypi-readme
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, httpx
|
||||
, openllm-core
|
||||
, soundfile
|
||||
, transformers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
inherit (openllm-core) src version;
|
||||
pname = "openllm-client";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "source/openllm-client";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatch-fancy-pypi-readme
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
openllm-core
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
grpc = [
|
||||
bentoml
|
||||
] ++ bentoml.optional-dependencies.grpc;
|
||||
agents = [
|
||||
transformers
|
||||
# diffusers
|
||||
soundfile
|
||||
] ++ transformers.agents;
|
||||
full = passthru.optional-dependencies.grpc ++ passthru.optional-dependencies.agents;
|
||||
};
|
||||
|
||||
# there is no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "openllm_client" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interacting with OpenLLM HTTP/gRPC server, or any BentoML server";
|
||||
homepage = "https://github.com/bentoml/OpenLLM/tree/main/openllm-client";
|
||||
changelog = "https://github.com/bentoml/OpenLLM/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
84
pkgs/development/python-modules/openllm-core/default.nix
Normal file
84
pkgs/development/python-modules/openllm-core/default.nix
Normal file
@ -0,0 +1,84 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, accelerate
|
||||
, attrs
|
||||
, bentoml
|
||||
, bitsandbytes
|
||||
, cattrs
|
||||
, datasets
|
||||
, hatch-fancy-pypi-readme
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, inflection
|
||||
, mypy-extensions
|
||||
, orjson
|
||||
, peft
|
||||
, ray
|
||||
, transformers
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openllm-core";
|
||||
version = "0.2.27";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bentoml";
|
||||
repo = "OpenLLM";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-R69Qsx9360pJx+7oyhHdeAXUjTAdevPmaBl9gj+AA8U=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/openllm-core";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatch-fancy-pypi-readme
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
bentoml
|
||||
cattrs
|
||||
inflection
|
||||
mypy-extensions
|
||||
orjson
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
vllm = [
|
||||
ray
|
||||
# vllm
|
||||
];
|
||||
fine-tune = [
|
||||
accelerate
|
||||
bitsandbytes
|
||||
datasets
|
||||
peft
|
||||
transformers
|
||||
# trl
|
||||
] ++ transformers.optional-dependencies.torch
|
||||
++ transformers.optional-dependencies.tokenizers
|
||||
++ transformers.optional-dependencies.accelerate;
|
||||
};
|
||||
|
||||
# there is no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "openllm_core" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Core components for OpenLLM";
|
||||
homepage = "https://github.com/bentoml/OpenLLM/tree/main/openllm-core";
|
||||
changelog = "https://github.com/bentoml/OpenLLM/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
198
pkgs/development/python-modules/openllm/default.nix
Normal file
198
pkgs/development/python-modules/openllm/default.nix
Normal file
@ -0,0 +1,198 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, hatch-fancy-pypi-readme
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, accelerate
|
||||
, bentoml
|
||||
, bitsandbytes
|
||||
, click
|
||||
, datasets
|
||||
, docker
|
||||
, einops
|
||||
, fairscale
|
||||
, flax
|
||||
, hypothesis
|
||||
, ipython
|
||||
, jax
|
||||
, jaxlib
|
||||
, jupyter
|
||||
, jupytext
|
||||
, keras
|
||||
, nbformat
|
||||
, notebook
|
||||
, openai
|
||||
, openllm-client
|
||||
, openllm-core
|
||||
, optimum
|
||||
, peft
|
||||
, pytest-mock
|
||||
, pytest-randomly
|
||||
, pytest-rerunfailures
|
||||
, pytest-xdist
|
||||
, ray
|
||||
, safetensors
|
||||
, sentencepiece
|
||||
, soundfile
|
||||
, syrupy
|
||||
, tabulate
|
||||
, tensorflow
|
||||
, tiktoken
|
||||
, transformers
|
||||
, openai-triton
|
||||
, xformers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
inherit (openllm-core) src version;
|
||||
pname = "openllm";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
sourceRoot = "source/openllm-python";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatch-fancy-pypi-readme
|
||||
hatch-vcs
|
||||
hatchling
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# remove cuda-python as it has an unfree license
|
||||
"cuda-python"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bentoml
|
||||
bitsandbytes
|
||||
click
|
||||
openllm-client
|
||||
optimum
|
||||
safetensors
|
||||
tabulate
|
||||
transformers
|
||||
] ++ bentoml.optional-dependencies.io
|
||||
++ tabulate.optional-dependencies.widechars
|
||||
# ++ transformers.optional-dependencies.accelerate
|
||||
++ transformers.optional-dependencies.tokenizers
|
||||
++ transformers.optional-dependencies.torch;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
agents = [
|
||||
# diffusers
|
||||
soundfile
|
||||
transformers
|
||||
] ++ transformers.optional-dependencies.agents;
|
||||
baichuan = [
|
||||
# cpm-kernels
|
||||
sentencepiece
|
||||
];
|
||||
chatglm = [
|
||||
# cpm-kernels
|
||||
sentencepiece
|
||||
];
|
||||
falcon = [
|
||||
einops
|
||||
xformers
|
||||
];
|
||||
fine-tune = [
|
||||
accelerate
|
||||
bitsandbytes
|
||||
datasets
|
||||
peft
|
||||
# trl
|
||||
];
|
||||
flan-t5 = [
|
||||
flax
|
||||
jax
|
||||
jaxlib
|
||||
keras
|
||||
tensorflow
|
||||
];
|
||||
ggml = [
|
||||
# ctransformers
|
||||
];
|
||||
gptq = [
|
||||
# auto-gptq
|
||||
]; # ++ autogptq.optional-dependencies.triton;
|
||||
grpc = [
|
||||
openllm-client
|
||||
] ++ openllm-client.optional-dependencies.grpc;
|
||||
llama = [
|
||||
fairscale
|
||||
sentencepiece
|
||||
];
|
||||
mpt = [
|
||||
einops
|
||||
openai-triton
|
||||
];
|
||||
openai = [
|
||||
openai
|
||||
tiktoken
|
||||
];
|
||||
opt = [
|
||||
flax
|
||||
jax
|
||||
jaxlib
|
||||
keras
|
||||
tensorflow
|
||||
];
|
||||
playground = [
|
||||
ipython
|
||||
jupyter
|
||||
jupytext
|
||||
nbformat
|
||||
notebook
|
||||
];
|
||||
starcoder = [
|
||||
bitsandbytes
|
||||
];
|
||||
vllm = [
|
||||
ray
|
||||
# vllm
|
||||
];
|
||||
all = with passthru.optional-dependencies; (
|
||||
agents ++ baichuan ++ chatglm ++ falcon ++ fine-tune ++ flan-t5 ++ ggml ++ gptq ++ llama ++ mpt ++ openai ++ opt ++ playground ++ starcoder ++ vllm
|
||||
);
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
docker
|
||||
hypothesis
|
||||
pytest-mock
|
||||
pytest-randomly
|
||||
pytest-rerunfailures
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
syrupy
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
# skip GPUs test on CI
|
||||
export GITHUB_ACTIONS=1
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# these tests access to huggingface.co
|
||||
"test_opt_125m"
|
||||
"test_opt_125m"
|
||||
"test_flan_t5"
|
||||
"test_flan_t5"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "openllm" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Operating LLMs in production";
|
||||
homepage = "https://github.com/bentoml/OpenLLM/tree/main/openllm-python";
|
||||
changelog = "https://github.com/bentoml/OpenLLM/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada natsukium ];
|
||||
};
|
||||
}
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openstacksdk";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NhUSnttnyCr70aFwbpFf+mjg7r/JnJA8NDqsZRfdWFg=";
|
||||
hash = "sha256-FBtR+ijGsc3rmOvcOMHO5qTnVL1ryEq3qqDQwrzlRD4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rchitect";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "randy3k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0=";
|
||||
hash = "sha256-e0xCUp5WBP4UKPkwPfrouNNYTBEnhlHHlkBQmghQfdk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,25 +7,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Send2Trash";
|
||||
version = "1.8.1b0";
|
||||
version = "1.8.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hsoft";
|
||||
repo = "send2trash";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q=";
|
||||
hash = "sha256-p0Pd9g+nLoT+oruthwjBn2E9rznvcx35VmzOAce2iTY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Confuses setuptools validation
|
||||
# setuptools.extern.packaging.requirements.InvalidRequirement: One of the parsed requirements in `extras_require[win32]` looks like a valid environment marker: 'sys_platform == "win32"'
|
||||
sed -i '/win32 =/d' setup.cfg
|
||||
|
||||
# setuptools.extern.packaging.requirements.InvalidRequirement: One of the parsed requirements in `extras_require[objc]` looks like a valid environment marker: 'sys_platform == "darwin"'
|
||||
sed -i '/objc =/d' setup.cfg
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.88.0";
|
||||
version = "0.93.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PE/KK2MFSVinaCLztdu7LS+gSemlq4UzVVwSjK+9yiM=";
|
||||
hash = "sha256-ixNh/pCt6e8x9n0wg7GBTwhm3PkmHQzd4CGmacWcAfY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.44.1";
|
||||
version = "0.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "conftest";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-a/5g5USbK8Bat+V3vecuHVlh3e0omqWYrKe2rFTxxnM=";
|
||||
hash = "sha256-e8aKjW1SCpmYcfiI1uH5tOjmQqS5kbhPEtRVR/FeWwA=";
|
||||
};
|
||||
vendorHash = "sha256-Q0bV6ePjQiIzYXB7sEiAYZ9kIbErPsoAXQqdMt8Xd10=";
|
||||
vendorHash = "sha256-kSweCT/8boHb6Go18FBpLtbYI0unUU59QWLgQCrbpfs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ctlptl";
|
||||
version = "0.8.21";
|
||||
version = "0.8.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ulP159bhiVxZ5D7YamPR7AhCZ5qBr63Eitgf0/Sc6lo=";
|
||||
hash = "sha256-/LKsaWqJZG9LdUt9zVAspLOYGr0TrhOJB4j0Vv40rkE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nfSqu1u7NWbZYL7CEZ/i2tdxQBblRbwJwdwoEtol/Us=";
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clickhouse-backup";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexAkulov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B6MImom0BSvbZVjeMWvF+oDEfoALl4xhXXitaOOU/ZI=";
|
||||
sha256 = "sha256-ngLDKAwdrX385BIPYlQAYkA0Ty73wWwEesKQuC6+cvo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YSr3fKqJJtNRbUW1TjwDM96cA6CoYz1LUit/pC8V3Fs=";
|
||||
vendorHash = "sha256-NOQV7c930kutXmgi1eaETu1JMJerKNK2Ns4YBRaoBUw=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols
|
||||
{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, wayland
|
||||
, libX11, libGL }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "devspace";
|
||||
version = "6.3.2";
|
||||
version = "6.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loft-sh";
|
||||
repo = "devspace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TDC4zhsNcU3qwvBSxvaYxlWHXX1YllRX9n6CGKlXOq4=";
|
||||
sha256 = "sha256-xAK06bpl8BGsVUu6O1C2l+tzeiCQoRUMIUtwntUZVvU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opengrok";
|
||||
version = "1.12.13";
|
||||
version = "1.12.14";
|
||||
|
||||
# binary distribution
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-DfSLQj6cbgDT56MwwnlC6hK/y3Hce2Ueprw0o3NURW0=";
|
||||
hash = "sha256-4v+fDmDnmoAZimf63nSCqUp0y+a5UKQBxNWSNp64XE4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
36
pkgs/development/tools/oxlint/default.nix
Normal file
36
pkgs/development/tools/oxlint/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oxlint";
|
||||
version = "0.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "web-infra-dev";
|
||||
repo = "oxc";
|
||||
rev = "oxlint_v${version}";
|
||||
hash = "sha256-di+uCLZJNJMETMSUxQwlFaZPJps0+HIL7h+EvudP5II=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-r+HRm9JNFKFL78VP/Yz87b1nQDLwbNuhHd0JkXeuCC0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--bin=oxlint" ];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A suite of high-performance tools for JavaScript and TypeScript written in Rust";
|
||||
homepage = "https://github.com/web-infra-dev/oxc";
|
||||
changelog = "https://github.com/web-infra-dev/oxc/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "oxlint";
|
||||
};
|
||||
}
|
||||
@ -103,6 +103,20 @@ let
|
||||
};
|
||||
|
||||
in {
|
||||
antlr4_13 = (mkAntlr {
|
||||
version = "4.13.0";
|
||||
sourceSha256 = "sha256-s1yAdScMYg1wFpYNsBAtpifIhQsnSAgJg7JjPDx+htc=";
|
||||
jarSha256 = "sha256-vG9KvA0iWidXASbFFAJWnwAKje2jSHtw52QoQOVw5KY=";
|
||||
extraCppCmakeFlags = [
|
||||
# Generate CMake config files, which are not installed by default.
|
||||
"-DANTLR4_INSTALL=ON"
|
||||
|
||||
# Disable tests, since they require downloading googletest, which is
|
||||
# not available in a sandboxed build.
|
||||
"-DANTLR_BUILD_CPP_TESTS=OFF"
|
||||
];
|
||||
}).antlr;
|
||||
|
||||
antlr4_12 = (mkAntlr {
|
||||
version = "4.12.0";
|
||||
sourceSha256 = "sha256-0JMG8UYFT+IAWvARY2KnuXSr5X6LlVZN4LJHy5d4x08=";
|
||||
|
||||
51
pkgs/development/tools/rust/cargo-codspeed/default.nix
Normal file
51
pkgs/development/tools/rust/cargo-codspeed/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, curl
|
||||
, pkg-config
|
||||
, libgit2_1_5
|
||||
, openssl
|
||||
, zlib
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-codspeed";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CodSpeedHQ";
|
||||
repo = "codspeed-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-egKy1ilI4wbpmw1AM3W1Yxq4Cy6jEx8Y0FFM92C0JM0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nYWl9V9/LKBJ6Hpsinr/2wCY5yrVXgp6Q2oUNU/b4MU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
libgit2_1_5
|
||||
openssl
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Security
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "-p=cargo-codspeed" ];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo extension to build & run your codspeed benchmarks";
|
||||
homepage = "https://github.com/CodSpeedHQ/codspeed-rust";
|
||||
changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/${src.rev}";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "cargo-codspeed";
|
||||
};
|
||||
}
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.65";
|
||||
version = "1.0.66";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-fPrke89Nlr9Yj0bkB6HTwMymQsjAQ+5+o7iVPGH7Tyc=";
|
||||
sha256 = "sha256-nkE8N0O+aBJPNPGjsp55KnpkaQum11InYHks/Pae+A0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q7nBKdwZlL/HleuiniuvErGF6Avf58xR++cJ7PP8RME=";
|
||||
cargoHash = "sha256-To36pZW6AkV5HLhYJ0Wke7q9JYgguTBWYehitLJVY6w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swc";
|
||||
version = "0.91.67";
|
||||
version = "0.91.68";
|
||||
|
||||
env = {
|
||||
# swc depends on nightly features
|
||||
@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec {
|
||||
src = fetchCrate {
|
||||
pname = "swc_cli";
|
||||
inherit version;
|
||||
sha256 = "sha256-ibNrdMxb1A/QwtK/J/2tbqCxpWssTeFSXrO8oEeEoDA=";
|
||||
sha256 = "sha256-SLVXh+8oBcq/pKHB5mMLPOR4J3Xlns5eNs8mo2qh/30=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-puECB7/b2lKTquaDvzd19pYbmY8OeRfbA9u1xMjzl/k=";
|
||||
cargoSha256 = "sha256-nYMy4OtzNymzan/xZ6Ekx9QL+6AOtciI+sLl4f2Owy0=";
|
||||
|
||||
buildFeatures = [ "swc_core/plugin_transform_host_native" ];
|
||||
|
||||
@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Rust-based platform for the Web";
|
||||
homepage = "https://github.com/swc-project/swc";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
maintainers = with maintainers; [ dit7ya kashw2 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minesweep-rs";
|
||||
version = "6.0.27";
|
||||
version = "6.0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpcloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-z94mKAboLs6fi+RKfwijm2RDpO729uJoSlxSzBdrkRI=";
|
||||
hash = "sha256-PgZ9fL+g2X3CddPVD/JRrIFbw7GS73ELD3EhhR9BAUc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IRWPjOUV3ElXPNYCRvQQAw74YBtEnTHtrWDYHO/eDNE=";
|
||||
cargoHash = "sha256-c06TfslXGAshR1HXz6PCI26DMpFsb6OrzQ38p4RgsAw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sweep some mines for fun, and probably not for profit";
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "10.3.0";
|
||||
version = "10.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UkhcSRVABgZs9/G5r6ZMLfFPZMeXE8atR5+HNG5y3tk=";
|
||||
hash = "sha256-NEbQ4GoZXnFes6jvqKDg4T8eDAHHEYytJ7W7qeZSCmE=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-IimrJZLaSkwWsqoVmNRyLhcME4y1YKw5xLayKxRj5lw=";
|
||||
vendorHash = "sha256-mpN4YCiuL2jrZ4r/YOUhQSOBlGGHndQyrB9GT5mTAyI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -65,11 +65,11 @@ rec {
|
||||
# Vulkan developer beta driver
|
||||
# See here for more information: https://developer.nvidia.com/vulkan-driver
|
||||
vulkan_beta = generic rec {
|
||||
version = "535.43.08";
|
||||
version = "535.43.09";
|
||||
persistencedVersion = "535.98";
|
||||
settingsVersion = "535.98";
|
||||
sha256_64bit = "sha256-u9OJ4xaHGDb5iA5+5jwJhWQGRDa5R6piF1c+K2DGaJs=";
|
||||
openSha256 = "sha256-kbH/6yDhh44SB08xcX6+tm70PuUHF0tfbvHfIwx7o/U=";
|
||||
sha256_64bit = "sha256-7QDp+VDgxH7RGW40kbQp4F/luh0DCYb4BS0gU/6wn+c=";
|
||||
openSha256 = "sha256-7MOwKQCTaOo1//8OlSaNdpKeDXejZvmKFFeqhFrhAk8=";
|
||||
settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s=";
|
||||
persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM=";
|
||||
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
|
||||
|
||||
@ -25,11 +25,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "postfix";
|
||||
version = "3.8.1";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-VOG//e0wMoKKcN4iwqGpTRwJf8RRPg/b/P2/O/9rcJI=";
|
||||
hash = "sha256-Z5CQPNu14ORxlmkeuaXyz4BQJi3vlB4Dnm1L9AQ6XjA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper m4 ];
|
||||
@ -109,6 +109,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.postfix.org/";
|
||||
changelog = "https://www.postfix.org/announcements/postfix-${version}.html";
|
||||
description = "A fast, easy to administer, and secure mail server";
|
||||
license = with licenses; [ ipl10 epl20 ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "copilot-cli";
|
||||
version = "1.30.0";
|
||||
version = "1.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q495MJlvElm5yrX4QWrwvB62Tdzq0W5pTYsTXyw9Idw=";
|
||||
hash = "sha256-ldSF+M6gYKJ6EDJ4jKpPS+XTyybynsRhibNtLG1+DlE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/2uUiFL2wL+gAzqY2S3sqytPLKB5+QkYXCBNLqSJSWU=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.72.0";
|
||||
version = "1.72.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+M7+/iexcqQD1RVJziNll0XaPAsUiFlC3+1EwXxA5P0=";
|
||||
sha256 = "sha256-WaM0GQP5JIGKJuRPcIqaPt98qkjRuzjbv6oiHARu6lA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -8,11 +8,11 @@ with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "mycli";
|
||||
version = "1.26.1";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jAMDXJtFJtv6CwhZZU4pdKDndZKp6bJ/QPWo2q6DvrE=";
|
||||
sha256 = "sha256-px21vZwafQAG9PL/AVSM51Y30/UMo6fne5ULW0av980=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,22 +1,28 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, ssmsh }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ssmsh";
|
||||
version = "1.4.7";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bwhaley";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-juyTCtcuFIlKyLxDrK5tRRzCMwoSXG4EUA32E/Z4y5c=";
|
||||
sha256 = "sha256-GpN+yicgFIHOaMeJJcRn55f6fQbFX12vSV089/cMsqc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-dqUMwnHRsR8n4bHEKoePyuqr8sE4NWPpuYo5SwOw0Rw=";
|
||||
vendorSha256 = "sha256-17fmdsfOrOaySPsXofLzz0+vmiemg9MbnWhRoZ67EuQ=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
ldflags = [ "-w" "-s" "-X main.Version=${version}" ];
|
||||
|
||||
passthru.tests = testers.testVersion {
|
||||
package = ssmsh;
|
||||
command = "ssmsh -version";
|
||||
version = "Version ${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/bwhaley/ssmsh";
|
||||
description = "An interactive shell for AWS Parameter Store";
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tlsclient";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~moody";
|
||||
repo = "tlsclient";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-36fhY9kO6tPUuRkpk3Jv9oBRYX/SnmdZg0Rzt/A6MQE=";
|
||||
hash = "sha256-Ff41LZ5jbrqni2ptsUlI3L17SCHnGo4utg8etFubRNI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenvNoCC, lib, fetchFromGitHub, fuse-overlayfs, util-linux, makeWrapper }:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "try";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "binpash";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TTKr22FwXfPL/YrFT+r12nFSxbk/47N6rrb3Vw/lSPI=";
|
||||
hash = "sha256-2EDRVwW4XzQhd7rAM2rDuR94Fkaq4pH5RTooFEBBh5g=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btrfs-progs";
|
||||
version = "6.3.3";
|
||||
version = "6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
|
||||
sha256 = "sha256-S+MAFXYCcNCBZCzAAjqL/ufLZXoqoFVkTmpW1oaVuW4=";
|
||||
sha256 = "sha256-j1B6DN9qizcthi2+SUP+hMZtyyCI48/eLPs7F26sHBw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -33,7 +33,7 @@ xorg,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.39.1";
|
||||
version = "1.39.3";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
@ -82,7 +82,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
|
||||
sha256 = "sha256-i4dAkpA0i/RSC0PpkEafbxriJy1Y9bW5YrZRjFaS8nw=";
|
||||
sha256 = "sha256-6HK1t05amGd7H6MS9Lg+vJvWdOWi+ukqz5gY1IaPw9E=";
|
||||
}
|
||||
else
|
||||
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nfdump";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phaag";
|
||||
repo = "nfdump";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ns/RG0kyu2b0UjcJKArcAjY+dI397ljhrUO8euS5Snk=";
|
||||
hash = "sha256-etmelBCZQKscuVJt5dBtwQVjiZNUFLTu11Gw0jmYcAg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
415
pkgs/tools/security/vaultwarden/Cargo.lock
generated
415
pkgs/tools/security/vaultwarden/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -9,13 +9,13 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vaultwarden";
|
||||
version = "1.29.1";
|
||||
version = "1.29.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-uASoPZRBQ9IKJHtMGeeZzmr0fCYDWl56EzaJVj6LwMk=";
|
||||
hash = "sha256-ByMPS68GBOvjB/RpoLAvgE+NcbbIa1qfU1TQ4yhbH+I=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2023.5.0";
|
||||
version = "2023.7.1";
|
||||
|
||||
bw_web_builds = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "bw_web_builds";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dH+d206nDaUrX2FcpPTegAtlQvquxk+tfQt3vJQlOjw=";
|
||||
hash = "sha256-B7FGLKuwxldlHnIIzQbDjZT9cs5+lixo/fBtlexNLQc=";
|
||||
};
|
||||
in buildNpmPackage rec {
|
||||
pname = "vaultwarden-webvault";
|
||||
@ -23,10 +23,10 @@ in buildNpmPackage rec {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "web-v${lib.removeSuffix "b" version}";
|
||||
hash = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU=";
|
||||
hash = "sha256-HEEUboaIY/Zi/wUhp9y7oIOuQl6csjo97eygTLPNfNo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY=";
|
||||
npmDepsHash = "sha256-8Epkvjzllt//kdrKT4jUDOhj47Fnb0qSFU1qJthL2Mo=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${bw_web_builds}/{patches,resources} ..
|
||||
|
||||
@ -11720,6 +11720,8 @@ with pkgs;
|
||||
|
||||
oxker = callPackage ../applications/misc/oxker { };
|
||||
|
||||
oxlint = callPackage ../development/tools/oxlint { };
|
||||
|
||||
ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { };
|
||||
|
||||
ovito = libsForQt5.callPackage ../applications/graphics/ovito {
|
||||
@ -17178,6 +17180,7 @@ with pkgs;
|
||||
cargo-clone = callPackage ../development/tools/rust/cargo-clone {
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { };
|
||||
cargo-component = callPackage ../development/tools/rust/cargo-component { };
|
||||
cargo-cranky = callPackage ../development/tools/rust/cargo-cranky { };
|
||||
cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { };
|
||||
@ -18601,9 +18604,10 @@ with pkgs;
|
||||
antlr4_9
|
||||
antlr4_10
|
||||
antlr4_11
|
||||
antlr4_12;
|
||||
antlr4_12
|
||||
antlr4_13;
|
||||
|
||||
antlr4 = antlr4_12;
|
||||
antlr4 = antlr4_13;
|
||||
|
||||
antlr = antlr4;
|
||||
|
||||
@ -39969,9 +39973,11 @@ with pkgs;
|
||||
|
||||
# this is a wrapper for kicad.base and kicad.libraries
|
||||
kicad = callPackage ../applications/science/electronics/kicad { };
|
||||
# this is the same but without the (sizable) 3D models library
|
||||
kicad-small = kicad.override { pname = "kicad-small"; with3d = false; };
|
||||
# this is the master branch at whatever point update.sh last updated versions.nix
|
||||
kicad-unstable = kicad.override { pname = "kicad-unstable"; stable = false; };
|
||||
# mostly here so the kicad-unstable components (except packages3d) get built
|
||||
# and a small version of that
|
||||
kicad-unstable-small = kicad.override {
|
||||
pname = "kicad-unstable-small";
|
||||
stable = false;
|
||||
@ -41330,6 +41336,8 @@ with pkgs;
|
||||
|
||||
steamcontroller = callPackage ../misc/drivers/steamcontroller { };
|
||||
|
||||
stepreduce = callPackage ../applications/misc/stepreduce { };
|
||||
|
||||
stern = callPackage ../applications/networking/cluster/stern { };
|
||||
|
||||
streamripper = callPackage ../applications/audio/streamripper { };
|
||||
@ -42289,6 +42297,8 @@ with pkgs;
|
||||
|
||||
gitrs = callPackage ../tools/misc/gitrs { };
|
||||
|
||||
dict-cc-py = callPackage ../applications/misc/dict-cc-py { };
|
||||
|
||||
wttrbar = callPackage ../applications/misc/wttrbar { };
|
||||
|
||||
wpm = callPackage ../applications/misc/wpm { };
|
||||
|
||||
@ -4014,6 +4014,12 @@ self: super: with self; {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL;
|
||||
};
|
||||
|
||||
openllm = callPackage ../development/python-modules/openllm { };
|
||||
|
||||
openllm-client = callPackage ../development/python-modules/openllm-client { };
|
||||
|
||||
openllm-core = callPackage ../development/python-modules/openllm-core { };
|
||||
|
||||
openstep-plist = callPackage ../development/python-modules/openstep-plist { };
|
||||
|
||||
glyphslib = callPackage ../development/python-modules/glyphslib { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user