Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -9597,6 +9597,12 @@
|
||||
githubId = 2502736;
|
||||
name = "James Hillyerd";
|
||||
};
|
||||
jhollowe = {
|
||||
email = "jhollowe@johnhollowell.com";
|
||||
github = "jhollowe";
|
||||
githubId = 2881268;
|
||||
name = "John Hollowell";
|
||||
};
|
||||
j-hui = {
|
||||
email = "j-hui@cs.columbia.edu";
|
||||
github = "j-hui";
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amarok";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-S+zyrp3cvoYRA+ZCFDaireIvU4yxw2ANTmZ/cb6ljys=";
|
||||
sha256 = "sha256-yXuZZ/qPFbjp9N+2YYTKxqfsncZloQW8UWjY5yD+Fus=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seq66";
|
||||
version = "0.99.12";
|
||||
version = "0.99.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahlstromcj";
|
||||
repo = "seq66";
|
||||
rev = version;
|
||||
hash = "sha256-+EU0UdmZaDnhN142yR/r0tK1FKBbuFPmde6iSS26Tjo=";
|
||||
hash = "sha256-hR8kEt3tKnH96JmmkMuY0WWxxp9YTcSvsJvICKNjvyQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ];
|
||||
|
||||
@@ -72,14 +72,14 @@ self: let
|
||||
|
||||
sourceRoot = "ada-mode-${self.ada-mode.version}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [
|
||||
buildPackages.gnat
|
||||
buildPackages.gprbuild
|
||||
buildPackages.dos2unix
|
||||
buildPackages.re2c
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = old.buildInputs ++ [
|
||||
pkgs.gnatPackages.gnatcoll-xref
|
||||
];
|
||||
|
||||
|
||||
@@ -15,6 +15,10 @@ lib.packagesFromDirectoryRecursive {
|
||||
inherit (pkgs) codeium;
|
||||
};
|
||||
|
||||
consult-gh = callPackage ./manual-packages/consult-gh {
|
||||
inherit (pkgs) gh;
|
||||
};
|
||||
|
||||
lsp-bridge = callPackage ./manual-packages/lsp-bridge {
|
||||
inherit (pkgs) basedpyright git go gopls python3;
|
||||
};
|
||||
|
||||
@@ -2,8 +2,12 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "lspce-module";
|
||||
version = "1.1.0-unstable-2024-07-14";
|
||||
@@ -22,13 +26,8 @@ rustPlatform.buildRustPackage {
|
||||
"--skip=msg::tests::serialize_request_with_null_params"
|
||||
];
|
||||
|
||||
# rename module without changing either suffix or location
|
||||
# use for loop because there seems to be two modules on darwin systems
|
||||
# https://github.com/zbelial/lspce/issues/7#issue-1783708570
|
||||
postInstall = ''
|
||||
for f in $out/lib/*; do
|
||||
mv --verbose $f $out/lib/lspce-module.''${f##*.}
|
||||
done
|
||||
mv --verbose $out/lib/liblspce_module${libExt} $out/lib/lspce-module${libExt}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
+13
-15
@@ -1,29 +1,27 @@
|
||||
{ stdenv, fetchurl, emacs, lib }:
|
||||
{
|
||||
melpaBuild,
|
||||
fetchzip,
|
||||
lib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
melpaBuild rec {
|
||||
pname = "session-management-for-emacs";
|
||||
ename = "session";
|
||||
version = "2.2a";
|
||||
|
||||
src = fetchurl {
|
||||
src = fetchzip {
|
||||
url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz";
|
||||
sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
|
||||
hash = "sha256-lc6NIX+lx97qCs5JqG7x0iVE6ki09Gy7DEQuPW2c+7s=";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/share/emacs/site-lisp"
|
||||
cp lisp/*.el "$out/share/emacs/site-lisp/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
/* installation: add to your ~/.emacs
|
||||
meta = {
|
||||
/*
|
||||
installation: add to your ~/.emacs
|
||||
(require 'session)
|
||||
(add-hook 'after-init-hook 'session-initialize)
|
||||
*/
|
||||
description = "Small session management for emacs";
|
||||
homepage = "https://emacs-session.sourceforge.net/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -199,7 +199,7 @@ let
|
||||
stripDebugList = [ "share" ];
|
||||
});
|
||||
|
||||
emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: {
|
||||
emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: lib.optionalAttrs (lib.versionOlder old.version "20240808.2016") {
|
||||
buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
|
||||
|
||||
postBuild = ''
|
||||
@@ -321,9 +321,8 @@ let
|
||||
'';
|
||||
dontUseCmakeBuildDir = true;
|
||||
doCheck = pkgs.stdenv.isLinux;
|
||||
packageRequires = [ self.emacs ];
|
||||
buildInputs = [ pkgs.llvmPackages.libclang self.emacs ];
|
||||
nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm ];
|
||||
buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang ];
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ];
|
||||
});
|
||||
|
||||
# tries to write a log file to $HOME
|
||||
@@ -545,7 +544,7 @@ let
|
||||
# Telega has a server portion for it's network protocol
|
||||
telega = super.telega.overrideAttrs (old: {
|
||||
buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
|
||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace telega-customize.el \
|
||||
@@ -601,7 +600,7 @@ let
|
||||
export EZMQ_LIBDIR=$(mktemp -d)
|
||||
make
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [
|
||||
pkgs.autoconf
|
||||
pkgs.automake
|
||||
pkgs.pkg-config
|
||||
@@ -687,7 +686,7 @@ let
|
||||
};
|
||||
|
||||
vterm = super.vterm.overrideAttrs (old: {
|
||||
nativeBuildInputs = [ pkgs.cmake ];
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ];
|
||||
buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ];
|
||||
cmakeFlags = [
|
||||
"-DEMACS_SOURCE=${self.emacs.src}"
|
||||
|
||||
@@ -35,7 +35,23 @@ let
|
||||
|
||||
super = imported;
|
||||
|
||||
overrides = { };
|
||||
overrides = {
|
||||
p4-16-mode = super.p4-16-mode.overrideAttrs {
|
||||
# workaround https://github.com/NixOS/nixpkgs/issues/301795
|
||||
prePatch = ''
|
||||
mkdir tmp-untar-dir
|
||||
pushd tmp-untar-dir
|
||||
|
||||
tar --extract --verbose --file=$src
|
||||
content_directory=$(echo p4-16-mode-*)
|
||||
cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el
|
||||
src=$PWD/$content_directory.tar
|
||||
tar --create --verbose --file=$src $content_directory
|
||||
|
||||
popd
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
super // overrides
|
||||
|
||||
@@ -30,6 +30,21 @@ self: let
|
||||
super = imported;
|
||||
|
||||
overrides = {
|
||||
p4-16-mode = super.p4-16-mode.overrideAttrs {
|
||||
# workaround https://github.com/NixOS/nixpkgs/issues/301795
|
||||
prePatch = ''
|
||||
mkdir tmp-untar-dir
|
||||
pushd tmp-untar-dir
|
||||
|
||||
tar --extract --verbose --file=$src
|
||||
content_directory=$(echo p4-16-mode-*)
|
||||
cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el
|
||||
src=$PWD/$content_directory.tar
|
||||
tar --create --verbose --file=$src $content_directory
|
||||
|
||||
popd
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
in super // overrides);
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
version = "2024-06-06";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-m1H/7JsSF7Akm5eBlPB/F4mAdFjUPtOQIUoXup09w40=";
|
||||
rev = "127.0.6533.119-1";
|
||||
hash = "sha256-m7x7tPrJfddPER9uiSp983xGn3YSH+Bq01l14vOlwrU=";
|
||||
rev = "127.0.6533.119-2";
|
||||
};
|
||||
};
|
||||
hash = "sha256-LuUDEpYCJLR/X+zjsF26aum4/Wfu2MNowofPu8iRVxI=";
|
||||
|
||||
@@ -24,7 +24,7 @@ let
|
||||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "6.8.3381.48";
|
||||
version = "6.8.3381.53";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "arm64";
|
||||
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-VLX2nWcpwWqI5QtBFyXRieaO+kLXMeeyWwFIVgz8XIo=";
|
||||
x86_64-linux = "sha256-ZlrL4eOQnQjIBzOiLLDHZFjf6nr9KiyapZmqJFkDqX8=";
|
||||
aarch64-linux = "sha256-wcfEaUcl/FUhhrp977/xg5+dE+93vy8wn5x6m8qX1EU=";
|
||||
x86_64-linux = "sha256-6WLGvd9Kp6fRG1HxMOjK4MhK4eoYjwEgYGJROI7lM2Y=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xlsxgrep";
|
||||
version = "0.0.23";
|
||||
version = "0.0.29";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm";
|
||||
sha256 = "sha256-vgHNu7MVDjULoBiTkk74W8ZLJ02eds60XshTX3iLJGI=";
|
||||
};
|
||||
|
||||
pythonPath = with python3Packages; [ xlrd ];
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "ardugotools";
|
||||
@@ -14,12 +14,23 @@ buildGoModule {
|
||||
src = fetchFromGitHub {
|
||||
owner = "randomouscrap98";
|
||||
repo = "ardugotools";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lYpUb+AiQrcrBGBvnOwzDC4aX1F8o21DUnad56qb7zo=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SqeUcYa8XscwaJaCSIoZ9lEtRJ0hN01XJDyCJFX2dTc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Z9ObsS+GwVsz6ZlXCgN0WlShHzbmx4WLa/1/XLSSAAs=";
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
# Skip tests referencing a non-existing file
|
||||
skippedTests = [
|
||||
"TestRunLuaFlashcartGenerator_CategoriesOnly"
|
||||
"TestRunLuaFlashcartGenerator_FullCart"
|
||||
"TestRunLuaFlashcartGenerator_MakeCart"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
meta = {
|
||||
description = "CLI toolset for Arduboy";
|
||||
changelog = "https://github.com/randomouscrap98/ardugotools/releases/tag/v${version}";
|
||||
|
||||
@@ -69,7 +69,6 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
addDriverRunpath
|
||||
wrapGAppsHook3
|
||||
cmake
|
||||
glslang
|
||||
nasm
|
||||
ninja
|
||||
pkg-config
|
||||
@@ -83,6 +82,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
curl
|
||||
fmt_9
|
||||
glm
|
||||
glslang
|
||||
gtk3
|
||||
hidapi
|
||||
imgui'
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.79.5";
|
||||
version = "0.79.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "grype";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JgCEiMETervYPI1XI25kAmleOMEs+w3atxKrwuGPxKc=";
|
||||
hash = "sha256-4DvtZDDr1m+2kd0uEEQwW2KrTXa7ShF4jRFjSNMjJiM=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
{
|
||||
appimageTools,
|
||||
lib,
|
||||
fetchurl,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
suffix =
|
||||
{
|
||||
aarch64-linux = "linux-armv7l";
|
||||
x86_64-linux = "linux-x86_64";
|
||||
i686-linux = "linux-i386";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "hamrs";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${version}/hamrs-${version}-${suffix}.AppImage";
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-nBW8q7LVWQz93LkTc+c36H+2ymLLwLKfxePUwEm3D2E=";
|
||||
x86_64-linux = "sha256-tplp7TADvbxkk5qBb4c4zm4mrzrVtW/WVUjiolBBJHc=";
|
||||
i686-linux = "sha256-PllxLMBsPCedKU7OUN0nqi4qtQ57l2Z+huLfkfaBfT4=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
extraInstallCommands =
|
||||
let
|
||||
contents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
''
|
||||
install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${contents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple, portable logger tailored for activities like Parks on the Air, Field Day, and more.";
|
||||
homepage = "https://hamrs.app/";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.jhollowe ];
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
mainProgram = "hamrs";
|
||||
sourceProvenance = [ sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
@@ -2,26 +2,32 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "microfetch";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NotAShelf";
|
||||
repo = "microfetch";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iBfnui7xrx31euYnQxoJf1xXFYFiJnDMadLRAiRCN04=";
|
||||
hash = "sha256-bRN16Iq9m6HaeT+KWCpeukTu1tnMOvtM6lDHO5OiIS4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-J+S6XIMUcWj4jXABQinEDx6dRG5Byc2UxJoKj2y1tQU=";
|
||||
cargoHash = "sha256-dGlAiPrOWFI8ogo/1S2ZK/ZPBtKGCyA72B+6B4bp5Mg=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Microscopic fetch script in Rust, for NixOS systems";
|
||||
homepage = "https://github.com/NotAShelf/microfetch";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ nydragon ];
|
||||
maintainers = with lib.maintainers; [
|
||||
nydragon
|
||||
NotAShelf
|
||||
];
|
||||
mainProgram = "microfetch";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simdutf";
|
||||
version = "5.3.4";
|
||||
version = "5.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdutf";
|
||||
repo = "simdutf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-zttqfzTF9P1czM2+HECcDC2j2XPfsJn0r+qpnNDfLWw=";
|
||||
hash = "sha256-n99lt0OYK6OyLArdgPRabQ80ohQgHklpt9saDzKhvJw=";
|
||||
};
|
||||
|
||||
# Fix build on darwin
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "1.0-unstable-2024-08-05";
|
||||
version = "1.0-unstable-2024-08-12";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "a9d7ff23a533ee354fcbc5a1260296a6b0ecfefa";
|
||||
hash = "sha256-VPIgS127ewX5yTZEZZgUZYAXqbCfSa+AMtFMufdQMWo=";
|
||||
rev = "3a901ed0beeaf5e3268a40779f2944ef99f93774";
|
||||
hash = "sha256-JlDNiKcaZG2OYeiVlIovEIDN/h7ET5d0M83vlHMQQK4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "projects" ];
|
||||
|
||||
@@ -18,12 +18,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.80.1";
|
||||
version = "1.81.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
hash = "sha256-Vqucix0hil9isi4/+DLC4tq8XLVeiFUEMBeJfkZMEpI=";
|
||||
hash = "sha256-MDmCsDXc4ohqz+btqbWhhq0PoTNqE6MfVpzrjIoS4rU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "db-dtypes";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,12 +22,12 @@ buildPythonPackage rec {
|
||||
owner = "googleapis";
|
||||
repo = "python-db-dtypes-pandas";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FVRqh30mYVfC8zuhPteuvqGYGTp3PW+pi1bquUjYFAg=";
|
||||
hash = "sha256-DjLgzJ/OivrhHJQGBkIiRNJyi5xWLFp9nBEetD8H0YY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
numpy
|
||||
packaging
|
||||
pandas
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gtts";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pndurette";
|
||||
repo = "gTTS";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4GIrj5pIk27euo2gzSKpRQaXNyI6aH0E6HNAivJthCE=";
|
||||
hash = "sha256-8FPKAMVXqw/4X050tAnOAx/wGboZPPJs72VwwaOEamE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -4,36 +4,43 @@
|
||||
fetchFromGitHub,
|
||||
gfortran,
|
||||
makeWrapper,
|
||||
setuptools,
|
||||
numpy,
|
||||
pytest,
|
||||
distutils,
|
||||
pytestCheckHook,
|
||||
mock,
|
||||
pytest-mock,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "i-pi";
|
||||
version = "2.6.1";
|
||||
format = "setuptools";
|
||||
version = "3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "i-pi";
|
||||
repo = "i-pi";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-c1bs8ZI/dfDwKx5Df8ndtsDxESQrdbMkvrjfI6b9JTg=";
|
||||
hash = "sha256-SJ0qTwwdIOR1nXs9MV6O1oxJPR6/6H86wscDy/sLc/g=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gfortran
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
dependencies = [ numpy ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
mock
|
||||
pytest-mock
|
||||
];
|
||||
] ++ lib.optional (pythonAtLeast "3.12") distutils;
|
||||
|
||||
pytestFlagsArray = [ "ipi_tests/unit_tests" ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/i-pi \
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langsmith";
|
||||
version = "0.1.85";
|
||||
version = "0.1.99";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "langchain-ai";
|
||||
repo = "langsmith-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IPbamCfaurikFAqKnvMp8+x5ULCeQ61d5oZFO9+s4SQ=";
|
||||
hash = "sha256-aN5HiQAXX7ZlVBzkit4DAw+7KQHI3ck1DLvBPDSKVhM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
@@ -78,6 +78,7 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# due to circular import
|
||||
"tests/integration_tests/test_client.py"
|
||||
"tests/integration_tests/test_prompts.py"
|
||||
"tests/unit_tests/test_client.py"
|
||||
# Tests require a Langsmith API key
|
||||
"tests/evaluation/test_evaluation.py"
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-material";
|
||||
version = "9.5.30";
|
||||
version = "9.5.31";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
owner = "squidfunk";
|
||||
repo = "mkdocs-material";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VgOPmOwPAwTqCCDxtiQ3dReTdjfXYL7/1CdSqTgw+uo=";
|
||||
hash = "sha256-fzTyQ4YFBa5mm8bUKWR50d0qoGJoNIVbFobnVpK1FZg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pulumi-aws";
|
||||
# Version is independant of pulumi's.
|
||||
version = "6.48.0";
|
||||
version = "6.49.0";
|
||||
|
||||
pyproject = true;
|
||||
build-system = [ setuptools ];
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "pulumi";
|
||||
repo = "pulumi-aws";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Q4peAFlwH1th/WZawg0QF5SdKHJkytJoy9aMw0b9Ak4=";
|
||||
hash = "sha256-xsQVPJgO4c42GXgVGkCnZT1Jhve1InEXrt1Fpwc4UX4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/sdk/python";
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyttsx3";
|
||||
version = "2.90";
|
||||
version = "2.91";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
sha256 = "a585b6d8cffc19bd92db1e0ccbd8aa9c6528dd2baa5a47045d6fed542a44aa19";
|
||||
sha256 = "sha256-jxkhfE1lpGhw4LgvLn6xVw7CssqAUX++7gleVPdvc+I=";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
};
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
let
|
||||
data = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "path-of-building-data";
|
||||
version = "2.48.1";
|
||||
version = "2.48.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PathOfBuildingCommunity";
|
||||
repo = "PathOfBuilding";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-b6tHBlMFJqm0FaXj+5gY+ltd3J3N3IM9QZGd0i1iXLk=";
|
||||
hash = "sha256-KMj+aS+xd96pt1NhqL3CBKj83ZfiX2npmJtwUFa00qU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -303,7 +303,7 @@ in {
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
|
||||
ROCKCHIP_TPL = rkbin.TPL_RK3588;
|
||||
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ];
|
||||
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
|
||||
};
|
||||
|
||||
ubootNovena = buildUBoot {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, installShellFiles
|
||||
, nixosTests
|
||||
@@ -22,27 +21,17 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
pname = "usbguard";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "USBGuard";
|
||||
repo = pname;
|
||||
rev = "usbguard-${version}";
|
||||
hash = "sha256-uwNoKczmVOMpkU4KcKTOtbcTHiYVGXjk/rVbqMl5pGk=";
|
||||
hash = "sha256-8y8zaKJfoIXc9AvG1wi3EzZA7BR2wVFLuOyD+zpBY0s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for gcc-13:
|
||||
# https://github.com/USBGuard/usbguard/pull/586
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/USBGuard/usbguard/commit/22b1e0897af977cc96af926c730ff948bd120bb5.patch";
|
||||
hash = "sha256-yw0ZHcn6naHcsfsqdBB/aTgCwvEHecew/6HDmjyY2ZA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
installShellFiles
|
||||
@@ -94,6 +83,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://usbguard.github.io/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.tnias ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
, fetchgit
|
||||
, libbsd
|
||||
, readline
|
||||
,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rosie";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/rosie-pattern-language/rosie";
|
||||
rev = "9303e04ae2cffabdda6ccc4e2a351a47218615ff";
|
||||
sha256 = "1smh760baf43hr56p6rh4khz3shyzda5lqva4ffxwchl7yy7r82j";
|
||||
rev = "79605830e32dff33544f9ebe7d7be752c29424b5";
|
||||
sha256 = "sha256-n7Tem/4ZjizfCPT21teYK2wZ/gVpgjHUim9s7soEwbM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user