ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-08 21:56:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-01-18 06:01:21 +00:00 committed by GitHub
commit c98a84a2fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with 1976 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/lib/systemd-lib.nix
View File

@ -435,11 +435,10 @@ in rec {
automountToUnit = name: def:
{ inherit (def) aliases wantedBy requiredBy enable overrideStrategy;
text = commonUnitText def +
''
[Automount]
${attrsToSection def.automountConfig}
'';
text = commonUnitText def ''
[Automount]
${attrsToSection def.automountConfig}
'';
};
sliceToUnit = name: def:

2
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View File

@ -39,7 +39,7 @@ in
font-lock-plus = callPackage ./manual-packages/font-lock-plus { };
ghc-mod = callPackage ./manual-packages/elisp-ffi { };
ghc-mod = callPackage ./manual-packages/ghc-mod { };
git-undo = callPackage ./manual-packages/git-undo { };

25
pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghc-mod/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib
, melpaBuild
, haskell-mode
, haskellPackages
, writeText
}:
melpaBuild {
pname = "ghc";
inherit (haskellPackages.ghc-mod) version src;
packageRequires = [ haskell-mode ];
propagatedUserEnvPkgs = [ haskellPackages.ghc-mod ];
recipe = writeText "recipe" ''
(ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
'';
meta = {
description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
license = lib.licenses.bsd3;
};
}

4
pkgs/applications/editors/ldtk/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ldtk";
version = "1.5.2";
version = "1.5.3";
src = fetchurl {
url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip";
hash = "sha256-/2exLVMdSnn/Rc2lL1ytDZ6NvYRJA6W+NT7gGzxm6Vc=";
hash = "sha256-i7HIcKs10srfvwihGdMEnnmGoqgFWNJhC6vGf81QJWY=";
};
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];

6
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -15,9 +15,9 @@
version = "2023-10-23";
};
};
hash = "sha256-yqk0bh68onWqML20Q8eDsTT9o+eKtta7kS9HL74do6Q=";
hash_deb_amd64 = "sha256-MxIyOXssQ1Ke5WZbBbB4FpDec+rn46m8+PbMdmxaQCA=";
version = "120.0.6099.216";
hash = "sha256-HFQ7QAL4hcux3jmMmLYFNym3sfWR1o1hWV75bokID4I=";
hash_deb_amd64 = "sha256-dFllEHRYH3yAPg3uaaCzdpiZxSLENEwmtIb/gg53/ZU=";
version = "120.0.6099.224";
};
ungoogled-chromium = {
deps = {

4
pkgs/applications/version-management/gh/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gh";
version = "2.41.0";
version = "2.42.1";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
hash = "sha256-GkrEirunY17WgAv4XOreG+JwPQn7cRTmr7hJ3/2tSrY=";
hash = "sha256-5kTBOWdL31UfFDp8XC+lc2vJrXZ0PBJafXyczMPn59o=";
};
vendorHash = "sha256-XBoC1sHfxInkamSHNm7Vb3AKCgIch6uYx0jJWqN7PN8=";

28
pkgs/by-name/co/cosmic-protocols/package.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, fetchFromGitHub
, stdenv
, wayland-scanner
}:
stdenv.mkDerivation rec {
pname = "cosmic-protocols";
version = "0-unstable-2024-01-11";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "e65fa5e2bb47e51656221657049bd3f88ae9dae5";
hash = "sha256-vj7Wm1uJ5ULvGNEwKznNhujCZQiuntsWMyKQbIVaO/Q=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];
nativeBuildInputs = [ wayland-scanner ];
meta = with lib; {
homepage = "https://github.com/pop-os/cosmic-protocols";
description = "Addtional wayland-protocols used by the COSMIC desktop environment";
license = [ licenses.mit licenses.gpl3Only ];
maintainers = with maintainers; [ nyanbinary ];
platforms = platforms.linux;
};
}

1589
pkgs/by-name/co/cosmic-session/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

72
pkgs/by-name/co/cosmic-session/package.nix Normal file
View File

@ -0,0 +1,72 @@
{
lib,
fetchFromGitHub,
bash,
rustPlatform,
just,
dbus,
rust,
stdenv,
xdg-desktop-portal-cosmic,
}:
rustPlatform.buildRustPackage rec {
pname = "cosmic-session";
version = "0-unstable-2024-01-17";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "8e73c0f6940288c4a24a102a7ba9f20eb6bd754f";
sha256 = "sha256-plglQ9i+kcG70v9ElCzwNMhO1xcuEAQiO0DeZfRjbcg=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"cosmic-notifications-util-0.1.0" = "sha256-GmTT7SFBqReBMe4GcNSym1YhsKtFQ/0hrDcwUqXkaBw=";
"launch-pad-0.1.0" = "sha256-tnbSJ/GP9GTnLnikJmvb9XrJSgnUnWjadABHF43L1zc=";
};
};
postPatch = ''
substituteInPlace Justfile \
--replace '#!/usr/bin/env' "#!$(command -v env)" \
--replace 'target/release/cosmic-session' "target/${
rust.lib.toRustTargetSpecShort stdenv.hostPlatform
}/release/cosmic-session"
substituteInPlace data/start-cosmic \
--replace '#!/bin/bash' "#!${lib.getBin bash}/bin/bash" \
--replace '/usr/bin/cosmic-session' "$out/bin/cosmic-session" \
--replace '/usr/bin/dbus-run-session' "${
lib.getBin dbus
}/bin/dbus-run-session"
substituteInPlace data/cosmic.desktop --replace '/usr/bin/start-cosmic' "$out/bin/start-cosmic"
'';
nativeBuildInputs = [ just ];
dontUseJustBuild = true;
justFlags = [
"--set"
"prefix"
(placeholder "out")
"--set"
"xdp_cosmic"
xdg-desktop-portal-cosmic
];
passthru.providedSessions = [ "cosmic" ];
meta = with lib; {
homepage = "https://github.com/pop-os/cosmic-session";
description = "Session manager for the COSMIC desktop environment";
license = licenses.gpl3Only;
mainProgram = "cosmic-session";
maintainers = with maintainers; [
a-kenji
nyanbinary
];
platforms = platforms.linux;
};
}

31
pkgs/by-name/ha/hare/cross-compilation-tests.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildPackages
, hare
, runCommandNoCC
, stdenv
, writeText
}:
let
inherit (stdenv.hostPlatform.uname) processor;
inherit (stdenv.hostPlatform) emulator;
mainDotHare = writeText "main.ha" ''
use fmt;
use os;
export fn main() void = {
const machine = os::machine();
if (machine == "${processor}") {
fmt::println("os::machine() matches ${processor}")!;
} else {
fmt::fatalf("os::machine() does not match ${processor}: {}", machine);
};
};
'';
in
runCommandNoCC "${hare.pname}-cross-compilation-test" { meta.timeout = 60; } ''
HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)"
export HARECACHE
outbin="test-${processor}"
${lib.getExe hare} build -q -a "${processor}" -o "$outbin" ${mainDotHare}
${emulator buildPackages} "./$outbin"
: 1>$out
''

63
pkgs/by-name/ha/hare/package.nix
View File

@ -8,15 +8,55 @@
, scdoc
, tzdata
, substituteAll
, callPackage
, enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit)
, pkgsCross
, x86_64PkgsCrossToolchain ? pkgsCross.gnu64
, aarch64PkgsCrossToolchain ? pkgsCross.aarch64-multiplatform
, riscv64PkgsCrossToolchain ? pkgsCross.riscv64
}:
# There's no support for `aarch64-freebsd` or `riscv64-freebsd` on nix.
# See `lib.systems.doubles.aarch64` and `lib.systems.doubles.riscv64`.
assert let
inherit (stdenv.hostPlatform) isLinux is64bit;
inherit (lib) intersectLists platforms concatStringsSep;
workingPlatforms = intersectLists platforms.linux (with platforms; x86_64 ++ aarch64 ++ riscv64);
in
(enableCrossCompilation -> !(isLinux && is64bit))
-> builtins.throw ''
The cross-compilation toolchains may only be enabled on the following platforms:
${concatStringsSep "\n" workingPlatforms}
'';
let
# We use harec's override of qbe until 1.2 is released, but the `qbe` argument
# is kept to avoid breakage.
qbe = harec.qbeUnstable;
# https://harelang.org/platforms/
arch = stdenv.hostPlatform.uname.processor;
platform = lib.strings.toLower stdenv.hostPlatform.uname.system;
platform = lib.toLower stdenv.hostPlatform.uname.system;
embeddedOnBinaryTools =
let
genToolsFromToolchain = toolchain:
let
crossTargetPrefix = toolchain.stdenv.cc.targetPrefix;
toolchainArch = toolchain.stdenv.hostPlatform.uname.processor;
absOrRelPath = toolDrv: toolBasename:
if arch == toolchainArch then toolBasename
else lib.getExe' toolDrv "${crossTargetPrefix}${toolBasename}";
in
{
"ld" = absOrRelPath toolchain.buildPackages.binutils "ld";
"as" = absOrRelPath toolchain.buildPackages.binutils "as";
"cc" = absOrRelPath toolchain.stdenv.cc "cc";
};
in
{
x86_64 = genToolsFromToolchain x86_64PkgsCrossToolchain;
aarch64 = genToolsFromToolchain aarch64PkgsCrossToolchain;
riscv64 = genToolsFromToolchain riscv64PkgsCrossToolchain;
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "hare";
@ -58,6 +98,19 @@ stdenv.mkDerivation (finalAttrs: {
"PREFIX=${builtins.placeholder "out"}"
"PLATFORM=${platform}"
"ARCH=${arch}"
# Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does
# not follow the FHS.
"HAREPATH=$(SRCDIR)/hare/stdlib"
] ++ lib.optionals enableCrossCompilation [
"RISCV64_AS=${embeddedOnBinaryTools.riscv64.as}"
"RISCV64_CC=${embeddedOnBinaryTools.riscv64.cc}"
"RISCV64_LD=${embeddedOnBinaryTools.riscv64.ld}"
"AARCH64_AS=${embeddedOnBinaryTools.aarch64.as}"
"AARCH64_CC=${embeddedOnBinaryTools.aarch64.cc}"
"AARCH64_LD=${embeddedOnBinaryTools.aarch64.ld}"
"x86_64_AS=${embeddedOnBinaryTools.x86_64.as}"
"x86_64_CC=${embeddedOnBinaryTools.x86_64.cc}"
"x86_64_LD=${embeddedOnBinaryTools.x86_64.ld}"
];
enableParallelBuilding = true;
@ -80,6 +133,14 @@ stdenv.mkDerivation (finalAttrs: {
setupHook = ./setup-hook.sh;
passthru = {
tests = lib.optionalAttrs enableCrossCompilation {
crossCompilation = callPackage ./cross-compilation-tests.nix {
hare = finalAttrs.finalPackage;
};
};
};
meta = {
homepage = "https://harelang.org/";
description = "Systems programming language designed to be simple, stable, and robust";

21
pkgs/by-name/ve/vesktop/package.nix
View File

@ -20,13 +20,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vesktop";
version = "0.4.4";
version = "1.5.0";
src = fetchFromGitHub {
owner = "Vencord";
repo = "Vesktop";
rev = "v${finalAttrs.version}";
hash = "sha256-Ot2O5J1wUZAWgdpJNaEUSwtbcNqDdGhzuCtx8Qg+4gg=";
hash = "sha256-27998q9wbaNP1xYY+KHTBeJRfR6Q/K0LNdbRb3YHC6c=";
};
# NOTE: This requires pnpm 8.10.0 or newer
@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
dontBuild = true;
dontFixup = true;
outputHashMode = "recursive";
outputHash = "sha256-v6ibAcfYgr1VjGK7NUF4DKd5da03mZndPUAnSl++RqE=";
outputHash = "sha256-cnk+KFdvsgG1wGDib7zgIS6/RkrR5EYAHtHcrFSU0Es=";
};
nativeBuildInputs = [
@ -111,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
# this is consistent with other nixpkgs electron packages and upstream, as far as I am aware
# yes, upstream really packages it as "vesktop" but uses "vencorddesktop" file names
installPhase =
let
# this is mainly required for venmic
@ -132,10 +131,10 @@ stdenv.mkDerivation (finalAttrs: {
${libicns}/bin/icns2png -x icon.icns
for file in icon_*x32.png; do
file_suffix=''${file//icon_}
install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vencorddesktop.png
install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png
done
makeWrapper ${electron}/bin/electron $out/bin/vencorddesktop \
makeWrapper ${electron}/bin/electron $out/bin/vesktop \
--prefix LD_LIBRARY_PATH : ${libPath} \
--add-flags $out/opt/Vesktop/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
@ -145,11 +144,11 @@ stdenv.mkDerivation (finalAttrs: {
desktopItems = [
(makeDesktopItem {
name = "vencorddesktop";
name = "vesktop";
desktopName = "Vesktop";
exec = "vencorddesktop %U";
icon = "vencorddesktop";
startupWMClass = "VencordDesktop";
exec = "vesktop %U";
icon = "vesktop";
startupWMClass = "Vesktop";
genericName = "Internet Messenger";
keywords = [ "discord" "vencord" "electron" "chat" ];
categories = [ "Network" "InstantMessaging" "Chat" ];
@ -166,6 +165,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.gpl3Only;
maintainers = with maintainers; [ getchoo Scrumplex vgskye pluiedev ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
mainProgram = "vencorddesktop";
mainProgram = "vesktop";
};
})

3
pkgs/development/coq-modules/QuickChick/default.nix
View File

@ -6,7 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
owner = "QuickChick";
inherit version;
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
{ cases = [ (range "8.15" "8.18") pred.true ]; out = "2.0.1"; }
{ cases = [ (range "8.15" "8.18") pred.true ]; out = "2.0.2"; }
{ cases = [ (range "8.13" "8.17") pred.true ]; out = "1.6.5"; }
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
@ -18,6 +18,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
{ cases = [ "8.6" pred.true ]; out = "20171102"; }
{ cases = [ "8.5" pred.true ]; out = "20170512"; }
] null;
release."2.0.2".sha256 = "sha256-xxKkwDRjB8nUiXNhein1Ppn0DP5FZ13J90xUPAnQBbs=";
release."2.0.1".sha256 = "sha256-gJc+9Or6tbqE00920Il4pnEvokRoiADX6CxP/Q0QZaY=";
release."1.6.5".sha256 = "sha256-rcFyRDH8UbB9KVk10P5qjtPkWs04p78VNHkCq4mXr3U=";
release."1.6.4".sha256 = "sha256-C1060wPSU33yZAFLxGmZlAMXASnx98qz3oSLO8DO+mM=";

23
pkgs/development/libraries/hpx/default.nix
View File

@ -1,18 +1,29 @@
{ lib, stdenv, fetchFromGitHub, asio, boost, cmake, hwloc, gperftools, ninja
, pkg-config, python3 }:
{ lib
, stdenv
, fetchFromGitHub
, asio
, boost
, cmake
, hwloc
, gperftools
, ninja
, pkg-config
, python3
}:
stdenv.mkDerivation rec {
pname = "hpx";
version = "1.8.1";
version = "1.9.1";
src = fetchFromGitHub {
owner = "STEllAR-GROUP";
repo = "hpx";
rev = version;
sha256 = "sha256-YJ4wHaPE5E6ngUAYrQB1SkW4IoHW71tUDKKNANVA9Xw=";
rev = "v${version}";
hash = "sha256-1gLDwgCqv+3+rOSG7a3fFsnjqfKpnPpWnBmrW+z+jWw=";
};
buildInputs = [ asio boost hwloc gperftools ];
propagatedBuildInputs = [ hwloc ];
buildInputs = [ asio boost gperftools ];
nativeBuildInputs = [ cmake pkg-config python3 ];
strictDeps = true;

4
pkgs/development/python-modules/gdown/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "gdown";
version = "4.7.1";
version = "4.7.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-NH8jdpZ5qvfvpz5WVScPzajKVr5l64Skoh0UOYlUEEU=";
hash = "sha256-N+3DoO3aGn/l68xjHDqtBhJYJ2ZGBjDuUvSBuh7Hrv4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/gradio/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
@ -140,6 +141,9 @@ buildPythonPackage rec {
preCheck = ''
export HOME=$TMPDIR
cat ${./conftest-skip-network-errors.py} >> test/conftest.py
'' + lib.optionalString stdenv.isDarwin ''
# OSError: [Errno 24] Too many open files
ulimit -n 4096
'';
disabledTests = [

6
pkgs/development/python-modules/meilisearch/default.nix
View File

@ -9,8 +9,8 @@
buildPythonPackage rec {
pname = "meilisearch";
version = "0.28.4";
format = "pyproject";
version = "0.29.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "meilisearch";
repo = "meilisearch-python";
rev = "refs/tags/v${version}";
hash = "sha256-ASrm21dW1lCiUZJReJYlot2sp9sO1HuGaWVZXDOC9i4=";
hash = "sha256-jquaxJ+4/yaPsPqer+v2UY1N60U71ig4nowqm/KRIeA=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/moderngl_window/default.nix
View File

@ -2,6 +2,7 @@
, stdenv
, buildPythonPackage
, fetchFromGitHub
, pythonRelaxDepsHook
, setuptools
, glfw
, moderngl
@ -32,7 +33,12 @@ buildPythonPackage rec {
hash = "sha256-OfvIxezeZyuv5LLbe+4o1X2UCGnXT2DNvAF7t2Isw6Y=";
};
pythonRelaxDeps = [
"pillow"
];
nativeBuildInputs = [
pythonRelaxDepsHook
setuptools
];

7
pkgs/development/python-modules/mpd2/default.nix
View File

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, twisted
, unittestCheckHook
}:
@ -9,7 +10,7 @@
buildPythonPackage rec {
pname = "python-mpd2";
version = "3.1.1";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.6";
@ -18,6 +19,10 @@ buildPythonPackage rec {
hash = "sha256-S67DWEzEPtmUjVVZB5+vwmebBrKt4nPpCbNYJlSys/U=";
};
nativeBuildInputs = [
setuptools
];
passthru.optional-dependencies = {
twisted = [
twisted

94
pkgs/development/python-modules/open-interpreter/default.nix Normal file
View File

@ -0,0 +1,94 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, pythonOlder
, pythonRelaxDepsHook
, poetry-core
, appdirs
, astor
, inquirer
, litellm
, pyyaml
, rich
, six
, tiktoken
, tokentrim
, wget
, psutil
, html2image
, ipykernel
, jupyter-client
, matplotlib
, toml
, posthog
, openai
, setuptools
}:
buildPythonPackage rec {
pname = "open-interpreter";
version = "0.2.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "KillianLucas";
repo = pname;
rev = "v${version}";
hash = "sha256-XeJ6cADtyXtqoTXwYJu+i9d3NYbJCLpYOeZYmdImtwI=";
};
# Remove unused dependency
postPatch = ''
substituteInPlace pyproject.toml --replace 'git-python = "^1.0.3"' ""
'';
pythonRelaxDeps = [
"tiktoken"
];
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [
appdirs
astor
inquirer
litellm
pyyaml
rich
six
tiktoken
tokentrim
wget
psutil
html2image
ipykernel
jupyter-client
matplotlib
toml
posthog
openai
# Not explicitly in pyproject.toml but required due to use of `pkgs_resources`
setuptools
];
pythonImportsCheck = [ "interpreter" ];
# Most tests required network access
doCheck = false;
meta = with lib; {
description = "OpenAI's Code Interpreter in your terminal, running locally";
homepage = "https://github.com/KillianLucas/open-interpreter";
license = licenses.mit;
changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}";
maintainers = with maintainers; [ happysalada ];
mainProgram = "interpreter";
};
}

2
pkgs/development/python-modules/pyasyncore/default.nix
View File

@ -29,7 +29,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Make asyncore available for Python 3.12 onwards";
homepage = "https://github.com/simonrob/pyasyncore";
license = licenses.unfree; # FIXME: nix-init did not found a license
license = licenses.psfl;
maintainers = with maintainers; [ ];
};
}

12
pkgs/development/python-modules/tokentrim/default.nix
View File

@ -5,16 +5,16 @@
, tiktoken
}:
buildPythonPackage {
buildPythonPackage rec {
pname = "tokentrim";
version = "unstable-2023-09-07";
format = "pyproject";
version = "0.1.13";
pyproject = true;
src = fetchFromGitHub {
owner = "KillianLucas";
repo = "tokentrim";
rev = "e98ad3a2ca0e321a7347f76c30be584175495139";
hash = "sha256-95xitHnbFFaj0xPuLMWvIvuJzoCO3VSd592X1RI9h3A=";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-zr2SLT3MBuMD98g9fdS0mLuijcssRQ/S3+tCq2Cw1/4=";
};
nativeBuildInputs = [

1
pkgs/games/legendary-gl/default.nix
View File

@ -35,6 +35,7 @@ buildPythonApplication rec {
homepage = "https://github.com/derrod/legendary";
license = licenses.gpl3;
maintainers = with maintainers; [ equirosa ];
mainProgram = "legendary";
};
passthru.updateScript = gitUpdater { };

60
pkgs/tools/llm/open-interpreter/default.nix
View File

@ -1,60 +0,0 @@
{ lib
, python3
, fetchFromGitHub
, semgrep
}:
let
version = "0.1.11";
in
python3.pkgs.buildPythonApplication {
pname = "open-interpreter";
format = "pyproject";
inherit version;
src = fetchFromGitHub {
owner = "KillianLucas";
repo = "open-interpreter";
rev = "v${version}";
hash = "sha256-viUMGUBy5UNWag6P8tXE4TcJIx53Q/tASNV3bmCCK0g=";
};
nativeBuildInputs = [
python3.pkgs.poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
appdirs
astor
gitpython
huggingface-hub
inquirer
jinja2
litellm
openai
# pyreadline3 # this is a windows deps
python-dotenv
pyyaml
rich
six
tiktoken
tokenizers
tokentrim
wget
yaspin
] ++ [
semgrep
];
# the import check phase fails trying to do a network request to openai
# because of litellm
# pythonImportsCheck = [ "interpreter" ];
meta = with lib; {
description = "OpenAI's Code Interpreter in your terminal, running locally";
homepage = "https://github.com/KillianLucas/open-interpreter";
license = licenses.mit;
changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}";
maintainers = with maintainers; [ happysalada ];
mainProgram = "interpreter";
};
}

4
pkgs/tools/networking/sing-box/default.nix
View File

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "sing-box";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "SagerNet";
repo = pname;
rev = "v${version}";
hash = "sha256-gz0kfrpRz1OgruNBkpO6N80nmK4iAS+KlK9LYQZpRUQ=";
hash = "sha256-+N+3RfWOIM6bZAxmmfG3jMWICWKvOC1CV4hBv8oZjIM=";
};
vendorHash = "sha256-NgtZ0z/9X+GWaZqQJMecF/Bxq9u8JKCewgQGSru+EJc=";

2
pkgs/top-level/all-packages.nix
View File

@ -11589,7 +11589,7 @@ with pkgs;
open-ecard = callPackage ../tools/security/open-ecard { };
open-interpreter = callPackage ../tools/llm/open-interpreter { };
open-interpreter = with python3Packages; toPythonApplication open-interpreter;
openjade = callPackage ../tools/text/sgml/openjade { };

2
pkgs/top-level/python-packages.nix
View File

@ -8657,6 +8657,8 @@ self: super: with self; {
open-garage = callPackage ../development/python-modules/open-garage { };
open-interpreter = callPackage ../development/python-modules/open-interpreter { };
open-meteo = callPackage ../development/python-modules/open-meteo { };
openai-triton = callPackage ../development/python-modules/openai-triton {