Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
b81c4a4861
|
|
@ -132,6 +132,12 @@
|
|||
github = "13r0ck";
|
||||
githubId = 58987761;
|
||||
};
|
||||
_21eleven = {
|
||||
name = "Noah Lidell";
|
||||
email = "noahlidell@gmail.com";
|
||||
github = "21eleven";
|
||||
githubId = 8813855;
|
||||
};
|
||||
_2gn = {
|
||||
name = "Hiram Tanner";
|
||||
github = "2gn";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ use File::Path qw(make_path);
|
|||
use File::Slurp;
|
||||
use Getopt::Long;
|
||||
use JSON;
|
||||
use DateTime;
|
||||
use Time::Piece;
|
||||
|
||||
# Keep track of deleted uids and gids.
|
||||
my $uidMapFile = "/var/lib/nixos/uid-map";
|
||||
|
|
@ -26,17 +26,8 @@ sub updateFile {
|
|||
# Converts an ISO date to number of days since 1970-01-01
|
||||
sub dateToDays {
|
||||
my ($date) = @_;
|
||||
my ($year, $month, $day) = split('-', $date, -3);
|
||||
my $dt = DateTime->new(
|
||||
year => $year,
|
||||
month => $month,
|
||||
day => $day,
|
||||
hour => 0,
|
||||
minute => 0,
|
||||
second => 0,
|
||||
time_zone => 'UTC',
|
||||
);
|
||||
return $dt->epoch / 86400;
|
||||
my $time = Time::Piece->strptime($date, "%Y-%m-%d");
|
||||
return $time->epoch / 60 / 60 / 24;
|
||||
}
|
||||
|
||||
sub nscdInvalidate {
|
||||
|
|
|
|||
|
|
@ -648,7 +648,7 @@ in {
|
|||
install -m 0700 -d /root
|
||||
install -m 0755 -d /home
|
||||
|
||||
${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON p.DateTime ])}/bin/perl \
|
||||
${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON ])}/bin/perl \
|
||||
-w ${./update-users-groups.pl} ${spec}
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, alsa-utils
|
||||
, alsa-lib
|
||||
, gtk4
|
||||
, wrapGAppsHook4
|
||||
|
|
@ -22,9 +24,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ];
|
||||
sourceRoot = "${src.name}/src";
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 makeWrapper ];
|
||||
buildInputs = [ gtk4 alsa-lib ];
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/alsa-scarlett-gui --prefix PATH : ${lib.makeBinPath [ alsa-utils ]}
|
||||
|
||||
substituteInPlace $out/share/applications/vu.b4.alsa-scarlett-gui.desktop \
|
||||
--replace "Exec=/bin/alsa-scarlett-gui" "Exec=$out/bin/alsa-scarlett-gui"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "music-player";
|
||||
version = "0.2.0-alpha.13";
|
||||
version = "0.2.0-alpha.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsirysndr";
|
||||
repo = "music-player";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LuO64E5kJdMgd5h0+Sb8Wg7hxUmS8E7bKT3NIyd9+Lc=";
|
||||
hash = "sha256-l8Y1fc5v0YDm87b+d3DuMgKFiem6WFfJEASplHoqva0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Xn0OUHMgKxzDvhO+xRv5jMa50OzEtl6yhHbJ1R/a56Y=";
|
||||
cargoHash = "sha256-nnOHuAn+eGf+iiX3QbDTH4zHMQ6KV4QP6RnyBhLMrEc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spatialite-tools";
|
||||
version = "5.1.0";
|
||||
version = "5.1.0a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${version}.tar.gz";
|
||||
hash = "sha256-3zAwNnwInKkPpmMIl/PxooB4TaKeG6Y080DbpLCFg7U=";
|
||||
hash = "sha256-EZ40dY6AiM27Q+2BtKbq6ojHZLC32hkAGlUUslRVAc4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -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; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
, qttools
|
||||
, qtlocation ? null # qt5 only
|
||||
, qtpositioning ? null # qt6 only
|
||||
, qtpbfimageplugin
|
||||
, qtserialport
|
||||
, qtsvg
|
||||
, qt5compat ? null # qt6 only
|
||||
|
|
@ -16,21 +15,21 @@
|
|||
|
||||
let
|
||||
isQt6 = lib.versions.major qtbase.version == "6";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpxsee";
|
||||
version = "13.4";
|
||||
version = "13.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
hash = "sha256-Zf2eyDx5QK69W6HNz/IGGHkX2qCDnxYsU8KLCgU9teY=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Y3JcWkg0K724i/5Leyi8r26uKpq/aDwghJBG8xfxpd4=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtpbfimageplugin qtserialport ]
|
||||
++ (if isQt6 then [
|
||||
buildInputs = [
|
||||
qtserialport
|
||||
] ++ (if isQt6 then [
|
||||
qtbase
|
||||
qtpositioning
|
||||
qtsvg
|
||||
|
|
@ -39,7 +38,11 @@ stdenv.mkDerivation rec {
|
|||
qtlocation
|
||||
]);
|
||||
|
||||
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
lrelease gpxsee.pro
|
||||
|
|
@ -56,17 +59,17 @@ stdenv.mkDerivation rec {
|
|||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
broken = isQt6 && stdenv.isDarwin;
|
||||
changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
|
||||
description = "GPS log file viewer and analyzer";
|
||||
homepage = "https://www.gpxsee.org/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
longDescription = ''
|
||||
GPXSee is a Qt-based GPS log file viewer and analyzer that supports
|
||||
all common GPS log file formats.
|
||||
'';
|
||||
homepage = "https://www.gpxsee.org/";
|
||||
changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ womfoo sikmir ];
|
||||
platforms = platforms.unix;
|
||||
broken = isQt6 && stdenv.isDarwin;
|
||||
maintainers = with lib.maintainers; [ womfoo sikmir ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
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 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "A small screenlocker for Wayland compositors";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ jordanisaacs ];
|
||||
mainProgram = "waylock";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
27
pkgs/applications/misc/yambar-hyprland-wses/default.nix
Normal file
27
pkgs/applications/misc/yambar-hyprland-wses/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "yambar-hyprland-wses";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonhoo";
|
||||
repo = "yambar-hyprland-wses";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-furHj1AAFgNiNHP9RBsVrIvrDckSKU8FXilzH9TQ99c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/ewEgrBxRw5Xii5PX1GLKzBrZjgnzYc/Hz+M1pJpncQ=";
|
||||
|
||||
meta = {
|
||||
description = "Enable Yambar to show Hyprland workspaces";
|
||||
homepage = "https://github.com/jonhoo/yambar-hyprland-wses";
|
||||
license = with lib.licenses; [ asl20 mit ];
|
||||
maintainers = with lib.maintainers; [ ludovicopiero ];
|
||||
mainProgram = "yambar-hyprland-wses";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "acorn";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acorn-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ERB9RwvBcZ+G+UqR0Wv+HCkrc8tJQdamIeg7ZfKx8jQ=";
|
||||
hash = "sha256-ZS3YxXgMSu8+eRnpqrtaBTQIlSY3cscudcTbztiRsbM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iiyWYGoW0vno/C5qZVvtYypbVpjJwWydMo4+HxXy8IM=";
|
||||
vendorHash = "sha256-jkkzlMc2y8HvPZjpmRIQz64JK5yjhdoJevE0dclBHvA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeshark";
|
||||
version = "41.6";
|
||||
version = "50.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
rev = version;
|
||||
sha256 = "sha256-UFBht8H8iOHwMU8PM2FCb+oh7rTkN/XC3/W3EmuTp84=";
|
||||
sha256 = "sha256-bABPfy790cMIfunKYfZwDbEn07fhq6g0m/yqeFgJg4Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rcxnvKkc9zerfULRdU5eGRRqSDQQDNMYaLJ7oEMQghk=";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "terraform-compliance";
|
||||
version = "1.3.43";
|
||||
version = "1.3.44";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-compliance";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-Otz0jXSqqg8u8jVnqHTpPW/oyb+Qq2NywgxYPtIAKEc=";
|
||||
sha256 = "sha256-eE9bqu9ipuas+rdcJpn09V6nkdoYPOpChHgPH8U0rNw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -55,6 +55,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://github.com/terraform-compliance/cli";
|
||||
changelog = "https://github.com/terraform-compliance/cli/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kalbasit ];
|
||||
maintainers = with maintainers; [ kalbasit kashw2 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.50.6";
|
||||
version = "0.50.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-h6Qz27zWAN0mxDok2dpxlE0qLP2ECwMjiCZxg+9T/dw=";
|
||||
hash = "sha256-NAilGvA0S4GEQgqKKQMddemZmyFBnKE4+R689kAyoMg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZpLQcWi3qYTsy6BUZbHFFmhWG6CWqcb/NuzPLOUtKfs=";
|
||||
vendorHash = "sha256-wQ5jxOTuYkiW5zHcduByKZ+vHPKn/1ELL3DskKze+UI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,16 +33,16 @@ let
|
|||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.40.0";
|
||||
version = "1.40.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QvSBM2zR/LcQ2wtkh6mtlU8iqYmZfv6U5bRyMYjLZhE=";
|
||||
hash = "sha256-UmRI1aYPAz8I6Th+L5N1YXbvaIOS6m2jEKFl6MdCUVA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lxyXfPNu5U+0cge+cwcXHIJv+gVXCSzc5t/2c4IQxNM=";
|
||||
npmDepsHash = "sha256-zk7Zc/I8uK8CXo0nHMg1CPG28OHRoL1fh1MLOsIr3ao=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +1,54 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, makeBinaryWrapper
|
||||
, itk
|
||||
, vtk
|
||||
, Cocoa
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ANTs";
|
||||
version = "2.4.4";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ANTsX";
|
||||
repo = "ANTs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GQndI8ayBvqujb2/qXT6RBAfr8hNPCI5IbwYkPlyNg0=";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-rSibcsprhMC1qsuZN8ou32QPLf8n62BiDzpnTRWRx0Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = [ itk vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
|
||||
buildInputs = [
|
||||
itk
|
||||
vtk
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DANTS_SUPERBUILD=FALSE"
|
||||
"-DUSE_VTK=TRUE"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for file in $out/bin/*; do
|
||||
wrapProgram $file --set ANTSPATH "$out/bin"
|
||||
wrapProgram $file --set PATH "$out/bin"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ANTsX/ANTs";
|
||||
meta = {
|
||||
changelog = "https://github.com/ANTsX/ANTs/releases/tag/v${finalAttrs.version}";
|
||||
description = "Advanced normalization toolkit for medical image registration and other processing";
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://github.com/ANTsX/ANTs";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "antsRegistration";
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
(fetchpatch {
|
||||
name = "pari_2_11.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/21ba7540d385a9864b44850d6987893dfa16bfc0/build/pkgs/giac/patches/pari_2_11.patch";
|
||||
sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k=";
|
||||
})
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
# means some outputs differ in the make check. Patch around this:
|
||||
(fetchpatch {
|
||||
name = "nofltk-check.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26/build/pkgs/giac/patches/nofltk-check.patch";
|
||||
sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY=";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -63,20 +63,20 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
# fix path to info dir (see https://trac.sagemath.org/ticket/11348)
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/infodir.patch";
|
||||
sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x";
|
||||
})
|
||||
|
||||
# fix https://sourceforge.net/p/maxima/bugs/2596/
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/matrixexp.patch";
|
||||
sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg";
|
||||
})
|
||||
|
||||
# undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca
|
||||
# see https://trac.sagemath.org/ticket/13364#comment:93
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch";
|
||||
sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/1615f58890e8f9881c4228c78a6b39b9aab1303a/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch";
|
||||
sha256 = "0q3wajncyfr3gahd8gwk9x7g56zw54lpywrl63lqk7drkf60mrcl";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
26
pkgs/applications/version-management/degit/default.nix
Normal file
26
pkgs/applications/version-management/degit/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "degit";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rich-Harris";
|
||||
repo = "degit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Vw/gtmKywi5faSCs7Wek80nmnqcPHXlQarD5qMwlsQE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-42cM31C2c1Gr7HWOowMUTEUEyL0mGnyl5fyQECcz1Sw=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Rich-Harris/degit/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Make copies of git repositories";
|
||||
homepage = "https://github.com/Rich-Harris/degit";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kidonng ];
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.32.0";
|
||||
version = "0.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cBcmNeGfVPCdVvXkMe2Vx3zUaWGE1vMSfwmNPapTwBo=";
|
||||
hash = "sha256-F09gIDByRIJENwbzUb2IlWkyXjva0b7ivORgXotL/20=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cD4QFrDgwwJIrpSYmoale+2p0xD2JMHcIcuc4sRH4wI=";
|
||||
cargoHash = "sha256-D0XGH6b6dJrgLnFUViRAl9+AhnR2Bt4J2hDXUyJhOyg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
|
|
|||
39
pkgs/data/fonts/azeret-mono/default.nix
Normal file
39
pkgs/data/fonts/azeret-mono/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "azeret-mono";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "displaay";
|
||||
repo = "Azeret";
|
||||
rev = "3d45a6c3e094f08bfc70551b525bd2037cac51ba";
|
||||
hash = "sha256-WC5a2O+/hdX+lLz81obcmq64wYpX48ZxsYPEaZUbFaY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 fonts/ttf/*.ttf -t $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Azeret Mono";
|
||||
longDescription = ''
|
||||
The story of the typeface began with a draft that was driven by an exploration of OCR fonts, past and futuristic operating systems, various interfaces and the nineties. The final result is more based on a desire to achieve an appearance of the typeface that could serve in operating systems. Thus the overall character is a conjunction of everything described with details that evoke a specific personality.
|
||||
|
||||
Azeret is a sans-serif typeface with a mono-linear character. Don’t go looking for too much contrast in the strokes! The circular parts of the letters do not have a smooth connection to the stems. The x-height is higher than usual and thus the ascenders and descenders are short. Alternates are also available which open the possibility of creating different moods. A number of them hint at a nineties aesthetic.
|
||||
|
||||
The monospaced sub-family is available for free and is also on Google Fonts. If you would like to explore Azeret more you can do it on our micro-site which we developed with Martin Ehrlich.
|
||||
|
||||
Designer: Martin Vácha, Daniel Quisek
|
||||
Production: Renegade Fonts (Jan Charvát, Zuzana Konečná)
|
||||
'';
|
||||
homepage = "https://displaay.net/typeface/azeret/azeret-mono/";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ _21eleven ];
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Script that creates the "database" (nested python array) and pickles it
|
||||
spkg-install = fetchurl {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=9.2";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/conway_polynomials/spkg-install.py";
|
||||
sha256 = "1bwnqasnyv793hxg29viing4dnliz29grkhldsirq19d509yk1fs";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Script that creates the sqlite database from the allcurves textfile
|
||||
spkg-install = fetchurl {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/${pname}/spkg-install.py?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/${pname}/spkg-install.py";
|
||||
sha256 = "116g684i6mvs11fvb6fzfsr4fn903axn31vigdyb8bgpf8l4hvc5";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
let unwrapped = mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "thunar";
|
||||
version = "4.18.6";
|
||||
version = "4.18.7";
|
||||
|
||||
sha256 = "sha256-7SWpIBGm/YhnQSWYi5BgYjx8WCiEqxZRTagz/cY0p3E=";
|
||||
sha256 = "sha256-pxIblhC40X0wdE6+uvmV5ypp4sOZtzn/evcS33PlNpU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
# Rebased version of
|
||||
# https://gitlab.com/embeddable-common-lisp/ecl/commit/ac5f011f57a85a38627af154bc3ee7580e7fecd4.patch
|
||||
name = "getcwd.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/16.1.2-getcwd.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/ecl/patches/16.1.2-getcwd.patch";
|
||||
sha256 = "1fbi8gn7rv8nqff5mpaijsrch3k3z7qc5cn4h1vl8qrr8xwqlqhb";
|
||||
})
|
||||
./ecl-1.16.2-libffi-3.3-abi.patch
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
# https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/ecl/patches/write_error.patch";
|
||||
sha256 = "0hfxacpgn4919hg0mn4wf4m8r7y592r4gw7aqfnva7sckxi6w089";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
||||
'' +
|
||||
|
|
|
|||
|
|
@ -5,18 +5,24 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cel-go";
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "cel-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qk7jopOr/woWCi5j509K4bdlIybuZZ+UFTmTHEEw9/Y=";
|
||||
hash = "sha256-+YGRcTlPKTdecMicW4UjupSnuuq5msfGKTP/bwOf7dw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/repl";
|
||||
modRoot = "repl";
|
||||
|
||||
vendorHash = "sha256-OypSL91/2FVCF3ADNSJH33JxH0+3HxIziwmXHb/vZM4=";
|
||||
vendorHash = "sha256-RSCZOR++WBoGffCQp114Sa1Dbms2tBa0xceVQ3skwR4=";
|
||||
|
||||
patches = [
|
||||
# repl/go.mod and repl/go.sum are outdated
|
||||
# ran `go mod tidy` in the repl directory
|
||||
./go-mod-tidy.patch
|
||||
];
|
||||
|
||||
subPackages = [
|
||||
"main"
|
||||
|
|
|
|||
52
pkgs/development/interpreters/cel-go/go-mod-tidy.patch
Normal file
52
pkgs/development/interpreters/cel-go/go-mod-tidy.patch
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
--- a/repl/go.mod
|
||||
+++ b/repl/go.mod
|
||||
@@ -6,16 +6,16 @@ require (
|
||||
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1
|
||||
github.com/chzyer/readline v1.5.1
|
||||
github.com/google/cel-go v0.14.0
|
||||
- google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9
|
||||
- google.golang.org/protobuf v1.30.0
|
||||
+ google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5
|
||||
+ google.golang.org/protobuf v1.31.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/stoewer/go-strcase v1.3.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
|
||||
- golang.org/x/sys v0.7.0 // indirect
|
||||
+ golang.org/x/sys v0.8.0 // indirect
|
||||
golang.org/x/text v0.9.0 // indirect
|
||||
- google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
|
||||
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
|
||||
)
|
||||
|
||||
replace github.com/google/cel-go => ../.
|
||||
--- a/repl/go.sum
|
||||
+++ b/repl/go.sum
|
||||
@@ -26,18 +26,18 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
|
||||
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
|
||||
golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
|
||||
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
|
||||
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
|
||||
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
|
||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
-google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ=
|
||||
-google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
|
||||
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM=
|
||||
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
|
||||
+google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44=
|
||||
+google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q=
|
||||
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg=
|
||||
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I=
|
||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
||||
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
|
||||
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.22";
|
||||
hash = "sha256-mSNU44LGxhjQHtS+Br7qjewxeLFBU99k08jEi4Xp+8I=";
|
||||
version = "8.1.23";
|
||||
hash = "sha256-kppieFF32okt3/ygdLqy8f9XhHOg1K25FcEvXz407Bs=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.9";
|
||||
hash = "sha256-SEYLmUrn61CWoxD0TRPoZd4XcRBNSlUNUwcr5YpvF2w=";
|
||||
version = "8.2.10";
|
||||
hash = "sha256-zJg06PG2E9dneviEPDZR6YKavKjr/pB5JR0Nhdmgqj4=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
4
pkgs/development/interpreters/spidermonkey/115.nix
Normal file
4
pkgs/development/interpreters/spidermonkey/115.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
import ./common.nix {
|
||||
version = "115.2.0";
|
||||
hash = "sha512-3ztO/ZYH6OtJMnF3YMhl6zGsepYkbLQ4UZDDMxbJWV4Hk6HzxF67lnSpuk/OmNg/cbBjvvCe8wfZLRzXjTDYEg==";
|
||||
}
|
||||
|
|
@ -157,10 +157,13 @@ stdenv.mkDerivation (finalAttrs: rec {
|
|||
export AS=$CC
|
||||
export AC_MACRODIR=$PWD/build/autoconf/
|
||||
|
||||
'' + lib.optionalString (lib.versionAtLeast version "91" && lib.versionOlder version "115") ''
|
||||
pushd js/src
|
||||
sh ../../build/autoconf/autoconf.sh --localdir=$PWD configure.in > configure
|
||||
chmod +x configure
|
||||
popd
|
||||
'' + lib.optionalString (lib.versionAtLeast version "115") ''
|
||||
patchShebangs build/cargo-linker
|
||||
'' + ''
|
||||
# We can't build in js/src/, so create a build dir
|
||||
mkdir obj
|
||||
|
|
@ -184,6 +187,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
|||
homepage = "https://spidermonkey.dev/";
|
||||
license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78.
|
||||
maintainers = with maintainers; [ abbradar lostnet catap ];
|
||||
broken = stdenv.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666).
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
# https://trac.sagemath.org/ticket/20710#comment:18
|
||||
(fetchpatch {
|
||||
name = "error_recovery.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=d3c1f607e32f964bf0cab877a63767c86fd00266";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/d3c1f607e32f964bf0cab877a63767c86fd00266/build/pkgs/glpk/patches/error_recovery.patch";
|
||||
sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA=";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
42
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
42
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
|
|
@ -221,13 +221,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "async-imap"
|
||||
version = "0.9.0"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da93622739d458dd9a6abc1abf0e38e81965a5824a3b37f9500437c82a8bb572"
|
||||
checksum = "b538b767cbf9c162a6c5795d4b932bd2c20ba10b5a91a94d2b2b6886c1dce6a8"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"base64 0.21.2",
|
||||
"byte-pool",
|
||||
"bytes",
|
||||
"chrono",
|
||||
"futures",
|
||||
"imap-proto",
|
||||
|
|
@ -544,16 +544,6 @@ version = "3.13.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
|
||||
|
||||
[[package]]
|
||||
name = "byte-pool"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158"
|
||||
dependencies = [
|
||||
"crossbeam-queue",
|
||||
"stable_deref_trait",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.13.1"
|
||||
|
|
@ -924,16 +914,6 @@ dependencies = [
|
|||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-queue"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.16"
|
||||
|
|
@ -1123,7 +1103,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat"
|
||||
version = "1.119.1"
|
||||
version = "1.120.0"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
|
|
@ -1199,7 +1179,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat-jsonrpc"
|
||||
version = "1.119.1"
|
||||
version = "1.120.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-channel",
|
||||
|
|
@ -1223,7 +1203,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat-repl"
|
||||
version = "1.119.1"
|
||||
version = "1.120.0"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
|
|
@ -1238,7 +1218,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat-rpc-server"
|
||||
version = "1.119.1"
|
||||
version = "1.120.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
|
|
@ -1263,7 +1243,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "deltachat_ffi"
|
||||
version = "1.119.1"
|
||||
version = "1.120.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"deltachat",
|
||||
|
|
@ -4596,12 +4576,6 @@ dependencies = [
|
|||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stable_deref_trait"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
|
||||
|
||||
[[package]]
|
||||
name = "static_assertions"
|
||||
version = "1.1.0"
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.119.1";
|
||||
version = "1.120.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LP5h99qldf9QoRDmo581H+sUx1QsD6nOGt1ES3Fr/6E=";
|
||||
hash = "sha256-q2Va0NbWwte8wZQWhXiORlYGoFDvuWmQShSRtlwbA6Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, writeShellScript
|
||||
, pkg-config
|
||||
|
|
@ -17,19 +18,28 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libredwg";
|
||||
version = "0.12.5";
|
||||
version = "0.12.5.6248";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreDWG";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE=";
|
||||
hash = "sha256-EHfqj+FeZZpQzF9/LFWg+onTMz2/9tvXNcdpZrdjry0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "dwg2svg-strcasestr-musl-fix.patch";
|
||||
# https://github.com/LibreDWG/libredwg/pull/822
|
||||
url = "https://github.com/LibreDWG/libredwg/commit/eec0b7aac6d2f695b7b258f47c3bde3f71f963ee.patch";
|
||||
hash = "sha256-TjpJuhRl9t0b9NOJ1FEOO0/y586WwaJcNzTM0cTwmYI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = let
|
||||
printVersion = writeShellScript "print-version" ''
|
||||
echo ${lib.escapeShellArg version}
|
||||
echo -n ${lib.escapeShellArg version}
|
||||
'';
|
||||
in ''
|
||||
# avoid git dependency
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
|||
|
||||
patches = [(fetchpatch {
|
||||
name = "clang5-support.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ppl/patches/clang5-support.patch?h=9.2";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/ppl/patches/clang5-support.patch";
|
||||
sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87";
|
||||
})];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -28,19 +28,19 @@ stdenv.mkDerivation rec {
|
|||
# Fix makefiles which use all the variables in all the wrong ways and
|
||||
# hardcode values for some variables.
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch";
|
||||
sha256 = "1ry3w1mk9q4jqd91zlaa1bdiiplld4hpfjaldbhlmzlgrrc99qmq";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch";
|
||||
sha256 = "0zsbh6k3kqdg82fv0kzghr1x7pafisv943gmssqscp107bhg77bz";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch";
|
||||
sha256 = "0vhw70ylnmydgjhwx8jjlb2slccj4pfqn6vzirkyz1wp8apsmfhp";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/reid-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/reid-Makefile.patch";
|
||||
sha256 = "1r311sn012xs135s0d21qwsig2kld7rdcq19nm0zbnklviid57df";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
29
pkgs/development/mobile/titanium-alloy/default.nix
Normal file
29
pkgs/development/mobile/titanium-alloy/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "alloy";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tidev";
|
||||
repo = "alloy";
|
||||
rev = version;
|
||||
hash = "sha256-s1hAbbUy7k/GacBIk8OMD48/1IUcRcpV3LnrCCZim1A=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-YNyFrO6+oFluyk3TlUf/0vdHrgTJ3l5DN801wnpBa6s=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/tidev/alloy/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "MVC framework for the Appcelerator Titanium SDK";
|
||||
homepage = "https://github.com/tidev/alloy";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "alloy";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
29
pkgs/development/mobile/titanium/default.nix
Normal file
29
pkgs/development/mobile/titanium/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "titanium";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tidev";
|
||||
repo = "titanium-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eJHf4vbapCaIVk0Xc0sml14jkFCsS/Gv7ftaFakB5rI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-60r+zqUCSDvQgrjg5SGfZiv87AoGx1XcnbW1ki1sbCM=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/tidev/titanium-cli/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Command Line Tool for creating and building Titanium Mobile applications and modules";
|
||||
homepage = "https://github.com/tidev/titanium-cli";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "titanium";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,8 +12,8 @@ rec {
|
|||
};
|
||||
|
||||
buildApp = import ./build-app.nix {
|
||||
inherit (pkgs) stdenv lib python which file jdk nodejs;
|
||||
inherit (pkgs.nodePackages) alloy titanium;
|
||||
inherit (pkgs) stdenv lib python which file jdk nodejs titanium;
|
||||
alloy = pkgs.titanium-alloy;
|
||||
inherit (androidenv) composeAndroidPackages;
|
||||
inherit (xcodeenv) composeXcodeWrapper;
|
||||
inherit titaniumsdk;
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ mapAliases {
|
|||
"@maizzle/cli" = pkgs.maizzle; # added 2023-08-17
|
||||
"@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21
|
||||
"@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
|
||||
alloy = pkgs.titanium-alloy; # added 2023-08-17
|
||||
antennas = pkgs.antennas; # added 2023-07-30
|
||||
inherit (pkgs) asar; # added 2023-08-26
|
||||
balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31
|
||||
|
|
@ -60,6 +61,8 @@ mapAliases {
|
|||
inherit (pkgs) configurable-http-proxy; # added 2023-08-19
|
||||
inherit (pkgs) cordova; # added 2023-08-18
|
||||
dat = throw "dat was removed because it was broken"; # added 2023-08-21
|
||||
inherit (pkgs) degit; # added 2023-08-18
|
||||
inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18
|
||||
eask = pkgs.eask; # added 2023-08-17
|
||||
inherit (pkgs.elmPackages) elm-test;
|
||||
eslint_d = pkgs.eslint_d; # Added 2023-05-26
|
||||
|
|
@ -67,8 +70,11 @@ mapAliases {
|
|||
flood = pkgs.flood; # Added 2023-07-25
|
||||
git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21
|
||||
glob = pkgs.node-glob; # added 2023-08-18
|
||||
inherit (pkgs) gqlint; # added 2023-08-19
|
||||
inherit (pkgs) graphqurl; # added 2023-08-19
|
||||
gtop = pkgs.gtop; # added 2023-07-31
|
||||
hs-client = pkgs.hsd; # added 2023-08-20
|
||||
inherit (pkgs) hsd; # added 2023-08-19
|
||||
inherit (pkgs) html-minifier; # added 2023-08-19
|
||||
inherit (pkgs) htmlhint; # added 2023-08-19
|
||||
hueadm = pkgs.hueadm; # added 2023-07-31
|
||||
|
|
@ -76,22 +82,28 @@ mapAliases {
|
|||
immich = pkgs.immich-cli; # added 2023-08-19
|
||||
indium = throw "indium was removed because it was broken"; # added 2023-08-19
|
||||
ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
|
||||
inherit (pkgs) jake; # added 2023-08-19
|
||||
inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
|
||||
karma = pkgs.karma-runner; # added 2023-07-29
|
||||
leetcode-cli = vsc-leetcode-cli; # added 2023-08-31
|
||||
manta = pkgs.node-manta; # Added 2023-05-06
|
||||
markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
|
||||
inherit (pkgs) markdownlint-cli2; # added 2023-08-22
|
||||
mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
|
||||
musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
|
||||
node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
|
||||
inherit (pkgs) npm-check-updates; # added 2023-08-22
|
||||
inherit (pkgs) react-static; # added 2023-08-21
|
||||
readability-cli = pkgs.readability-cli; # Added 2023-06-12
|
||||
reveal-md = pkgs.reveal-md; # added 2023-07-31
|
||||
inherit (pkgs) rtlcss; # added 2023-08-29
|
||||
s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18
|
||||
inherit (pkgs) snyk; # Added 2023-08-30
|
||||
"@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02
|
||||
ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21
|
||||
stf = throw "stf was removed because it was broken"; # added 2023-08-21
|
||||
thelounge = pkgs.thelounge; # Added 2023-05-22
|
||||
inherit (pkgs) titanium; # added 2023-08-17
|
||||
triton = pkgs.triton; # Added 2023-05-06
|
||||
typescript = pkgs.typescript; # Added 2023-06-21
|
||||
inherit (pkgs) ungit; # added 2023-08-20
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
"@antfu/ni" = "ni";
|
||||
"@electron-forge/cli" = "electron-forge";
|
||||
"@microsoft/rush" = "rush";
|
||||
"@squoosh/cli" = "squoosh-cli";
|
||||
"@webassemblyjs/cli-1.11.1" = "wasm2wast";
|
||||
coffee-script = "coffee";
|
||||
"@withgraphite/graphite-cli" = "gt";
|
||||
|
|
@ -35,7 +34,6 @@
|
|||
conventional-changelog-cli = "conventional-changelog";
|
||||
cpy-cli = "cpy";
|
||||
diff2html-cli = "diff2html";
|
||||
dockerfile-language-server-nodejs = "docker-langserver";
|
||||
fast-cli = "fast";
|
||||
fauna-shell = "fauna";
|
||||
fkill-cli = "fkill";
|
||||
|
|
@ -47,7 +45,6 @@
|
|||
grunt-cli = "grunt";
|
||||
gulp-cli = "gulp";
|
||||
kaput-cli = "kaput";
|
||||
leetcode-cli = "leetcode";
|
||||
less = "lessc";
|
||||
localtunnel = "lt";
|
||||
lua-fmt = "luafmt";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
, "@microsoft/rush"
|
||||
, "@nerdwallet/shepherd"
|
||||
, "@shopify/cli"
|
||||
, "@squoosh/cli"
|
||||
, "@tailwindcss/aspect-ratio"
|
||||
, "@tailwindcss/forms"
|
||||
, "@tailwindcss/language-server"
|
||||
|
|
@ -25,7 +24,6 @@
|
|||
, {"@webassemblyjs/wasm-text-gen": "1.11.1"}
|
||||
, {"@webassemblyjs/wast-refmt": "1.11.1"}
|
||||
, "alex"
|
||||
, "alloy"
|
||||
, "audiosprite"
|
||||
, "autoprefixer"
|
||||
, "auto-changelog"
|
||||
|
|
@ -101,11 +99,9 @@
|
|||
, "create-react-native-app"
|
||||
, "cspell"
|
||||
, "csslint"
|
||||
, "degit"
|
||||
, "dhcp"
|
||||
, "diagnostic-languageserver"
|
||||
, "diff2html-cli"
|
||||
, "dockerfile-language-server-nodejs"
|
||||
, "dotenv-cli"
|
||||
, "dotenv-vault"
|
||||
, "elasticdump"
|
||||
|
|
@ -141,20 +137,16 @@
|
|||
, "grunt-cli"
|
||||
, "makam"
|
||||
, "meshcommander"
|
||||
, "gqlint"
|
||||
, "gulp"
|
||||
, "gulp-cli"
|
||||
, "he"
|
||||
, "http-server"
|
||||
, "hsd"
|
||||
, "hs-airdrop"
|
||||
, "hs-client"
|
||||
, "ijavascript"
|
||||
, "inliner"
|
||||
, "imapnotify"
|
||||
, "insect"
|
||||
, "intelephense"
|
||||
, "jake"
|
||||
, "joplin"
|
||||
, "js-beautify"
|
||||
, "js-yaml"
|
||||
|
|
@ -170,7 +162,6 @@
|
|||
, "katex"
|
||||
, "keyoxide"
|
||||
, "lcov-result-merger"
|
||||
, "leetcode-cli"
|
||||
, "vsc-leetcode-cli"
|
||||
, "lerna"
|
||||
, "less"
|
||||
|
|
@ -189,7 +180,6 @@
|
|||
, "meat"
|
||||
, "mocha"
|
||||
, "multi-file-swagger"
|
||||
, "musescore-downloader"
|
||||
, "near-cli"
|
||||
, "neovim"
|
||||
, "nijs"
|
||||
|
|
@ -233,7 +223,6 @@
|
|||
, "pyright"
|
||||
, "quicktype"
|
||||
, "react-native-cli"
|
||||
, "react-static"
|
||||
, "react-tools"
|
||||
, "redoc-cli"
|
||||
, "remod-cli"
|
||||
|
|
@ -318,7 +307,6 @@
|
|||
, "thelounge-theme-zenburn-sourcecodepro"
|
||||
, "three"
|
||||
, "tiddlywiki"
|
||||
, "titanium"
|
||||
, "tsun"
|
||||
, "ts-node"
|
||||
, "ttf2eot"
|
||||
|
|
|
|||
2756
pkgs/development/node-packages/node-packages.nix
generated
2756
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -118,9 +118,6 @@ final: prev: {
|
|||
'';
|
||||
};
|
||||
|
||||
hsd = prev.hsd.override {
|
||||
buildInputs = [ final.node-gyp-build pkgs.unbound ];
|
||||
};
|
||||
|
||||
ijavascript = prev.ijavascript.override (oldAttrs: {
|
||||
preRebuild = ''
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TyVmvricfaS+i96DGwh0IKhMm56U1DyebAmRb+OFCh4=";
|
||||
hash = "sha256-EE8+VoZ755wd8s3Gm0lziu+1r4rAFgdjEtqI0apoZ7E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -59,7 +59,8 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Python library to transform SAM templates into AWS CloudFormation templates";
|
||||
homepage = "https://github.com/aws/serverless-application-model";
|
||||
homepage = "https://github.com/awslabs/serverless-application-model";
|
||||
changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-retry-connector";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fw1Eo4f9MdCjICkZiCUX3wa947s1kv9qqYmYjd0zqF4=";
|
||||
hash = "sha256-q+J4PUBm42jBcLbiywWwDZxUI0Gsl8GjnLPwniWp+Kw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak";
|
||||
version = "0.20.2";
|
||||
version = "0.21.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "hbldh";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hiQSsQHq1hoCQhoWU50i2NXYR/LaTHAize9cfr1uZsY=";
|
||||
hash = "sha256-hnXBXm0BFNNzw563Ybr76KHiqt2sFqo0dtiRHGWsu3A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cryptography
|
||||
, cython_3
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
|
|
@ -10,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bluetooth-data-tools";
|
||||
version = "1.9.1";
|
||||
version = "1.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -19,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DLB2mBjHPVT2Fg2Kr0WUDuu5nqBCbdu525wAD3ERKV8=";
|
||||
hash = "sha256-iyfk0OOJezNCNyqRCbR2cTTTdgdYQM6hExTngd/3CtA=";
|
||||
};
|
||||
|
||||
# The project can build both an optimized cython version and an unoptimized
|
||||
|
|
@ -32,6 +33,10 @@ buildPythonPackage rec {
|
|||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,38 +1,37 @@
|
|||
{ lib
|
||||
, aws-sam-translator
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, aws-sam-translator
|
||||
, jschema-to-python
|
||||
, jsonpatch
|
||||
, jsonschema
|
||||
, junit-xml
|
||||
, networkx
|
||||
, pyyaml
|
||||
, sarif-om
|
||||
, setuptools
|
||||
, six
|
||||
, mock
|
||||
, networkx
|
||||
, pydot
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, regex
|
||||
, sarif-om
|
||||
, setuptools
|
||||
, sympy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cfn-lint";
|
||||
version = "0.73.2";
|
||||
version = "0.79.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-cloudformation";
|
||||
repo = "cfn-python-lint";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CNB5LrXllGxy99NjCrbjkUXUpJ72U3pUnWqrqkOiCG8=";
|
||||
hash = "sha256-5Lb8dA8HqDdEO/Ehv5y/JlP+te46mzrTw/kNHBb9l38=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "jsonschema~=3.0" "jsonschema>=3.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aws-sam-translator
|
||||
jschema-to-python
|
||||
|
|
@ -40,9 +39,11 @@ buildPythonPackage rec {
|
|||
jsonschema
|
||||
junit-xml
|
||||
networkx
|
||||
networkx
|
||||
pyyaml
|
||||
regex
|
||||
sarif-om
|
||||
six
|
||||
sympy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -62,34 +63,28 @@ buildPythonPackage rec {
|
|||
# https://github.com/aws-cloudformation/cfn-python-lint/issues/1705
|
||||
# See also: https://github.com/NixOS/nixpkgs/issues/108076
|
||||
"TestQuickStartTemplates"
|
||||
# requires git directory
|
||||
# Requires git directory
|
||||
"test_update_docs"
|
||||
# Tests depend on network access (fails in getaddrinfo)
|
||||
"test_update_resource_specs_python_2"
|
||||
"test_update_resource_specs_python_3"
|
||||
"test_sarif_formatter"
|
||||
# Some CLI tests fails
|
||||
"test_bad_config"
|
||||
"test_override_parameters"
|
||||
"test_positional_template_parameters"
|
||||
"test_template_config"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cfnlint"
|
||||
"cfnlint.conditions"
|
||||
"cfnlint.core"
|
||||
"cfnlint.decode.node"
|
||||
"cfnlint.decode.cfn_yaml"
|
||||
"cfnlint.decode.cfn_json"
|
||||
"cfnlint.decorators.refactored"
|
||||
"cfnlint.graph"
|
||||
"cfnlint.helpers"
|
||||
"cfnlint.rules"
|
||||
"cfnlint.runner"
|
||||
"cfnlint.template"
|
||||
"cfnlint.transform"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Checks cloudformation for practices and behaviour that could potentially be improved";
|
||||
homepage = "https://github.com/aws-cloudformation/cfn-python-lint";
|
||||
changelog = "https://github.com/aws-cloudformation/cfn-python-lint/blob/master/CHANGELOG.md";
|
||||
changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
# (https://trac.sagemath.org/ticket/27267). depends on Cython patch.
|
||||
(fetchpatch {
|
||||
name = "use-trashcan-for-gen.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/b6ea17ef8e4d652de0a85047bac8d41e90b25555/build/pkgs/cypari/patches/trashcan.patch";
|
||||
hash = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8=";
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-tastypie";
|
||||
version = "0.14.5";
|
||||
version = "0.14.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "django-tastypie";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RgYinpo8eVzRaSkcnFkSq+IqpcFt6LCCHkpHyB/7u5M=";
|
||||
hash = "sha256-emZVcycGLa8Z2yMv/NWZi1b5fPk50u841cFfFF3Ke/s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.27.0";
|
||||
version = "3.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZgRYwx/vICs1ombD8LGvCr0Wf9TpQurDGBoC2mtbxRs=";
|
||||
hash = "sha256-mKtqfEpnWftpGReaUrmXf3LftZnMtEizPi4RbIwgnUM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.8.14";
|
||||
version = "2023.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-msN3S7rBYZnCAh2IGBVzHjqiTapzH2kMV5CBFHmtcNE=";
|
||||
hash = "sha256-FM07+ORPFne+9gtruuKqp2EwPLF9py7zi9a6vehN2Yk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipyvue";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2j8qYRXR8nmV5++g4OJn65dq3lypgqo9oxBscNb4eNs=";
|
||||
hash = "sha256-XPmrGg0SCTiZKMeTCeJywuKaa5ByY9FQTBy+THSJSiQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipywidgets ];
|
||||
|
|
@ -23,8 +23,8 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "ipyvue" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Jupyter widgets base for Vue libraries.";
|
||||
homepage = "https://github.com/mariobuikhuizen/ipyvuetify";
|
||||
description = "Jupyter widgets base for Vue libraries";
|
||||
homepage = "https://github.com/mariobuikhuizen/ipyvue";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 = "libtmux";
|
||||
version = "0.23.0post0";
|
||||
version = "0.23.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmux-python";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qk9QYfLVJVtkNgAZ19UziU7metluz10gDs9HbMoqZjo=";
|
||||
hash = "sha256-uMsQFDPLsphS6T55sDMKFawYgAycp8u9NizF5ZHnMqQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -206,6 +206,8 @@ buildPythonPackage rec {
|
|||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
# tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1}
|
||||
"test_binops"
|
||||
# These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921.
|
||||
"test_rolling"
|
||||
];
|
||||
|
||||
# Tests have relative paths, and need to reference compiled C extensions
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "19.2.1";
|
||||
version = "19.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4HLRZSxeRqpe8xutu5sGO63LAStx+3OgkQ1qPH1CUDY=";
|
||||
hash = "sha256-hVI3syst8F5BNrHcu21OxszPMWuv0wY65yFdfoXLMWM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, nose
|
||||
, nose3
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, semver
|
||||
|
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
nose
|
||||
nose3
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "policy-sentry";
|
||||
version = "0.12.8";
|
||||
version = "0.12.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "salesforce";
|
||||
repo = "policy_sentry";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-I56xWBbE1TqP+I8Op5X4TqHNB+gRlEPi7YQldIsjv4Q=";
|
||||
hash = "sha256-mVB7qqADjf4XnDaQyL5C4/Z6hOxAMQbmr6fGnaXD+O0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyschlage";
|
||||
version = "2023.8.1";
|
||||
version = "2023.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "dknowles2";
|
||||
repo = "pyschlage";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PTkuVGUdqRcvgcIL7yoVWNLQcWyDpXXHLxb7CoD8J1s=";
|
||||
hash = "sha256-4uYUEx6OcUMG8nS/PqZK5hHFQd/7pTGIix2it8pleuY=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -10,9 +10,11 @@
|
|||
, pandas
|
||||
, pyarrow
|
||||
, pytest
|
||||
, pythonOlder
|
||||
, scikit-learn
|
||||
, scipy
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -21,11 +23,17 @@ buildPythonPackage rec {
|
|||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7NoMEN/xOLFwaBXeMysShfZwrn6MzpJZYhNQHVieaqQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyarrow
|
||||
jellyfish
|
||||
|
|
@ -41,14 +49,19 @@ buildPythonPackage rec {
|
|||
|
||||
# pytestCheckHook does not work
|
||||
# Reusing their CI setup which involves 'rm -rf recordlinkage' in preCheck phase do not work too.
|
||||
nativeCheckInputs = [ pytest ];
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "recordlinkage" ];
|
||||
pythonImportsCheck = [
|
||||
"recordlinkage"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to link records in or between data sources";
|
||||
homepage = "https://recordlinkage.readthedocs.io/";
|
||||
changelog = "https://github.com/J535D165/recordlinkage/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.raitobezarius ];
|
||||
maintainers = with maintainers; [ raitobezarius ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,37 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, xorg
|
||||
, cffi
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, xorg
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.2.0";
|
||||
pname = "xcffib";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8yMCFEf55zB40hu5KMSPTavq6z87N+gDxta5hzXoFIM=";
|
||||
hash = "sha256-qVyUZfL5e0/O3mBr0eCEB6Mt9xy3YP1Xv+U2d9tpGsw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-leftover-six-import.patch";
|
||||
url = "https://github.com/tych0/xcffib/commit/8a488867d30464913706376ca3a9f4c98ca6c5cf.patch";
|
||||
hash = "sha256-wEms0gC7tVqtmKMjjpH/34kdQ6HUV0h67bUGbgijlqw=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Hardcode cairo library path
|
||||
sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ cffi ];
|
||||
propagatedNativeBuildInputs = [
|
||||
cffi
|
||||
];
|
||||
|
||||
propagatedNativeBuildInputs = [ cffi ];
|
||||
propagatedBuildInputs = [
|
||||
cffi
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
|
@ -44,11 +43,14 @@ buildPythonPackage rec {
|
|||
rm -r xcffib
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "xcffib" ];
|
||||
pythonImportsCheck = [
|
||||
"xcffib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A drop in replacement for xpyb, an XCB python binding";
|
||||
homepage = "https://github.com/tych0/xcffib";
|
||||
changelog = "https://github.com/tych0/xcffib/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kamilchm ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue