Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -139,7 +139,7 @@ in
|
||||
enableOCR = mkOption {
|
||||
description = ''
|
||||
Whether to enable Optical Character Recognition functionality for
|
||||
testing graphical programs. See [Machine objects](`ssec-machine-objects`).
|
||||
testing graphical programs. See [`Machine objects`](#ssec-machine-objects).
|
||||
'';
|
||||
type = types.bool;
|
||||
default = false;
|
||||
|
||||
@@ -70,7 +70,11 @@ in
|
||||
# to garage 1.0.0 while relying on the module-level default, they would be left
|
||||
# with a config which evaluates and builds, but then garage refuses to start
|
||||
# because either replication_factor or replication_mode is required.
|
||||
# This assertion can be removed in NixOS 24.11, when all users have been warned once.
|
||||
# The replication_factor option also was `toString`'ed before, which is
|
||||
# now not possible anymore, so we prompt the user to change it to a string
|
||||
# if present.
|
||||
# These assertions can be removed in NixOS 24.11, when all users have been
|
||||
# warned once.
|
||||
{
|
||||
assertion = (cfg.settings ? replication_factor || cfg.settings ? replication_mode) || lib.versionOlder cfg.package "1.0.0";
|
||||
message = ''
|
||||
@@ -80,6 +84,22 @@ in
|
||||
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = lib.isString (cfg.settings.replication_mode or "");
|
||||
message = ''
|
||||
The explicit `replication_mode` option in `services.garage.settings`
|
||||
has been removed and is now handled by the freeform settings in order
|
||||
to allow it being completely absent (for Garage 1.x).
|
||||
That module option previously `toString`'ed the value it's configured
|
||||
with, which is now no longer possible.
|
||||
|
||||
You're still using a non-string here, please manually set it to
|
||||
a string, or migrate to the separate setting keys introduced in 1.x.
|
||||
|
||||
Refer to https://garagehq.deuxfleurs.fr/documentation/working-documents/migration-1/
|
||||
for the migration guide.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
environment.etc."garage.toml" = {
|
||||
|
||||
@@ -280,7 +280,7 @@ in {
|
||||
};
|
||||
|
||||
config = {
|
||||
boot.binfmt.registrations = builtins.listToAttrs (map (system: {
|
||||
boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.system; {
|
||||
name = system;
|
||||
value = { config, ... }: let
|
||||
interpreter = getEmulator system;
|
||||
|
||||
@@ -51,4 +51,5 @@ in
|
||||
[
|
||||
"0_8"
|
||||
"0_9"
|
||||
"1_x"
|
||||
]
|
||||
|
||||
@@ -7,10 +7,10 @@ args@{ mkNode, ver, ... }:
|
||||
};
|
||||
|
||||
nodes = {
|
||||
node1 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::1"; };
|
||||
node2 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::2"; };
|
||||
node3 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::3"; };
|
||||
node4 = mkNode { replicationMode = 3; publicV6Address = "fc00:1::4"; };
|
||||
node1 = mkNode { replicationMode = "3"; publicV6Address = "fc00:1::1"; };
|
||||
node2 = mkNode { replicationMode = "3"; publicV6Address = "fc00:1::2"; };
|
||||
node3 = mkNode { replicationMode = "3"; publicV6Address = "fc00:1::3"; };
|
||||
node4 = mkNode { replicationMode = "3"; publicV6Address = "fc00:1::4"; };
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
||||
@@ -98,7 +98,6 @@ let
|
||||
cfg = (import ../lib/eval-config.nix {
|
||||
system = if use64bitGuest then "x86_64-linux" else "i686-linux";
|
||||
modules = [
|
||||
../modules/profiles/minimal.nix
|
||||
(testVMConfig vmName vmScript)
|
||||
];
|
||||
}).config;
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cava";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "karlstav";
|
||||
repo = "cava";
|
||||
rev = version;
|
||||
hash = "sha256-hndlEuKbI8oHvm0dosO0loQAw/U2qasoJ+4K8JG7I2Q=";
|
||||
hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, installShellFiles, libpulseaudio, nas }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gbsplay";
|
||||
version = "0.0.97";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mmitch";
|
||||
repo = "gbsplay";
|
||||
rev = version;
|
||||
sha256 = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--without-test" # See mmitch/gbsplay#62
|
||||
"--without-contrib"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = [ libpulseaudio nas ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gameboy sound player";
|
||||
license = licenses.gpl1Plus;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
-4174
File diff suppressed because it is too large
Load Diff
@@ -9,25 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "waylyrics";
|
||||
version = "0.3.5";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "waylyrics";
|
||||
repo = "waylyrics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-44O2+OLsBZhl0/0910RsdCe8cHt6UGhYF7CUfhsFQU8=";
|
||||
hash = "sha256-ZOz8LkMznSX/7nSu7IpZ8kVemo2AuRLOgrS3WWg+BXU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ksni-0.2.1" = "sha256-kjirYZVDP9e7/933L7gwSgVrNInSTbsRCAfnhUqmcLI=";
|
||||
};
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
cargoHash = "sha256-mURcz3i98qlsn/rzZjeJncyVX5xsuqWY2/PcNA6WAWQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||
buildInputs = [ openssl dbus ];
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fte";
|
||||
version = "0.50.02";
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ perl libX11 libXpm gpm ncurses slang ];
|
||||
|
||||
ftesrc = fetchurl {
|
||||
url = "mirror://sourceforge/fte/fte-20110708-src.zip";
|
||||
sha256 = "17j9akr19w19myglw5mljjw2g3i2cwxiqrjaln82h3rz5ma1qcfn";
|
||||
};
|
||||
ftecommon = fetchurl {
|
||||
url = "mirror://sourceforge/fte/fte-20110708-common.zip";
|
||||
sha256 = "1xva4kh0674sj2b9rhf2amlr37yxmsvjkgyj89gpcn0rndw1ahaq";
|
||||
};
|
||||
src = [ ftesrc ftecommon ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-DHAVE_STRLCAT -DHAVE_STRLCPY";
|
||||
|
||||
buildFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" "INSTALL_NONROOT=1" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free text editor for developers";
|
||||
homepage = "https://fte.sourceforge.net/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hexedit";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixel";
|
||||
repo = "hexedit";
|
||||
rev = version;
|
||||
sha256 = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "View and edit files in hexadecimal or in ASCII";
|
||||
homepage = "http://rigaux.org/hexedit.html";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "hexedit";
|
||||
};
|
||||
}
|
||||
@@ -1,20 +1,21 @@
|
||||
{ callPackage, makeWrapper, gobject-introspection, cmake
|
||||
{ stdenv, cmake, pkg-config, callPackage, makeWrapper, gobject-introspection, wrapGAppsHook3
|
||||
, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }:
|
||||
let pkg = import ./base.nix {
|
||||
version = "3.2.5";
|
||||
pname = "image-analyzer";
|
||||
pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc";
|
||||
};
|
||||
in callPackage pkg {
|
||||
buildInputs = [ glib gtk3 libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg
|
||||
python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ];
|
||||
drvParams = {
|
||||
nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/image-analyzer \
|
||||
--set PYTHONPATH "$PYTHONPATH" \
|
||||
--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
|
||||
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
};
|
||||
stdenv.mkDerivation {
|
||||
|
||||
inherit (callPackage ./common-drv-attrs.nix {
|
||||
version = "3.2.6";
|
||||
pname = "image-analyzer";
|
||||
hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
|
||||
}) pname version src meta;
|
||||
|
||||
buildInputs = [ libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg
|
||||
python3Packages.pygobject3 python3Packages.matplotlib ];
|
||||
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/image-analyzer \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
--set PYTHONPATH "$PYTHONPATH"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
{ callPackage, python3Packages, intltool, makeWrapper }:
|
||||
let pkg = import ./base.nix {
|
||||
version = "3.2.5";
|
||||
pname = "cdemu-client";
|
||||
pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7";
|
||||
};
|
||||
in callPackage pkg {
|
||||
nativeBuildInputs = [ makeWrapper intltool ];
|
||||
buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 ];
|
||||
drvParams = {
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/cdemu \
|
||||
--set PYTHONPATH "$PYTHONPATH"
|
||||
'';
|
||||
};
|
||||
{ stdenv, callPackage, python3Packages, cmake, pkg-config, intltool, wrapGAppsNoGuiHook }:
|
||||
stdenv.mkDerivation {
|
||||
|
||||
inherit (callPackage ./common-drv-attrs.nix {
|
||||
version = "3.2.5";
|
||||
pname = "cdemu-client";
|
||||
hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8=";
|
||||
}) pname version src meta;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config intltool wrapGAppsNoGuiHook ];
|
||||
buildInputs = with python3Packages; [ dbus-python pygobject3 ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/cdemu \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
--set PYTHONPATH "$PYTHONPATH"
|
||||
'';
|
||||
|
||||
}
|
||||
|
||||
+8
-15
@@ -1,20 +1,13 @@
|
||||
{ pname, version, pkgSha256 }:
|
||||
attrs@{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {}, ... }:
|
||||
stdenv.mkDerivation ( rec {
|
||||
inherit pname version buildInputs;
|
||||
{ lib, fetchurl
|
||||
, pname, version, hash
|
||||
}:
|
||||
|
||||
{
|
||||
inherit pname version;
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
|
||||
sha256 = pkgSha256;
|
||||
inherit hash;
|
||||
};
|
||||
nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkg-config cmake ];
|
||||
setSourceRoot = ''
|
||||
mkdir build
|
||||
cd build
|
||||
sourceRoot="`pwd`"
|
||||
'';
|
||||
configurePhase = ''
|
||||
cmake ../${pname}-${version} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "A suite of tools for emulating optical drives and discs";
|
||||
longDescription = ''
|
||||
@@ -33,4 +26,4 @@ stdenv.mkDerivation ( rec {
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ bendlas ];
|
||||
};
|
||||
} // drvParams)
|
||||
}
|
||||
@@ -1,15 +1,17 @@
|
||||
{ callPackage, glib, libao, intltool, libmirage, coreutils }:
|
||||
let pkg = import ./base.nix {
|
||||
version = "3.2.5";
|
||||
pname = "cdemu-daemon";
|
||||
pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d";
|
||||
};
|
||||
in callPackage pkg {
|
||||
nativeBuildInputs = [ intltool ];
|
||||
{ stdenv, callPackage, cmake, pkg-config, glib, libao, intltool, libmirage, coreutils }:
|
||||
stdenv.mkDerivation {
|
||||
|
||||
inherit (callPackage ./common-drv-attrs.nix {
|
||||
version = "3.2.6";
|
||||
pname = "cdemu-daemon";
|
||||
hash = "sha256-puQE4+91xhRuNjVPZYgN/WO0uO8fVAOdxQWOGQ+FfY8=";
|
||||
}) pname version src meta;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config intltool ];
|
||||
buildInputs = [ glib libao libmirage ];
|
||||
drvParams.postInstall = ''
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/dbus-1/services
|
||||
cp -R ../$pname-$version/service-example $out/share/cdemu
|
||||
cp -R ../service-example $out/share/cdemu
|
||||
substitute \
|
||||
$out/share/cdemu/net.sf.cdemu.CDEmuDaemon.service \
|
||||
$out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \
|
||||
|
||||
@@ -1,22 +1,21 @@
|
||||
{ callPackage, makeWrapper, gobject-introspection, cmake
|
||||
, python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }:
|
||||
let
|
||||
pkg = import ./base.nix {
|
||||
version = "3.2.5";
|
||||
{ stdenv, callPackage, cmake, pkg-config, wrapGAppsHook3
|
||||
, python3Packages, libnotify, intltool, gnome, gdk-pixbuf, librsvg }:
|
||||
stdenv.mkDerivation {
|
||||
|
||||
inherit (callPackage ./common-drv-attrs.nix {
|
||||
version = "3.2.6";
|
||||
pname = "gcdemu";
|
||||
pkgSha256 = "1nvpbq4mz8caw91q5ny9gf206g9bypavxws9nxyfcanfkc4zfkl4";
|
||||
};
|
||||
inherit (python3Packages) python pygobject3;
|
||||
in callPackage pkg {
|
||||
buildInputs = [ python pygobject3 gtk3 glib libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
|
||||
drvParams = {
|
||||
nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gcdemu \
|
||||
--set PYTHONPATH "$PYTHONPATH" \
|
||||
--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
|
||||
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
# TODO AppIndicator
|
||||
};
|
||||
hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA=";
|
||||
}) pname version src meta;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool ];
|
||||
buildInputs = [ python3Packages.pygobject3 libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gcdemu \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
--set PYTHONPATH "$PYTHONPATH"
|
||||
'';
|
||||
|
||||
}
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
{ callPackage, gobject-introspection, cmake, pkg-config
|
||||
{ stdenv, callPackage, cmake, pkg-config
|
||||
, glib, libsndfile, zlib, bzip2, xz, libsamplerate, intltool
|
||||
, pcre, util-linux, libselinux, libsepol }:
|
||||
|
||||
let pkg = import ./base.nix {
|
||||
version = "3.2.5";
|
||||
pname = "libmirage";
|
||||
pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm";
|
||||
};
|
||||
in callPackage pkg {
|
||||
stdenv.mkDerivation {
|
||||
|
||||
inherit (callPackage ./common-drv-attrs.nix {
|
||||
version = "3.2.7";
|
||||
pname = "libmirage";
|
||||
hash = "sha256-+okkgNeVS8yoKSrQDy4It7PiPlTSiOsUoFxQ1FS9s9M=";
|
||||
}) pname version src meta;
|
||||
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
|
||||
buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate ];
|
||||
drvParams = {
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
|
||||
nativeBuildInputs = [ cmake gobject-introspection pkg-config intltool ];
|
||||
propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkg-config intltool ];
|
||||
propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz";
|
||||
sha256 = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM=";
|
||||
hash = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM=";
|
||||
};
|
||||
|
||||
makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "photoqt";
|
||||
version = "4.4";
|
||||
version = "4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
|
||||
hash = "sha256-dCaNF5UoH6SkKBrZGtwg2qZcDtlptdBxEGZL2oKyjhI=";
|
||||
hash = "sha256-QFziMNRhiM4LaNJ8RkJ0iCq/8J82wn0F594qJeSN3Lw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "texturepacker";
|
||||
version = "7.3.0";
|
||||
version = "7.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb";
|
||||
hash = "sha256-0i6LDrLBvTFKC5kW2PXP3Be6boUIJZ0fd1JG6FoS1kQ=";
|
||||
hash = "sha256-v+azjIIscmp72WB3gki0CKb+z+FYsuJxIx9jvdfs+qM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hyprland-autoname-workspaces";
|
||||
version = "1.1.13";
|
||||
version = "1.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprland-community";
|
||||
repo = "hyprland-autoname-workspaces";
|
||||
rev = version;
|
||||
hash = "sha256-JEzsbJcDX/qx1CMy+3UwcHOwFLPqyAG58MpGMtdSyYY=";
|
||||
hash = "sha256-RTx4fmamjydrQzC1CpgbuvV6kg0S6Jyj/0Q9FrfrMlU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Rpivw4VCVHjZywDwr4pajfGv/mkOdVrXVT/9Oe2Hw44=";
|
||||
cargoHash = "sha256-Te3nBgr3uq8km8lX3AkCAS28leolZLXEF68phIEpg5k=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically rename workspaces with icons of started applications";
|
||||
|
||||
@@ -20,7 +20,7 @@ mkDerivation rec {
|
||||
mainProgram = "tipp10";
|
||||
homepage = "https://gitlab.com/tipp10/tipp10";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ sigmanificient ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, lib, fzf, xclip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unipicker";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeremija";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1k4v53pm3xivwg9vq2kndpcmah0yn4679r5jzxvg38bbkfdk86c1";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
fzf
|
||||
xclip
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
substituteInPlace unipicker \
|
||||
--replace "/etc/unipickerrc" "$out/etc/unipickerrc" \
|
||||
--replace "fzf" "${fzf}/bin/fzf"
|
||||
substituteInPlace unipickerrc \
|
||||
--replace "/usr/local" "$out" \
|
||||
--replace "fzf" "${fzf}/bin/fzf"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"DESTDIR=$(out)"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI utility for searching unicode characters by description and optionally copying them to clipboard";
|
||||
homepage = "https://github.com/jeremija/unipicker";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "unipicker";
|
||||
};
|
||||
}
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "125.0.2535.13";
|
||||
version = "125.0.2535.37";
|
||||
revision = "1";
|
||||
hash = "sha256-vO7crYX/QW+S1fjT37JtyRJyziauG+H3LWOasX4VaKM=";
|
||||
hash = "sha256-/fZcFIVj4stIxim2UYsxA5rNkyGf/i3eDf25npsdDi4=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "126.0.2552.0";
|
||||
version = "126.0.2566.1";
|
||||
revision = "1";
|
||||
hash = "sha256-TQHTqCweP0mEkEYRxlU7YtYS6Y6ooZ4V6peCsVvcIjg=";
|
||||
hash = "sha256-PePosWGdkLm5OK82YP9LQbvVz5de8KL06I6rv0TKP3A=";
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "124.0.2478.80";
|
||||
version = "124.0.2478.97";
|
||||
revision = "1";
|
||||
hash = "sha256-p+t12VcwxSDuyZj3VfzEJ6m0rGoVC7smeyHoODttwQU=";
|
||||
hash = "sha256-hdCtHWOEez3VTw8hTRiitURiu0MpFTbnc60biym795k=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.14";
|
||||
version = "13.0.15";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -102,7 +102,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-z7fZtq+jnoAi6G8RNahGtP1LXeOXU/2wYz5ha2ddAeM=";
|
||||
hash = "sha256-TypPevAkp1G7GPzBTRUv3N4UJydAqfllNekTsYfiisQ=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "13.0.14";
|
||||
version = "13.0.15";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-UWR2zMVXa6QMz1EIWJf43Vmj14ZIaug105esxeSd0KU=";
|
||||
hash = "sha256-e2YFrPzle9s/j3+uxFjoK538pLV1u1a4kD6V8RaqpOU=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-n+qj3IY4z+erOg4iUkQ4CP3rtJASTeKPg7beZRdesw4=";
|
||||
hash = "sha256-20C4UuSN2PZ2L3AZv7klNClD4RoThpmnKrpoK9An24w=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "protonmail-bridge";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonMail";
|
||||
repo = "proton-bridge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xjpySIbt7f86PRR/9F1DXMc0G+pBq3/75STW6Zw6IhE=";
|
||||
hash = "sha256-V2PevO9jhtKMrFVlviKPwcApP4ZTRbCLVoPx0gGNosU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cgQcI6yrnc5BUuyOkaYu24GzCaGe+BgXOC2zdt1Z1Lg=";
|
||||
vendorHash = "sha256-qi6ME74pJH/wgDh0xp/Rsc9hPd3v3L/M8pBQJzNieK8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gurobi";
|
||||
version = "11.0.1";
|
||||
version = "11.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz";
|
||||
hash = "sha256-oZ7Oz22e4k6cVF3TDFxp/pE+RuU+3p/CatTWj1ci5ZY=";
|
||||
hash = "sha256-9DrIo+25h7mgphRSrNnY2+nrNzaMbafONuUkfLKho2g=";
|
||||
};
|
||||
|
||||
sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64";
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "kitty-themes";
|
||||
version = "unstable-2024-04-23";
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://github.com/kovidgoyal/kitty-themes";
|
||||
description = "Themes for the kitty terminal emulator";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib, xz
|
||||
, yasm, glslang
|
||||
, linuxPackages
|
||||
, nixosTests
|
||||
# If open-watcom-bin is not passed, VirtualBox will fall back to use
|
||||
# the shipped alternative sources (assembly).
|
||||
, open-watcom-bin
|
||||
@@ -268,6 +269,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
passthru = {
|
||||
inherit extensionPack; # for inclusion in profile to prevent gc
|
||||
tests = nixosTests.virtualbox;
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.86";
|
||||
version = "1.0.87";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-wp4JYuAHtZrHer4db0vBCchf8mQIt6jXWqjqpGKws4o=";
|
||||
hash = "sha256-sBL1/5was2qN8M2s8u443mb376ySE+T58bmdfO0XqE0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QNH3G34yTEecZyVgw2a1RJnd1CMfV4aw1OJqes/cK2s=";
|
||||
cargoHash = "sha256-DhjZMOKfXBGSF8b7OQ7l++/RKjtww+cUJDj91JW9ROY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo subcommand to show result of macro expansion";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "eigenlayer";
|
||||
version = "0.7.3";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Layr-Labs";
|
||||
repo = "eigenlayer-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HsDuDe2ANxL+cTJ3mm1enLoKRewZ9Ey/YajpsLO66JA=";
|
||||
hash = "sha256-bj1+gm11gYwvuut8tUrML7Sg1W5rmGH49tZ4u/76s84=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aclRbQtGg6yQMJtaO1WjtHLXU7cE1HX1ZDckRIEtw6o=";
|
||||
vendorHash = "sha256-Hws6qlt0O/1xP94ghiIBIF/FwvYGu0fY8LWjVgAp/pQ=";
|
||||
|
||||
ldflags = ["-s" "-w"];
|
||||
subPackages = ["cmd/eigenlayer"];
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
perl,
|
||||
libX11,
|
||||
libXpm,
|
||||
gpm,
|
||||
ncurses,
|
||||
slang,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fte";
|
||||
version = "0.50.02";
|
||||
|
||||
ftesrc = fetchurl {
|
||||
url = "mirror://sourceforge/fte/fte-20110708-src.zip";
|
||||
hash = "sha256-1jEcVC0/DyiQpUpmHDtnIo4nuJS0Fk6frynwFPJUSZ4=";
|
||||
};
|
||||
|
||||
ftecommon = fetchurl {
|
||||
url = "mirror://sourceforge/fte/fte-20110708-common.zip";
|
||||
hash = "sha256-WEEVeLMZWHZfQtK/Kbeu3Z+RaVXCwZyWkJocA+Akavc=";
|
||||
};
|
||||
|
||||
src = [
|
||||
finalAttrs.ftesrc
|
||||
finalAttrs.ftecommon
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [
|
||||
perl
|
||||
libX11
|
||||
libXpm
|
||||
gpm
|
||||
ncurses
|
||||
slang
|
||||
];
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-DHAVE_STRLCAT -DHAVE_STRLCPY";
|
||||
installFlags = [ "INSTALL_NONROOT=1" ];
|
||||
|
||||
# not setting it cause fte to not find xfte
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = {
|
||||
description = "A free text editor for developers";
|
||||
homepage = "https://fte.sourceforge.net/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
libpulseaudio,
|
||||
nas,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gbsplay";
|
||||
version = "0.0.97";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mmitch";
|
||||
repo = "gbsplay";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--without-test" # See mmitch/gbsplay#62
|
||||
"--without-contrib"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = [
|
||||
libpulseaudio
|
||||
nas
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Gameboy sound player";
|
||||
license = lib.licenses.gpl1Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "gbsplay";
|
||||
};
|
||||
})
|
||||
+8
-8
@@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, git }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "git-standup";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kamranahmedse";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "git-standup";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "1xnn0jjha56v7l2vj45zzxncl6m5x2hq6nkffgc1bcikhp1pidn7";
|
||||
};
|
||||
|
||||
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
|
||||
--prefix PATH : "${lib.makeBinPath [ git ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Recall what you did on the last working day";
|
||||
homepage = "https://github.com/kamranahmedse/git-standup";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "git-standup";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
ncurses,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hexedit";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixel";
|
||||
repo = "hexedit";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-fIgPbr7qmxyEga2YaAD0+NBM8LeDm/tVAq99ub7aiAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
meta = {
|
||||
description = "View and edit files in hexadecimal or in ASCII";
|
||||
homepage = "http://rigaux.org/hexedit.html";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "hexedit";
|
||||
};
|
||||
})
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "lunar-client";
|
||||
version = "3.2.6";
|
||||
version = "3.2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
|
||||
hash = "sha512-JZ6fXUDurLxe6acRRXTHot2GTUqMaSwy7N5K4cmFmOn4s8W2aXek+o8med3ytaxoTd6FmibXmCxrjnOVMHBRGA==";
|
||||
hash = "sha512-dziL9lnpsiJ2BV+jNOhVMvZtYY/K4chyiZB5/fMCw9/4/3Boe/DO7s2steEOhxEsPqUcWaf1Sjs6DFSX/CHUqw==";
|
||||
};
|
||||
|
||||
extraInstallCommands =
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lutgen";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ozwaldorf";
|
||||
repo = "lutgen-rs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-O2995+DLiCRDM/+oPTOBiM0L1x0jmbLTlR48+5IfOQw=";
|
||||
hash = "sha256-Rj6y8ZiNWQsGn8B+iNMZvuE/U2703oYbJW+ZSdV3fl4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ys4c/YUJJikDEUJjzagZBB+kSy+EFf+PqQdK/h+3gWU=";
|
||||
cargoHash = "sha256-7yNr6Zc5A7rj6sUnplo2gB2xNUgZ3TLwUuBEfVKZfIQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "19.27.0";
|
||||
version = "19.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gnK4cu44aSVai48z7U4AlgiulCwNQU/LgN5XJKIYDv8=";
|
||||
hash = "sha256-vn3P9upO6d0jpZzrG77/xkhfn4NINnBZ3YymlRdoONw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YKl6Euk4907SeIy8BZL7aF2b0AsvknZ7CU8n49GNLz0=";
|
||||
vendorHash = "sha256-mZNhsvEI1AbsAhoK7AuNgrQvYlkGrrpPVuv3R5nssC4=";
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
diff --git a/mk b/mk
|
||||
index a5baa0f8..37cac28e 100755
|
||||
--- a/mk
|
||||
+++ b/mk
|
||||
@@ -25,7 +25,7 @@ const rm = (x) => {
|
||||
};
|
||||
const pj = JSON.parse(rf('package.json'));
|
||||
// v:version string - "x.y.z" where z is the number of commits since the beginning of the project
|
||||
-const v = `${pj.version.replace(/\.0$/, '')}.${sh('git rev-list --count HEAD')}`;
|
||||
+const v = "@version@";
|
||||
const isDyalogBuild = /^dyalog/.test(pj.name);
|
||||
const tasks = { };
|
||||
|
||||
@@ -36,8 +36,8 @@ const b = (f) => {
|
||||
const vi = {
|
||||
versionInfo: {
|
||||
version: v,
|
||||
- date: sh('git show -s HEAD --pretty=format:%ci'),
|
||||
- rev: sh('git rev-parse HEAD'),
|
||||
+ date: 'unknown',
|
||||
+ rev: 'nixpkgs',
|
||||
},
|
||||
};
|
||||
wf('_/version.js', `D=${JSON.stringify(vi)}`);
|
||||
@@ -50,6 +50,9 @@ const incl = new RegExp('^$'
|
||||
+ '|^/style($|/(fonts|img)|.*\\.css$)');
|
||||
const pkg = (x, y, f) => {
|
||||
rq('electron-packager')({
|
||||
+ asar: true,
|
||||
+ electronZipDir: "local-cache",
|
||||
+ electronVersion: "@electron_version@",
|
||||
dir: '.',
|
||||
platform: x,
|
||||
arch: y,
|
||||
@@ -0,0 +1,152 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
jq,
|
||||
moreutils,
|
||||
zip,
|
||||
makeWrapper,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
electron_27,
|
||||
}:
|
||||
|
||||
let
|
||||
platformInfos = {
|
||||
"x86_64-linux" = {
|
||||
zipSuffix = "linux-x64";
|
||||
buildCmd = "linux";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
zipSuffix = "darwin-x64";
|
||||
buildCmd = "osx";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
zipSuffix = "darwin-arm64";
|
||||
buildCmd = "osxarm";
|
||||
};
|
||||
};
|
||||
|
||||
platformInfo = platformInfos.${stdenv.system};
|
||||
|
||||
# Electron 27 is the latest version that works as of RIDE version 4.5.4097
|
||||
electron = electron_27;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "ride";
|
||||
version = "4.5.4097";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dyalog";
|
||||
repo = "ride";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xR+HVC1JVrPkgPhIJZxdTVG52+QbanmD1c/uO5l84oc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-EG3pZkjDGBI2dDaQZ6351+oU4xfHd6HNB8eD7ErpYIg=";
|
||||
|
||||
patches = [
|
||||
# Fix info in the "about" page, set electron version, set local-cache as zipdir
|
||||
(substituteAll {
|
||||
src = ./mk.patch;
|
||||
version = version;
|
||||
electron_version = electron.version;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove spectron (it would download electron-chromedriver binaries)
|
||||
${jq}/bin/jq 'del(.devDependencies.spectron)' package.json | ${moreutils}/bin/sponge package.json
|
||||
|
||||
pushd style
|
||||
|
||||
# Remove non-deterministic glob ordering
|
||||
sed -i "/\*\*/d" layout.less light-theme.less dark-theme.less
|
||||
|
||||
# Individually include all files that were previously globbed
|
||||
shopt -s globstar
|
||||
for file in less/layout/**/*.less; do
|
||||
echo "@import '$file';" >> layout.less
|
||||
done
|
||||
for file in less/colour/**/*.less; do
|
||||
echo "@import '$file';" >> light-theme.less
|
||||
echo "@import '$file';" >> dark-theme.less
|
||||
done
|
||||
shopt -u globstar
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
zip
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
npmBuildFlags = platformInfo.buildCmd;
|
||||
|
||||
# This package uses electron-packager instead of electron-builder
|
||||
# Here, we create a local cache of electron zip-files, so electron-packager can copy from it
|
||||
postConfigure = ''
|
||||
mkdir local-cache
|
||||
cp -r --no-preserve=all ${electron}/libexec/electron electron
|
||||
pushd electron
|
||||
zip -qr ../local-cache/electron-v${electron.version}-${platformInfo.zipSuffix}.zip *
|
||||
popd
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 D.png $out/share/icons/hicolor/64x64/apps/ride.png
|
||||
install -Dm644 D.svg $out/share/icons/hicolor/scalable/apps/ride.svg
|
||||
|
||||
pushd _/ride*/*
|
||||
|
||||
install -Dm644 ThirdPartyNotices.txt -t $out/share/doc/ride
|
||||
|
||||
mkdir -p $out/share/ride
|
||||
cp -r locales resources{,.pak} $out/share/ride
|
||||
makeWrapper ${lib.getExe electron} $out/bin/ride \
|
||||
--add-flags $out/share/ride/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--inherit-argv0
|
||||
|
||||
popd
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "ride";
|
||||
exec = "ride";
|
||||
icon = "ride";
|
||||
desktopName = "RIDE";
|
||||
categories = [
|
||||
"Development"
|
||||
"IDE"
|
||||
];
|
||||
comment = meta.description;
|
||||
terminal = false;
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
broken = stdenv.isDarwin;
|
||||
changelog = "https://github.com/Dyalog/ride/releases/tag/${src.rev}";
|
||||
description = "Remote IDE for Dyalog APL";
|
||||
homepage = "https://github.com/Dyalog/ride";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "ride";
|
||||
maintainers = with lib.maintainers; [
|
||||
tomasajt
|
||||
markus1189
|
||||
];
|
||||
platforms = lib.attrNames platformInfos;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
fzf,
|
||||
xclip,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unipicker";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeremija";
|
||||
repo = "unipicker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Br9nCK5eWoSN1i4LM2F31B62L9vuN5KzjS9pC9lq9oM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
fzf
|
||||
xclip
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
substituteInPlace unipicker \
|
||||
--replace-fail "/etc/unipickerrc" "$out/etc/unipickerrc" \
|
||||
--replace-fail "fzf" "${fzf}/bin/fzf"
|
||||
substituteInPlace unipickerrc \
|
||||
--replace-fail "/usr/local" "$out" \
|
||||
--replace-fail "fzf" "${fzf}/bin/fzf"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A CLI utility for searching unicode characters by description and optionally copying them to clipboard";
|
||||
homepage = "https://github.com/jeremija/unipicker";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "unipicker";
|
||||
};
|
||||
})
|
||||
@@ -5,14 +5,22 @@ stdenvNoCC.mkDerivation rec {
|
||||
version = "5.0.12";
|
||||
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
x86_64-darwin = (fetchurl {
|
||||
url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_darwin_all.tar.gz";
|
||||
hash = "sha256-RwTMJwvkuX/okHSyxzpvaD6uD8fheVbr7bgBC2eMQOo=";
|
||||
});
|
||||
aarch64-darwin = (fetchurl {
|
||||
url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_darwin_all.tar.gz";
|
||||
hash = "sha256-RwTMJwvkuX/okHSyxzpvaD6uD8fheVbr7bgBC2eMQOo=";
|
||||
});
|
||||
x86_64-linux = (fetchurl {
|
||||
url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_linux_amd64.tar.gz";
|
||||
hash = "sha256-svEPMVY7r7pAoXwFIMYqCEduqR3Nkocaguf2nIGt+G8=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
});
|
||||
aarch64-linux = (fetchurl {
|
||||
url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_linux_arm64.tar.gz";
|
||||
hash = "sha256-ZraS/PqSPL/kcj5o6hzDdL70IV2IWXOma6OHCiXIDQc=";
|
||||
};
|
||||
});
|
||||
}.${stdenvNoCC.system} or (throw "${pname}-${version}: ${stdenvNoCC.system} is unsupported.");
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -26,9 +34,10 @@ stdenvNoCC.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/platformsh/cli";
|
||||
description = "The unified tool for managing your Upsun services from the command line";
|
||||
mainProgram = "upsun";
|
||||
maintainers = with lib.maintainers; [ spk ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation {
|
||||
homepage = "https://abrudz.github.io/APL386/";
|
||||
description = "APL385 Unicode font evolved";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
mainProgram = "rasm";
|
||||
# use -n option to display all licenses
|
||||
license = licenses.mit; # expat version
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ zlib libxml2 eigen python3 cairo pcre ];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_CXX_STANDARD=14" ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/kgabis/parson";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, gfortran
|
||||
, blas
|
||||
@@ -21,7 +22,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
|
||||
};
|
||||
|
||||
patches = [ ./platform.patch ];
|
||||
patches = [
|
||||
./platform.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/clMathLibraries/clBLAS/commit/68ce5f0b824d7cf9d71b09bb235cf219defcc7b4.patch";
|
||||
hash = "sha256-XoVcHgJ0kTPysZbM83mUX4/lvXVHKbl7s2Q8WWiUnMs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/ibireme/yyjson";
|
||||
changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -833,6 +833,66 @@ let
|
||||
lispLibs = oa.lispLibs ++ [ self.sb-cga ];
|
||||
});
|
||||
|
||||
qlot-cli = build-asdf-system rec {
|
||||
pname = "qlot";
|
||||
version = "1.5.2";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "fukamachi";
|
||||
repo = "qlot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-j9iT25Yz9Z6llCKwwiHlVNKLqwuKvY194LrAzXuljsE=";
|
||||
};
|
||||
|
||||
lispLibs = with super; [
|
||||
archive
|
||||
deflate
|
||||
dexador
|
||||
fuzzy-match
|
||||
ironclad
|
||||
lparallel
|
||||
yason
|
||||
];
|
||||
|
||||
nativeLibs = [
|
||||
pkgs.openssl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgs.makeWrapper
|
||||
];
|
||||
|
||||
buildScript = pkgs.writeText "build-qlot-cli" ''
|
||||
(load "${self.qlot-cli.asdfFasl}/asdf.${self.qlot-cli.faslExt}")
|
||||
(asdf:load-system :qlot/command)
|
||||
(asdf:load-system :qlot/subcommands)
|
||||
|
||||
;; Use uiop:dump-image instead of sb-ext:dump-image for the image restore hooks
|
||||
(setf uiop:*image-entry-point* #'qlot/cli:main)
|
||||
(uiop:dump-image "qlot"
|
||||
:executable t
|
||||
#+sb-core-compression :compression
|
||||
#+sb-core-compression t)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp qlot.asd $out
|
||||
rm *.asd
|
||||
cp -r * $out
|
||||
|
||||
mv $out/qlot $out/bin
|
||||
wrapProgram $out/bin/qlot \
|
||||
--prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta.mainProgram = "qlot";
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
in packages
|
||||
|
||||
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Count lines of code quickly";
|
||||
mainProgram = "loc";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "anthropic";
|
||||
version = "0.25.6";
|
||||
version = "0.25.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "anthropics";
|
||||
repo = "anthropic-sdk-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-83TufOgu6W9UvoCEUgDiw6gXDAdwyIKEALVF0hjj6wk=";
|
||||
hash = "sha256-CBe5rzO2+m1AGfDbAqxCzZ+Rm1Er4e0JuxtFRzgHV/Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,145 +1,98 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, deprecated
|
||||
, rich
|
||||
, backoff
|
||||
, packaging
|
||||
, pydantic
|
||||
, typer
|
||||
, tqdm
|
||||
, wrapt
|
||||
, numpy
|
||||
, httpx
|
||||
, pandas
|
||||
, monotonic
|
||||
# optional-dependencies
|
||||
, fastapi
|
||||
, opensearch-py
|
||||
, elasticsearch8
|
||||
, uvicorn
|
||||
, smart-open
|
||||
, brotli-asgi
|
||||
, alembic
|
||||
, sqlalchemy
|
||||
, greenlet
|
||||
, aiosqlite
|
||||
, luqum
|
||||
, scikit-learn
|
||||
, aiofiles
|
||||
, pyyaml
|
||||
, python-multipart
|
||||
, python-jose
|
||||
, passlib
|
||||
, psutil
|
||||
# , segment-analytics-python
|
||||
, asyncpg
|
||||
, psycopg2
|
||||
, schedule
|
||||
, prodict
|
||||
, cleanlab
|
||||
, datasets
|
||||
, huggingface-hub
|
||||
{
|
||||
lib,
|
||||
aiofiles,
|
||||
aiosqlite,
|
||||
alembic,
|
||||
asyncpg,
|
||||
backoff,
|
||||
brotli-asgi,
|
||||
buildPythonPackage,
|
||||
cleanlab,
|
||||
datasets,
|
||||
deprecated,
|
||||
elasticsearch8,
|
||||
evaluate,
|
||||
factory-boy,
|
||||
faiss,
|
||||
fastapi,
|
||||
fetchFromGitHub,
|
||||
flyingsquid,
|
||||
greenlet,
|
||||
httpx,
|
||||
huggingface-hub,
|
||||
luqum,
|
||||
monotonic,
|
||||
numpy,
|
||||
openai,
|
||||
opensearch-py,
|
||||
packaging,
|
||||
pandas,
|
||||
passlib,
|
||||
peft,
|
||||
pgmpy,
|
||||
plotly,
|
||||
prodict,
|
||||
psutil,
|
||||
psycopg2,
|
||||
pydantic,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
python-jose,
|
||||
python-multipart,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
pyyaml,
|
||||
rich,
|
||||
schedule,
|
||||
scikit-learn,
|
||||
sentence-transformers,
|
||||
seqeval,
|
||||
setuptools,
|
||||
smart-open,
|
||||
snorkel,
|
||||
spacy,
|
||||
spacy-transformers,
|
||||
sqlalchemy,
|
||||
tqdm,
|
||||
transformers,
|
||||
typer,
|
||||
uvicorn,
|
||||
wrapt,
|
||||
# , flair
|
||||
, faiss
|
||||
, flyingsquid
|
||||
, pgmpy
|
||||
, plotly
|
||||
, snorkel
|
||||
, spacy
|
||||
, transformers
|
||||
, evaluate
|
||||
, seqeval
|
||||
# , setfit
|
||||
# , spacy-huggingface-hub
|
||||
# , span_marker
|
||||
, openai
|
||||
, peft
|
||||
# test dependencies
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, pytest-mock
|
||||
, pytest-asyncio
|
||||
, factory-boy
|
||||
# , trl
|
||||
}:
|
||||
let
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "argilla";
|
||||
version = "1.27.0";
|
||||
optional-dependencies = {
|
||||
server = [
|
||||
fastapi
|
||||
opensearch-py
|
||||
elasticsearch8
|
||||
uvicorn
|
||||
smart-open
|
||||
brotli-asgi
|
||||
alembic
|
||||
sqlalchemy
|
||||
greenlet
|
||||
aiosqlite
|
||||
luqum
|
||||
scikit-learn
|
||||
aiofiles
|
||||
pyyaml
|
||||
python-multipart
|
||||
python-jose
|
||||
passlib
|
||||
psutil
|
||||
# segment-analytics-python
|
||||
] ++
|
||||
elasticsearch8.optional-dependencies.async ++
|
||||
uvicorn.optional-dependencies.standard ++
|
||||
python-jose.optional-dependencies.cryptography ++
|
||||
passlib.optional-dependencies.bcrypt;
|
||||
postgresql = [ asyncpg psycopg2 ];
|
||||
listeners = [ schedule prodict ];
|
||||
integrations = [
|
||||
pyyaml
|
||||
cleanlab
|
||||
datasets
|
||||
huggingface-hub
|
||||
# flair
|
||||
faiss
|
||||
flyingsquid
|
||||
pgmpy
|
||||
plotly
|
||||
snorkel
|
||||
spacy
|
||||
transformers
|
||||
evaluate
|
||||
seqeval
|
||||
# setfit
|
||||
# span_marker
|
||||
openai
|
||||
peft
|
||||
] ++ transformers.optional-dependencies.torch;
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
version = "1.28.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argilla-io";
|
||||
repo = pname;
|
||||
repo = "argilla";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CBVP/+XFKnJBMcxsDd7lgQ1JFX7zFlHmdBwkAMmq85g=";
|
||||
hash = "sha256-gQpJ2umi3IE5BhRu3bM7ONPIP0hb2YG37jGvDKQHZWA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"typer"
|
||||
"rich"
|
||||
"httpx"
|
||||
"numpy"
|
||||
"rich"
|
||||
"typer"
|
||||
"wrapt"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies = [
|
||||
httpx
|
||||
deprecated
|
||||
packaging
|
||||
@@ -154,7 +107,67 @@ buildPythonPackage {
|
||||
typer
|
||||
];
|
||||
|
||||
# still quite a bit of optional dependencies missing
|
||||
passthru.optional-dependencies = {
|
||||
server =
|
||||
[
|
||||
aiofiles
|
||||
aiosqlite
|
||||
alembic
|
||||
brotli-asgi
|
||||
elasticsearch8
|
||||
fastapi
|
||||
greenlet
|
||||
luqum
|
||||
opensearch-py
|
||||
passlib
|
||||
psutil
|
||||
python-jose
|
||||
python-multipart
|
||||
pyyaml
|
||||
scikit-learn
|
||||
smart-open
|
||||
sqlalchemy
|
||||
uvicorn
|
||||
]
|
||||
++ elasticsearch8.optional-dependencies.async
|
||||
++ uvicorn.optional-dependencies.standard
|
||||
++ python-jose.optional-dependencies.cryptography
|
||||
++ passlib.optional-dependencies.bcrypt;
|
||||
postgresql = [
|
||||
asyncpg
|
||||
psycopg2
|
||||
];
|
||||
listeners = [
|
||||
schedule
|
||||
prodict
|
||||
];
|
||||
integrations = [
|
||||
cleanlab
|
||||
datasets
|
||||
evaluate
|
||||
faiss
|
||||
flyingsquid
|
||||
huggingface-hub
|
||||
openai
|
||||
peft
|
||||
pgmpy
|
||||
plotly
|
||||
pyyaml
|
||||
sentence-transformers
|
||||
seqeval
|
||||
snorkel
|
||||
spacy
|
||||
spacy-transformers
|
||||
transformers
|
||||
# flair
|
||||
# setfit
|
||||
# span_marker
|
||||
# trl
|
||||
# spacy-huggingface-hub
|
||||
] ++ transformers.optional-dependencies.torch;
|
||||
};
|
||||
|
||||
# Still quite a bit of optional dependencies missing
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
@@ -163,26 +176,19 @@ buildPythonPackage {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
pytest-mock
|
||||
pytest-asyncio
|
||||
factory-boy
|
||||
]
|
||||
++ optional-dependencies.server
|
||||
++ optional-dependencies.postgresql
|
||||
++ optional-dependencies.listeners
|
||||
++ optional-dependencies.integrations;
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
|
||||
pytestFlagsArray = [ "--ignore=tests/server/datasets/test_dao.py" ];
|
||||
|
||||
passthru.optional-dependencies = optional-dependencies;
|
||||
disabledTestPaths = [ "tests/server/datasets/test_dao.py" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Argilla: the open-source data curation platform for LLMs";
|
||||
mainProgram = "argilla";
|
||||
description = "Open-source data curation platform for LLMs";
|
||||
homepage = "https://github.com/argilla-io/argilla";
|
||||
changelog = "https://github.com/argilla-io/argilla/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
mainProgram = "argilla";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
, ipykernel
|
||||
, python
|
||||
, pexpect
|
||||
, bash
|
||||
, bashInteractive
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./bash-path.patch;
|
||||
bash = lib.getExe bash;
|
||||
bash = lib.getExe bashInteractive;
|
||||
})
|
||||
];
|
||||
|
||||
@@ -45,8 +45,20 @@ buildPythonPackage rec {
|
||||
${python.pythonOnBuildForHost.interpreter} -m bash_kernel.install --prefix $out
|
||||
'';
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# Create a JUPYTER_PATH with the kernelspec
|
||||
export JUPYTER_PATH=$(mktemp -d)
|
||||
mkdir -p $JUPYTER_PATH/kernels/bash
|
||||
echo '{ "language": "bash", "argv": [ "${python}/bin/python", "-m", "bash_kernel", "-f", "{connection_file}" ] }' > $JUPYTER_PATH/kernels/bash/kernel.json
|
||||
|
||||
# Evaluate a test notebook with papermill
|
||||
cd $(mktemp -d)
|
||||
${python.withPackages (ps: [ps.papermill])}/bin/papermill --kernel bash ${./test.ipynb} out.ipynb
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bash Kernel for Jupyter";
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"cells": [
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"echo hi"
|
||||
]
|
||||
}
|
||||
],
|
||||
"metadata": {
|
||||
"kernel_info": {
|
||||
"display_name": "Unknown",
|
||||
"name": "bash"
|
||||
},
|
||||
"language_info": {
|
||||
"file_extension": ".ipynb",
|
||||
"name": "bash",
|
||||
"version": "5.0"
|
||||
}
|
||||
},
|
||||
"nbformat": 4,
|
||||
"nbformat_minor": 2
|
||||
}
|
||||
@@ -366,7 +366,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.104";
|
||||
version = "1.34.105";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -374,7 +374,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-GsQmm7pLMdSCQfAtLwa0WB+75hdC3O44MV4BQgwQMVs=";
|
||||
hash = "sha256-auwBMUR4haJNuCJ5YJoIEwxdCw9zjfxwpZ/z9FPASmg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, hatch-vcs
|
||||
, aiohttp
|
||||
, awkward
|
||||
, cachetools
|
||||
, cloudpickle
|
||||
@@ -21,6 +22,7 @@
|
||||
, packaging
|
||||
, pandas
|
||||
, pyarrow
|
||||
, requests
|
||||
, scipy
|
||||
, toml
|
||||
, tqdm
|
||||
@@ -32,7 +34,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coffea";
|
||||
version = "2024.4.1";
|
||||
version = "2024.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -41,20 +43,16 @@ buildPythonPackage rec {
|
||||
owner = "CoffeaTeam";
|
||||
repo = "coffea";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Iu1GHnLUqdhYO7hoHaf+O/S6KO0P+dvl0wgfRA5vtGI=";
|
||||
hash = "sha256-FHE7/VL0mnf0eBPzCsrr8ISr7OmfFvI9xuV0CPa7JdU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "numba>=0.58.1" "numba"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
awkward
|
||||
cachetools
|
||||
cloudpickle
|
||||
@@ -72,6 +70,7 @@ buildPythonPackage rec {
|
||||
packaging
|
||||
pandas
|
||||
pyarrow
|
||||
requests
|
||||
scipy
|
||||
toml
|
||||
tqdm
|
||||
@@ -88,6 +87,12 @@ buildPythonPackage rec {
|
||||
"coffea"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Requires internet access
|
||||
# https://github.com/CoffeaTeam/coffea/issues/1094
|
||||
"test_lumimask"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -46,6 +46,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://www.gcovr.com/";
|
||||
changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-storage";
|
||||
version = "2.24.0";
|
||||
version = "2.25.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tK9bmqzYOWuEB9G4d2AaN22O6m0ZKCOop4gb0v3Ads4=";
|
||||
hash = "sha256-GV/9KxgOnqoivqs+QKC2Hs0UbssyZnz0Immo1xEbTUg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery";
|
||||
version = "3.21.0";
|
||||
version = "3.22.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YmXDn51b31DxHLganCoGBdKF3zSsE53g0jM7ElCt0P8=";
|
||||
hash = "sha256-lXWR5vlI18tKoPeo5OR7RhfNfwJp4opxw3lTw5tuikw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -93,8 +93,10 @@ buildPythonPackage rec {
|
||||
"test_arrow_extension_types_same_for_storage_and_REST_APIs_894"
|
||||
"test_list_rows_empty_table"
|
||||
"test_list_rows_page_size"
|
||||
"test_list_rows_scalars"
|
||||
"test_list_rows_range_csv"
|
||||
"test_list_rows_range"
|
||||
"test_list_rows_scalars_extreme"
|
||||
"test_list_rows_scalars"
|
||||
"test_dry_run"
|
||||
"test_session"
|
||||
# Mocking of _ensure_bqstorage_client fails
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.16.0";
|
||||
version = "3.17.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-DWmh96XviHVsmeVrivTDnq5A0hBog/DieUxcs2QmltU=";
|
||||
hash = "sha256-YMUEBj8c154KA5Y/cm1gbypDxkfY4ncCq5wbym5rS9s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,14 +17,14 @@ let
|
||||
};
|
||||
platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
hashes = rec {
|
||||
cp311-aarch64-darwin = "sha256-pMwq4TXvr0mrKxZppeW2MQE/KrplWWFGmjKRLKwbHCI=";
|
||||
cp311-aarch64-linux = "sha256-fxJSQUt+nk7JBGtkDi+qTl/js0hnWGZGyht4AqD9g60=";
|
||||
cp311-aarch64-darwin = "sha256-jODaasqXupII5JDE1QLUK+Jd07WJfAtxB3NIHCeuDa4=";
|
||||
cp311-aarch64-linux = "sha256-hx6BgCbI8ojXRA/NS4Qr7N8QBvQ0lfxPbj7G2bi6PXo=";
|
||||
cp311-x86_64-darwin = cp311-aarch64-darwin;
|
||||
cp311-x86_64-linux = "sha256-q1nmuWmlDPeNWWw4bX3KECOChNQkwU+6hItYqWcyY4M=";
|
||||
cp312-aarch64-darwin = "sha256-5+1QxYOhjbs01S3gqhkQ9Bx/0/NhbXEi710BGpiC5kM=";
|
||||
cp312-aarch64-linux = "sha256-N7cFtibenj+SrZ7ZtevZtDUdW48DnLC4p5jB9vrWlb8=";
|
||||
cp311-x86_64-linux = "sha256-hiZbepqPPlMcG77m5hwefQtoJk6XZ5W0z3rsaLnmbrg=";
|
||||
cp312-aarch64-darwin = "sha256-H5J44n2CUqOo8jzn2G6gZPehWsbPnZtHXi4Iygx2RRM=";
|
||||
cp312-aarch64-linux = "sha256-xFUR7yizqSsytyfStRigKlZ7q8uY+VgRR/j29DKPWp0=";
|
||||
cp312-x86_64-darwin = cp312-aarch64-darwin;
|
||||
cp312-x86_64-linux = "sha256-Aw5xxvCwdgfdT7HMrWT/jKWx3RDjs8IuB4in0ZGdqcw=";
|
||||
cp312-x86_64-linux = "sha256-giNHTNfLX1hIiWOPQlLOnqjrbPWkKQrA4KXug6ujYxI=";
|
||||
};
|
||||
hash =
|
||||
hashes."${pyShortVersion}-${stdenv.system}"
|
||||
@@ -32,7 +32,7 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "gurobipy";
|
||||
version = "11.0.1";
|
||||
version = "11.0.2";
|
||||
inherit format;
|
||||
|
||||
src = fetchPypi {
|
||||
|
||||
@@ -1,42 +1,56 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pbr
|
||||
, python-ldap
|
||||
, prettytable
|
||||
, six
|
||||
, fixtures
|
||||
, testresources
|
||||
, testtools
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
pbr,
|
||||
python-ldap,
|
||||
prettytable,
|
||||
six,
|
||||
unittestCheckHook,
|
||||
fixtures,
|
||||
testresources,
|
||||
testtools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ldappool";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "ldappool";
|
||||
inherit version;
|
||||
sha256 = "4bb59b7d6b11407f48ee01a781267e3c8ba98d91f426806ac7208612ae087b86";
|
||||
hash = "sha256-S7WbfWsRQH9I7gGngSZ+PIupjZH0JoBqxyCGEq4Ie4Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Tests run without most of the dependencies
|
||||
echo "" > test-requirements.txt
|
||||
# PrettyTable is now maintained again
|
||||
substituteInPlace requirements.txt --replace "PrettyTable<0.8,>=0.7.2" "PrettyTable"
|
||||
'';
|
||||
build-system = [
|
||||
setuptools
|
||||
pbr
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pbr ];
|
||||
dependencies = [
|
||||
python-ldap
|
||||
prettytable
|
||||
six
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ python-ldap prettytable six ];
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
fixtures
|
||||
testresources
|
||||
testtools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ fixtures testresources testtools ];
|
||||
pythonImportsCheck = [ "ldappool" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple connector pool for python-ldap";
|
||||
homepage = "https://opendev.org/openstack/ldappool/";
|
||||
license = with licenses; [ mpl11 lgpl21Plus gpl2Plus ];
|
||||
license = with licenses; [
|
||||
mpl11
|
||||
lgpl21Plus
|
||||
gpl2Plus
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,12 +18,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orange-canvas-core";
|
||||
version = "0.2.0";
|
||||
version = "0.1.35";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KMEFZkAZkDhuDPpAts+u825p5pFJZbyrsMW/S1AArp4=";
|
||||
hash = "sha256-xLCwjeNDx9RqxlNkIWMo0Pcrg7akGuu4Rv9oRDgOK18=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -16,12 +16,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orange-widget-base";
|
||||
version = "4.23.0";
|
||||
version = "4.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mz+BcZEdg1p9V0ewYRrw3jKBWLMbL9RR6o4hUEUx9DA=";
|
||||
hash = "sha256-nV2aBPZzn7K+QECtCVoLLh5smG31zE2G9jFTKlxh9qM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, baycomp
|
||||
, bottleneck
|
||||
, buildPythonPackage
|
||||
@@ -24,12 +25,15 @@
|
||||
, orange-canvas-core
|
||||
, orange-widget-base
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
, pytest-qt
|
||||
, pyqtgraph
|
||||
, pyqtwebengine
|
||||
, python
|
||||
, python-louvain
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, pip
|
||||
, qt5
|
||||
, qtconsole
|
||||
, recommonmark
|
||||
@@ -112,6 +116,7 @@ let
|
||||
keyrings-alt
|
||||
pyyaml
|
||||
baycomp
|
||||
pip
|
||||
];
|
||||
|
||||
# FIXME: ImportError: cannot import name '_variable' from partially initialized module 'Orange.data' (most likely due to a circular import) (/build/source/Orange/data/__init__.py)
|
||||
@@ -146,9 +151,9 @@ let
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.unittests = self.overridePythonAttrs (old: {
|
||||
pname = "${old.pname}-tests";
|
||||
format = "other";
|
||||
tests.unittests = stdenv.mkDerivation {
|
||||
name = "${self.name}-tests";
|
||||
inherit (self) src;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
@@ -160,23 +165,32 @@ let
|
||||
cp -r ${self}/${python.sitePackages}/Orange .
|
||||
chmod +w -R .
|
||||
|
||||
rm Orange/tests/test_url_reader.py # uses network
|
||||
rm Orange/tests/test_ada_boost.py # broken: The 'base_estimator' parameter of AdaBoostRegressor must be an object implementing 'fit' and 'predict' or a str among {'deprecated'}. Got None instead.
|
||||
substituteInPlace Orange/classification/tests/test_xgb_cls.py \
|
||||
--replace test_learners mk_test_learners
|
||||
|
||||
substituteInPlace Orange/modelling/tests/test_xgb.py \
|
||||
--replace test_learners mk_test_learners
|
||||
|
||||
substituteInPlace Orange/**/tests/*.py \
|
||||
--replace test_filename filename_test
|
||||
|
||||
# TODO: debug why orange is crashing on GC, may be a upstream issue
|
||||
chmod +x Orange/__init__.py
|
||||
echo "import gc; gc.disable()" | tee -a Orange/__init__.py
|
||||
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} -m unittest -b -v ./Orange/**/test*.py
|
||||
runHook postCheck
|
||||
'';
|
||||
nativeBuildInputs = [ pytestCheckHook pytest-qt ];
|
||||
|
||||
postInstall = "";
|
||||
postCheck = ''
|
||||
touch $out
|
||||
'';
|
||||
|
||||
doBuild = false;
|
||||
doInstall = false;
|
||||
|
||||
nativeBuildInputs = [ self ] ++ old.nativeBuildInputs;
|
||||
});
|
||||
buildInputs = [ self ];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
, lxml
|
||||
, pyproj
|
||||
, pytestCheckHook
|
||||
@@ -10,12 +11,11 @@
|
||||
, pytz
|
||||
, pyyaml
|
||||
, requests
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "owslib";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -23,8 +23,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "geopython";
|
||||
repo = "OWSLib";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-miKAgZBiqZ6+0qDvlf8+VZ6omH5hlImO0E7AVK7FuD0=";
|
||||
rev = version;
|
||||
hash = "sha256-vjJsLavVOqTTrVtYbtA0G+nl0HanKeGtzNFFj92Frw8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
attrs,
|
||||
bitarray,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyais";
|
||||
version = "2.6.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "M0r13n";
|
||||
repo = "pyais";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/I/4ATvX/0ya8xtineXyjSFJBGhDNy/tosh2NdnKLK4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
attrs
|
||||
bitarray
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "pyais" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests the examples which have additional requirements
|
||||
"tests/test_examples.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for decoding and encoding AIS messages (AIVDM/AIVDO)";
|
||||
homepage = "https://github.com/M0r13n/pyais";
|
||||
changelog = "https://github.com/M0r13n/pyais/blob/${version}/CHANGELOG.txt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,28 +1,29 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, astroid
|
||||
, dill
|
||||
, isort
|
||||
, mccabe
|
||||
, platformdirs
|
||||
, requests
|
||||
, setuptools
|
||||
, tomli
|
||||
, tomlkit
|
||||
, typing-extensions
|
||||
, gitpython
|
||||
, py
|
||||
, pytest-timeout
|
||||
, pytest-xdist
|
||||
, pytest7CheckHook
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
astroid,
|
||||
buildPythonPackage,
|
||||
dill,
|
||||
fetchFromGitHub,
|
||||
gitpython,
|
||||
isort,
|
||||
mccabe,
|
||||
platformdirs,
|
||||
py,
|
||||
pytest-timeout,
|
||||
pytest-xdist,
|
||||
pytest7CheckHook,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools,
|
||||
tomli,
|
||||
tomlkit,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylint";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -31,25 +32,22 @@ buildPythonPackage rec {
|
||||
owner = "pylint-dev";
|
||||
repo = "pylint";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JHtMaZNwl+yLwEDD4Nl0vOt9NQ9DO7iIy5LR/9ta1Pw=";
|
||||
hash = "sha256-LmpLt2GCzYU73BUpORHaFbGqkxyYqoPoKZpUJSChqKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astroid
|
||||
dill
|
||||
isort
|
||||
mccabe
|
||||
platformdirs
|
||||
tomlkit
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
typing-extensions
|
||||
];
|
||||
dependencies =
|
||||
[
|
||||
astroid
|
||||
dill
|
||||
isort
|
||||
mccabe
|
||||
platformdirs
|
||||
tomlkit
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.11") [ tomli ]
|
||||
++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gitpython
|
||||
@@ -67,7 +65,8 @@ buildPythonPackage rec {
|
||||
# displaying implemented interfaces in pylint 3.0. The
|
||||
# implementation relies on the '__implements__' attribute proposed
|
||||
# in PEP 245, which was rejected in 2006.
|
||||
"-W" "ignore::DeprecationWarning"
|
||||
"-W"
|
||||
"ignore::DeprecationWarning"
|
||||
"-v"
|
||||
];
|
||||
|
||||
@@ -84,30 +83,32 @@ buildPythonPackage rec {
|
||||
"tests/pyreverse/test_writer.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError when self executing and checking output
|
||||
# expected output looks like it should match though
|
||||
"test_invocation_of_pylint_config"
|
||||
"test_generate_rcfile"
|
||||
"test_generate_toml_config"
|
||||
"test_help_msg"
|
||||
"test_output_of_callback_options"
|
||||
# Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted. The list of emitted warnings is: [].
|
||||
"test_save_and_load_not_a_linter_stats"
|
||||
# Truncated string expectation mismatch
|
||||
"test_truncated_compare"
|
||||
# Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483
|
||||
"test_functional"
|
||||
# AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')]
|
||||
"test_functional_relation_extraction"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"test_parallel_execution"
|
||||
"test_py3k_jobs_option"
|
||||
];
|
||||
disabledTests =
|
||||
[
|
||||
# AssertionError when self executing and checking output
|
||||
# expected output looks like it should match though
|
||||
"test_invocation_of_pylint_config"
|
||||
"test_generate_rcfile"
|
||||
"test_generate_toml_config"
|
||||
"test_help_msg"
|
||||
"test_output_of_callback_options"
|
||||
# Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted. The list of emitted warnings is: [].
|
||||
"test_save_and_load_not_a_linter_stats"
|
||||
# Truncated string expectation mismatch
|
||||
"test_truncated_compare"
|
||||
# Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483
|
||||
"test_functional"
|
||||
# AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')]
|
||||
"test_functional_relation_extraction"
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"test_parallel_execution"
|
||||
"test_py3k_jobs_option"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pylint.readthedocs.io/en/stable/";
|
||||
description = "A bug and style checker for Python";
|
||||
homepage = "https://pylint.readthedocs.io/en/stable/";
|
||||
changelog = "https://github.com/pylint-dev/pylint/releases/tag/v${version}";
|
||||
longDescription = ''
|
||||
Pylint is a Python static code analysis tool which looks for programming errors,
|
||||
@@ -118,7 +119,7 @@ buildPythonPackage rec {
|
||||
- symilar: an independent similarities checker
|
||||
- epylint: Emacs and Flymake compatible Pylint
|
||||
'';
|
||||
license = licenses.gpl1Plus;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, pytest-cov
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -11,6 +12,8 @@ buildPythonPackage rec {
|
||||
version = "1.0.36";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "semuconsulting";
|
||||
repo = "pynmeagps";
|
||||
@@ -18,20 +21,21 @@ buildPythonPackage rec {
|
||||
hash = "sha256-n7dCr85TeBLxdrD1ZAA7PGJd9+3+xFJ8gjRU/JOFysY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "--cov --cov-report html --cov-fail-under 95" ""
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pynmeagps"
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "pynmeagps" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/semuconsulting/pynmeagps";
|
||||
description = "NMEA protocol parser and generator";
|
||||
homepage = "https://github.com/semuconsulting/pynmeagps";
|
||||
changelog = "https://github.com/semuconsulting/pynmeagps/releases/tag/v${version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ dylan-gonzalez ];
|
||||
};
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
, freefont_ttf
|
||||
, makeFontsConf
|
||||
, setuptools
|
||||
, python
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -70,6 +71,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://www.pyqtgraph.org/";
|
||||
changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG";
|
||||
license = licenses.mit;
|
||||
broken = lib.versionAtLeast python.version "3.12";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ koral ];
|
||||
};
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
, semver
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, toml
|
||||
}:
|
||||
|
||||
@@ -25,16 +24,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-qmrHFQRypBJOI1N6W/Dtc5ss9JGqoPhFlbqrLHcb6vc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"astroid"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
astroid
|
||||
packaging
|
||||
toml
|
||||
@@ -51,10 +45,12 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python tool to find and list requirements of a Python project";
|
||||
mainProgram = "detect-requirements";
|
||||
homepage = "https://github.com/landscapeio/requirements-detector";
|
||||
changelog = "https://github.com/landscapeio/requirements-detector/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kamadorueda ];
|
||||
mainProgram = "detect-requirements";
|
||||
# https://github.com/landscapeio/requirements-detector/issues/48
|
||||
broken = versionAtLeast astroid.version "3";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, distro
|
||||
, fetchFromGitHub
|
||||
, jre
|
||||
, numpy
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, jpype1
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
distro,
|
||||
fetchFromGitHub,
|
||||
jre,
|
||||
numpy,
|
||||
pandas,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
jpype1,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tabula-py";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,37 +24,31 @@ buildPythonPackage rec {
|
||||
owner = "chezou";
|
||||
repo = "tabula-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MGv2n8DoSjumD3lRcqwI0sEsaEDgs1n+st8DwZuZauo=";
|
||||
hash = "sha256-C06du4mhpnF2qxcEMZxp5O/8xpNaj9Jp8LFaxBkGF/Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tabula/backend.py \
|
||||
--replace '"java"' '"${lib.getExe jre}"'
|
||||
--replace-fail '"java"' '"${lib.getExe jre}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
jre
|
||||
];
|
||||
buildInputs = [ jre ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
distro
|
||||
numpy
|
||||
pandas
|
||||
jpype1
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tabula"
|
||||
];
|
||||
pythonImportsCheck = [ "tabula" ];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1144";
|
||||
version = "3.0.1146";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cUuigY67wgYj6DvFiplXJbqcLNKxH9odeG5a8bSZ7/8=";
|
||||
hash = "sha256-4U+nI5DODPLgQXzzgZKVTZdKPVneUQVomsdpoQHRqdE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uproot";
|
||||
version = "5.3.2";
|
||||
version = "5.3.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -28,15 +28,15 @@ buildPythonPackage rec {
|
||||
owner = "scikit-hep";
|
||||
repo = "uproot5";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dq362pevqgLx5KwZ19zQ6aOn5NCyiqynPCF7YdI6tkw=";
|
||||
hash = "sha256-ptfT31eUNSpVaZfXAyRcIc2T2p82rXmzUyySSVbI9lI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
awkward
|
||||
cramjam
|
||||
numpy
|
||||
@@ -76,6 +76,7 @@ buildPythonPackage rec {
|
||||
"test_http_size"
|
||||
"test_http_size_port"
|
||||
"test_issue_1054_filename_colons"
|
||||
"test_multiple_page_lists"
|
||||
"test_no_multipart"
|
||||
"test_open_fsspec_github"
|
||||
"test_open_fsspec_http"
|
||||
@@ -83,6 +84,7 @@ buildPythonPackage rec {
|
||||
"test_pickle_roundtrip_http"
|
||||
"test_split_ranges_if_large_file_in_http"
|
||||
# Cyclic dependency with dask-awkward
|
||||
"test_dask_duplicated_keys"
|
||||
"test_decompression_executor_for_dask"
|
||||
];
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-mutants";
|
||||
version = "24.4.0";
|
||||
version = "24.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcefrog";
|
||||
repo = "cargo-mutants";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u59NnxDFQN92BMkm2sHy8OhundFJElJ2H1SgdeLpOMs=";
|
||||
hash = "sha256-qKgHlFb7sraXTpqf6QsOspzHGWtVZAUSOl3rl6pqQJk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7dLpqhT3v7b0I1wmn7Q6IL1M5Ul/Mu9xxrdwlI2xKAs=";
|
||||
cargoHash = "sha256-h9nhE7pSwxE2NKJQtlA6Exwh36pC6Lp0y3u0AEh39N4=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.44";
|
||||
version = "1.0.45";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-CLMMrzEvw0QrlDPUfM67thzSXZ6hOfNw7mUVNdMcRgA=";
|
||||
hash = "sha256-d0v34CUm3r9QScxrc5aKSLpNLPTK+OHAZ7JdS9A4lAw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XMuApConypaF6PNylDx9Dg2e1VvPy8m///Pnk/S14g8=";
|
||||
cargoHash = "sha256-QNVySY5IEGXdRBwJDG2eLZ+u28X/qYcdCkFiBCpgNhE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
|
||||
DiskArbitration
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "instawow";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "layday";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-eHydxQxqHKTBrhiPl8coMNYYr7gNfKF4Tf8clbiq2HE=";
|
||||
sha256 = "sha256-U4Y+P+fSyqxT0oHJXn2gwxPOJtnYBwaq9ca+FvGBUkA=";
|
||||
};
|
||||
|
||||
extras = [ ]; # Disable GUI, most dependencies are not packaged.
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, fetchDebianPatch, fetchpatch, cmake, pkg-config
|
||||
, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, fetchDebianPatch, fetchpatch, cmake, pkg-config
|
||||
, SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal, libepoxy
|
||||
, curl
|
||||
, freealut, readline, libb2, gcc-unwrapped
|
||||
, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther
|
||||
}:
|
||||
@@ -10,12 +11,14 @@ let
|
||||
sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "8.1";
|
||||
version = "unstable-2023-10-30";
|
||||
pname = "openclonk";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2";
|
||||
sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openclonk";
|
||||
repo = "openclonk";
|
||||
rev = "5275334a11ef7c23ce809f35d6b443abd91b415f";
|
||||
sha256 = "14x5b2rh739156l4072rbsnv9n862jz1zafi6ng158ja5fwl16l2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -26,15 +29,11 @@ in stdenv.mkDerivation rec {
|
||||
patch = "system-libb2.patch";
|
||||
hash = "sha256-zuH6zxSQXRhnt75092Xwb6XYv8UG391E5Arbnr7ApiI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-gcc-11-build.patch";
|
||||
url = "https://github.com/openclonk/openclonk/commit/e304efde2c8643bbc0fc1ad5e85024982744b233.patch";
|
||||
hash = "sha256-jfVCgeZuYo4x53zhljKcnMDMIBECTRsUSxkl6JaL6HA=";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelInstalling = false;
|
||||
|
||||
postInstall = ''
|
||||
mv -v $out/games/openclonk $out/bin/
|
||||
'' + lib.optionalString enableSoundtrack ''
|
||||
ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg
|
||||
'';
|
||||
@@ -43,6 +42,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut
|
||||
libepoxy curl
|
||||
readline libb2
|
||||
];
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, kernel }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8.9";
|
||||
version = "2.12.0";
|
||||
name = "ena-${version}-${kernel.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amzn";
|
||||
repo = "amzn-drivers";
|
||||
rev = "ena_linux_${version}";
|
||||
hash = "sha256-9Csrq9wM7Q99qPj7+NlnQgP6KcciNHMbAAb+Wg7eYAU=";
|
||||
hash = "sha256-Z/eeIUY7Yl2l/IqK3Z2nxPhn+JLvP976IZ9ZXPBqoSo=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
|
||||
# linux 3.12
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
|
||||
patches = [
|
||||
# Use kernel version checks instead of API feature detection
|
||||
# See https://github.com/NixOS/nixpkgs/pull/310680
|
||||
./override-features-api-detection.patch
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
cd kernel/linux/ena
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
diff --git a/kernel/linux/ena/kcompat.h b/kernel/linux/ena/kcompat.h
|
||||
index 32a9cc5..8d39362 100644
|
||||
--- a/kernel/linux/ena/kcompat.h
|
||||
+++ b/kernel/linux/ena/kcompat.h
|
||||
@@ -888,21 +888,6 @@ xdp_prepare_buff(struct xdp_buff *xdp, unsigned char *hard_start,
|
||||
#define ENA_XDP_XMIT_FREES_FAILED_DESCS_INTERNALLY
|
||||
#endif
|
||||
|
||||
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) && \
|
||||
- !(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 188) && \
|
||||
- LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) && \
|
||||
- !(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 251) && \
|
||||
- LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0))) && \
|
||||
- !(defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 6)) && \
|
||||
- !(defined(SUSE_VERSION) && (SUSE_VERSION == 15 && SUSE_PATCHLEVEL >= 4)) && \
|
||||
- !(defined(SUSE_VERSION) && (SUSE_VERSION == 15 && SUSE_PATCHLEVEL == 3) && \
|
||||
- ENA_KERNEL_VERSION_GTE(5, 3, 18, 150300, 59, 43))
|
||||
-static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr)
|
||||
-{
|
||||
- memcpy(dev->dev_addr, addr, ETH_ALEN);
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) || \
|
||||
(defined(RHEL_RELEASE_CODE) && \
|
||||
RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 6) && \
|
||||
@@ -1112,7 +1097,7 @@ static inline void ena_dma_unmap_page_attrs(struct device *dev,
|
||||
#define pci_dev_id(pdev) ((((u16)(pdev->bus->number)) << 8) | (pdev->devfn))
|
||||
#endif /* ENA_HAVE_PCI_DEV_ID */
|
||||
|
||||
-#ifndef ENA_HAVE_XDP_DO_FLUSH
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
|
||||
#define xdp_do_flush xdp_do_flush_map
|
||||
#endif /* ENA_HAVE_XDP_DO_FLUSH */
|
||||
|
||||
@@ -1147,15 +1132,15 @@ static inline unsigned int cpumask_local_spread(unsigned int i, int node)
|
||||
}
|
||||
#endif /* ENA_HAVE_CPUMASK_LOCAL_SPREAD */
|
||||
|
||||
-#ifndef ENA_HAVE_UPDATE_AFFINITY_HINT
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
|
||||
static inline int irq_update_affinity_hint(unsigned int irq, const struct cpumask *m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
-#endif /* ENA_HAVE_UPDATE_AFFINITY_HINT */
|
||||
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5.17.0) */
|
||||
|
||||
-#ifndef ENA_HAVE_ETHTOOL_PUTS
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0)
|
||||
#define ethtool_puts ethtool_sprintf
|
||||
-#endif /* ENA_HAVE_ETHTOOL_PUTS */
|
||||
+#endif
|
||||
|
||||
#endif /* _KCOMPAT_H_ */
|
||||
@@ -44,6 +44,8 @@
|
||||
|
||||
smartthinq-sensors = callPackage ./smartthinq-sensors {};
|
||||
|
||||
tuya_local = callPackage ./tuya_local {};
|
||||
|
||||
waste_collection_schedule = callPackage ./waste_collection_schedule {};
|
||||
|
||||
xiaomi_gateway3 = callPackage ./xiaomi_gateway3 {};
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildHomeAssistantComponent
|
||||
, fetchFromGitHub
|
||||
|
||||
# dependencies
|
||||
, tinytuya
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "make-all";
|
||||
domain = "tuya_local";
|
||||
version = "2024.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "tuya-local";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-If5SLLizagolXF5Y43UQK5IZ9oB1lQJVjTorgmtRXtg=";
|
||||
};
|
||||
|
||||
dependencies = [ tinytuya ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Local support for Tuya devices in Home Assistant";
|
||||
homepage = "https://github.com/make-all/tuya-local";
|
||||
changelog = "https://github.com/make-all/tuya-local/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pathob ];
|
||||
};
|
||||
}
|
||||
@@ -21,16 +21,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2024-05-01T01-11-10Z";
|
||||
version = "2024-05-10T01-41-38Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
hash = "sha256-abx2eYYMU1bWBYHcocTw6uavPLhLlgksG2/eoZWuWOo=";
|
||||
hash = "sha256-qYNyAfWdmQPMIwHEzSlA4nf93aFkR1TvulOVNf46wAI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pPIcH2I/0792iXLMveZIRSBFKCnvraCyBUutREwTig0=";
|
||||
vendorHash = "sha256-fyNOROkByuH5oEnYiQd0XhqqDKL4EnOEZedXCBI6BuY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pocketbase";
|
||||
version = "0.22.11";
|
||||
version = "0.22.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocketbase";
|
||||
repo = "pocketbase";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PYaAZRD7MPq2+bWqjkX0UrfFG9Er5Isfkm67GY8TO0U=";
|
||||
hash = "sha256-ltz1efvP1wLQx/9rIRvt0ajEvEUaOjSWQzxjFhjXMI4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M7UWOUKenXfzro0fcXjT5MGnUcWeiuaLd7GznU81SCA=";
|
||||
vendorHash = "sha256-EsBMnIeSBQw3tu2jSLS9VpmHHyfHw9crGSmOrUIRvoo=";
|
||||
|
||||
# This is the released subpackage from upstream repo
|
||||
subPackages = [ "examples/base" ];
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opensearch";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz";
|
||||
hash = "sha256-cF2JZX5psuh7h8acazK9tcjNu6wralJtliwqaBnd/V8=";
|
||||
hash = "sha256-NHLt23GDdtq1DliMByXN52jnKGZApdngp04MTz7F7HY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+26
-12
@@ -1,14 +1,23 @@
|
||||
{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python3, fetchpatch
|
||||
, libiconv }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
meson,
|
||||
ninja,
|
||||
fetchFromGitHub,
|
||||
which,
|
||||
python3,
|
||||
fetchpatch,
|
||||
libiconv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ksh";
|
||||
version = "2020.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "att";
|
||||
repo = "ast";
|
||||
rev = version;
|
||||
owner = "att";
|
||||
repo = "ast";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j";
|
||||
};
|
||||
|
||||
@@ -19,13 +28,18 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja which python3 ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
which
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [ libiconv ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "KornShell Command And Programming Language";
|
||||
longDescription = ''
|
||||
The KornShell language was designed and developed by David G. Korn at
|
||||
@@ -34,12 +48,12 @@ stdenv.mkDerivation rec {
|
||||
many different computers and workstations on which it is implemented.
|
||||
'';
|
||||
homepage = "https://github.com/att/ast";
|
||||
license = licenses.cpl10;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
license = lib.licenses.cpl10;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
shellPath = "/bin/ksh";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell_plugin_formats";
|
||||
inherit (nushell) version src;
|
||||
cargoHash = "sha256-mInMs0kAJn3/fgRAG0E8hgvaly2G68kT5O+D83pLq78=";
|
||||
cargoHash = "sha256-+DTsBh3+nLjuwuk0rnxZeSQ+lM55PAhj+8e9L2bQdXU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nushell_plugin_gstat";
|
||||
inherit (nushell) version src;
|
||||
cargoHash = "sha256-1HfuMtjtUzwsIxkYV8azttnjEyAnC7X1aMIdw2N0yxQ=";
|
||||
cargoHash = "sha256-0pzQrUKMfYZdUzJgm6WYIrTUkF2arYGDCuASgmDpvmc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "nushell_plugin_query";
|
||||
inherit (nushell) version src;
|
||||
cargoHash = "sha256-takIDfMriDzZT/9JkqWPis10EaZhfwGpi7EkoOh4+vw=";
|
||||
cargoHash = "sha256-cu7gSEr5xOpBpkv++YpOMUf/UtvFYuQMDWrGphb6V/0=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
|
||||
|
||||
@@ -93,6 +93,7 @@ rec {
|
||||
# Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore
|
||||
# we have to keep all the numbers in the version to handle major/minor/patch level.
|
||||
# for <1.0.
|
||||
# Please add new versions to nixos/tests/garage/default.nix as well.
|
||||
|
||||
garage_0_8_7 = generic {
|
||||
version = "0.8.7";
|
||||
|
||||
@@ -44,7 +44,7 @@ buildGoModule rec {
|
||||
homepage = "https://wakatime.com/";
|
||||
description = "WakaTime command line interface";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ sigmanificient ];
|
||||
mainProgram = "wakatime-cli";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hurl";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Orange-OpenSource";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-77RGS4B5Jwb/J5eOG2A7sdfAU7PnRaxqz5nogpOnj70=";
|
||||
hash = "sha256-gSkiNwRR47CZ1YjVa5o8EByCzWBAYPfsMRXydTwFwp0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3D8jyHFrhb3y4yeYtO1GqSyb5wlqUydf/4clsbLjJVE=";
|
||||
cargoHash = "sha256-dY00xcMnOCWhdRzC+3mTHSIqeYEPUDBJeYd/GiLM/38=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "11.3.1";
|
||||
version = "11.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XDUjDw8Xd0DwX275MvowVo4yhaK0Sqjd2f2RGe22MSY=";
|
||||
hash = "sha256-amTkhUChhgO4Uhv23TLFiKAkp58NqBmbyVsF/vaq/ZU=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-54dcWKTVplIrBQlCtQFLiGwEzxT3eMIxqLhL3PO+wdk=";
|
||||
vendorHash = "sha256-FNl7Tu2dDWmtCO3pJRWQpSkfR7aa96AdjP6lTcj6WY4=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
||||
@@ -1,24 +1,29 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gau";
|
||||
version = "2.2.1";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AtKakeQnxRbFAbK/aQ4OQoEowN753jm4P4M57Oo3x1Y=";
|
||||
repo = "gau";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1sF33uat6nwtTaXbZzO8YF4jewyQJ6HvI2l/zyTrJsg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nhsGhuX5AJMHg+zQUt1G1TwVgMCxnuJ2T3uBrx7bJNs=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to fetch known URLs";
|
||||
mainProgram = "gau";
|
||||
longDescription = ''
|
||||
getallurls (gau) fetches known URLs from various sources for any
|
||||
given domain.
|
||||
@@ -26,5 +31,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/lc/gau";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "gau";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.75.1";
|
||||
version = "3.76.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-y6UnJ6lPcMxUsTZBwGjfiNvLsq7PYZhSEQHy2tU9xl0=";
|
||||
hash = "sha256-c3zQaIZmVjU4TyvidTnJlUwU9Xg4h0i/Sr8lBvBt5kA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-woQPmothNrn5ZNZmz8ODP8P8nTVoT6v7/4Z9kfdmfno=";
|
||||
vendorHash = "sha256-4pmemOKnXIQKWqg6NWL8G5zWfjneQngT56whu/f9aJc=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -2441,8 +2441,6 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
git-standup = callPackage ../applications/version-management/git-standup { };
|
||||
|
||||
git-stree = callPackage ../applications/version-management/git-stree { };
|
||||
|
||||
git-subrepo = callPackage ../applications/version-management/git-subrepo { };
|
||||
@@ -5346,8 +5344,6 @@ with pkgs;
|
||||
|
||||
gb-backup = callPackage ../tools/backup/gamerbackup { };
|
||||
|
||||
gbsplay = callPackage ../applications/audio/gbsplay { };
|
||||
|
||||
gdrive = callPackage ../applications/networking/gdrive { };
|
||||
|
||||
gdrive3 = callPackage ../applications/networking/gdrive3 { };
|
||||
@@ -20276,6 +20272,7 @@ with pkgs;
|
||||
ccrtp = callPackage ../development/libraries/ccrtp { };
|
||||
|
||||
cctag = callPackage ../development/libraries/cctag {
|
||||
stdenv = clangStdenv;
|
||||
tbb = tbb_2021_11;
|
||||
};
|
||||
|
||||
@@ -31182,8 +31179,6 @@ with pkgs;
|
||||
python3Packages = python39Packages;
|
||||
};
|
||||
|
||||
fte = callPackage ../applications/editors/fte { };
|
||||
|
||||
g933-utils = callPackage ../tools/misc/g933-utils { };
|
||||
|
||||
gavrasm = callPackage ../development/compilers/gavrasm { };
|
||||
@@ -31503,8 +31498,6 @@ with pkgs;
|
||||
|
||||
hexdino = callPackage ../applications/editors/hexdino { };
|
||||
|
||||
hexedit = callPackage ../applications/editors/hexedit { };
|
||||
|
||||
hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { };
|
||||
|
||||
hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix {
|
||||
@@ -35071,8 +35064,6 @@ with pkgs;
|
||||
|
||||
unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { };
|
||||
|
||||
unipicker = callPackage ../applications/misc/unipicker { };
|
||||
|
||||
unpaper = callPackage ../tools/graphics/unpaper { };
|
||||
|
||||
unison-ucm = callPackage ../development/compilers/unison { };
|
||||
|
||||
@@ -10599,6 +10599,8 @@ self: super: with self; {
|
||||
|
||||
pyairvisual = callPackage ../development/python-modules/pyairvisual { };
|
||||
|
||||
pyais = callPackage ../development/python-modules/pyais { };
|
||||
|
||||
pyalgotrade = callPackage ../development/python-modules/pyalgotrade { };
|
||||
|
||||
pyamg = callPackage ../development/python-modules/pyamg { };
|
||||
|
||||
Reference in New Issue
Block a user