Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-09-26 00:02:17 +00:00 committed by GitHub
commit cc5ae613ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
58 changed files with 906 additions and 909 deletions

View File

@ -303,11 +303,8 @@ You can use the `dhall-to-nixpkgs` command-line utility to automate
packaging Dhall code. For example: packaging Dhall code. For example:
```ShellSession ```ShellSession
$ nix-env --install --attr haskellPackages.dhall-nixpkgs $ nix-shell -p haskellPackages.dhall-nixpkgs nix-prefetch-git
[nix-shell]$ dhall-to-nixpkgs github https://github.com/Gabriella439/dhall-semver.git
$ nix-env --install --attr nix-prefetch-git # Used by dhall-to-nixpkgs
$ dhall-to-nixpkgs github https://github.com/Gabriella439/dhall-semver.git
{ buildDhallGitHubPackage, Prelude }: { buildDhallGitHubPackage, Prelude }:
buildDhallGitHubPackage { buildDhallGitHubPackage {
name = "dhall-semver"; name = "dhall-semver";
@ -325,6 +322,10 @@ $ dhall-to-nixpkgs github https://github.com/Gabriella439/dhall-semver.git
} }
``` ```
:::{.note}
`nix-prefetch-git` has to be in `$PATH` for `dhall-to-nixpkgs` to work.
:::
The utility takes care of automatically detecting remote imports and converting The utility takes care of automatically detecting remote imports and converting
them to package dependencies. You can also use the utility on local them to package dependencies. You can also use the utility on local
Dhall directories, too: Dhall directories, too:

View File

@ -4558,6 +4558,16 @@
fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16";
}]; }];
}; };
dpc = {
email = "dpc@dpc.pw";
github = "dpc";
githubId = 9209;
matrix = "@dpc:matrix.org";
name = "Dawid Ciężarkiewicz";
keys = [{
fingerprint = "0402 11D2 0830 2D71 5792 8197 86BB 1D5B 5575 7D38";
}];
};
DPDmancul = { DPDmancul = {
name = "Davide Peressoni"; name = "Davide Peressoni";
email = "davide.peressoni@tuta.io"; email = "davide.peressoni@tuta.io";

View File

@ -5,6 +5,10 @@ let
stateDir = "/var/lib/unifi"; stateDir = "/var/lib/unifi";
cmd = '' cmd = ''
@${cfg.jrePackage}/bin/java java \ @${cfg.jrePackage}/bin/java java \
${optionalString (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16")
"--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED "
+ "--add-opens java.base/sun.security.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED "
+ "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"} \
${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
-jar ${stateDir}/lib/ace.jar -jar ${stateDir}/lib/ace.jar
@ -24,8 +28,8 @@ in
services.unifi.jrePackage = mkOption { services.unifi.jrePackage = mkOption {
type = types.package; type = types.package;
default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8; default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8;
defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8''; defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8'';
description = lib.mdDoc '' description = lib.mdDoc ''
The JRE package to use. Check the release notes to ensure it is supported. The JRE package to use. Check the release notes to ensure it is supported.
''; '';

View File

@ -7,10 +7,8 @@ let
# valid policy options # valid policy options
policy = (types.enum [ "allow" "block" "reject" "keep" "apply-policy" ]); policy = (types.enum [ "allow" "block" "reject" "keep" "apply-policy" ]);
defaultRuleFile = "/var/lib/usbguard/rules.conf";
# decide what file to use for rules # decide what file to use for rules
ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else defaultRuleFile; ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else cfg.ruleFile;
daemonConf = '' daemonConf = ''
# generated by nixos/modules/services/security/usbguard.nix # generated by nixos/modules/services/security/usbguard.nix
@ -51,6 +49,19 @@ in
''; '';
}; };
ruleFile = mkOption {
type = types.nullOr types.path;
default = /var/lib/usbguard/rules.conf;
example = /run/secrets/usbguard-rules;
description = lib.mdDoc ''
This tells the USBGuard daemon which file to load as policy rule set.
The file can be changed manually or via the IPC interface assuming it has the right file permissions.
For more details see {manpage}`usbguard-rules.conf(5)`.
'';
};
rules = mkOption { rules = mkOption {
type = types.nullOr types.lines; type = types.nullOr types.lines;
default = null; default = null;
@ -63,8 +74,7 @@ in
be changed by the IPC interface. be changed by the IPC interface.
If you do not set this option, the USBGuard daemon will load If you do not set this option, the USBGuard daemon will load
it's policy rule set from `${defaultRuleFile}`. it's policy rule set from the option configured in `services.usbguard.ruleFile`.
This file can be changed manually or via the IPC interface.
Running `usbguard generate-policy` as root will Running `usbguard generate-policy` as root will
generate a config for your currently plugged in devices. generate a config for your currently plugged in devices.
@ -248,7 +258,6 @@ in
''; '';
}; };
imports = [ imports = [
(mkRemovedOptionModule [ "services" "usbguard" "ruleFile" ] "The usbguard module now uses ${defaultRuleFile} as ruleFile. Alternatively, use services.usbguard.rules to configure rules.")
(mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ] "The usbguard module now hardcodes IPCAccessControlFiles to /var/lib/usbguard/IPCAccessControl.d.") (mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ] "The usbguard module now hardcodes IPCAccessControlFiles to /var/lib/usbguard/IPCAccessControl.d.")
(mkRemovedOptionModule [ "services" "usbguard" "auditFilePath" ] "Removed usbguard module audit log files. Audit logs can be found in the systemd journal.") (mkRemovedOptionModule [ "services" "usbguard" "auditFilePath" ] "Removed usbguard module audit log files. Audit logs can be found in the systemd journal.")
(mkRenamedOptionModule [ "services" "usbguard" "implictPolicyTarget" ] [ "services" "usbguard" "implicitPolicyTarget" ]) (mkRenamedOptionModule [ "services" "usbguard" "implictPolicyTarget" ] [ "services" "usbguard" "implicitPolicyTarget" ])

View File

@ -116,7 +116,7 @@ in
unitConfig = { unitConfig = {
ConditionPathExists = [ ConditionPathExists = [
# Skip this service if the database already exists # Skip this service if the database already exists
"!$STATE_DIRECTORY/honk.db" "!%S/honk/honk.db"
]; ];
}; };
}; };

View File

@ -34,7 +34,7 @@ let
# copy additional plugin(s), theme(s) and language(s) # copy additional plugin(s), theme(s) and language(s)
${concatStringsSep "\n" (mapAttrsToList (name: theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${name}") cfg.themes)} ${concatStringsSep "\n" (mapAttrsToList (name: theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${name}") cfg.themes)}
${concatStringsSep "\n" (mapAttrsToList (name: plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${name}") cfg.plugins)} ${concatStringsSep "\n" (mapAttrsToList (name: plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${name}") cfg.plugins)}
${concatMapStringsSep "\n" (language: "cp -r ${language} $out/share/wordpress/wp-content/languages/") cfg.languages} ${concatMapStringsSep "\n" (language: "cp -r ${language}/* $out/share/wordpress/wp-content/languages/") cfg.languages}
''; '';
}; };

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mympd"; pname = "mympd";
version = "12.0.1"; version = "12.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jcorporation"; owner = "jcorporation";
repo = "myMPD"; repo = "myMPD";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-tkkaBIWoQS28FsCSN5CKw2ZQ3cbYa34PVZCUGaaqaQo="; sha256 = "sha256-7jE3erxrCPN2deI7EV0gDH1gy2XdwC1YdU2mo2xMI6Q=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -28,11 +28,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "blender"; pname = "blender";
version = "3.6.2"; version = "3.6.3";
src = fetchurl { src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
hash = "sha256-olEmcOM3VKo/IWOhQp/qOkdJvwzM7bCkf8i8Bzh07Eg="; hash = "sha256-iRIwPrvPHwiIxHr7hpmG6NjS/liJkxcAgrzlk8LEFPg=";
}; };
patches = [ patches = [

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "slweb"; pname = "slweb";
version = "0.6.7"; version = "0.6.9";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~strahinja"; owner = "~strahinja";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Y7w3yVqA8MNJJ3OcGaeziydZyzF0bap41Il6eE/Hu40="; sha256 = "sha256-YSHJJ+96Xj2zaDtPi8jftPWIyeIG9LwQ/eYT/oh2Y2c=";
}; };
nativeBuildInputs = [ redo-apenwarr ]; nativeBuildInputs = [ redo-apenwarr ];

View File

@ -3,10 +3,10 @@
{ {
firefox = buildMozillaMach rec { firefox = buildMozillaMach rec {
pname = "firefox"; pname = "firefox";
version = "117.0.1"; version = "118.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1583b0ad3b3b17c59bfbfb3e416074766327d0b926ef4f6c6b1e3b2d7cf6a18dec592b7d17fab9493ba1506f3540a02277096d28616dd29b6e7b9e93905f2071"; sha512 = "7c34c43930bda84d17a241fe7e0f8e6ca262410423ae7e7cc8444224aea2d25a52acc9079064ba57f3350e3573eb23aeaf7a2d98136d17e6fa89a61aaf57155d";
}; };
meta = { meta = {
@ -90,11 +90,11 @@
firefox-esr-115 = buildMozillaMach rec { firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115"; pname = "firefox-esr-115";
version = "115.2.1esr"; version = "115.3.0esr";
applicationName = "Mozilla Firefox ESR"; applicationName = "Mozilla Firefox ESR";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "5f9ff96996e3c482fa4d2e2861fdf14d2154bf0277d412bf9c9435204c7e2e2539ce7ef0891d8dafc74d5a12650a5ccd33d79547aa1bbb2c2a0972aaeb755edf"; sha512 = "4a85095620a61dc516cfce6f288ba491a99c72a78c6dfae264c1292f9eba902e3df7101b97a6f8531114ccce421c92586e143872798aafd7aabbe98a257692ee";
}; };
meta = { meta = {

View File

@ -362,7 +362,7 @@ let
extraPoliciesFiles=(${builtins.toString extraPoliciesFiles}) extraPoliciesFiles=(${builtins.toString extraPoliciesFiles})
for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do
jq -s '.[0] + .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json jq -s '.[0] * .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json
mv .tmp.json "$POL_PATH" mv .tmp.json "$POL_PATH"
done done

View File

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools"; pname = "signalbackup-tools";
version = "20230922-4"; version = "20230925";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bepaald"; owner = "bepaald";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-6VzcylvGyEB+5KYX1r9wEEfSECh+O947KdcN3DMJxE0="; hash = "sha256-j1iAFNG6A/u/2OY07At0kobXtlSqoy3jM2rBf96qhHQ=";
}; };
postPatch = '' postPatch = ''

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "stratovirt"; pname = "stratovirt";
version = "2.2.0"; version = "2.3.0";
src = fetchgit { src = fetchgit {
url = "https://gitee.com/openeuler/stratovirt.git"; url = "https://gitee.com/openeuler/stratovirt.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-K99CmaBrJu30/12FxnsNsDKsTyX4f2uQSO7cwHsPuDw="; sha256 = "sha256-f5710f7Lz7ul1DYrC0CAfDR+7e1NrE9ESPdB8nlVUKw=";
}; };
patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ]; patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ];
cargoSha256 = "sha256-SFIOGGRzGkVWHIXkviVWuhDN29pa0uD3GqKh+G421xI="; cargoSha256 = "sha256-prs7zkPAKQ99gjW7gy+4+CgEgGhaTTCLPTbLk/ZHdts=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -1,4 +1,4 @@
From af3001b1b2697ae3165e2fdf47a560fd9ab19a68 Mon Sep 17 00:00:00 2001 From c5ef87eb831f7f77c0564dd1dce92a579e7c4747 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net> From: Astro <astro@spaceboyz.net>
Date: Sun, 18 Jun 2023 23:10:23 +0200 Date: Sun, 18 Jun 2023 23:10:23 +0200
Subject: [PATCH] micro_vm: allow SYS_clock_gettime Subject: [PATCH] micro_vm: allow SYS_clock_gettime
@ -8,13 +8,13 @@ Subject: [PATCH] micro_vm: allow SYS_clock_gettime
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs
index 89ce5c29..2a6aa0cc 100644 index c37d3f4e..f9e7cce2 100644
--- a/machine/src/micro_vm/syscall.rs --- a/machine/src/micro_vm/syscall.rs
+++ b/machine/src/micro_vm/syscall.rs +++ b/machine/src/micro_vm/syscall.rs
@@ -128,6 +128,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> { @@ -125,6 +125,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> {
#[cfg(all(target_env = "gnu", target_arch = "x86_64"))]
BpfRule::new(libc::SYS_readlink), BpfRule::new(libc::SYS_readlink),
BpfRule::new(libc::SYS_getrandom), BpfRule::new(libc::SYS_getrandom),
BpfRule::new(libc::SYS_fallocate),
+ #[cfg(target_env = "gnu")] + #[cfg(target_env = "gnu")]
+ BpfRule::new(libc::SYS_clock_gettime), + BpfRule::new(libc::SYS_clock_gettime),
madvise_rule(), madvise_rule(),

View File

@ -120,7 +120,6 @@
"EasyScreenCast@iacopodeenosee.gmail.com" = "easyScreenCast"; # extensionPortalSlug is "easyscreencast" "EasyScreenCast@iacopodeenosee.gmail.com" = "easyScreenCast"; # extensionPortalSlug is "easyscreencast"
"gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = "fuzzy-app-search"; # extensionPortalSlug is "gnome-fuzzy-app-search" "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = "fuzzy-app-search"; # extensionPortalSlug is "gnome-fuzzy-app-search"
"TopIcons@phocean.net" = "topicons-plus"; # extensionPortalSlug is "topicons" "TopIcons@phocean.net" = "topicons-plus"; # extensionPortalSlug is "topicons"
"paperwm@hedning:matrix.org" = "paperwm"; # is not on extensions.gnome.org
"no-title-bar@jonaspoehler.de" = "no-title-bar"; # extensionPortalSlug is "no-title-bar-forked" "no-title-bar@jonaspoehler.de" = "no-title-bar"; # extensionPortalSlug is "no-title-bar-forked"
# These extensions are automatically packaged at the moment. We preserve the old attribute name # These extensions are automatically packaged at the moment. We preserve the old attribute name
# for backwards compatibility. # for backwards compatibility.

View File

@ -9,7 +9,6 @@
"icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "icon-hider@kalnitsky.org" = callPackage ./icon-hider { };
"impatience@gfxmonk.net" = callPackage ./impatience { }; "impatience@gfxmonk.net" = callPackage ./impatience { };
"no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { };
"paperwm@hedning:matrix.org" = callPackage ./paperwm { };
"pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; "pidgin@muffinmad" = callPackage ./pidgin-im-integration { };
"pop-shell@system76.com" = callPackage ./pop-shell { }; "pop-shell@system76.com" = callPackage ./pop-shell { };
"sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { };

View File

@ -1,42 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, gitUpdater
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell-extension-paperwm";
version = "44.3.1";
src = fetchFromGitHub {
owner = "paperwm";
repo = "PaperWM";
rev = "v${finalAttrs.version}";
hash = "sha256-oGBnQGtx2ku4cfgZkZ3OdHlVuiYR8hy1eYDWDZP3fn4=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org"
cp -r . "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org"
runHook postInstall
'';
passthru.updateScript = gitUpdater { url = finalAttrs.meta.homepage; };
meta = {
homepage = "https://github.com/paperwm/PaperWM";
description = "Tiled scrollable window management for Gnome Shell";
changelog = "https://github.com/paperwm/PaperWM/releases/tag/${finalAttrs.src.rev}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ hedning AndersonTorres cab404 ];
platforms = lib.platforms.all;
};
passthru.extensionUuid = "paperwm@hedning:matrix.org";
})

View File

@ -391,15 +391,7 @@ self: super: {
# https://github.com/awakesecurity/nix-graph/issues/5 # https://github.com/awakesecurity/nix-graph/issues/5
nix-graph = doJailbreak super.nix-graph; nix-graph = doJailbreak super.nix-graph;
cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix;
# Adds a workaround to the API changes in the versions library
# Should be dropped by the next release
# https://github.com/cachix/cachix/pull/556
(appendPatch (fetchpatch {
url = "https://github.com/cachix/cachix/commit/078d2d2212d7533a6a4db000958bfc4373c4deeb.patch";
hash = "sha256-xfJaO2CuZWFHivq4gqbkNnTOWPiyFVjlwOPV6yibKH4=";
stripLen = 1;
}) super.cachix);
# https://github.com/froozen/kademlia/issues/2 # https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia; kademlia = dontCheck super.kademlia;

View File

@ -1070,29 +1070,29 @@ self: super: builtins.intersectAttrs super {
domaindriven-core = dontCheck super.domaindriven-core; domaindriven-core = dontCheck super.domaindriven-core;
cachix-api = overrideCabal (drv: { cachix-api = overrideCabal (drv: {
version = "1.6"; version = "1.6.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "cachix"; owner = "cachix";
repo = "cachix"; repo = "cachix";
rev = "v1.6"; rev = "v1.6.1";
sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg=";
}; };
postUnpack = "sourceRoot=$sourceRoot/cachix-api"; postUnpack = "sourceRoot=$sourceRoot/cachix-api";
postPatch = '' postPatch = ''
sed -i 's/1.5/1.6/' cachix-api.cabal sed -i 's/1.6/1.6.1/' cachix-api.cabal
''; '';
}) super.cachix-api; }) super.cachix-api;
cachix = overrideCabal (drv: { cachix = overrideCabal (drv: {
version = "1.6"; version = "1.6.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "cachix"; owner = "cachix";
repo = "cachix"; repo = "cachix";
rev = "v1.6"; rev = "v1.6.1";
sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg=";
}; };
postUnpack = "sourceRoot=$sourceRoot/cachix"; postUnpack = "sourceRoot=$sourceRoot/cachix";
postPatch = '' postPatch = ''
sed -i 's/1.5/1.6/' cachix.cabal sed -i 's/1.6/1.6.1/' cachix.cabal
''; '';
}) (lib.pipe }) (lib.pipe
(super.cachix.override { (super.cachix.override {
@ -1102,7 +1102,7 @@ self: super: builtins.intersectAttrs super {
[ [
(addBuildTool self.hercules-ci-cnix-store.nixPackage) (addBuildTool self.hercules-ci-cnix-store.nixPackage)
(addBuildTool pkgs.pkg-config) (addBuildTool pkgs.pkg-config)
(addBuildDepend self.ascii-progress) (addBuildDepend self.immortal)
] ]
); );

View File

@ -1,7 +1,7 @@
{ lib, mkDerivation }: { lib, mkDerivation }:
mkDerivation { mkDerivation {
version = "26.0.2"; version = "26.1";
sha256 = "sha256-GzF/cpTUe5hoocDK5aio/lo8oYFeTr+HkftTYpQnOdA="; sha256 = "sha256-GECxenOxwZ0A7cY5Z/amthNezGVPsmZWB5gHayy78cI=";
} }

View File

@ -138,10 +138,10 @@ in {
sourceVersion = { sourceVersion = {
major = "7"; major = "7";
minor = "3"; minor = "3";
patch = "11"; patch = "12";
}; };
hash = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw="; hash = "sha256-3WHYjaJ0ws4s7HdmfUo9+aZSvMUOJvkJkdTdCvZrzPQ=";
pythonVersion = "2.7"; pythonVersion = "2.7";
db = db.override { dbmSupport = !stdenv.isDarwin; }; db = db.override { dbmSupport = !stdenv.isDarwin; };
python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; python = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
@ -155,10 +155,10 @@ in {
sourceVersion = { sourceVersion = {
major = "7"; major = "7";
minor = "3"; minor = "3";
patch = "11"; patch = "12";
}; };
hash = "sha256-sPMWb7Klqt/VzrnbXN1feSmg7MygK0omwNrgSS98qOo="; hash = "sha256-56IEbH5sJfw4aru1Ey6Sp8wkkeOTVpmpRstdy7NCwqo=";
pythonVersion = "3.9"; pythonVersion = "3.9";
db = db.override { dbmSupport = !stdenv.isDarwin; }; db = db.override { dbmSupport = !stdenv.isDarwin; };
python = __splicedPackages.pypy27; python = __splicedPackages.pypy27;
@ -167,28 +167,26 @@ in {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
pypy38 = __splicedPackages.pypy39.override { pypy310 = __splicedPackages.pypy39.override {
self = __splicedPackages.pythonInterpreters.pypy38; self = __splicedPackages.pythonInterpreters.pypy310;
pythonVersion = "3.8"; pythonVersion = "3.10";
hash = "sha256-TWdpv8pzc06GZv1wUDt86wam4lkRDmFzMbs4mcpOYFg="; hash = "sha256-huTk6sw2BGxhgvQwGHllN/4zpg4dKizGuOf5Gl3LPkI=";
}; };
pypy37 = throw "pypy37 has been removed from nixpkgs since it is no longer supported upstream"; # Added 2023-01-04
pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix {
# Not included at top-level # Not included at top-level
self = __splicedPackages.pythonInterpreters.pypy27_prebuilt; self = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
sourceVersion = { sourceVersion = {
major = "7"; major = "7";
minor = "3"; minor = "3";
patch = "11"; patch = "12";
}; };
hash = { hash = {
aarch64-linux = "sha256-6pJNod7+kyXvdg4oiwT5hGFOQFWA9TIetqXI9Tm9QVo="; aarch64-linux = "sha256-4E3LYoantHJOw/DlDTzBuoWDMB3RZYwG1/N1meQgHFk=";
x86_64-linux = "sha256-uo7ZWKkFwHNaTP/yh1wlCJlU3AIOCH2YKw/6W52jFs0="; x86_64-linux = "sha256-GmGiV0t5Rm9gYBDymZormVvZbNCF+Rp46909XCxA6B0=";
aarch64-darwin = "sha256-zFaWq0+TzTSBweSZC13t17pgrAYC+hiQ02iImmxb93E="; aarch64-darwin = "sha256-a3R6oHauhZfklgPF3sTKWTWhoKEy10BKVZvpaiYNm/c=";
x86_64-darwin = "sha256-Vt7unCJkD1aGw1udZP2xzjq9BEWD5AePCxccov0qGY4="; x86_64-darwin = "sha256-bon/3RVTfOT/zjFFtl7lfC6clSiSvZW5NAEtLwCfUDs=";
}.${stdenv.system}; }.${stdenv.system};
pythonVersion = "2.7"; pythonVersion = "2.7";
inherit passthruFun; inherit passthruFun;
@ -200,13 +198,13 @@ in {
sourceVersion = { sourceVersion = {
major = "7"; major = "7";
minor = "3"; minor = "3";
patch = "11"; patch = "12";
}; };
hash = { hash = {
aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk="; aarch64-linux = "sha256-6TJ/ue2vKtkZNdW4Vj7F/yQZO92xdcGsqvdywCWvGCQ=";
x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; x86_64-linux = "sha256-hMiblm+rK1j0UaSC7jDKf+wzUENb0LlhRhXGHcbaI5A=";
aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4="; aarch64-darwin = "sha256-DooaNGi5eQxzSsaY9bAMwD/BaJnMxs6HZGX6wLg5gOM=";
x86_64-darwin = "sha256-0z9AsgcJmHJYWv1xhzV1ym6mOKJ9gjvGISOMWuglQu0="; x86_64-darwin = "sha256-ZPAI/6BwxAfl70bIJWsuAU3nGW6l2Fg4WGElTnlZ9Os=";
}.${stdenv.system}; }.${stdenv.system};
pythonVersion = "3.9"; pythonVersion = "3.9";
inherit passthruFun; inherit passthruFun;

View File

@ -8,7 +8,6 @@
{ stdenv { stdenv
, python , python
, runCommand , runCommand
, substituteAll
, lib , lib
, callPackage , callPackage
, pkgs , pkgs
@ -60,7 +59,7 @@ let
is_nixenv = "True"; is_nixenv = "True";
is_virtualenv = "False"; is_virtualenv = "False";
}; };
} // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) {
# Venv built using plain Python # Venv built using plain Python
# Python 2 does not support venv # Python 2 does not support venv
# TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3.
@ -109,7 +108,7 @@ let
cpython-gdb = callPackage ./tests/test_cpython_gdb { cpython-gdb = callPackage ./tests/test_cpython_gdb {
interpreter = python; interpreter = python;
}; };
} // lib.optionalAttrs (python.pythonAtLeast "3.7") rec { } // lib.optionalAttrs (python.pythonAtLeast "3.7") {
# Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages
nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix {
interpreter = python; interpreter = python;
@ -126,7 +125,7 @@ let
extension = self: super: { extension = self: super: {
foobar = super.numpy; foobar = super.numpy;
}; };
in { in lib.optionalAttrs (python.isPy3k) ({
test-packageOverrides = let test-packageOverrides = let
myPython = let myPython = let
self = python.override { self = python.override {
@ -150,7 +149,7 @@ let
]; ];
}); });
in pkgs_.${python.pythonAttr}.pkgs.foo; in pkgs_.${python.pythonAttr}.pkgs.foo;
}; });
condaTests = let condaTests = let
requests = callPackage ({ requests = callPackage ({
@ -178,7 +177,7 @@ let
} }
) {}; ) {};
pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]); pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]);
in lib.optionalAttrs stdenv.isLinux in lib.optionalAttrs (python.isPy3k && stdenv.isLinux)
{ {
condaExamplePackage = runCommand "import-requests" {} '' condaExamplePackage = runCommand "import-requests" {} ''
${pythonWithRequests.interpreter} -c "import requests" > $out ${pythonWithRequests.interpreter} -c "import requests" > $out

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "cpp-utilities"; pname = "cpp-utilities";
version = "5.24.0"; version = "5.24.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Martchus"; owner = "Martchus";
repo = "cpp-utilities"; repo = "cpp-utilities";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-krskfuoCRxYcAIDqrae4+yEABXXZ9Nv0BjBVwSMjC7g="; sha256 = "sha256-Prb593+jXhYzwPHQnwen2qgaNfdX1Atiz1FhmXm9X7U=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -0,0 +1,30 @@
{ lib
, fetchFromGitHub
, buildDunePackage
, cppo
}:
buildDunePackage rec {
pname = "ocolor";
version = "1.3.1";
minimalOCamlVersion = "4.02";
src = fetchFromGitHub {
owner = "marc-chevalier";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "osQTZGJp9yDoKNa6WoyhViNbRg1ukcD0Jxiu4VxqeUc=";
};
nativeBuildInputs = [
cppo
];
meta = {
description = "Print with style in your terminal using Formats semantic tags";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ toastal ];
homepage = "https://github.com/marc-chevalier/ocolor";
};
}

View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aemet-opendata"; pname = "aemet-opendata";
version = "0.4.4"; version = "0.4.5";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Noltari"; owner = "Noltari";
repo = "AEMET-OpenData"; repo = "AEMET-OpenData";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-Jm7fv1fNavp2GkfKPhZXYGnGuCBy6BdN9iTNYTBIyew="; hash = "sha256-rjHiDn8//zjFR27RTGGWZCxKI6pDXu47DFINV8Tq7ZM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiohomekit"; pname = "aiohomekit";
version = "3.0.3"; version = "3.0.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "Jc2k"; owner = "Jc2k";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-6fNsiHddnsdjei0/wqx5ifWhM3bALlYG5Gli69+FmnM="; hash = "sha256-ZcgV+IkdSVKMd2GfnXqS6MibWT96YKVTJgor0zG+a/k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aliyun-python-sdk-core"; pname = "aliyun-python-sdk-core";
version = "2.13.36"; version = "2.14.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-IL1UmE+jFtpwDH81WlGrC4FmkOKg/O+3te8BP+0NqSg="; hash = "sha256-yAaBWkj/24lMxbzhW4JZuaMBLMDNoBvi89+7hE8/TyE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -20,7 +20,7 @@
let let
pname = "django-redis"; pname = "django-redis";
version = "5.2.0"; version = "5.3.0";
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
@ -31,7 +31,7 @@ buildPythonPackage {
owner = "jazzband"; owner = "jazzband";
repo = "django-redis"; repo = "django-redis";
rev = version; rev = version;
hash = "sha256-e8wCgfxBT+WKFY4H83CTMirTpQym3QAoeWnXbRCDO90="; hash = "sha256-eX9rUUvpkRrkZ82YalWn8s9DTw6nsbGzi1A6ibRoQGw=";
}; };
postPatch = '' postPatch = ''
@ -67,11 +67,6 @@ buildPythonPackage {
pytestCheckHook pytestCheckHook
]; ];
pytestFlagsArray = lib.optionals (pythonAtLeast "3.11") [
# DeprecationWarning: 'cgi' is deprecated and slated for removal in Python 3.13
"-W" "ignore::DeprecationWarning"
];
disabledTests = [ disabledTests = [
# ModuleNotFoundError: No module named 'test_cache_options' # ModuleNotFoundError: No module named 'test_cache_options'
"test_custom_key_function" "test_custom_key_function"
@ -79,7 +74,7 @@ buildPythonPackage {
"test_delete_pattern_calls_get_client_given_no_client" "test_delete_pattern_calls_get_client_given_no_client"
"test_delete_pattern_calls_make_pattern" "test_delete_pattern_calls_make_pattern"
"test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given"
"test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" "test_delete_pattern_calls_pipeline_delete_and_execute"
"test_delete_pattern_calls_scan_iter" "test_delete_pattern_calls_scan_iter"
"test_delete_pattern_calls_delete_for_given_keys" "test_delete_pattern_calls_delete_for_given_keys"
]; ];
@ -87,6 +82,7 @@ buildPythonPackage {
meta = with lib; { meta = with lib; {
description = "Full featured redis cache backend for Django"; description = "Full featured redis cache backend for Django";
homepage = "https://github.com/jazzband/django-redis"; homepage = "https://github.com/jazzband/django-redis";
changelog = "https://github.com/jazzband/django-redis/releases/tag/${version}";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ hexa ]; maintainers = with maintainers; [ hexa ];
}; };

View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hcloud"; pname = "hcloud";
version = "1.28.0"; version = "1.29.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-BM6iy3dSjiy65uLi1Yr1qvaWcnrE/LQfyFkZLrzD8pw="; hash = "sha256-d5LEN7sFoO+R7pGTvLOMRoej/KB17uY3kqF+CY97x1k=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -5,7 +5,7 @@
, cudaSupport ? false , cudaSupport ? false
# runtime # runtime
, ffmpeg , ffmpeg-headless
# propagates # propagates
, numpy , numpy
@ -14,7 +14,6 @@
, tqdm , tqdm
, more-itertools , more-itertools
, transformers , transformers
, ffmpeg-python
, numba , numba
, openai-triton , openai-triton
, scipy , scipy
@ -26,20 +25,20 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "whisper"; pname = "whisper";
version = "20230314"; version = "20230918";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openai"; owner = "openai";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-qQCELjRFeRCT1k1CBc3netRtFvt+an/EbkrgnmiX/mc="; hash = "sha256-wBAanFVEIIzTcoX40P9eI26UdEu0SC/xuife/zi2Xho=";
}; };
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./ffmpeg-path.patch; src = ./ffmpeg-path.patch;
inherit ffmpeg; ffmpeg = ffmpeg-headless;
}) })
]; ];
@ -48,7 +47,6 @@ buildPythonPackage rec {
tqdm tqdm
more-itertools more-itertools
transformers transformers
ffmpeg-python
numba numba
scipy scipy
tiktoken tiktoken
@ -61,7 +59,7 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace requirements.txt \ substituteInPlace requirements.txt \
--replace "tiktoken==0.3.1" "tiktoken>=0.3.1" --replace "tiktoken==0.3.3" "tiktoken>=0.3.3"
'' ''
# openai-triton is only needed for CUDA support. # openai-triton is only needed for CUDA support.
# triton needs CUDA to be build. # triton needs CUDA to be build.
@ -80,7 +78,6 @@ buildPythonPackage rec {
disabledTests = [ disabledTests = [
# requires network access to download models # requires network access to download models
"test_tokenizer"
"test_transcribe" "test_transcribe"
# requires NVIDIA drivers # requires NVIDIA drivers
"test_dtw_cuda_equivalence" "test_dtw_cuda_equivalence"

View File

@ -1,13 +1,13 @@
diff --git a/whisper/audio.py b/whisper/audio.py diff --git a/whisper/audio.py b/whisper/audio.py
index a6074e8..da18350 100644 index 4f5b6e0..bfe7924 100644
--- a/whisper/audio.py --- a/whisper/audio.py
+++ b/whisper/audio.py +++ b/whisper/audio.py
@@ -41,7 +41,7 @@ def load_audio(file: str, sr: int = SAMPLE_RATE): @@ -44,7 +44,7 @@ def load_audio(file: str, sr: int = SAMPLE_RATE):
out, _ = ( # and resampling as necessary. Requires the ffmpeg CLI in PATH.
ffmpeg.input(file, threads=0) # fmt: off
.output("-", format="s16le", acodec="pcm_s16le", ac=1, ar=sr) cmd = [
- .run(cmd=["ffmpeg", "-nostdin"], capture_stdout=True, capture_stderr=True) - "ffmpeg",
+ .run(cmd=["@ffmpeg@/bin/ffmpeg", "-nostdin"], capture_stdout=True, capture_stderr=True) + "@ffmpeg@/bin/ffmpeg",
) "-nostdin",
except ffmpeg.Error as e: "-threads", "0",
raise RuntimeError(f"Failed to load audio: {e.stderr.decode()}") from e "-i", file,

View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "policy-sentry"; pname = "policy-sentry";
version = "0.12.9"; version = "0.12.10";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "salesforce"; owner = "salesforce";
repo = "policy_sentry"; repo = "policy_sentry";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-mVB7qqADjf4XnDaQyL5C4/Z6hOxAMQbmr6fGnaXD+O0="; hash = "sha256-Kha5fq5l1yXWjDZq9GFKk3gYRtrEyiCFjbEAdYGPSa8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "s3fs"; pname = "s3fs";
version = "2023.9.1"; version = "2023.9.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-QuGCHtlMFgfISIU9HXFevNJcEzgLb1EMLLSYx+Wz5nQ="; hash = "sha256-ZMzOrTKoFkIt2a4daTxdY1TZn2SuJsVjiPHY4ceFgyE=";
}; };
postPatch = '' postPatch = ''

View File

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "transmission-rpc"; pname = "transmission-rpc";
version = "7.0.0"; version = "7.0.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Trim21"; owner = "Trim21";
repo = "transmission-rpc"; repo = "transmission-rpc";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-66TKUi4rNZDMWPncyxgHY6oW62DVOQLSWO1RevHG7EY="; hash = "sha256-wBTx4gy6c6TMtc2m+xibEzCgYJJiMMZ16+pq3H06hgs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sbt-extras"; pname = "sbt-extras";
rev = "99b0d2138b498b3d553c0b23d5d18cad3e40e028"; rev = "7b70bbfc1cbe04172b5299ac092050d78d615a5a";
version = "2023-09-14"; version = "2023-09-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paulp"; owner = "paulp";
repo = "sbt-extras"; repo = "sbt-extras";
inherit rev; inherit rev;
sha256 = "hejhCclA/HSyEC4MgX3h61fB8jsfIErGAnxqUrqNBLU="; sha256 = "Uu1eyshAWkc9VgxPHa6V0+o4At/hDS/OuIJluHlxZjE=";
}; };
dontBuild = true; dontBuild = true;

View File

@ -11,14 +11,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-audit"; pname = "cargo-audit";
version = "0.18.1"; version = "0.18.2";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-XK2SsyT4CyDjCF56v/g7tX5SZKC3krBQNs/ddeFu35A="; hash = "sha256-mBY4M0phjwWS2qWTlVSjLpD0lzMDutMRMbAerbMSXmI=";
}; };
cargoHash = "sha256-1Uifk1W7NCmHAbUl83GpMUBD6WWUl1J/HjtGv4dEuiA="; cargoHash = "sha256-bBcyJxlb18Bf76GOR6anTNQYqRpYs3dkGVy9rC5au5k=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -27,14 +27,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vcmi"; pname = "vcmi";
version = "1.2.1"; version = "1.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vcmi"; owner = "vcmi";
repo = "vcmi"; repo = "vcmi";
rev = version; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-F1g3ric23jKetl5aBG5NRpT4LnGXhBKZmGp2hg6Io9s="; hash = "sha256-dwTQRpu+IrKhuiiw/uYBt8i/BYlQ5XCy/jUhDAo6aa4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DENABLE_LUA:BOOL=ON" "-DENABLE_LUA:BOOL=ON"
"-DENABLE_ERM:BOOL=ON" "-DENABLE_ERM:BOOL=OFF"
"-DENABLE_GITVERSION:BOOL=OFF" "-DENABLE_GITVERSION:BOOL=OFF"
"-DENABLE_PCH:BOOL=OFF" "-DENABLE_PCH:BOOL=OFF"
"-DENABLE_TEST:BOOL=OFF" "-DENABLE_TEST:BOOL=OFF"

View File

@ -3,14 +3,14 @@
let let
# These names are how they are designated in https://xanmod.org. # These names are how they are designated in https://xanmod.org.
ltsVariant = { ltsVariant = {
version = "6.1.53"; version = "6.1.54";
hash = "sha256-+70dp+zVOvfKJv9hEy3FpEs2ldrxHiWbokaUnXrNj5o="; hash = "sha256-sAVWtpR0fzBcLR82MFREG4Qv/JEXyJ+5MZ/XDVE0fu8=";
variant = "lts"; variant = "lts";
}; };
mainVariant = { mainVariant = {
version = "6.5.3"; version = "6.5.4";
hash = "sha256-2giaFyN3kWzQ9cl1mTM9ecSlwoQS+dm3/LvbTAHjZ/A="; hash = "sha256-zT+aU/pOtKgzVOH5Xg4qd88RcDVBmO4af/rgrkUrnfw=";
variant = "main"; variant = "main";
}; };

View File

@ -10,9 +10,9 @@
] ]
}, },
"calendar": { "calendar": {
"sha256": "0liws0xkndrx5qd06hn3n5jg7yl02w38j0nj37wyrv4qjk9w6n7v", "sha256": "14jf0vrjkscz6j2xsf2xn18v3vwqkd8qi47iyyz2wlzdgi25zl6v",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.4/calendar-v4.4.4.tar.gz", "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.1/calendar-v4.5.1.tar.gz",
"version": "4.4.4", "version": "4.5.1",
"description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite teams matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite teams matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
"homepage": "https://github.com/nextcloud/calendar/", "homepage": "https://github.com/nextcloud/calendar/",
"licenses": [ "licenses": [
@ -20,9 +20,9 @@
] ]
}, },
"contacts": { "contacts": {
"sha256": "0f9k3glw6kfj4ms9bxw5zcv0ygfg0jdhdn9cdzq8a3d8i07v0vb8", "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz", "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz",
"version": "5.3.2", "version": "5.4.2",
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **Were not reinventing the wheel!** Based on the great and open SabreDAV library.", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **Were not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme", "homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [ "licenses": [
@ -40,9 +40,9 @@
] ]
}, },
"deck": { "deck": {
"sha256": "1rsfyl6p6myy36mv4x9ci3g53k4ndbwqmss4pfk3sh1y6vik8hcn", "sha256": "01bpcq96y1yp4cmkssjcpqamk3wsg99jbsyhich2kjj9a33d0a5v",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.5/deck-v1.8.5.tar.gz", "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.6/deck-v1.8.6.tar.gz",
"version": "1.8.5", "version": "1.8.6",
"description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
"homepage": "https://github.com/nextcloud/deck", "homepage": "https://github.com/nextcloud/deck",
"licenses": [ "licenses": [
@ -80,9 +80,9 @@
] ]
}, },
"groupfolders": { "groupfolders": {
"sha256": "1yfhy14cfz16ax5i8d6zhl4m161qzy98xzm36y1656rh96i2ksbx", "sha256": "0mkw8w3miq14ky3c04d3pli1n1jcrsf47005pv8ny170zyhai943",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.5/groupfolders-v13.1.5.tar.gz", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.6/groupfolders-v13.1.6.tar.gz",
"version": "13.1.5", "version": "13.1.6",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
"homepage": "https://github.com/nextcloud/groupfolders", "homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [ "licenses": [
@ -113,15 +113,15 @@
"sha256": "1i05dbdhbsg6pmzs7w9dh0wmfd4irv4d44v1gwsfmr00w4mwn9v1", "sha256": "1i05dbdhbsg6pmzs7w9dh0wmfd4irv4d44v1gwsfmr00w4mwn9v1",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.7/mail-v2.2.7.tar.gz", "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.7/mail-v2.2.7.tar.gz",
"version": "2.2.7", "version": "2.2.7",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
"homepage": "https://github.com/nextcloud/mail#readme", "homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [ "licenses": [
"agpl" "agpl"
] ]
}, },
"maps": { "maps": {
"sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", "sha256": "0517kakkk7lr7ays6rrnl276709kcm5yvkp8g6cwjnfih7pmnkn9",
"url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0-2a-nightly/maps-1.1.0-2a-nightly.tar.gz",
"version": "1.1.0", "version": "1.1.0",
"description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
"homepage": "https://github.com/nextcloud/maps", "homepage": "https://github.com/nextcloud/maps",
@ -130,9 +130,9 @@
] ]
}, },
"memories": { "memories": {
"sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", "sha256": "1w17cy5ciybq2yf42rmiim77mkfdrjg49l2l3b2v2dxpfv36is1s",
"url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", "url": "https://github.com/pulsejet/memories/releases/download/v5.4.1/memories.tar.gz",
"version": "5.2.1", "version": "5.4.1",
"description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.",
"homepage": "https://memories.gallery", "homepage": "https://memories.gallery",
"licenses": [ "licenses": [
@ -180,9 +180,9 @@
] ]
}, },
"polls": { "polls": {
"sha256": "0w41zxbf8kqnr5hwlf6z5bymwz1d0vbgg5ippc72a8rwma7hlyay", "sha256": "1v5zb164f60qskfiv02l9x2v0d4rayacg5qivd70dawmyqnz4vmd",
"url": "https://github.com/nextcloud/polls/releases/download/v5.2.0/polls.tar.gz", "url": "https://github.com/nextcloud/polls/releases/download/v5.3.2/polls.tar.gz",
"version": "5.2.0", "version": "5.3.2",
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
"homepage": "https://github.com/nextcloud/polls", "homepage": "https://github.com/nextcloud/polls",
"licenses": [ "licenses": [
@ -220,9 +220,9 @@
] ]
}, },
"spreed": { "spreed": {
"sha256": "0az92qmc24n91zh2vq4qs99zppph6bchknv5akw6c7iqpg8d12gk", "sha256": "0n6dbvfmasyrrpzqp5i5k6bcp6ipwawkvn7hl557nhy2d60k0ffs",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.7/spreed-v15.0.7.tar.gz", "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.8/spreed-v15.0.8.tar.gz",
"version": "15.0.7", "version": "15.0.8",
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds",
"homepage": "https://github.com/nextcloud/spreed", "homepage": "https://github.com/nextcloud/spreed",
"licenses": [ "licenses": [

View File

@ -1,8 +1,8 @@
{ {
"bookmarks": { "bookmarks": {
"sha256": "16j10gj5nghgji36jhng60291wl4h9c3vndjx9j8jij9qn6hz23f", "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.0/bookmarks-13.1.0.tar.gz", "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz",
"version": "13.1.0", "version": "13.1.1",
"description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0",
"homepage": "https://github.com/nextcloud/bookmarks", "homepage": "https://github.com/nextcloud/bookmarks",
"licenses": [ "licenses": [
@ -10,9 +10,9 @@
] ]
}, },
"calendar": { "calendar": {
"sha256": "0liws0xkndrx5qd06hn3n5jg7yl02w38j0nj37wyrv4qjk9w6n7v", "sha256": "14jf0vrjkscz6j2xsf2xn18v3vwqkd8qi47iyyz2wlzdgi25zl6v",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.4/calendar-v4.4.4.tar.gz", "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.1/calendar-v4.5.1.tar.gz",
"version": "4.4.4", "version": "4.5.1",
"description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite teams matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite teams matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
"homepage": "https://github.com/nextcloud/calendar/", "homepage": "https://github.com/nextcloud/calendar/",
"licenses": [ "licenses": [
@ -20,9 +20,9 @@
] ]
}, },
"contacts": { "contacts": {
"sha256": "0f9k3glw6kfj4ms9bxw5zcv0ygfg0jdhdn9cdzq8a3d8i07v0vb8", "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz", "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz",
"version": "5.3.2", "version": "5.4.2",
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **Were not reinventing the wheel!** Based on the great and open SabreDAV library.", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **Were not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme", "homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [ "licenses": [
@ -40,9 +40,9 @@
] ]
}, },
"deck": { "deck": {
"sha256": "0lgm6d99r2qpsx3ymnjy5i7h8c0yif9fgn2nhq49jz51x09pc7kd", "sha256": "0j228lbf0zrm2sq45f9abgkln1qzgrkw8ac5r6fhyi0qfxcpmm0m",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.2/deck-v1.9.2.tar.gz", "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.3/deck-v1.9.3.tar.gz",
"version": "1.9.2", "version": "1.9.3",
"description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
"homepage": "https://github.com/nextcloud/deck", "homepage": "https://github.com/nextcloud/deck",
"licenses": [ "licenses": [
@ -80,9 +80,9 @@
] ]
}, },
"groupfolders": { "groupfolders": {
"sha256": "00w3ri03d8kwnzzjgfbx8c5882gnw666nyxpjp4nq5rmr05m14s1", "sha256": "03zljgzhyvvc7jfabphxvkgp8rhbypz17zmlvmr46cwh1djnx5m9",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.4/groupfolders-v14.0.4.tar.gz", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.5/groupfolders-v14.0.5.tar.gz",
"version": "14.0.4", "version": "14.0.5",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
"homepage": "https://github.com/nextcloud/groupfolders", "homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [ "licenses": [
@ -110,19 +110,19 @@
] ]
}, },
"mail": { "mail": {
"sha256": "044adgcsix1lkisk6lr6y1z7hiqb0p3sipwn16xilxy1cdnxwf5h", "sha256": "1n5z683ws6206vcy0qza342ihwv4wl5kvr1nscji84hvl18ccdfr",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.6/mail-v3.2.6.tar.gz", "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.0/mail-v3.4.0.tar.gz",
"version": "3.2.6", "version": "3.4.0",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
"homepage": "https://github.com/nextcloud/mail#readme", "homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [ "licenses": [
"agpl" "agpl"
] ]
}, },
"maps": { "maps": {
"sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", "sha256": "1rcmqnm5364h5gaq1yy6b6d7k17napgn0yc9ymrnn75bps9s71v9",
"url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", "url": "https://github.com/nextcloud/maps/releases/download/v1.1.1/maps-1.1.1.tar.gz",
"version": "1.1.0", "version": "1.1.1",
"description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
"homepage": "https://github.com/nextcloud/maps", "homepage": "https://github.com/nextcloud/maps",
"licenses": [ "licenses": [
@ -130,9 +130,9 @@
] ]
}, },
"memories": { "memories": {
"sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", "sha256": "1w17cy5ciybq2yf42rmiim77mkfdrjg49l2l3b2v2dxpfv36is1s",
"url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", "url": "https://github.com/pulsejet/memories/releases/download/v5.4.1/memories.tar.gz",
"version": "5.2.1", "version": "5.4.1",
"description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.",
"homepage": "https://memories.gallery", "homepage": "https://memories.gallery",
"licenses": [ "licenses": [
@ -180,9 +180,9 @@
] ]
}, },
"polls": { "polls": {
"sha256": "0w41zxbf8kqnr5hwlf6z5bymwz1d0vbgg5ippc72a8rwma7hlyay", "sha256": "1v5zb164f60qskfiv02l9x2v0d4rayacg5qivd70dawmyqnz4vmd",
"url": "https://github.com/nextcloud/polls/releases/download/v5.2.0/polls.tar.gz", "url": "https://github.com/nextcloud/polls/releases/download/v5.3.2/polls.tar.gz",
"version": "5.2.0", "version": "5.3.2",
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
"homepage": "https://github.com/nextcloud/polls", "homepage": "https://github.com/nextcloud/polls",
"licenses": [ "licenses": [
@ -220,9 +220,9 @@
] ]
}, },
"spreed": { "spreed": {
"sha256": "09jkq0fiw5h60qvjhld0nrralf2yrdcnpr9q4chw5hq0q710526n", "sha256": "1fnlilb9l4vfqdkyk0f3djzdkv0pw3yy30f7psfj6hh6y82pvfky",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.5/spreed-v16.0.5.tar.gz", "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.6/spreed-v16.0.6.tar.gz",
"version": "16.0.5", "version": "16.0.6",
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds",
"homepage": "https://github.com/nextcloud/spreed", "homepage": "https://github.com/nextcloud/spreed",
"licenses": [ "licenses": [

View File

@ -1,8 +1,8 @@
{ {
"bookmarks": { "bookmarks": {
"sha256": "16j10gj5nghgji36jhng60291wl4h9c3vndjx9j8jij9qn6hz23f", "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.0/bookmarks-13.1.0.tar.gz", "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz",
"version": "13.1.0", "version": "13.1.1",
"description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0",
"homepage": "https://github.com/nextcloud/bookmarks", "homepage": "https://github.com/nextcloud/bookmarks",
"licenses": [ "licenses": [
@ -10,9 +10,9 @@
] ]
}, },
"calendar": { "calendar": {
"sha256": "0liws0xkndrx5qd06hn3n5jg7yl02w38j0nj37wyrv4qjk9w6n7v", "sha256": "14jf0vrjkscz6j2xsf2xn18v3vwqkd8qi47iyyz2wlzdgi25zl6v",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.4/calendar-v4.4.4.tar.gz", "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.1/calendar-v4.5.1.tar.gz",
"version": "4.4.4", "version": "4.5.1",
"description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite teams matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite teams matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **Were not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
"homepage": "https://github.com/nextcloud/calendar/", "homepage": "https://github.com/nextcloud/calendar/",
"licenses": [ "licenses": [
@ -20,9 +20,9 @@
] ]
}, },
"contacts": { "contacts": {
"sha256": "0f9k3glw6kfj4ms9bxw5zcv0ygfg0jdhdn9cdzq8a3d8i07v0vb8", "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz", "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz",
"version": "5.3.2", "version": "5.4.2",
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **Were not reinventing the wheel!** Based on the great and open SabreDAV library.", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **Were not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme", "homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [ "licenses": [
@ -40,9 +40,9 @@
] ]
}, },
"deck": { "deck": {
"sha256": "1vj58yfwgnsjs0khlyazfp1rx2sppkhv5c9w9hw3gjsxvg6ayxph", "sha256": "060im5zlj7w6x9d5jpxsziqc8ym6fk573dynvdz231jx360s52g6",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.10.0/deck-v1.10.0.tar.gz", "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.0/deck-v1.11.0.tar.gz",
"version": "1.10.0", "version": "1.11.0",
"description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
"homepage": "https://github.com/nextcloud/deck", "homepage": "https://github.com/nextcloud/deck",
"licenses": [ "licenses": [
@ -80,9 +80,9 @@
] ]
}, },
"groupfolders": { "groupfolders": {
"sha256": "1ghq09ym82i6w4w11zarx5m64axa3m1abwyzmmhz9zv1rlz5xjm4", "sha256": "17wqhnbbmgw5ywi39ygf6m1hys7fvr5nhbjzqna6a0bjfr9g19d7",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.0.2/groupfolders-v15.0.2.tar.gz", "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.1/groupfolders-v15.3.1.tar.gz",
"version": "15.0.2", "version": "15.3.1",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
"homepage": "https://github.com/nextcloud/groupfolders", "homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [ "licenses": [
@ -110,19 +110,19 @@
] ]
}, },
"mail": { "mail": {
"sha256": "044adgcsix1lkisk6lr6y1z7hiqb0p3sipwn16xilxy1cdnxwf5h", "sha256": "1n5z683ws6206vcy0qza342ihwv4wl5kvr1nscji84hvl18ccdfr",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.6/mail-v3.2.6.tar.gz", "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.0/mail-v3.4.0.tar.gz",
"version": "3.2.6", "version": "3.4.0",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
"homepage": "https://github.com/nextcloud/mail#readme", "homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [ "licenses": [
"agpl" "agpl"
] ]
}, },
"maps": { "maps": {
"sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", "sha256": "1rcmqnm5364h5gaq1yy6b6d7k17napgn0yc9ymrnn75bps9s71v9",
"url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", "url": "https://github.com/nextcloud/maps/releases/download/v1.1.1/maps-1.1.1.tar.gz",
"version": "1.1.0", "version": "1.1.1",
"description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
"homepage": "https://github.com/nextcloud/maps", "homepage": "https://github.com/nextcloud/maps",
"licenses": [ "licenses": [
@ -130,9 +130,9 @@
] ]
}, },
"memories": { "memories": {
"sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", "sha256": "1w17cy5ciybq2yf42rmiim77mkfdrjg49l2l3b2v2dxpfv36is1s",
"url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", "url": "https://github.com/pulsejet/memories/releases/download/v5.4.1/memories.tar.gz",
"version": "5.2.1", "version": "5.4.1",
"description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻‍🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.",
"homepage": "https://memories.gallery", "homepage": "https://memories.gallery",
"licenses": [ "licenses": [
@ -180,9 +180,9 @@
] ]
}, },
"polls": { "polls": {
"sha256": "0w41zxbf8kqnr5hwlf6z5bymwz1d0vbgg5ippc72a8rwma7hlyay", "sha256": "1v5zb164f60qskfiv02l9x2v0d4rayacg5qivd70dawmyqnz4vmd",
"url": "https://github.com/nextcloud/polls/releases/download/v5.2.0/polls.tar.gz", "url": "https://github.com/nextcloud/polls/releases/download/v5.3.2/polls.tar.gz",
"version": "5.2.0", "version": "5.3.2",
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
"homepage": "https://github.com/nextcloud/polls", "homepage": "https://github.com/nextcloud/polls",
"licenses": [ "licenses": [
@ -220,9 +220,9 @@
] ]
}, },
"spreed": { "spreed": {
"sha256": "02npdw77xbpmxr8nff4wpiz08155zcxbkd3awhzhl6gq00pigwrw", "sha256": "07q6kxbvrg652px8a4wi1msxm2z7r7z7s8v4nnccvdcscv90d99d",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.0.3/spreed-v17.0.3.tar.gz", "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz",
"version": "17.0.3", "version": "17.1.1",
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds",
"homepage": "https://github.com/nextcloud/spreed", "homepage": "https://github.com/nextcloud/spreed",
"licenses": [ "licenses": [

View File

@ -66,7 +66,8 @@ in rec {
}; };
unifi7 = generic { unifi7 = generic {
version = "7.4.156"; version = "7.5.176";
sha256 = "sha256-UJjzSC2qKi2ABwH5p0s/5fXfB3NVfYBb3wBfE/8NlK4="; suffix = "-1136930355";
sha256 = "sha256-prsFq09zYrB74p/MGKjwvZftw78k9wbIva5xFdk+Ztw=";
}; };
} }

View File

@ -11,32 +11,9 @@
, eol ? false , eol ? false
}: }:
let let
py = python3 // { extraBuildInputs = plugins python3.pkgs;
pkgs = python3.pkgs.overrideScope (self: super: {
django = super.django_4;
drf-nested-routers = super.drf-nested-routers.overridePythonAttrs (_oldAttrs: {
patches = [
# all for django 4 compat
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.diff";
hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI=";
})
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.diff";
hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU=";
})
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.diff";
hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0=";
})
];
});
});
};
extraBuildInputs = plugins py.pkgs;
in in
py.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "netbox"; pname = "netbox";
inherit version; inherit version;
@ -51,7 +28,7 @@
patches = extraPatches; patches = extraPatches;
propagatedBuildInputs = with py.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
bleach bleach
boto3 boto3
django_4 django_4
@ -90,7 +67,7 @@
jsonschema jsonschema
] ++ extraBuildInputs; ] ++ extraBuildInputs;
buildInputs = with py.pkgs; [ buildInputs = with python3.pkgs; [
mkdocs-material mkdocs-material
mkdocs-material-extensions mkdocs-material-extensions
mkdocstrings mkdocstrings
@ -98,7 +75,7 @@
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
py.pkgs.mkdocs python3.pkgs.mkdocs
]; ];
postBuild = '' postBuild = ''

View File

@ -7,31 +7,7 @@
, plugins ? ps: [] , plugins ? ps: []
}: }:
let python3.pkgs.buildPythonApplication rec {
py = python3.override {
packageOverrides = final: prev: {
django = final.django_4;
drf-nested-routers = prev.drf-nested-routers.overridePythonAttrs (oldAttrs: {
patches = [
# all for django 4 compat
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.diff";
hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI=";
})
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.diff";
hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU=";
})
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.diff";
hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0=";
})
];
});
};
};
in py.pkgs.buildPythonApplication rec {
pname = "peering-manager"; pname = "peering-manager";
version = "1.7.4"; version = "1.7.4";
@ -44,7 +20,7 @@ in py.pkgs.buildPythonApplication rec {
format = "other"; format = "other";
propagatedBuildInputs = with py.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
django django
djangorestframework djangorestframework
django-cacheops django-cacheops
@ -65,7 +41,7 @@ in py.pkgs.buildPythonApplication rec {
pyyaml pyyaml
requests requests
tzdata tzdata
] ++ plugins py.pkgs; ] ++ plugins python3.pkgs;
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
@ -87,8 +63,8 @@ in py.pkgs.buildPythonApplication rec {
passthru = { passthru = {
# PYTHONPATH of all dependencies used by the package # PYTHONPATH of all dependencies used by the package
python = py; python = python3;
pythonPath = py.pkgs.makePythonPath propagatedBuildInputs; pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;
tests = { tests = {
inherit (nixosTests) peering-manager; inherit (nixosTests) peering-manager;

View File

@ -1,20 +1,20 @@
{ {
"de_DE": { "de_DE": {
"path": "de_DE", "path": "de_DE",
"rev": "1125866", "rev": "1208447",
"sha256": "1igf7zlws3l1vw8pvmdfzpqaarc4yjdcgz2qkzi14wnf3sna66p9", "sha256": "1xavixayja6b2mxjp478yxkiimykmg50r23bl011nmkvir7sgm9f",
"version": "6.2" "version": "6.3"
}, },
"fr_FR": { "fr_FR": {
"path": "fr_FR", "path": "fr_FR",
"rev": "1124123", "rev": "1211900",
"sha256": "1830p1fyjij31ilvdaqyjvbgjkaavkqq18ckmmg7mswl6ij9zigs", "sha256": "0gk4awawykdk7kj2nmr6qbfmj2fygvpp9hgnmdz55p5p0mq26a0q",
"version": "6.2" "version": "6.3"
}, },
"ro_RO": { "ro_RO": {
"path": "ro_RO", "path": "ro_RO",
"rev": "1124117", "rev": "1219994",
"sha256": "0cgpwm8wrmj68b2q3g4nq5dnvmx4g7qh11nq0yq5hgnlwrb8dx5g", "sha256": "0xjdv91pqpvzqajcaazcqvb79842llzl27lp2cqr4r8p2kivg94d",
"version": "6.2" "version": "6.3"
} }
} }

View File

@ -6,34 +6,34 @@
"version": "2.4.5" "version": "2.4.5"
}, },
"akismet": { "akismet": {
"path": "akismet/tags/5.1", "path": "akismet/tags/5.3",
"rev": "2894240", "rev": "2966753",
"sha256": "032b3hhdqyjj4y4z246wlhyjj74qw0c60kndc7nv79l7h3i1q10f", "sha256": "17ayrjbwc6ij7qqaph3jjn94i27nmhr6hki5gjl4dzrz8142zrwn",
"version": "5.1" "version": "5.3"
}, },
"antispam-bee": { "antispam-bee": {
"path": "antispam-bee/tags/2.11.3", "path": "antispam-bee/tags/2.11.5",
"rev": "2898402", "rev": "2969611",
"sha256": "0rh5r7qdhq9y7dily2b7h24dn5r0qr10gqw9qvvnz4lsqq3mpw2q", "sha256": "1pbigfchwkz9zks3vf1xd83d0aj4n1fmlimn8dpa5pw96687nc9d",
"version": "2.11.3" "version": "2.11.5"
}, },
"async-javascript": { "async-javascript": {
"path": "async-javascript/tags/2.21.08.31", "path": "async-javascript/tags/2.21.08.31",
"rev": "2760769", "rev": "2929532",
"sha256": "1yf3pj0nn4gyl0a2wfvznpwb7y0glxg19rgny3bh38k4pj9mli49", "sha256": "0v9lrbxcgk6diz927q36nx45nbl6hm8bdig9lc0gj42i183y3g61",
"version": "2.21.08.31" "version": "2.21.08.31"
}, },
"breeze": { "breeze": {
"path": "breeze/tags/2.0.22", "path": "breeze/tags/2.0.29",
"rev": "2913544", "rev": "2959271",
"sha256": "09x5ii2255cj78hamvbkzxfgj917pn7agpl7v8lgpkf0y113lvqi", "sha256": "0ggyy9l33czv72vp1y4n03ky2nr2ysllkz5phfy9axhhv5a01ip0",
"version": "2.0.22" "version": "2.0.29"
}, },
"co-authors-plus": { "co-authors-plus": {
"path": "co-authors-plus/tags/3.5.10", "path": "co-authors-plus/tags/3.5.15",
"rev": "2853502", "rev": "2959167",
"sha256": "1nlw3bkvz05fl1d4fyh3b9n27hchs90w9c30hikhpj2vxfkpc4zh", "sha256": "1n01sk2vgiym25wvxi4igpx773ph59y5f5lvwaasilamdpw0lzh4",
"version": "3.5.10" "version": "3.5.15"
}, },
"code-syntax-block": { "code-syntax-block": {
"path": "code-syntax-block/tags/3.1.1", "path": "code-syntax-block/tags/3.1.1",
@ -42,15 +42,15 @@
"version": "3.1.1" "version": "3.1.1"
}, },
"cookie-notice": { "cookie-notice": {
"path": "cookie-notice/tags/2.4.8", "path": "cookie-notice/tags/2.4.10",
"rev": "2888335", "rev": "2956191",
"sha256": "0gya4qi0hxhvry9a6r3lmby242lf7yqam96vdhyav080s7fr4m8b", "sha256": "1mi4ml1s92ljd85f1fiig1p1yi962db07m4kjw7vl3b7l3j4qdq5",
"version": "2.4.8" "version": "2.4.10"
}, },
"disable-xml-rpc": { "disable-xml-rpc": {
"path": "disable-xml-rpc/tags/1.0.1", "path": "disable-xml-rpc/tags/1.0.1",
"rev": "2561901", "rev": "2954460",
"sha256": "04x5dj79bx5avx8db991nlhrpd3qv3maniqmzwnyd8ab2zblzx83", "sha256": "03vay6j7ac44pg55hlm02lglm3ggmjxdq95dhh0cmavbiafimhqq",
"version": "1.0.1" "version": "1.0.1"
}, },
"gutenberg": { "gutenberg": {
@ -72,10 +72,10 @@
"version": "2.3.2" "version": "2.3.2"
}, },
"jetpack": { "jetpack": {
"path": "jetpack/tags/12.1", "path": "jetpack/tags/12.6.1",
"rev": "2907118", "rev": "2969951",
"sha256": "0z6qzxfqcsx6ywzvak24l64aig33g344x84zy4n9a3h6ymz4rcrb", "sha256": "1wyyn5wfv40gy1r0lps9ggfb796pd483qf839d8qmsf2kk4qndyx",
"version": "12.1" "version": "12.6.1"
}, },
"jetpack-lite": { "jetpack-lite": {
"path": "jetpack-lite/tags/3.0.3", "path": "jetpack-lite/tags/3.0.3",
@ -91,8 +91,8 @@
}, },
"login-lockdown": { "login-lockdown": {
"path": "login-lockdown/tags/2.06", "path": "login-lockdown/tags/2.06",
"rev": "2911341", "rev": "2951219",
"sha256": "1xg2q76m96vyfk4sc9fqi0x7b2ddb3jbv0hm0iawxckv9baxh2gl", "sha256": "0sl1pydylz1xpp3404nv2rdw8y2ccjvwglncj8flhjmgiwkjf47x",
"version": "2.06" "version": "2.06"
}, },
"mailpoet": { "mailpoet": {
@ -109,14 +109,14 @@
}, },
"opengraph": { "opengraph": {
"path": "opengraph/tags/1.11.1", "path": "opengraph/tags/1.11.1",
"rev": "2892781", "rev": "2950019",
"sha256": "0z0vxvmd2brgh32hjfns0hssi93k7rw4rnsf8jx9gff3q6xxhlkc", "sha256": "0vfxv2d3z572m99nlxzla0l5s1lp14a6inb3x1plr779zn0rlg5c",
"version": "1.11.1" "version": "1.11.1"
}, },
"simple-login-captcha": { "simple-login-captcha": {
"path": "simple-login-captcha/tags/1.3.5", "path": "simple-login-captcha/tags/1.3.5",
"rev": "2887191", "rev": "2947230",
"sha256": "0jwm4snrw6lwkq48258n0aca8rn16mlgr5n9ngj6b38i2nj5i7i3", "sha256": "054f51gybpy71iwdjnxf89v8x8dlvg4k4ggd2psvjjf16ai258dw",
"version": "1.3.5" "version": "1.3.5"
}, },
"static-mail-sender-configurator": { "static-mail-sender-configurator": {
@ -126,10 +126,10 @@
"version": "0.9.3" "version": "0.9.3"
}, },
"webp-converter-for-media": { "webp-converter-for-media": {
"path": "webp-converter-for-media/tags/5.8.6", "path": "webp-converter-for-media/tags/5.10.1",
"rev": "2906166", "rev": "2965002",
"sha256": "0i30yshs94rdlj1wpfkkp2n4b4w98mq806cmkk2696ak9ddi5gdh", "sha256": "0xcw537pc2k62g55aj7z14kxa09gv6l4q123hx69dp5g7cwl32sg",
"version": "5.8.6" "version": "5.10.1"
}, },
"webp-express": { "webp-express": {
"path": "webp-express/tags/0.25.6", "path": "webp-express/tags/0.25.6",
@ -156,10 +156,10 @@
"version": "1.0" "version": "1.0"
}, },
"wp-fastest-cache": { "wp-fastest-cache": {
"path": "wp-fastest-cache/tags/1.1.5", "path": "wp-fastest-cache/tags/1.1.9",
"rev": "2905667", "rev": "2962251",
"sha256": "1vpw526zw9yin1ppkcf98027yxwdzk5q7xvhbgar74jchq91zzfc", "sha256": "0dwd8csv3ixixiajgihxx1xhwq9vy3idlhw4ya2xsyk38gisfa4z",
"version": "1.1.5" "version": "1.1.9"
}, },
"wp-gdpr-compliance": { "wp-gdpr-compliance": {
"path": "wp-gdpr-compliance/tags/2.0.22", "path": "wp-gdpr-compliance/tags/2.0.22",
@ -168,22 +168,22 @@
"version": "2.0.22" "version": "2.0.22"
}, },
"wp-mail-smtp": { "wp-mail-smtp": {
"path": "wp-mail-smtp/tags/3.8.0", "path": "wp-mail-smtp/tags/3.9.0",
"rev": "2904482", "rev": "2960628",
"sha256": "0wd2x1kkh499gaq7p33sjvbbhrmgfi6vlalv2lsmlnh9nbgdf6cn", "sha256": "1zxpbm92v2hmqipr9jy5awv3wmp7zik85hk9sb7i4ccvds8i90yw",
"version": "3.8.0" "version": "3.9.0"
}, },
"wp-statistics": { "wp-statistics": {
"path": "wp-statistics/tags/14.1", "path": "wp-statistics/tags/14.1.6.2",
"rev": "2907012", "rev": "2968479",
"sha256": "0pb5988x1aqpdkr5ar32zl004c48c6040bvjdws6f3z6vi6i475x", "sha256": "1sx8zki5ip2s3lkjdllsyybmsisy7dqzgnpgwj0ksk2gr4aksz1y",
"version": "14.1" "version": "14.1.6.2"
}, },
"wp-swiper": { "wp-swiper": {
"path": "wp-swiper/trunk", "path": "wp-swiper/trunk",
"rev": "2905097", "rev": "2945958",
"sha256": "0g8m6rar78pwshyk124ww04gy18bz85z8xv0ir8b7lxx8l8rpmvd", "sha256": "0s8rp2h43sslb5c2h3d9h72qcwd7krn8hggh412l5r2j87cn4qwf",
"version": "1.0.32" "version": "1.0.33"
}, },
"wp-user-avatars": { "wp-user-avatars": {
"path": "wp-user-avatars/trunk", "path": "wp-user-avatars/trunk",
@ -192,9 +192,9 @@
"version": "1.4.1" "version": "1.4.1"
}, },
"wpforms-lite": { "wpforms-lite": {
"path": "wpforms-lite/tags/1.8.1.2", "path": "wpforms-lite/tags/1.8.3.1",
"rev": "2897758", "rev": "2952405",
"sha256": "07wdk0139l9fwg7yc9qh2g0a8c5c37788si6xaf8gcvqj7fd9c2z", "sha256": "1v3mpzl6lxk1bvwlq6a72cc66s9fg5vb55agnl4dmbwm2mir7qjc",
"version": "1.8.1.2" "version": "1.8.3.1"
} }
} }

View File

@ -18,10 +18,10 @@
"version": "1.8" "version": "1.8"
}, },
"twentytwentythree": { "twentytwentythree": {
"path": "twentytwentythree/1.1", "path": "twentytwentythree/1.2",
"rev": "188105", "rev": "198780",
"sha256": "1k2249zv5c6n58m875jc6n83ri6fy229l5v8wm757bhb9nqljdpk", "sha256": "1qybkprcjv89qrzkbv8lrhir6ns1wx3kzdimjnjhx70ggkbygh5y",
"version": "1.1" "version": "1.2"
}, },
"twentytwentytwo": { "twentytwentytwo": {
"path": "twentytwentytwo/1.4", "path": "twentytwentytwo/1.4",

View File

@ -1,89 +1,139 @@
{ stdenv, lib, autoPatchelfHook, fetchurl, libunwind, libuuid, icu, curl { lib
, darwin, makeWrapper, less, openssl, pam, lttng-ust }: , stdenv
, fetchurl
, less
, makeWrapper
, autoPatchelfHook
, curl
, icu
, libuuid
, libunwind
, openssl
, darwin
, lttng-ust
, pam
, testers
, powershell
, writeShellScript
, common-updater-scripts
, gnused
, jq
}:
let archString = if stdenv.isAarch64 then "arm64" let
else if stdenv.isx86_64 then "x64" ext = stdenv.hostPlatform.extensions.sharedLibrary;
else throw "unsupported platform"; platformLdLibraryPath = {
platformString = if stdenv.isDarwin then "osx" darwin = "DYLD_FALLBACK_LIBRARY_PATH";
else if stdenv.isLinux then "linux" linux = "LD_LIBRARY_PATH";
else throw "unsupported platform"; }.${stdenv.hostPlatform.parsed.kernel.name} or (throw "unsupported platform");
platformHash = {
x86_64-darwin = "sha256-FX3OyVzwU+Ms2tgjpZ4dPdjeJx2H5541dQZAjhI3n1U=";
aarch64-darwin = "sha256-Dg7FRF5inRnzP6tjDhIgHTJ1J2EQXnegqimZPK574WQ=";
x86_64-linux = "sha256-6F1VROE6kk+LLEpdwtQ6vkbkZjP4no0TjTnAqurLmXY=";
aarch64-linux = "sha256-NO4E2TOUIYyUFJmi3zKJzOyP0/rTPTZgJZcebVNkSfk=";
}.${stdenv.hostPlatform.system} or (throw "unsupported platform");
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
else if stdenv.isLinux then "LD_LIBRARY_PATH"
else throw "unsupported platform";
libraries = [ libunwind libuuid icu curl openssl ] ++
(if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "powershell"; pname = "powershell";
version = "7.3.4"; version = "7.3.7";
src = fetchurl { src = passthru.sources.${stdenv.hostPlatform.system}
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = platformHash;
};
sourceRoot = "."; sourceRoot = ".";
strictDeps = true; strictDeps = true;
buildInputs = [ less ] ++ libraries;
nativeBuildInputs = [ makeWrapper ]
++ lib.optional stdenv.isLinux autoPatchelfHook;
installPhase = nativeBuildInputs = [
let less
ext = stdenv.hostPlatform.extensions.sharedLibrary; makeWrapper
in '' ] ++ lib.optionals stdenv.isLinux [
pslibs=$out/share/powershell autoPatchelfHook
mkdir -p $pslibs ];
cp -r * $pslibs buildInputs = [
curl
icu
libuuid
libunwind
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.Libsystem
] ++ lib.optionals stdenv.isLinux [
lttng-ust
pam
];
# At least the 7.1.4-osx package does not have the executable bit set. installPhase = ''
chmod a+x $pslibs/pwsh runHook preInstall
mkdir -p $out/{bin,share/powershell}
cp -R * $out/share/powershell
chmod +x $out/share/powershell/pwsh
makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \
--prefix ${platformLdLibraryPath} : "${lib.makeLibraryPath buildInputs}" \
--set TERM xterm \
--set POWERSHELL_TELEMETRY_OPTOUT 1 \
--set DOTNET_CLI_TELEMETRY_OPTOUT 1
'' + lib.optionalString (stdenv.isLinux && stdenv.isx86_64) '' '' + lib.optionalString (stdenv.isLinux && stdenv.isx86_64) ''
patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext} $pslibs/libmi.so patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext} $out/share/powershell/libmi.so
patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext} $pslibs/libmi.so patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext} $out/share/powershell/libmi.so
'' + lib.optionalString stdenv.isLinux '' '' + lib.optionalString stdenv.isLinux ''
patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $pslibs/libcoreclrtraceptprovider.so patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $out/share/powershell/libcoreclrtraceptprovider.so
'' + '' '' + ''
runHook postInstall
mkdir -p $out/bin
makeWrapper $pslibs/pwsh $out/bin/pwsh \
--prefix ${platformLdLibraryPath} : "${lib.makeLibraryPath libraries}" \
--set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1
''; '';
dontStrip = true; dontStrip = true;
doInstallCheck = true; passthru = {
installCheckPhase = '' shellPath = "/bin/pwsh";
# May need a writable home, seen on Darwin. sources = {
HOME=$TMP $out/bin/pwsh --help > /dev/null aarch64-darwin = fetchurl {
''; url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz";
hash = "sha256-KSBsYw369fURSmoD/YyZm9CLEIbhDR12mRp1xLCJ4Wc=";
};
aarch64-linux = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
hash = "sha256-GaAu3nD0xRqqE0Lm7Z5Da6YUQGiCFc5xHuJYDLKySGc=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
hash = "sha256-+6cy4PLpt3ZR7ui3H9rAg3C39kVryPtqE5HKzMpBa24=";
};
x86_64-linux = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
hash = "sha256-GKsAH+A89/M1fxvw4C4yb7+ITcfD6Y4Oicb1K8AswwI=";
};
};
tests.version = testers.testVersion {
package = powershell;
command = "HOME=$(mktemp -d) pwsh --version";
};
updateScript = writeShellScript "update-powershell" ''
set -o errexit
export PATH="${lib.makeBinPath [ common-updater-scripts curl gnused jq ]}"
NEW_VERSION=$(curl -s https://api.github.com/repos/PowerShell/PowerShell/releases/latest | jq .tag_name --raw-output | sed -e 's/v//')
if [[ "${version}" = "$NEW_VERSION" ]]; then
echo "The new version same as the old version."
exit 0
fi
for platform in ${lib.escapeShellArgs meta.platforms}; do
update-source-version "powershell" "0" "${lib.fakeHash}" --source-key="sources.$platform"
update-source-version "powershell" "$NEW_VERSION" --source-key="sources.$platform"
done
'';
};
meta = with lib; { meta = with lib; {
description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET";
homepage = "https://github.com/PowerShell/PowerShell"; homepage = "https://microsoft.com/PowerShell";
license = licenses.mit;
mainProgram = "pwsh";
maintainers = with maintainers; [ wegank ];
platforms = builtins.attrNames passthru.sources;
sourceProvenance = with sourceTypes; [ sourceProvenance = with sourceTypes; [
binaryBytecode binaryBytecode
binaryNativeCode binaryNativeCode
]; ];
maintainers = with maintainers; [ yrashk srgom p3psi ];
mainProgram = "pwsh";
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
license = with licenses; [ mit ];
}; };
passthru = {
shellPath = "/bin/pwsh";
};
} }

View File

@ -1,33 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash wget coreutils nix
version=$1
if [[ -z $version ]]
then
echo "Pass the version to get hashes for as an argument"
exit 1
fi
allOutput=""
dlDest=$(mktemp)
trap 'rm $dlDest' EXIT
for plat in osx linux; do
for arch in x64 arm64; do
URL="https://github.com/PowerShell/PowerShell/releases/download/v$version/powershell-$version-$plat-$arch.tar.gz"
wget $URL -O $dlDest >&2
hash=$(nix hash file $dlDest)
allOutput+="
variant: $plat $arch
hash: $hash
"
done
done
echo "$allOutput"

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "lego"; pname = "lego";
version = "4.14.0"; version = "4.14.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "go-acme"; owner = "go-acme";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-dIHyorypyaKIv0Jo+iAK25j7NabgmPtNC6eJVwCl0LQ="; sha256 = "sha256-o0opYPJk8QURDSPuxEoITyhu3PNvuvcT9ZsnWPJmoAY=";
}; };
vendorHash = "sha256-nAEPkikm98xbGQJzsB6YNXgpZVgR4AK/uCPwiQ25OYU="; vendorHash = "sha256-RW2ybMX55bds3uo90dGzBJPsmv9iIqllt5Ap2WF8PnQ=";
doCheck = false; doCheck = false;

View File

@ -10,19 +10,20 @@ let
packageOverrides = self: super: { packageOverrides = self: super: {
torch = super.torch-bin; torch = super.torch-bin;
torchvision = super.torchvision-bin; torchvision = super.torchvision-bin;
tensorflow = super.tensorflow-bin;
}; };
}; };
in in
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "tts"; pname = "tts";
version = "0.16.0"; version = "0.17.4";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coqui-ai"; owner = "coqui-ai";
repo = "TTS"; repo = "TTS";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-2JZyINyzy4X1DTp4ZsMLY/rCsH4JdQ8bF/3hoqtvNTU="; hash = "sha256-yZHdPqvYmlq/ZKeinez4MmO9+jCIl9JAD0t/tc/Uz8c=";
}; };
postPatch = let postPatch = let

View File

@ -0,0 +1,28 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, Security
}:
rustPlatform.buildRustPackage {
pname = "rblake2sum";
version = "0.3.1";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "rblake2sum";
rev = "cdbaba9f198bd28bfad2fbc17011ce5c8c7ad957";
hash = "sha256-bzOjJ+/M0YWY4/r8cNARPVqbuLBeTllqFyVXhJz6ZMI=";
};
cargoHash = "sha256-egwL3z7uB4AcRwPT0uPrenyh4FSxhbZKMdkPhRztMbs=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "A recursive blake2 digest (hash) of a file-system path";
homepage = "https://github.com/crev-dev/rblake2sum";
license = [ licenses.mit ];
maintainers = with maintainers; [ dpc ];
};
}

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "theharvester"; pname = "theharvester";
version = "4.4.3"; version = "4.4.4";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "laramies"; owner = "laramies";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-hAR5z1NwBmcmWRAg2F4QVicxKfzgTOOptlwKdx+G0+o="; hash = "sha256-L0WbPZE2alregOvWc+0nuMvsD17ayCw3JtahGhf4B1o=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gtree"; pname = "gtree";
version = "1.9.9"; version = "1.9.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ddddddO"; owner = "ddddddO";
repo = "gtree"; repo = "gtree";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-CBD01MIKrd/KSQvJg9xyS7V/ed/nfQ2CQe8C3Z9+lwM="; hash = "sha256-mB/Wftq6YB1aZFJaulNfSXEPYjiznA5rc9hsoCehc5A=";
}; };
vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; vendorHash = "sha256-Td2DOMXA/E2ynsAKv+CLuS53pI9Bd4GkWcWBMqHrQ5o=";
subPackages = [ subPackages = [
"cmd/gtree" "cmd/gtree"

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mdbook-admonish"; pname = "mdbook-admonish";
version = "1.11.1"; version = "1.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tommilligan"; owner = "tommilligan";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-cCtyYcUSmumnO3Vr4/r25++yIgwex1q9ZtgF4rRH4P0="; hash = "sha256-U9boL+Ki4szDwhdPBvXA5iXYjL9LEMVyez8DX35i5gI=";
}; };
cargoHash = "sha256-JHMHUUkMUIm3aY54LZGg+H2V4UsSPt8SWZTJne/Ju5o="; cargoHash = "sha256-cqzY6z4e3ZAVG5HOxkTKYEcAxXu4OsUjpP6SD/LIX74=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

View File

@ -6300,6 +6300,10 @@ with pkgs;
rare = python3Packages.callPackage ../games/rare { }; rare = python3Packages.callPackage ../games/rare { };
rblake2sum = callPackage ../tools/security/rblake2sum {
inherit (darwin.apple_sdk.frameworks) Security;
};
reg = callPackage ../tools/virtualization/reg { }; reg = callPackage ../tools/virtualization/reg { };
retool = callPackage ../applications/misc/retool { }; retool = callPackage ../applications/misc/retool { };
@ -18093,7 +18097,7 @@ with pkgs;
}; };
pythonInterpreters = callPackage ./../development/interpreters/python { }; pythonInterpreters = callPackage ./../development/interpreters/python { };
inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy310 pypy39 rustpython;
# List of extensions with overrides to apply to all Python package sets. # List of extensions with overrides to apply to all Python package sets.
pythonPackagesExtensions = [ ]; pythonPackagesExtensions = [ ];
@ -18108,9 +18112,8 @@ with pkgs;
pypy2Packages = pypy2.pkgs; pypy2Packages = pypy2.pkgs;
pypy27Packages = pypy27.pkgs; pypy27Packages = pypy27.pkgs;
pypy3Packages = pypy3.pkgs; pypy3Packages = pypy3.pkgs;
pypy37Packages = pypy37.pkgs;
pypy38Packages = pypy38.pkgs;
pypy39Packages = pypy39.pkgs; pypy39Packages = pypy39.pkgs;
pypy310Packages = pypy310.pkgs;
py3c = callPackage ../development/libraries/py3c { }; py3c = callPackage ../development/libraries/py3c { };

View File

@ -1294,6 +1294,8 @@ let
ocf_ppx = callPackage ../development/ocaml-modules/ocf/ppx.nix { }; ocf_ppx = callPackage ../development/ocaml-modules/ocf/ppx.nix { };
ocolor = callPackage ../development/ocaml-modules/ocolor { };
ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; ocp-build = callPackage ../development/tools/ocaml/ocp-build { };
ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { };