Merge master into staging-next
This commit is contained in:
commit
4781c03d7f
|
@ -5700,6 +5700,11 @@
|
|||
githubId = 54799;
|
||||
name = "Edward Tjörnhammar";
|
||||
};
|
||||
eeedean = {
|
||||
github = "eeedean";
|
||||
githubId = 8173116;
|
||||
name = "Dean Eckert";
|
||||
};
|
||||
eelco = {
|
||||
email = "edolstra+nixpkgs@gmail.com";
|
||||
github = "edolstra";
|
||||
|
@ -13399,6 +13404,12 @@
|
|||
matrix = "@mjm:beeper.com";
|
||||
name = "Matt Moriarity";
|
||||
};
|
||||
mjoerg = {
|
||||
name = "Martin Joerg";
|
||||
email = "martin.joerg@gmail.com";
|
||||
github = "mjoerg";
|
||||
githubId = 147256;
|
||||
};
|
||||
mjp = {
|
||||
email = "mike@mythik.co.uk";
|
||||
github = "MikePlayle";
|
||||
|
@ -14106,6 +14117,7 @@
|
|||
};
|
||||
nazarewk = {
|
||||
name = "Krzysztof Nazarewski";
|
||||
email = "nixpkgs@kdn.im";
|
||||
matrix = "@nazarewk:matrix.org";
|
||||
github = "nazarewk";
|
||||
githubId = 3494992;
|
||||
|
@ -15394,6 +15406,12 @@
|
|||
githubId = 72527881;
|
||||
name = "PassiveLemon";
|
||||
};
|
||||
patka = {
|
||||
email = "patka@patka.dev";
|
||||
github = "patka-123";
|
||||
githubId = 69802930;
|
||||
name = "patka";
|
||||
};
|
||||
patricksjackson = {
|
||||
email = "patrick@jackson.dev";
|
||||
github = "patricksjackson";
|
||||
|
|
|
@ -375,7 +375,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
- If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud29` will be installed by default.
|
||||
- If [`system.stateVersion`](#opt-system.stateVersion) is >=23.11, `pkgs.nextcloud27` will be installed by default.
|
||||
- Please note that an upgrade from v27 (or older) to v29 directly is not possible. Please upgrade to `nextcloud28` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud28;`](options.html#opt-services.nextcloud.package).
|
||||
- Known warnings after the upgrade are documented in [](#module-services-nextcloud-known-warnings).
|
||||
- Known warnings after the upgrade are documented in [](#module-services-nextcloud-known-warnings) from now on.
|
||||
- The "Photos" app only displays Media from inside the `Photos` directory. This can be changed manually in the "Photos" tab below "Photos settings".
|
||||
|
||||
- The vendored third party libraries have been mostly removed from `cudaPackages.nsight_systems`, which we now only ship for `cudaPackages_11_8` and later due to outdated dependencies. Users comfortable with the vendored dependencies may use `overrideAttrs` to amend the `postPatch` phase and the `meta.broken` correspondingly. Alternatively, one could package the deprecated `boost170` locally, as required for `cudaPackages_11_4.nsight_systems`.
|
||||
|
||||
|
|
|
@ -205,11 +205,6 @@ it complains loudly now. So nothing actionable here by default. Alternatively yo
|
|||
* set [](#opt-services.nextcloud.settings.log_type) to "file" to be able to view logs
|
||||
from the admin panel.
|
||||
|
||||
### Your web server is not properly set up to resolve `.well-known` URLs, failed on: `/.well-known/caldav` {#module-services-nextcloud-warning-wellknown-caldav}
|
||||
|
||||
This warning appearing seems to be an upstream issue and is being sorted out
|
||||
in [nextcloud/server#45033](https://github.com/nextcloud/server/issues/45033).
|
||||
|
||||
## Maintainer information {#module-services-nextcloud-maintainer-info}
|
||||
|
||||
As stated in the previous paragraph, we must provide a clean upgrade-path for Nextcloud
|
||||
|
|
|
@ -1105,10 +1105,10 @@ in {
|
|||
extraConfig = ''
|
||||
absolute_redirect off;
|
||||
location = /.well-known/carddav {
|
||||
return 301 /remote.php/dav;
|
||||
return 301 /remote.php/dav/;
|
||||
}
|
||||
location = /.well-known/caldav {
|
||||
return 301 /remote.php/dav;
|
||||
return 301 /remote.php/dav/;
|
||||
}
|
||||
location ~ ^/\.well-known/(?!acme-challenge|pki-validation) {
|
||||
return 301 /index.php$request_uri;
|
||||
|
|
|
@ -155,7 +155,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||
print(node.succeed("patronictl list cluster1"))
|
||||
node.wait_until_succeeds(f"[ $(patronictl list -f json cluster1 | jq 'length') == {expected_replicas + 1} ]")
|
||||
node.wait_until_succeeds("[ $(patronictl list -f json cluster1 | jq 'map(select(.Role | test(\"^Leader$\"))) | map(select(.State | test(\"^running$\"))) | length') == 1 ]")
|
||||
node.wait_until_succeeds(f"[ $(patronictl list -f json cluster1 | jq 'map(select(.Role | test(\"^Replica$\"))) | map(select(.State | test(\"^running$\"))) | length') == {expected_replicas} ]")
|
||||
node.wait_until_succeeds(f"[ $(patronictl list -f json cluster1 | jq 'map(select(.Role | test(\"^Replica$\"))) | map(select(.State | test(\"^streaming$\"))) | length') == {expected_replicas} ]")
|
||||
print(node.succeed("patronictl list cluster1"))
|
||||
client.wait_until_succeeds("psql -h 127.0.0.1 -U postgres --command='select 1;'")
|
||||
|
||||
|
|
|
@ -52,6 +52,7 @@
|
|||
, upower
|
||||
, vamp-plugin-sdk
|
||||
, wavpack
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
@ -65,7 +66,9 @@ mkDerivation rec {
|
|||
hash = "sha256-JSWUzerm7D6AKq6g/9eRrt3EE2movRdM+VLUg07sLHo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [
|
||||
chromaprint
|
||||
|
@ -118,9 +121,9 @@ mkDerivation rec {
|
|||
wavpack
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
|
||||
];
|
||||
preFixup=''
|
||||
qtWrapperArgs+=(--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive ''${gappsWrapperArgs[@]})
|
||||
'';
|
||||
|
||||
# mixxx installs udev rules to DATADIR instead of SYSCONFDIR
|
||||
# let's disable this and install udev rules manually via postInstall
|
||||
|
|
|
@ -36,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tidal-hifi";
|
||||
version = "5.10.0";
|
||||
version = "5.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
|
||||
sha256 = "sha256-+sRXpRAtbLpQlyJUhbc1Cuzh6aV8HRvYH/ja9sfvKoA=";
|
||||
sha256 = "sha256-vuvL6yYF43++De5RLsMgoSpmIjfLzvq5QpRfdJTESuw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, wrapQtAppsHook
|
||||
, python3
|
||||
, zbar
|
||||
|
@ -109,7 +110,30 @@ python.pkgs.buildPythonApplication {
|
|||
pyqt6
|
||||
];
|
||||
|
||||
patches = [
|
||||
# aiorpcx 0.23.1 compatibility
|
||||
# Note: this patches `/run_electrum`.
|
||||
# In the source repo, `/electrum/electrum`
|
||||
# is a symlink to `../run_electrum`,
|
||||
# so that path would also be affected by the patch.
|
||||
# However, in the distribution tarball used here,
|
||||
# `/electrum/electrum` is simply an exact copy of
|
||||
# `/run_electrum` and is thereby *not* affected.
|
||||
# So we have to manually copy the patched `/run_electrum`
|
||||
# over `/electrum/electrum` after the patching (see below).
|
||||
# XXX remove the copy command in `postPatch`
|
||||
# as soon as the patch itself is removed!
|
||||
(fetchpatch {
|
||||
url = "https://github.com/spesmilo/electrum/commit/5f95d919dfa9868eaf82889903b94faa8c6443e0.patch";
|
||||
hash = "sha256-cEkduLsL6A8qPhXS2KPQWzVtkQPYQhHSbuwQ2SnanHw=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# copy the patched `/run_electrum` over `/electrum/electrum`
|
||||
# so the aiorpcx compatibility patch is used
|
||||
cp run_electrum electrum/electrum
|
||||
|
||||
# make compatible with protobuf4 by easing dependencies ...
|
||||
substituteInPlace ./contrib/requirements/requirements.txt \
|
||||
--replace "protobuf>=3.20,<4" "protobuf>=3.20"
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mainsail";
|
||||
version = "2.11.0";
|
||||
version = "2.11.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
|
||||
hash = "sha256-RQBSNfJQx3D07frYhKdNlRFMJYXiOC9NAT3bbqCr2Ls=";
|
||||
hash = "sha256-RdBgGE/EUzb1/6PjQ34UjXjxt686s9May7npFtRocXE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3
|
||||
, curl, fuse3
|
||||
, desktopToDarwinBundle
|
||||
, glib, gtk3, gettext, libxkbfile, libX11, python3
|
||||
, freerdp, libssh, libgcrypt, gnutls, vte
|
||||
, freerdp3, libssh, libgcrypt, gnutls, vte
|
||||
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
|
||||
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
|
||||
, libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core
|
||||
|
@ -16,22 +17,23 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "remmina";
|
||||
version = "1.4.33";
|
||||
version = "1.4.35";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v.${finalAttrs.version}";
|
||||
sha256 = "sha256-3HyG2PBnTq/fVsvWA81fQ2gCOoAxINWeUDwzKcOuECk=";
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ]
|
||||
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
|
||||
|
||||
buildInputs = [
|
||||
curl fuse3
|
||||
gsettings-desktop-schemas
|
||||
glib gtk3 gettext libxkbfile libX11
|
||||
freerdp libssh libgcrypt gnutls
|
||||
freerdp3 libssh libgcrypt gnutls
|
||||
pcre2
|
||||
libvncserver libpthreadstubs libXdmcp libxkbcommon
|
||||
libsoup_3 spice-protocol
|
||||
|
@ -46,15 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optionals withVte [ vte ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_FREERDP3=ON"
|
||||
"-DWITH_VTE=${if withVte then "ON" else "OFF"}"
|
||||
"-DWITH_TELEPATHY=OFF"
|
||||
"-DWITH_AVAHI=OFF"
|
||||
"-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}"
|
||||
"-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}"
|
||||
"-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
"-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
"-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
"-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DHAVE_LIBAPPINDICATOR=OFF"
|
||||
"-DWITH_CUPS=OFF"
|
||||
|
@ -82,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meta = with lib; {
|
||||
license = licenses.gpl2Plus;
|
||||
homepage = "https://gitlab.com/Remmina/Remmina";
|
||||
changelog = "https://gitlab.com/Remmina/Remmina/-/blob/master/CHANGELOG.md#${lib.replaceStrings ["."] [""] finalAttrs.src.rev}";
|
||||
description = "Remote desktop client written in GTK";
|
||||
mainProgram = "remmina";
|
||||
maintainers = with maintainers; [ bbigras melsigl ryantm ];
|
||||
|
|
|
@ -50,7 +50,7 @@ buildGoModule rec {
|
|||
description = "An unofficial GUI wrapper around the Tailscale CLI client";
|
||||
homepage = "https://github.com/DeedleFake/trayscale";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ patka ];
|
||||
mainProgram = "trayscale";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "0-unstable-2024-04-27";
|
||||
version = "0-unstable-2024-05-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "fee4de37933f60895f78f45eb192d27bcdf0640e";
|
||||
hash = "sha256-ej8Pjz7gvVP8gVsC68h60/uy+CkrcrBflhW/PjsxCvM=";
|
||||
rev = "f29512886514410fa68d2debdb9389a8f81f3aaa";
|
||||
hash = "sha256-Uq8G2lSVTj1JmiLnn5FZd/WKS+wjZxoaliOyghVZg34=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "chirp";
|
||||
version = "0.4.0-unstable-2024-02-08";
|
||||
version = "0.4.0-unstable-2024-05-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kk7ds";
|
||||
repo = "chirp";
|
||||
rev = "902043a937ee3611744f2a4e35cd902c7b0a8d0b";
|
||||
hash = "sha256-oDUtR1xD73rfBRKkbE1f68siO/4oxoLxw16w1qa9fEo=";
|
||||
rev = "e95140ff433b805ca16df04cba501b7332a9ec95";
|
||||
hash = "sha256-UU3Ve6Yb7UK2nOLTfJasrlMX4iu1cpLBLScvhRhTUJ0=";
|
||||
};
|
||||
buildInputs = [
|
||||
glib
|
||||
|
|
|
@ -3,39 +3,20 @@
|
|||
, cmake
|
||||
, eigen
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, libcifpp
|
||||
, libmcfp
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
libcifpp' = libcifpp.overrideAttrs (oldAttrs: {
|
||||
# dssp 4.4.3 requires specific version "5.2.0" of libcifpp
|
||||
version = "5.2.0";
|
||||
src = fetchFromGitHub {
|
||||
inherit (oldAttrs.src) owner repo rev;
|
||||
hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/PDB-REDO/libcifpp/issues/51
|
||||
name = "fix-build-on-darwin.patch";
|
||||
url = "https://github.com/PDB-REDO/libcifpp/commit/641f06a7e7c0dc54af242b373820f2398f59e7ac.patch";
|
||||
hash = "sha256-eWNfp9nA/+2J6xjZR6Tj+5OM3L5MxdfRi0nBzyaqvS0=";
|
||||
})
|
||||
];
|
||||
});
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dssp";
|
||||
version = "4.4.5";
|
||||
version = "4.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDB-REDO";
|
||||
repo = "dssp";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-X0aMWqoMhmQVRHWKVm2S6JAOYiBuBBMzMoivMdpNx0M=";
|
||||
hash = "sha256-qePoZYkzzWuK6j1NM+q6fPuWVRDEe4OkPmXc9Nbqobo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -44,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
buildInputs = [
|
||||
eigen
|
||||
libcifpp'
|
||||
libcifpp
|
||||
libmcfp
|
||||
zlib
|
||||
];
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
pname = "messer-slim";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MesserLab";
|
||||
repo = "SLiM";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ba5I/bsDNAhDb1Kq0lWTC6YgpZ1PpeHPmB/vXx/JRK0=";
|
||||
sha256 = "sha256-TlB7Hj4pVN4p4VanACWjQBeTxP9/DvRvdCdgelrXx60=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gcc gcc-unwrapped ];
|
||||
|
|
|
@ -18,15 +18,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stgit";
|
||||
version = "2.4.6";
|
||||
version = "2.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stacked-git";
|
||||
repo = "stgit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZQU9AkemAMpMb2GhdfHaF6r6r6MbMXnmA0pq6Zq9Sek=";
|
||||
hash = "sha256-TfCmVN7oHOgMyreJo58r6qaQYAXqmekpZt2WyTMGLvQ=";
|
||||
};
|
||||
cargoHash = "sha256-DHTo0jRZlLmw/B042uqzpMLUhBwm+sbFj9pze5l1Kpk=";
|
||||
cargoHash = "sha256-kH7YrjoNkpoUdzcWtVqpWtmw+FIMrJYbo0ye30/VeVk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "open-in-mpv";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Baldomo";
|
||||
repo = "open-in-mpv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+sP8/wILBkT3NnhENDYZbOwqOufkFyMJFpQxquuUBEs=";
|
||||
hash = "sha256-Fa6oZMaR0ctZgYWoOXLaobc+pDRDZbDCFvRZUR+Fda4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c=";
|
||||
|
|
|
@ -5,20 +5,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "123.0";
|
||||
version = "124.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
# This is actually one commit before release 123, because the final
|
||||
# commit breaks the build and gets reverted in future releases.
|
||||
rev = "7c75ad6185893b4cc26676b6a0eb9fbdf9ed5b72";
|
||||
hash = "sha256-1Jj8TAgYxIGLJeTtiZBcXw0n/mTbh/uC8EFM0IYD5VY=";
|
||||
rev = "bc2900b9ccbdf37b780a63888ca94437fd7dd6af";
|
||||
hash = "sha256-t/47u5BlSC5vbRc7OQSbGBF+wnhcDFOMjrRQc/p2HcQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-f3w+msG7m6valf/I1puMrpiVgk0J1bdyp+rw3KQ/7ys=";
|
||||
cargoHash = "sha256-7zx0k7HXequpwcURHx+Ml3cDhdvLkXTg+V71F6TO/d0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "distrobox";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "89luca89";
|
||||
repo = "distrobox";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-mSka8QyoLjnaVEP23TtyzbPTBHDlnrSomVZdfw4PPng=";
|
||||
hash = "sha256-H2jeKs0h4ZAcP33HB5jptlubq62cwnjPK2wSlEIfFWA=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
|
||||
# https://github.com/89luca89/distrobox/issues/408
|
||||
substituteInPlace ./distrobox-generate-entry \
|
||||
--replace 'icon_default="''${HOME}/.local' "icon_default=\"$out"
|
||||
--replace-fail 'icon_default="''${HOME}/.local' "icon_default=\"$out"
|
||||
./install -P $out
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -9,16 +9,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atac";
|
||||
version = "0.14.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julien-cpsn";
|
||||
repo = "ATAC";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-d5qUleQrwWWTIEDj3VvJKpINHpc0rko18if4pv5GonU=";
|
||||
hash = "sha256-WDO6HDmjlXU4uelAJIWJN2sOJTioR7i2WzQpqg6dtKo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vlrllbcf5Y9DFwdekAHE5xtGlloKxTExXkp1LySEUK0=";
|
||||
cargoHash = "sha256-+dBEl1qk1/3WuSypsxV4x7DEmnMxa2z0MC03IZaON3s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-shear";
|
||||
version = "0.0.24";
|
||||
version = "0.0.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Boshen";
|
||||
repo = "cargo-shear";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7eBFDmeFOXqZhNE4RDlIq991xEoCGL6XLMmUQuLJvrE=";
|
||||
sha256 = "sha256-4NnCUe4DrnSeveicxvvDF49hrc4NdRx/N10PH7Q0k8k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-DQjLW6NtUPERT82zIlrGRk3FffU/EfLBMgAeFfFdDxE=";
|
||||
cargoHash = "sha256-gHXJz3Xw9vC04q001kd6AgEKKaRtAK3oGMn7JJh+Neo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Detect and remove unused dependencies from Cargo.toml";
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, pkg-config
|
||||
, stdenv
|
||||
, openssl
|
||||
, Security
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]);
|
||||
|
||||
# Checks need to be disabled here because the current test suite makes assumptions
|
||||
# about the surrounding environment that aren't Nix friendly. See these lines for specifics:
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
clash-verge.overrideAttrs (old: rec {
|
||||
pname = "clash-verge-rev";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb";
|
||||
hash = "sha256-wSpWTQ+AuDG3zKocDVatRqVW5yhrOtcbNI+jfMOaXvg=";
|
||||
hash = "sha256-V6W7IJFa8UrbPWPS2tReecZ41oYvAqV4q0NBkkhUHbQ=";
|
||||
};
|
||||
|
||||
meta = old.meta // (with lib; {
|
||||
|
|
|
@ -29,16 +29,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ironbar";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakeStanger";
|
||||
repo = "ironbar";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SowZ3qo06x32+A02Wmq4N/rU/yxyKqkn407qHzJLU0M=";
|
||||
hash = "sha256-TPbvKQdoGfZMzp+fl72vy6MtRV1yGcOG/es67VOA0xw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DaF669mOnICTnUzH4mc640xIecin/UEZSk7PWDjQbr0=";
|
||||
cargoHash = "sha256-+9R505xyEycv5Dav4ZCh1BiYRp3U1I9yBDqSPefo9uY=";
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmediainfo";
|
||||
version = "24.03";
|
||||
version = "24.04";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
|
||||
hash = "sha256-zCu0TkB8iQq1ZpNMVnY5GFBatYwUE0tT8NHanuokLI0=";
|
||||
hash = "sha256-dqb/BgiHdz8ll3tYiuUISEuxLRHLeivjMi2qnG5T8bI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
28
pkgs/by-name/lm/lmstudio/darwin.nix
Normal file
28
pkgs/by-name/lm/lmstudio/darwin.nix
Normal file
|
@ -0,0 +1,28 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, undmg
|
||||
, lib
|
||||
, meta
|
||||
, pname
|
||||
, version
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
inherit meta pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.lmstudio.ai/mac/arm64/${version}/b/latest/LM-Studio-${version}-arm64.dmg";
|
||||
hash = "sha256-kb1XoTZjhCL1+CsV+r3/EN0srzIJ43H2VMZ779dVq1k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/Applications
|
||||
cp -r *.app $out/Applications
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
|
29
pkgs/by-name/lm/lmstudio/linux.nix
Normal file
29
pkgs/by-name/lm/lmstudio/linux.nix
Normal file
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, appimageTools
|
||||
, fetchurl
|
||||
, version
|
||||
, pname
|
||||
, meta
|
||||
}:
|
||||
let
|
||||
src = fetchurl {
|
||||
url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage";
|
||||
hash = "sha256-hcV8wDhulFAxHDBDKicpEGovwcsn9RaIi/idUz+YzD8=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit meta pname version src;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/lm-studio.desktop \
|
||||
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio'
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,38 +1,22 @@
|
|||
{ lib
|
||||
, appimageTools
|
||||
, fetchurl
|
||||
, stdenv
|
||||
, callPackage
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "lmstudio";
|
||||
version = "0.2.20";
|
||||
src = fetchurl {
|
||||
url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage";
|
||||
hash = "sha256-T92ZDqGvxJfBkAWsK8EgHdQZnLefK3gDP2vCTL8X+eM=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/lm-studio.desktop \
|
||||
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio'
|
||||
'';
|
||||
|
||||
version = "0.2.22";
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
homepage = "https://lmstudio.ai/";
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "lmstudio";
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ drupol eeedean ];
|
||||
platforms = lib.platforms.linux ++ [ "aarch64-darwin" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
in
|
||||
if stdenv.isDarwin
|
||||
then callPackage ./darwin.nix { inherit pname version meta; }
|
||||
else callPackage ./linux.nix { inherit pname version meta; }
|
||||
|
||||
|
|
|
@ -28,25 +28,33 @@ in
|
|||
type = types.either types.package types.str;
|
||||
default = "models";
|
||||
};
|
||||
|
||||
parallelRequests = mkOption {
|
||||
type = types.int;
|
||||
default = 1;
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
type = types.enum [ "error" "warn" "info" "debug" "trace" ];
|
||||
default = "warn";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.local-ai = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment.LLAMACPP_PARALLEL = toString cfg.parallelRequests;
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = lib.escapeShellArgs ([
|
||||
"${cfg.package}/bin/local-ai"
|
||||
"--debug"
|
||||
"--address"
|
||||
":${toString cfg.port}"
|
||||
"--threads"
|
||||
(toString cfg.threads)
|
||||
"--localai-config-dir"
|
||||
"."
|
||||
"--models-path"
|
||||
(toString cfg.models)
|
||||
"--address=:${toString cfg.port}"
|
||||
"--threads=${toString cfg.threads}"
|
||||
"--localai-config-dir=."
|
||||
"--models-path=${cfg.models}"
|
||||
"--log-level=${cfg.logLevel}"
|
||||
]
|
||||
++ lib.optional (cfg.parallelRequests > 1) "--parallel-requests"
|
||||
++ cfg.extraArgs);
|
||||
RuntimeDirectory = "local-ai";
|
||||
WorkingDirectory = "%t/local-ai";
|
||||
|
|
|
@ -100,8 +100,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "784e11dea1f5ce9638851b2b0dddb107e2a609c8";
|
||||
hash = "sha256-yAQAUo5J+a6O2kTqhFL1UH0tANxpQn3JhAd3MByaC6I=";
|
||||
rev = "6ecf3189e00a1e8e737a78b6d10e1d7006e050a2";
|
||||
hash = "sha256-JS287UdCzj6Es134cbhr8y/AoejMEux0w++/pZ5NejY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postPatch = prev.postPatch + ''
|
||||
|
@ -254,8 +254,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "whisper.cpp";
|
||||
rev = "858452d58dba3acdc3431c9bced2bb8cfd9bf418";
|
||||
hash = "sha256-2fT3RgGpBex1mF6GJsVDo4rb0F31YqxTymsXcrpQAZk=";
|
||||
rev = "8fac6455ffeb0a0950a84e790ddb74f7290d33c4";
|
||||
hash = "sha256-Dez/Q2vMvSmscS+BJwkgZ4QG+ebM/N8s1Okd5my0CWI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ]
|
||||
|
@ -305,8 +305,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "mudler";
|
||||
repo = "go-stable-diffusion";
|
||||
rev = "362df9da29f882dbf09ade61972d16a1f53c3485";
|
||||
hash = "sha256-A5KvMZOviPsIpPHxM8cacT+qE2x1iFJAbPsRs4sLijY=";
|
||||
rev = "4a3cd6aeae6f66ee57eae9a0075f8c58c3a6a38f";
|
||||
hash = "sha256-KXUvMP6cDyWib4rG0RmVRm3pgrdsfKXaH3k0v5/mTe8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
buildFlags = [ "libstablediffusion.a" ];
|
||||
|
@ -342,8 +342,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "M0Rf30";
|
||||
repo = "go-tiny-dream";
|
||||
rev = "22a12a4bc0ac5455856f28f3b771331a551a4293";
|
||||
hash = "sha256-DAVHD6E0OKHf4C2ldoI0Mm7813DIrmWFONUhSCQPCfc=";
|
||||
rev = "c04fa463ace9d9a6464313aa5f9cd0f953b6c057";
|
||||
hash = "sha256-uow3vbAI4F/fTGjYOKOLqTpKq7NgGYSZhGlEhn7h6s0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = ''
|
||||
|
@ -373,12 +373,12 @@ let
|
|||
stdenv;
|
||||
|
||||
pname = "local-ai";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-skynet";
|
||||
repo = "LocalAI";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jZE8Ow9FFhnx/jvsURLYlYtSuKpE4UWBezxg/mpHs9g=";
|
||||
hash = "sha256-wr7sTMjGofGiZZbRJ+RfgXx9TM9Adu2NBAXeB3P5Ep0=";
|
||||
};
|
||||
|
||||
self = buildGoModule.override { stdenv = effectiveStdenv; } {
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
, writers
|
||||
, symlinkJoin
|
||||
, jq
|
||||
, prom2json
|
||||
}:
|
||||
let
|
||||
common-config = { config, ... }: {
|
||||
|
@ -14,6 +15,7 @@ let
|
|||
enable = true;
|
||||
package = self;
|
||||
threads = config.virtualisation.cores;
|
||||
logLevel = "debug";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -36,6 +38,10 @@ in
|
|||
''
|
||||
machine.wait_for_open_port(${port})
|
||||
machine.succeed("curl -f http://localhost:${port}/readyz")
|
||||
|
||||
machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
|
||||
|
||||
machine.copy_from_vm("metrics.json")
|
||||
'';
|
||||
});
|
||||
|
||||
|
@ -80,6 +86,10 @@ in
|
|||
machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${model}\"' models.json")
|
||||
machine.succeed("curl -f http://localhost:${port}/embeddings --json @${writers.writeJSON "request.json" requests.request} --output embeddings.json")
|
||||
machine.succeed("${jq}/bin/jq --exit-status 'debug | .model == \"${model}\"' embeddings.json")
|
||||
|
||||
machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
|
||||
|
||||
machine.copy_from_vm("metrics.json")
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -92,6 +102,7 @@ in
|
|||
# https://localai.io/advanced/#full-config-model-file-reference
|
||||
model-configs.${model} = rec {
|
||||
context_size = 8192;
|
||||
backend = "llama-cpp";
|
||||
parameters = {
|
||||
# https://huggingface.co/lmstudio-community/Meta-Llama-3-8B-Instruct-GGUF
|
||||
# https://ai.meta.com/blog/meta-llama-3/
|
||||
|
@ -157,6 +168,8 @@ in
|
|||
virtualisation.cores = 4;
|
||||
virtualisation.memorySize = 8192;
|
||||
services.local-ai.models = models;
|
||||
# TODO: Add test case parallel requests
|
||||
services.local-ai.parallelRequests = 2;
|
||||
};
|
||||
passthru = { inherit models requests; };
|
||||
testScript =
|
||||
|
@ -180,6 +193,10 @@ in
|
|||
machine.succeed("curl -f http://localhost:${port}/v1/completions --json @${writers.writeJSON "request-completions.json" requests.completions} --output completions.json")
|
||||
machine.succeed("${jq}/bin/jq --exit-status 'debug | .object ==\"text_completion\"' completions.json")
|
||||
machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${toString model-configs.${model}.parameters.max_tokens}' completions.json")
|
||||
|
||||
machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
|
||||
|
||||
machine.copy_from_vm("metrics.json")
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -243,6 +260,10 @@ in
|
|||
machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" requests.request} --output out.wav")
|
||||
machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${model-stt} --output transcription.json")
|
||||
machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${requests.request.input}\"' transcription.json")
|
||||
|
||||
machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
|
||||
|
||||
machine.copy_from_vm("metrics.json")
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mediainfo";
|
||||
version = "24.03";
|
||||
version = "24.04";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
hash = "sha256-b/jx+i+FmhMJH3Wiz5E0hmRPbiWa0cJa+5qT5IRExWM=";
|
||||
hash = "sha256-6+sctwGiMFnHNsszuRoxcsT5jnNB5EoLMKEZGRkaJ00=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
@ -23,6 +23,6 @@
|
|||
homepage = "https://github.com/paratestphp/paratest";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "paratest";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ patka ];
|
||||
};
|
||||
})
|
||||
|
|
|
@ -21,6 +21,6 @@ php.buildComposerProject (finalAttrs: {
|
|||
homepage = "https://pestphp.com";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "pest";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ patka ];
|
||||
};
|
||||
})
|
||||
|
|
|
@ -30,6 +30,6 @@ php.buildComposerProject (finalAttrs: {
|
|||
homepage = "https://github.com/phpactor/phpactor";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "phpactor";
|
||||
maintainers = lib.teams.php.members;
|
||||
maintainers = [ lib.maintainers.patka ] ++ lib.teams.php.members;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -1,27 +1,30 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, php
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "11.1.1";
|
||||
version = "11.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-aS2mQeE8WnEaTexl8qhhfGyi1MP48s6fjrTXkVLq1LU=";
|
||||
hash = "sha256-Wq2k44WpUhDhSyIx8ofn/jUR7FS3zn2CCe4OiFKHXEA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kjMJCrMG08AXX662GAR5+V6w1+WOv8F9r6ONIOowP8Q=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md";
|
||||
description = "PHP Unit Testing framework";
|
||||
homepage = "https://phpunit.de";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "phpunit";
|
||||
maintainers = [ lib.maintainers.onny ] ++ lib.teams.php.members;
|
||||
maintainers = with lib.maintainers; [ onny patka ] ++ lib.teams.php.members;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "primesieve";
|
||||
version = "12.1";
|
||||
version = "12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primesieve";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-AHl2GfZ1oJ8ZyjJzvg10AqN7TA7HFZ+qa6N2v51Qa78=";
|
||||
hash = "sha256-jULYLJK3iwPKgWpdTEetmSz1Nv2md1XUfR9A9mTQu9M=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" "man" ];
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proto";
|
||||
version = "0.34.4";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sh4EeK9LGY1t7BDWV31pOjp6CYhOIRR/wCb6LAv68ok=";
|
||||
hash = "sha256-kUoiERpkAVxow6YWEIkmF2A9oRrdqMnZLsFJOLf5Ucc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PU6r6Iwv00TLhAZSt9hERWvCgpC27Cuf3rrsjN1gO5k=";
|
||||
cargoHash = "sha256-3Jh5vPi/dNIVrxkibWe70eiZ54/wf6USTV+VV+H9mtk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2024-04-16";
|
||||
version = "0-unstable-2024-04-30";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "83e2d743202684eb1f89a1b93e859c69cd736455";
|
||||
hash = "sha256-iD+59mrFNVRu6g58XXLR2Pg8oDpNIiI/+TyCdbRbjtM=";
|
||||
rev = "dc2212318aec6c2aa6920795e16fab7dfcb8796e";
|
||||
hash = "sha256-XY2rQqu2CSKRImx0GmC5ggTZTyvrtX+LvqkYj0sEBuU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sispmctl";
|
||||
version = "4.11";
|
||||
version = "4.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sispmctl/sispmctl-${version}.tar.gz";
|
||||
hash = "sha256-dLlKNxAEaxUHDHMR8MrLgVVMhrQidxnMJzPLlscFJXg=";
|
||||
hash = "sha256-51eGOkg42m4cpypXrcWspvxH/73ccqaQUtir10PVcII=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "updatecli";
|
||||
version = "0.76.0";
|
||||
version = "0.76.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "updatecli";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UfiwagyE3w+kcPJnDDNTCGrxghnag/RPz6SSdAglyYA=";
|
||||
hash = "sha256-C+PWuFjTxmD+/qUsuJDueNrhFXKqu0PZnLPlQ3KJQlE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-STiVtzA78zeo5wywwzvA0dqmBW3REUvcpOXuWjpxReY=";
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "vunnel";
|
||||
version = "0.22.0";
|
||||
version = "0.22.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "vunnel";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+L1MUD9IKPnbh/yjRuF3aOszeMvkILuqHHWj949SrMo=";
|
||||
hash = "sha256-g/dlo2M7TJRYAbk3HtGQlMUZhORxt+OsDgP8W7rf+NE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
@ -4,9 +4,8 @@
|
|||
, libiconv
|
||||
, openssl
|
||||
, rustPlatform
|
||||
, Security
|
||||
, stdenv
|
||||
, SystemConfiguration
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
|||
nativeBuildInputs = [ perl ];
|
||||
|
||||
buildInputs = [ libiconv openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
|
||||
|
||||
doCheck = false;
|
||||
|
|
@ -1,71 +1,71 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, bash
|
||||
, fetchFromGitHub
|
||||
, fetchFromGitLab
|
||||
, SDL2
|
||||
, alsa-lib
|
||||
, catch2_3
|
||||
, fftw
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk-layer-shell
|
||||
, gtkmm3
|
||||
, howard-hinnant-date
|
||||
, hyprland
|
||||
, iniparser
|
||||
, jsoncpp
|
||||
, libdbusmenu-gtk3
|
||||
, libevdev
|
||||
, libinotify-kqueue
|
||||
, libinput
|
||||
, libjack2
|
||||
, libmpdclient
|
||||
, libnl
|
||||
, libpulseaudio
|
||||
, libsigcxx
|
||||
, libxkbcommon
|
||||
, meson
|
||||
, ncurses
|
||||
, ninja
|
||||
, pipewire
|
||||
, pkg-config
|
||||
, playerctl
|
||||
, portaudio
|
||||
, python3
|
||||
, scdoc
|
||||
, sndio
|
||||
, spdlog
|
||||
, sway
|
||||
, udev
|
||||
, upower
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
, wireplumber
|
||||
, wrapGAppsHook3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
bash,
|
||||
fetchFromGitHub,
|
||||
SDL2,
|
||||
alsa-lib,
|
||||
catch2_3,
|
||||
fftw,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
gtk-layer-shell,
|
||||
gtkmm3,
|
||||
howard-hinnant-date,
|
||||
hyprland,
|
||||
iniparser,
|
||||
jsoncpp,
|
||||
libdbusmenu-gtk3,
|
||||
libevdev,
|
||||
libinotify-kqueue,
|
||||
libinput,
|
||||
libjack2,
|
||||
libmpdclient,
|
||||
libnl,
|
||||
libpulseaudio,
|
||||
libsigcxx,
|
||||
libxkbcommon,
|
||||
meson,
|
||||
ncurses,
|
||||
ninja,
|
||||
pipewire,
|
||||
pkg-config,
|
||||
playerctl,
|
||||
portaudio,
|
||||
python3,
|
||||
scdoc,
|
||||
sndio,
|
||||
spdlog,
|
||||
sway,
|
||||
udev,
|
||||
upower,
|
||||
wayland,
|
||||
wayland-scanner,
|
||||
wireplumber,
|
||||
wrapGAppsHook3,
|
||||
|
||||
, cavaSupport ? true
|
||||
, enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
, evdevSupport ? true
|
||||
, experimentalPatches ? true
|
||||
, hyprlandSupport ? true
|
||||
, inputSupport ? true
|
||||
, jackSupport ? true
|
||||
, mpdSupport ? true
|
||||
, mprisSupport ? stdenv.isLinux
|
||||
, nlSupport ? true
|
||||
, pipewireSupport ? true
|
||||
, pulseSupport ? true
|
||||
, rfkillSupport ? true
|
||||
, runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
, sndioSupport ? true
|
||||
, swaySupport ? true
|
||||
, traySupport ? true
|
||||
, udevSupport ? true
|
||||
, upowerSupport ? true
|
||||
, wireplumberSupport ? true
|
||||
, withMediaPlayer ? mprisSupport && false
|
||||
, nix-update-script
|
||||
cavaSupport ? true,
|
||||
enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
evdevSupport ? true,
|
||||
experimentalPatches ? true,
|
||||
hyprlandSupport ? true,
|
||||
inputSupport ? true,
|
||||
jackSupport ? true,
|
||||
mpdSupport ? true,
|
||||
mprisSupport ? stdenv.isLinux,
|
||||
nlSupport ? true,
|
||||
pipewireSupport ? true,
|
||||
pulseSupport ? true,
|
||||
rfkillSupport ? true,
|
||||
runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
sndioSupport ? true,
|
||||
swaySupport ? true,
|
||||
traySupport ? true,
|
||||
udevSupport ? true,
|
||||
upowerSupport ? true,
|
||||
wireplumberSupport ? true,
|
||||
withMediaPlayer ? mprisSupport && false,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -79,13 +79,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waybar";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexays";
|
||||
repo = "Waybar";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-xinTLjZJhL4048jpAbN3i6nSxKAqnbesbK/GBX+1CkE=";
|
||||
hash = "sha256-LUageV0xC42MldMmYY1njkm95icBsqID1tEGy3wwrRM=";
|
||||
};
|
||||
|
||||
postUnpack = lib.optional cavaSupport ''
|
||||
|
@ -101,8 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pkg-config
|
||||
wayland-scanner
|
||||
wrapGAppsHook3
|
||||
] ++ lib.optional withMediaPlayer gobject-introspection
|
||||
++ lib.optional enableManpages scdoc;
|
||||
] ++ lib.optional withMediaPlayer gobject-introspection ++ lib.optional enableManpages scdoc;
|
||||
|
||||
propagatedBuildInputs = lib.optionals withMediaPlayer [
|
||||
glib
|
||||
|
@ -110,63 +109,66 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
python3.pkgs.pygobject3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk-layer-shell
|
||||
gtkmm3
|
||||
howard-hinnant-date
|
||||
jsoncpp
|
||||
libsigcxx
|
||||
libxkbcommon
|
||||
spdlog
|
||||
wayland
|
||||
]
|
||||
++ lib.optionals cavaSupport [
|
||||
SDL2
|
||||
alsa-lib
|
||||
fftw
|
||||
iniparser
|
||||
ncurses
|
||||
portaudio
|
||||
]
|
||||
++ lib.optional evdevSupport libevdev
|
||||
++ lib.optional hyprlandSupport hyprland
|
||||
++ lib.optional inputSupport libinput
|
||||
++ lib.optional jackSupport libjack2
|
||||
++ lib.optional mpdSupport libmpdclient
|
||||
++ lib.optional mprisSupport playerctl
|
||||
++ lib.optional nlSupport libnl
|
||||
++ lib.optional pulseSupport libpulseaudio
|
||||
++ lib.optional sndioSupport sndio
|
||||
++ lib.optional swaySupport sway
|
||||
++ lib.optional traySupport libdbusmenu-gtk3
|
||||
++ lib.optional udevSupport udev
|
||||
++ lib.optional upowerSupport upower
|
||||
++ lib.optional wireplumberSupport wireplumber
|
||||
++ lib.optional (cavaSupport || pipewireSupport) pipewire
|
||||
++ lib.optional (!stdenv.isLinux) libinotify-kqueue;
|
||||
buildInputs =
|
||||
[
|
||||
gtk-layer-shell
|
||||
gtkmm3
|
||||
howard-hinnant-date
|
||||
jsoncpp
|
||||
libsigcxx
|
||||
libxkbcommon
|
||||
spdlog
|
||||
wayland
|
||||
]
|
||||
++ lib.optionals cavaSupport [
|
||||
SDL2
|
||||
alsa-lib
|
||||
fftw
|
||||
iniparser
|
||||
ncurses
|
||||
portaudio
|
||||
]
|
||||
++ lib.optional evdevSupport libevdev
|
||||
++ lib.optional hyprlandSupport hyprland
|
||||
++ lib.optional inputSupport libinput
|
||||
++ lib.optional jackSupport libjack2
|
||||
++ lib.optional mpdSupport libmpdclient
|
||||
++ lib.optional mprisSupport playerctl
|
||||
++ lib.optional nlSupport libnl
|
||||
++ lib.optional pulseSupport libpulseaudio
|
||||
++ lib.optional sndioSupport sndio
|
||||
++ lib.optional swaySupport sway
|
||||
++ lib.optional traySupport libdbusmenu-gtk3
|
||||
++ lib.optional udevSupport udev
|
||||
++ lib.optional upowerSupport upower
|
||||
++ lib.optional wireplumberSupport wireplumber
|
||||
++ lib.optional (cavaSupport || pipewireSupport) pipewire
|
||||
++ lib.optional (!stdenv.isLinux) libinotify-kqueue;
|
||||
|
||||
nativeCheckInputs = [ catch2_3 ];
|
||||
doCheck = runTests;
|
||||
|
||||
mesonFlags = (lib.mapAttrsToList lib.mesonEnable {
|
||||
"cava" = cavaSupport;
|
||||
"dbusmenu-gtk" = traySupport;
|
||||
"jack" = jackSupport;
|
||||
"libinput" = inputSupport;
|
||||
"libnl" = nlSupport;
|
||||
"libudev" = udevSupport;
|
||||
"man-pages" = enableManpages;
|
||||
"mpd" = mpdSupport;
|
||||
"mpris" = mprisSupport;
|
||||
"pipewire" = pipewireSupport;
|
||||
"pulseaudio" = pulseSupport;
|
||||
"rfkill" = rfkillSupport;
|
||||
"sndio" = sndioSupport;
|
||||
"systemd" = false;
|
||||
"tests" = runTests;
|
||||
"upower_glib" = upowerSupport;
|
||||
"wireplumber" = wireplumberSupport;
|
||||
}) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true);
|
||||
mesonFlags =
|
||||
(lib.mapAttrsToList lib.mesonEnable {
|
||||
"cava" = cavaSupport;
|
||||
"dbusmenu-gtk" = traySupport;
|
||||
"jack" = jackSupport;
|
||||
"libinput" = inputSupport;
|
||||
"libnl" = nlSupport;
|
||||
"libudev" = udevSupport;
|
||||
"man-pages" = enableManpages;
|
||||
"mpd" = mpdSupport;
|
||||
"mpris" = mprisSupport;
|
||||
"pipewire" = pipewireSupport;
|
||||
"pulseaudio" = pulseSupport;
|
||||
"rfkill" = rfkillSupport;
|
||||
"sndio" = sndioSupport;
|
||||
"systemd" = false;
|
||||
"tests" = runTests;
|
||||
"upower_glib" = upowerSupport;
|
||||
"wireplumber" = wireplumberSupport;
|
||||
})
|
||||
++ lib.optional experimentalPatches (lib.mesonBool "experimental" true);
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace include/util/command.hpp \
|
||||
|
|
36
pkgs/by-name/wi/windows10-icons/package.nix
Normal file
36
pkgs/by-name/wi/windows10-icons/package.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "windows10-icons";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "B00merang-Artwork";
|
||||
repo = "Windows-10";
|
||||
rev = "${finalAttrs.version}";
|
||||
hash = "sha256-Yz6a7FcgPfzz4w8cKp8oq7/usIBUUZV7qhVmDewmzrI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/icons/windows10
|
||||
find . \
|
||||
! -path ./README.md \
|
||||
-mindepth 1 -maxdepth 1 \
|
||||
-exec cp -r {} $out/share/icons/windows10 \;
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Windows 10 icon theme";
|
||||
homepage = "http://b00merang.weebly.com/windows-10.html";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ mib ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xplr";
|
||||
version = "0.21.7";
|
||||
version = "0.21.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sayanarijit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZitwO/XfNrlTFNepQ5Wyk1A7cwlNm6+26nPHdZ8Wh3c=";
|
||||
sha256 = "sha256-GpGYCGXSCQhFEPDUnHaOdz0LZ0jjRcCRnRCyOrulDVs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mfSVjm0s/tLjjygwu8TuKn92mFM3Ui6TEHkIzS0eEOA=";
|
||||
cargoHash = "sha256-eCIoUUWHpFk+O5ipswwiQxf1H1ygkj07Sjyj4L8Ui6I=";
|
||||
|
||||
# fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin
|
||||
env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) {
|
||||
|
|
|
@ -184,6 +184,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# g-o-a-gtk already provides its own desktop item.
|
||||
rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop
|
||||
|
||||
# Actually removes Adwaita and HighContrast from Cinnamon styles with mint-artwork 1.8.2.
|
||||
# https://github.com/linuxmint/cinnamon/commit/13b1ad104e88197f6c4e2d02ab2674c07254b8e8
|
||||
rm -r $out/share/cinnamon/styles.d
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mint-artwork";
|
||||
version = "1.8.0";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
|
||||
"https://web.archive.org/web/20240122135036/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
|
||||
"https://web.archive.org/web/20240505123538/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-eCrch5IQdTd92DIqdjZFzvE4oShv3HuXfrLLUmLb0Ms=";
|
||||
hash = "sha256-MegMFrnU8Gcc2v5y3BQCIZS31JdpfSM5FIJJNcyt4LY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -5,8 +5,9 @@
|
|||
owner = "tchajed";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.10" "8.19"; out = "0.3.3"; }
|
||||
{ case = range "8.10" "8.19"; out = "0.3.4"; }
|
||||
] null;
|
||||
release."0.3.4".sha256 = "sha256-AhEcugUiVIsgbq884Lur/bQIuGw8prk+3AlNkP1omcw=";
|
||||
release."0.3.3".sha256 = "sha256-HDIPeFHiC9EwhiOH7yMGJ9d2zJMhboTpRGf9kWcB9Io=";
|
||||
release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk=";
|
||||
release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z";
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
, libX11
|
||||
, readline
|
||||
, darwin
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -31,6 +32,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Required for building on Darwin with clang >=15.
|
||||
name = "pr-172-fix.patch";
|
||||
url = "https://github.com/shumatech/BOSSA/commit/6e54973c3c758674c3d04b5e2cf12e097006f6a3.patch";
|
||||
hash = "sha256-2lp6Ej3IfofztC1n/yHLjabn0MH4BA/CM3dsnAw8klA=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "-arch x86_64" ""
|
||||
|
|
|
@ -6,11 +6,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jruby";
|
||||
version = "9.4.6.0";
|
||||
version = "9.4.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-LaFN5BUrcf2/o1ukaHpG7xLNRldAM3tUnMH+bHwTmBM=";
|
||||
hash = "sha256-8cOfgldQUwClKP+D/kch++YahVq7JePSfVLUOsl6TYA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
|
|
@ -3,20 +3,19 @@
|
|||
, boost
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, eigen
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libcifpp";
|
||||
version = "7.0.3";
|
||||
version = "7.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDB-REDO";
|
||||
repo = "libcifpp";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-YRK648gJ2UlgeG5GHMjTid1At0lYt7Zqu4/+O5WG/OM=";
|
||||
hash = "sha256-/dX77KRYmTIj8jxRzQRlpG/ktqDL1jjySux/JqHnE3I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -34,6 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
zlib
|
||||
];
|
||||
|
||||
# cmake requires the existence of this directory when building dssp
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/libcifpp
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manipulate mmCIF and PDB files";
|
||||
homepage = "https://github.com/PDB-REDO/libcifpp";
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvidia-vaapi-driver";
|
||||
version = "0.0.11";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elFarto";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mVVRpCyT374P1Vql0yPY0e5tNktHNJ8XHoixvxp3b20=";
|
||||
sha256 = "sha256-ETdHbPI3rZR4026rOT5K9/pjKTZxD5+RioKzUVGMwsA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocksdb";
|
||||
version = "9.1.0";
|
||||
version = "9.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8=";
|
||||
hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uriparser";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
|
||||
# Release tarball differs from source tarball
|
||||
src = fetchurl {
|
||||
url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-0n3qDItvb7l5jwfK7e8c2WpuP8XGGJWWd04Zr6fd3tc=";
|
||||
hash = "sha256-ctG1Wb46GAb3iKPZvjShsGPUKqI4spuk7mM9bv/NM70=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
|||
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${version}/ChangeLog";
|
||||
description = "Strictly RFC 3986 compliant URI parsing library";
|
||||
longDescription = ''
|
||||
uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C.
|
||||
|
|
|
@ -6,18 +6,19 @@
|
|||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "deployer";
|
||||
version = "7.3.3";
|
||||
version = "7.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deployphp";
|
||||
repo = "deployer";
|
||||
rev = "v${finalAttrs.version}^";
|
||||
hash = "sha256-zvK7NwIACAhWN/7D8lVY1Bv8x6xKAp/L826SovQhDYg=";
|
||||
hash = "sha256-nSrW4o0Tb8H056AAjjMzbsAVvWY2z1pdWmPFZDpDr1k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BDq2uryNWC31AEAEZJL9zGaAPbhXZ6hmfpsnr4wlixE=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/deployphp/deployer/releases/tag/v${finalAttrs.version}";
|
||||
description = "The PHP deployment tool with support for popular frameworks out of the box";
|
||||
homepage = "https://deployer.org/";
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
@ -25,6 +25,6 @@ php.buildComposerProject (finalAttrs: {
|
|||
homepage = "https://phpinsights.com/";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "phpinsights";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ patka ];
|
||||
};
|
||||
})
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "1.10.66";
|
||||
version = "1.10.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan-src";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZEQ6oP6zyi0cL69J9ck8gAht5taPkzH+iW5ALC4saAQ=";
|
||||
hash = "sha256-fa/bPOwZoYmnFBBmQofsFb8VphAfcTUwroSGCdnpNq8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Qp/eMhcKK32N1EMgeIspBDs28Oofwn6n2bEFKqvSx9E=";
|
||||
vendorHash = "sha256-cTJWXfBjH6BiD/a2qQ60MFB/QuFaVm8vOLMQYPW+7TI=";
|
||||
composerStrictValidation = false;
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "faster-whisper";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SYSTRAN";
|
||||
repo = "faster-whisper";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-b8P9fI32ubOrdayA0vnjLhpZ4qffB6W+8TEOA1YLKqo=";
|
||||
hash = "sha256-O2RRwb+omgSpfckHh3oPu454g2ULT4gyolrg5olHcRc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -62,9 +62,9 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/${version}";
|
||||
changelog = "https://github.com/SYSTRAN/faster-whisper/releases/tag/v${version}";
|
||||
description = "Faster Whisper transcription with CTranslate2";
|
||||
homepage = "https://github.com/guillaumekln/faster-whisper";
|
||||
homepage = "https://github.com/SYSTRAN/faster-whisper";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "geoalchemy2";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "geoalchemy";
|
||||
repo = "geoalchemy2";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cQixNLtjHPQrnNcxg0MrIdzvun2f1BqKY/2SxfcM2Nc=";
|
||||
hash = "sha256-EMsaB6VDDDvXg9LKa9ms0+AfzX1rG+yeR898EK59DDs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "goodwe";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "marcelblijleven";
|
||||
repo = "goodwe";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CIEv3srjyVWQ1UGKVRwPXpzrND/8hTbw6HSlko9+AIk=";
|
||||
hash = "sha256-RIiJs2drXOb4irs3kTDelP+Cuv94SJ+nwBrkHbqI/Jc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -31,6 +31,12 @@ in buildPythonPackage rec {
|
|||
hash = "sha256-e36PeAcqLt7IfJg28l80ID/UkqRHVwmhi0F6M8+yH6k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Unlock an overly strict locking of mpi4py version (seems not to be necessary).
|
||||
# See also: https://github.com/h5py/h5py/pull/2418/files#r1589372479
|
||||
./mpi4py-requirement.patch
|
||||
];
|
||||
|
||||
# avoid strict pinning of numpy
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/setup.py b/setup.py
|
||||
index b1463422..7f0c7b10 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -47,7 +47,7 @@ if setup_configure.mpi_enabled():
|
||||
# incompatible with newer setuptools.
|
||||
RUN_REQUIRES.append('mpi4py >=3.1.1')
|
||||
SETUP_REQUIRES.append("mpi4py ==3.1.1; python_version<'3.11'")
|
||||
- SETUP_REQUIRES.append("mpi4py ==3.1.4; python_version>='3.11'")
|
||||
+ SETUP_REQUIRES.append("mpi4py >=3.1.4; python_version>='3.11'")
|
||||
|
||||
# Set the environment variable H5PY_SETUP_REQUIRES=0 if we need to skip
|
||||
# setup_requires for any reason.
|
37
pkgs/development/python-modules/iterable-io/default.nix
Normal file
37
pkgs/development/python-modules/iterable-io/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iterable-io";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pR0Ps";
|
||||
repo = "iterable-io";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+PSINKS7/FeGHYvkOASA5m+1pBpKfURfylZ8CwKijgA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "iterableio" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Library to adapt iterables to a file-like interface";
|
||||
homepage = "https://github.com/pR0Ps/iterable-io";
|
||||
changelog = "https://github.com/pR0Ps/iterable-io/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = [ lib.maintainers.mjoerg ];
|
||||
};
|
||||
}
|
|
@ -10,24 +10,24 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jiwer";
|
||||
version = "3.0.3";
|
||||
format = "pyproject";
|
||||
version = "3.04";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jitsi";
|
||||
repo = pname;
|
||||
repo = "jiwer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-32bpSBYl6yxb4lJhHnfnYhtye7DaBZT0VAe9rDcleTc=";
|
||||
hash = "sha256-2LzAOgABK00Pz3v5WWYUAcZOYcTbRKfgw7U5DOohB/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
rapidfuzz
|
||||
click
|
||||
];
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-chroma";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_chroma";
|
||||
inherit version;
|
||||
hash = "sha256-E7DXWubBvMhru31XmNva6iPm2adJKmmt5pFqKZ8fquk=";
|
||||
hash = "sha256-nFdLrzcPr0Vry2e51eonOm+h8rT9IFpZxHtoESNkuec=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
@ -3,27 +3,29 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, setuptools
|
||||
, six
|
||||
, attrs
|
||||
, twisted
|
||||
, pyopenssl
|
||||
, service-identity
|
||||
, autobahn
|
||||
, treq
|
||||
, mock
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "magic-wormhole-mailbox-server";
|
||||
version = "0.4.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
# python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/issues/41
|
||||
disabled = pythonOlder "3.7" || pythonAtLeast "3.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb";
|
||||
hash = "sha256-GvEFkpCcqvUZwA5wbqyELF53+NQ1YhX+nGHHsiWKiPs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -35,6 +37,8 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
six
|
||||
|
@ -43,27 +47,24 @@ buildPythonPackage rec {
|
|||
] ++ autobahn.optional-dependencies.twisted
|
||||
++ twisted.optional-dependencies.tls;
|
||||
|
||||
pythonImportsCheck = [ "wormhole_mailbox_server" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
treq
|
||||
mock
|
||||
twisted
|
||||
];
|
||||
|
||||
# Fails in Darwin's sandbox
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
echo 'LogRequests.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py
|
||||
echo 'WebSocketAPI.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py
|
||||
'';
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
||||
# these tests fail in Darwin's sandbox
|
||||
"src/wormhole_mailbox_server/test/test_web.py"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
trial -j$NIX_BUILD_CORES wormhole_mailbox_server
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Securely transfer data between computers";
|
||||
homepage = "https://github.com/warner/magic-wormhole-mailbox-server";
|
||||
homepage = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server";
|
||||
changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.mjoerg ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,33 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, autobahn
|
||||
, mock
|
||||
, twisted
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "magic-wormhole-transit-relay";
|
||||
version = "0.2.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7" || pythonAtLeast "3.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b";
|
||||
hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ autobahn twisted ];
|
||||
|
||||
nativeCheckInputs = [ mock twisted ];
|
||||
pythonImportsCheck = [ "wormhole_transit_relay" ];
|
||||
|
||||
checkPhase = ''
|
||||
trial -j$NIX_BUILD_CORES wormhole_transit_relay
|
||||
'';
|
||||
nativeCheckInputs = [ pytestCheckHook mock twisted ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Transit Relay server for Magic-Wormhole";
|
||||
homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${version}/NEWS.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.mjoerg ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -17,7 +17,9 @@
|
|||
, tqdm
|
||||
, click
|
||||
, humanize
|
||||
, iterable-io
|
||||
, txtorcon
|
||||
, zipstream-ng
|
||||
|
||||
# optional-dependencies
|
||||
, noiseprotocol
|
||||
|
@ -34,7 +36,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "magic-wormhole";
|
||||
version = "0.14.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
@ -56,7 +58,9 @@ buildPythonPackage rec {
|
|||
tqdm
|
||||
click
|
||||
humanize
|
||||
iterable-io
|
||||
txtorcon
|
||||
zipstream-ng
|
||||
]
|
||||
++ autobahn.optional-dependencies.twisted
|
||||
++ twisted.optional-dependencies.tls;
|
||||
|
@ -111,12 +115,12 @@ buildPythonPackage rec {
|
|||
install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md";
|
||||
description = "Securely transfer data between computers";
|
||||
homepage = "https://github.com/magic-wormhole/magic-wormhole";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ asymmetric ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.mjoerg ];
|
||||
mainProgram = "wormhole";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mahotas";
|
||||
version = "1.4.13";
|
||||
version = "1.4.14";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luispedro";
|
||||
repo = "mahotas";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AmctF/9hLgHw6FUm0s61eCdcc12lBa1t0OkXclis//w=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9tjk3rhcfAYROZKwmwHzHAN7Ui0EgmxPErQyF//K0r8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-mkdocs";
|
||||
version = "2.0.10";
|
||||
version = "2.0.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "KyleKing";
|
||||
repo = "mdformat-mkdocs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-N1VU9bOdVENIX6QsFa0jeVugmXjl3gNkVPS/m8gEB2Q=";
|
||||
hash = "sha256-wx95Lsqgi7fM/1s6fSHxXOs396mIR9S9yCRebC2VFpI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oelint-parser";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_parser";
|
||||
hash = "sha256-MvLHi0/tMkWBARyIVm/cuMbS2euK37xvQUbkmOrUyVU=";
|
||||
hash = "sha256-i/fVihl+XnY3grHG2OXJ2ZQB43o/aNOGV/buh2zUMOQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ pip ];
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "19.9.2";
|
||||
version = "19.9.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-X5JKfIE6rISXb3F2liuyLrVHm5xw3DoFeMhqhEsdEIY=";
|
||||
hash = "sha256-4v+I1NXfVseKid8A5gBIvAIQfwdMMLWUNts9Ga29tWs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, installShellFiles
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, wheel
|
||||
|
@ -31,6 +32,7 @@ buildPythonPackage rec {
|
|||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
|
@ -62,8 +64,8 @@ buildPythonPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $man/share/man/man1/
|
||||
${docutils}/bin/rst2man.py doc/rst2pdf.rst $man/share/man/man1/rst2pdf.1
|
||||
${lib.getExe' docutils "rst2man"} doc/rst2pdf.rst rst2pdf.1
|
||||
installManPage rst2pdf.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -72,6 +74,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://rst2pdf.org/";
|
||||
changelog = "https://github.com/rst2pdf/rst2pdf/blob/${version}/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ pyrox0 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.217.0";
|
||||
version = "2.218.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-p73M0hBVpakdXGM56ECr4D3mQCBmB7Ud/p+Rj1+/Bic=";
|
||||
hash = "sha256-VDwD52mbOSNrZgUHM1fieYWW41V6Gf+paoP5nYg2cDI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,19 +1,20 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, torch
|
||||
, requests
|
||||
, setuptools
|
||||
, soundfile
|
||||
, typing-extensions
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
numpy,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
torch,
|
||||
requests,
|
||||
setuptools,
|
||||
soundfile,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "speechrecognition";
|
||||
version = "3.10.3";
|
||||
version = "3.10.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -22,12 +23,10 @@ buildPythonPackage rec {
|
|||
owner = "Uberi";
|
||||
repo = "speech_recognition";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-g2DE3u2nuJHqWA2X8S6zw5nUVS1yvSqO0VI3zKoIUgg=";
|
||||
hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
|
@ -41,9 +40,7 @@ buildPythonPackage rec {
|
|||
soundfile
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"speech_recognition"
|
||||
];
|
||||
pythonImportsCheck = [ "speech_recognition" ];
|
||||
|
||||
disabledTests = [
|
||||
# Test files are missing in source
|
||||
|
@ -57,7 +54,11 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Speech recognition module for Python, supporting several engines and APIs, online and offline";
|
||||
homepage = "https://github.com/Uberi/speech_recognition";
|
||||
license = with licenses; [ gpl2Only bsd3 ];
|
||||
changelog = "https://github.com/Uberi/speech_recognition/releases/tag/${version}";
|
||||
license = with licenses; [
|
||||
gpl2Only
|
||||
bsd3
|
||||
];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1139";
|
||||
version = "3.0.1140";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DH+15I/kMuUbRU8jYGLaDWxO7zumJ7Bh5yze3mmrh/M=";
|
||||
hash = "sha256-af0vBypBXfclCQ3BICh0hBjMCpE9F3PZE/bmk2jx+jI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
@ -1,23 +1,24 @@
|
|||
{ lib
|
||||
, bleak
|
||||
, bleak-retry-connector
|
||||
, bluetooth-data-tools
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pycryptodomex
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, sensor-state-data
|
||||
{
|
||||
lib,
|
||||
bleak,
|
||||
bleak-retry-connector,
|
||||
bluetooth-data-tools,
|
||||
bluetooth-sensor-state-data,
|
||||
buildPythonPackage,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
home-assistant-bluetooth,
|
||||
poetry-core,
|
||||
pycryptodomex,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
sensor-state-data,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xiaomi-ble";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -26,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = "xiaomi-ble";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Va/fzGDjBR/h1lUN47AixZnDYzEPNXQKTVXILKayhBc=";
|
||||
hash = "sha256-+zMjnLUzI8ctucvxXts7V4lN4Gp0ZQtArhpXUCBvhF0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -34,14 +35,11 @@ buildPythonPackage rec {
|
|||
--replace-fail " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pycryptodomex"
|
||||
];
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
pythonRelaxDeps = [ "pycryptodomex" ];
|
||||
|
||||
dependencies = [
|
||||
bleak
|
||||
|
@ -54,13 +52,9 @@ buildPythonPackage rec {
|
|||
sensor-state-data
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"xiaomi_ble"
|
||||
];
|
||||
pythonImportsCheck = [ "xiaomi_ble" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Xiaomi BLE devices";
|
||||
|
|
|
@ -26,7 +26,8 @@
|
|||
, maintainers ? [ ]
|
||||
# : passthru arguments (e.g. tests)
|
||||
, passthru ? { }
|
||||
|
||||
# : attributes to be merged into meta
|
||||
, broken ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -125,7 +126,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = {
|
||||
homepage = "https://skarnet.org/software/${pname}/";
|
||||
inherit description platforms;
|
||||
inherit broken description platforms;
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers;
|
||||
[ pmahoney Profpatsch qyliss ] ++ maintainers;
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchFromGitHub, skawarePackages, skalibs }:
|
||||
|
||||
let
|
||||
version = "2.9.4.0";
|
||||
version = "2.9.5.1";
|
||||
|
||||
in skawarePackages.buildPackage {
|
||||
inherit version;
|
||||
|
||||
pname = "execline";
|
||||
# ATTN: also check whether there is a new manpages version
|
||||
sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs=";
|
||||
sha256 = "33UANdD7IccmW/+37X4bZh3h6EKUSiJSvc3cMtDZchc=";
|
||||
|
||||
# Maintainer of manpages uses following versioning scheme: for every
|
||||
# upstream $version he tags manpages release as ${version}.1, and,
|
||||
|
@ -16,8 +16,8 @@ in skawarePackages.buildPackage {
|
|||
# ${version}.3 and so on are created.
|
||||
manpages = skawarePackages.buildManPages {
|
||||
pname = "execline-man-pages";
|
||||
version = "2.9.3.0.5";
|
||||
sha256 = "0fcjrj4xp7y7n1c55k45rxr5m7zpv6cbhrkxlxymd4j603i9jh6d";
|
||||
version = "2.9.5.1.1";
|
||||
sha256 = "hLo0TJJ4F2UQ+NkyO9DvVHO0ec86Eps1z99HthBzoIc=";
|
||||
description = "Port of the documentation for the execline suite to mdoc";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
};
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
skawarePackages.buildPackage {
|
||||
pname = "s6";
|
||||
version = "2.12.0.3";
|
||||
sha256 = "gA0xIm9sJc3T7AtlJA+AtWzl7BNzQdCo0VTndjjlgQM=";
|
||||
version = "2.12.0.4";
|
||||
sha256 = "yV1ReHYC4MjI5PkqcQy9qk7nl+6IbnE0Jyfil0+VwGs=";
|
||||
|
||||
manpages = skawarePackages.buildManPages {
|
||||
pname = "s6-man-pages";
|
||||
version = "2.12.0.2.1";
|
||||
sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ=";
|
||||
version = "2.12.0.4.1";
|
||||
sha256 = "9n4oIGfgcu+Q/UcY1Edr3n09Ecrbg77AI8TRBQoFzs0=";
|
||||
description = "Port of the documentation for the s6 supervision suite to mdoc";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
};
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{ skawarePackages, skalibs }:
|
||||
{ skawarePackages, stdenv, skalibs }:
|
||||
|
||||
skawarePackages.buildPackage {
|
||||
pname = "tipidee";
|
||||
version = "0.0.3.0";
|
||||
sha256 = "0dk6k86UKgJ2ioX5H2Xoga9S+SwMy9NFrK2KEKoNxCA=";
|
||||
version = "0.0.4.0";
|
||||
sha256 = "sha256-FzZRGg8IBTkzXINb9WCdVukej9KyPFQIUuXfdcLz1RQ=";
|
||||
|
||||
description = "A HTTP 1.1 webserver, serving static files and CGI/NPH";
|
||||
|
||||
|
@ -35,4 +35,5 @@ skawarePackages.buildPackage {
|
|||
mv examples $doc/share/doc/tipidee/examples
|
||||
'';
|
||||
|
||||
broken = stdenv.isDarwin;
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "air";
|
||||
version = "1.51.0";
|
||||
version = "1.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmtrek";
|
||||
repo = "air";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Vkg3QPUvhJphmZ7Ek3tuFnSEjfSy6LfctGMA07IufUU=";
|
||||
hash = "sha256-7iqS8p53Pyk2WQVkbTVA7eJNnD2KvO41S+JJBTFOToQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw=";
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cvehound";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evdenis";
|
||||
repo = "cvehound";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DnrFlDFJT74irvrNs/j7zwO76DYjTOuY0t+mu5c8gpk=";
|
||||
hash = "sha256-UvjmlAm/8B4KfE9grvvgn37Rui+ZRfs2oTLqYYgqcUQ=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jqp";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noahgorstein";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-z2EKtSM+/wWGgwsHKDcxtc/M6UZ01AiTZaaCYCWjU7M=";
|
||||
sha256 = "sha256-zcv6fYrqPp/IMg4ivqJtlJwOs2M5E8niWoIOXYiEZuA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7UiQjTgcwGOTEJEaWywEdZvpkM/MoXU3d6k8oVmUiW8=";
|
||||
vendorHash = "sha256-c+TZGLaUomlykIU4aN7awUp4kpIEoGOkkbvIC6ok7h4=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.14.22";
|
||||
version = "0.14.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-deny";
|
||||
rev = version;
|
||||
hash = "sha256-04CRMlH31MzYpE2pRUrbAvSojbxan4ktqX9J/zjeTkk=";
|
||||
hash = "sha256-TTBsxb+rC/0SL6pCZkf9HPwzExXb3UIT08cBQ4y855o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Nutx3Dvvh7qvgAtengWw0kJve4Ent9y7OXgovUZWTLE=";
|
||||
cargoHash = "sha256-i1p/k+SGwdxp9RGXfxnJVq+E1pek7RSA50fMgVRJzCQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-duplicates";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Keruspe";
|
||||
repo = "cargo-duplicates";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e0cegK4obUVIJyx5XKF+xicvkRvQwuObwB8tprrJnrw=";
|
||||
hash = "sha256-OwytBecRGizkDC2S92FKAy3/mc4Jg/NwaYIPahfiG6k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-i1IyHCa/w4DOGlPWjDE4IbVm3s/40DIwjwUGIMTYH4Y=";
|
||||
cargoHash = "sha256-LsdzHCQ4uG6+dwiUoC36VPuqUf8oPlcMHxNgdkvYzu8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
pname = "bun";
|
||||
|
||||
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
|
@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
|
|||
sources = {
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
|
||||
hash = "sha256-ffEu37NAT/74l1Kkr+e1hAkawbSeZlTQcHbqg/7jYOQ=";
|
||||
hash = "sha256-VDS01LVpTMl033tyUDk+efi0ShUyAXnZGrt33Nx2Qfg=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
|
||||
hash = "sha256-qKWtazbPfPjDxLChZ0FVyV2qQhPUHwF4wpHrFdCRlYg=";
|
||||
hash = "sha256-lvm3jmlY6QkLJVFtWea3h7hARU1DEkunBQniPw563H4=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
|
||||
hash = "sha256-a3ol9tkKyVa6MoBq5cscRLAS5o8OCcIUX43opKtePos=";
|
||||
hash = "sha256-3Kn4U0iX0RfNY/j919QjzRasmvF6A3elkmvrg9mMe7A=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
|
||||
hash = "sha256-IzjuIPXljt8EStcRdGj55SWIpqJdGQeVZVAS5u9sW+Y=";
|
||||
hash = "sha256-J6eVZ6SVOj/9ZU3e2kEKZAnU63RKTLf7ef3V7nJqopA=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-bun" ''
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user