dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-11-15 18:01:21 +00:00 committed by GitHub
commit fe4a555a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 825 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -198,8 +198,8 @@ let
${optionalString cfg.statusPage ''
server {
listen ${cfg.defaultHTTPListenPort};
${optionalString enableIPv6 "listen [::]:${cfg.defaultHTTPListenPort};" }
listen ${toString cfg.defaultHTTPListenPort};
${optionalString enableIPv6 "listen [::]:${toString cfg.defaultHTTPListenPort};" }
server_name localhost;

6
pkgs/applications/editors/sublime/4/packages.nix
View File

@ -5,9 +5,9 @@ let
in
{
sublime4 = common {
buildVersion = "4142";
x64sha256 = "JrFL17trcsUcS/bYbSbMhTnSMyla6AkoMII2lt2nAwY=";
aarch64sha256 = "r6bxOYXVA2RAo8prdBQ7/gSNKFPmwDW5osblIE0azT4=";
buildVersion = "4143";
x64sha256 = "fehiw40ZNnQUEXEQMo3e11SscJ/tVMjMXLBzfIlMBzw=";
aarch64sha256 = "4zpNHVEHO98vHcWTbqmwlrB4+HIwoQojeQvq7nAqSpM=";
} {};
sublime4-dev = common {

0
pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch → pkgs/applications/emulators/bsnes/ares/000-dont-rebuild-on-install.patch
View File

24
pkgs/applications/emulators/bsnes/ares/001-fix-ruby.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naur source-old/ruby/GNUmakefile source-new/ruby/GNUmakefile
--- source-old/ruby/GNUmakefile 1969-12-31 21:00:01.000000000 -0300
+++ source-new/ruby/GNUmakefile 2022-11-13 22:43:09.700197748 -0300
@@ -11,17 +11,9 @@
ruby += audio.openal
ruby += input.quartz #input.carbon
else ifeq ($(platform),linux)
- pkg_check = $(if $(shell pkg-config $1 && echo 1),$2)
- ruby += video.glx video.glx2 video.xshm
- ruby += $(call pkg_check,xv,video.xvideo)
- ruby += audio.oss audio.alsa
- ruby += $(call pkg_check,openal,audio.openal)
- ruby += $(call pkg_check,libpulse,audio.pulseaudio)
- ruby += $(call pkg_check,libpulse-simple,audio.pulseaudiosimple)
- ruby += $(call pkg_check,ao,audio.ao)
- ruby += input.xlib
- ruby += $(call pkg_check,libudev,input.udev)
- ruby += $(call pkg_check,sdl2,input.sdl)
+ ruby += video.glx video.glx2 video.xshm video.xvideo
+ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao
+ ruby += input.xlib input.udev input.sdl
else ifeq ($(platform),bsd)
pkg_check = $(if $(shell pkg-config $1 && echo 1),$2)
ruby += video.glx video.glx2 video.xshm

16
pkgs/applications/emulators/bsnes/ares/default.nix
View File

@ -17,20 +17,20 @@
, udev
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ares";
version = "129";
version = "130.1";
src = fetchFromGitHub {
owner = "ares-emulator";
repo = "ares";
rev = "v${version}";
hash = "sha256-prfvoGtbnsl/1ahx98jBOgT64W566GoUtE8rIOF7lYc=";
rev = "v${finalAttrs.version}";
hash = "sha256-q2wDpbNaDyKPBL20FDaHScKQEJYstlQdJ4CzbRoSPlk=";
};
patches = [
./dont-rebuild-on-install.patch
./fix-ruby.patch
./000-dont-rebuild-on-install.patch
./001-fix-ruby.patch
];
nativeBuildInputs = [
@ -64,12 +64,12 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://ares.dev";
homepage = "https://ares-emu.net";
description = "Open-source multi-system emulator with a focus on accuracy and preservation";
license = licenses.isc;
maintainers = with maintainers; [ Madouura AndersonTorres ];
platforms = platforms.linux;
};
}
})
# TODO: select between Qt, GTK2 and GTK3
# TODO: support Darwin

27
pkgs/applications/emulators/bsnes/ares/fix-ruby.patch
View File

@ -1,27 +0,0 @@
diff --git a/ruby/GNUmakefile b/ruby/GNUmakefile
index e85a51701..7fca89e0f 100644
--- a/ruby/GNUmakefile
+++ b/ruby/GNUmakefile
@@ -8,19 +8,9 @@ ifeq ($(ruby),)
ruby += audio.openal
ruby += input.quartz #input.carbon
else ifeq ($(platform),linux)
- pkg_check1 = $(if $(shell test -e /usr/lib/lib$1.so && echo 1),$2)
- pkg_check2 = $(if $(shell test -e /usr/lib/$(shell uname -m)-linux-gnu/lib$1.so && echo 1),$2)
- pkg_check = $(call pkg_check1,$1,$2) $(call pkg_check2,$1,$2)
- ruby += video.glx video.glx2 video.xshm
- ruby += $(call pkg_check,Xv,video.xvideo)
- ruby += audio.oss audio.alsa
- ruby += $(call pkg_check,openal,audio.openal)
- ruby += $(call pkg_check,pulse,audio.pulseaudio)
- ruby += $(call pkg_check,pulse-simple,audio.pulseaudiosimple)
- ruby += $(call pkg_check,ao,audio.ao)
- ruby += input.xlib
- ruby += $(call pkg_check,udev,input.udev)
- ruby += $(call pkg_check,SDL2,input.sdl)
+ ruby += video.glx video.glx2 video.xshm video.xvideo
+ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao
+ ruby += input.xlib input.udev input.sdl
else ifeq ($(platform),bsd)
pkg_check = $(if $(shell test -e /usr/local/lib/lib$1.so && echo 1),$2)
ruby += video.glx video.glx2 video.xshm

13
pkgs/applications/emulators/desmume/default.nix
View File

@ -21,15 +21,15 @@
, zlib
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "desmume";
version = "0.9.11+unstable=2021-09-22";
version = "0.9.13";
src = fetchFromGitHub {
owner = "TASVideos";
repo = pname;
rev = "7fc2e4b6b6a58420de65a4089d4df3934d7a46b1";
hash = "sha256-sTCyjQ31w1Lp+aa3VQ7/rdLbhjnqthce54mjKJZQIDM=";
repo = "desmume";
rev = "release_${lib.replaceChars ["."] ["_"] finalAttrs.version}";
hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo=";
};
nativeBuildInputs = [
@ -81,7 +81,8 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.unix;
broken = stdenv.isAarch64 && stdenv.isLinux; # ofborg failed
};
}
})
# TODO: investigate the patches
# TODO: investigate other platforms

38
pkgs/applications/emulators/fceux/default.nix
View File

@ -1,24 +1,44 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, SDL2, lua5_1, minizip, x264 }:
{ lib
, stdenv
, fetchFromGitHub
, SDL2
, cmake
, lua
, minizip
, pkg-config
, wrapQtAppsHook
, x264
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "fceux";
version = "2.6.4";
src = fetchFromGitHub {
owner = "TASEmulators";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM=";
repo = "fceux";
rev = "fceux-${finalAttrs.version}";
hash = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ SDL2 lua5_1 minizip x264 ];
nativeBuildInputs = [
cmake
pkg-config
wrapQtAppsHook
];
buildInputs = [
SDL2
lua
minizip
x264
];
meta = with lib; {
homepage = "http://www.fceux.com/";
description = "A Nintendo Entertainment System (NES) Emulator";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ sbruder scubed2 ];
homepage = "http://www.fceux.com/";
platforms = platforms.linux;
};
}
})

8
pkgs/applications/file-managers/doublecmd/default.nix
View File

@ -11,14 +11,14 @@
, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "doublecmd";
version = "1.0.8";
src = fetchFromGitHub {
owner = "doublecmd";
repo = "doublecmd";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-kuqleoDoxzOj3baTK0lBJpbDECoHeFubWhLXAVkEqAk=";
};
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libqt5pas
];
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}";
postPatch = ''
patchShebangs build.sh install/linux/install.sh
@ -70,5 +70,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; linux;
};
}
})
# TODO: deal with other platforms too

5
pkgs/applications/networking/cluster/terraform-providers/default.nix
View File

@ -2,6 +2,7 @@
, stdenv
, buildGoModule
, fetchFromGitHub
, fetchFromGitLab
, callPackage
, config
, writeShellScript
@ -21,6 +22,7 @@ let
, vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09
, deleteVendor ? false
, proxyVendor ? false
, mkProviderFetcher ? fetchFromGitHub
, mkProviderGoModule ? buildGoModule
# Looks like "registry.terraform.io/vancluever/acme"
, provider-source-address
@ -35,7 +37,7 @@ let
# goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled
CGO_ENABLED = 0;
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ];
src = fetchFromGitHub {
src = mkProviderFetcher {
name = "source-${rev}";
inherit owner repo rev hash;
};
@ -68,6 +70,7 @@ let
netlify = automated-providers.netlify.overrideAttrs (_: { meta.broken = stdenv.isDarwin; });
pass = automated-providers.pass.overrideAttrs (_: { meta.broken = stdenv.isDarwin; });
tencentcloud = automated-providers.tencentcloud.overrideAttrs (_: { meta.broken = stdenv.isDarwin; });
gitlab = automated-providers.gitlab.override { mkProviderFetcher = fetchFromGitLab; owner = "gitlab-org"; };
# mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
};

8
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -431,13 +431,13 @@
"version": "5.8.0"
},
"gitlab": {
"hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=",
"hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=",
"owner": "gitlabhq",
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
"repo": "terraform-provider-gitlab",
"rev": "v3.18.0",
"vendorHash": "sha256-YrgsycnRIB5UoWGADphfP6lf78M8ZnkJGP0Ti2QJtQ8=",
"version": "3.18.0"
"rev": "v3.19.0",
"vendorHash": "sha256-e9J4g5ZuiKcI/WSXMFY3Qglgt87qbXv7tDpxYbRRuaU=",
"version": "3.19.0"
},
"google": {
"hash": "sha256-guE04J0RCFOHPXGtEpxGZu8s6fnfoh0WLRRZ5GW/gLk=",

1
pkgs/applications/networking/protonvpn-gui/default.nix
View File

@ -70,6 +70,7 @@ buildPythonApplication rec {
homepage = "https://github.com/ProtonVPN/linux-app";
maintainers = with maintainers; [ wolfangaukang ];
license = licenses.gpl3Plus;
mainProgram = "protonvpn";
platforms = platforms.linux;
};
}

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

@ -4,8 +4,8 @@ let
common = opts: callPackage (import ./common.nix opts);
in {
sublime-merge = common {
buildVersion = "2077";
x64sha256 = "6xgh/oSatTYHCnQEXiZAoHs3yI1iimLMtzCosBKBVp8=";
buildVersion = "2079";
x64sha256 = "y4ocLXxxEkGaw9O/vhX9MJnc56QgK37YPJkUwK2YS0U=";
} {};
sublime-merge-dev = common {

17
pkgs/applications/video/openshot-qt/default.nix
View File

@ -2,6 +2,7 @@
, stdenv
, mkDerivationWith
, fetchFromGitHub
, fetchpatch
, doxygen
, gtk3
, libopenshot
@ -47,6 +48,22 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
export HOME=$(mktemp -d)
'';
# Following Arch PKGBUILD for Python 3.10 compatibility
# https://github.com/OpenShot/openshot-qt/issues/4608
# https://github.com/archlinux/svntogit-community/commits/packages/openshot/trunk
patches = [
(fetchpatch {
name = "video-widget.patch";
url = "https://github.com/OpenShot/openshot-qt/commit/9748a13268d66a5949aebc970637b5903756d018.patch";
hash = "sha256-QwLtcooDJeYWDp80a1dUFo2so/zEWqqsq5IgkXWX324=";
})
(fetchpatch {
name = "python-3.10-int.patch";
url = "https://github.com/OpenShot/openshot-qt/commit/fff785eb1e3e0c30ed6ca57e2d1933aaa807ae22.patch";
hash = "sha256-ee/s7rhF71ot5oPkGK+j59mL1B3e72xoH27KFoDL8s8=";
})
];
postFixup = ''
wrapProgram $out/bin/openshot-qt \
''

4
pkgs/applications/window-managers/icewm/default.nix
View File

@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "icewm";
version = "3.2.1";
version = "3.2.2";
src = fetchFromGitHub {
owner = "ice-wm";
repo = "icewm";
rev = finalAttrs.version;
hash = "sha256-CLRLDJtp/rrdckzBKgof+vYFi+sqszevtCNGwokNxI0=";
hash = "sha256-tVbBV3eaZ9MUXlzriiOeEuzojI3GHNaXRBjdsQjXrzw=";
};
nativeBuildInputs = [

32
pkgs/build-support/trivial-builders.nix
View File

@ -465,8 +465,11 @@ rec {
*
* This creates a simple derivation with symlinks to all inputs.
*
* entries is a list of attribute sets like
* { name = "name" ; path = "/nix/store/..."; }
* entries can be a list of attribute sets like
* [ { name = "name" ; path = "/nix/store/..."; } ]
*
* or an attribute set name -> path like:
* { name = "/nix/store/..."; other = "/nix/store/..."; }
*
* Example:
*
@ -482,13 +485,26 @@ rec {
*
* See the note on symlinkJoin for the difference between linkFarm and symlinkJoin.
*/
linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; }
''mkdir -p $out
linkFarm = name: entries:
let
entries' =
if (lib.isAttrs entries) then entries
else if (lib.isList entries) then lib.listToAttrs (map (x: lib.nameValuePair x.name x.path) entries)
else throw "linkFarm entries must be either attrs or a list!";
linkCommands = lib.mapAttrsToList (name: path: ''
mkdir -p "$(dirname ${lib.escapeShellArg "${name}"})"
ln -s ${lib.escapeShellArg "${path}"} ${lib.escapeShellArg "${name}"}
'') entries';
in
runCommand name {
preferLocalBuild = true;
allowSubstitutes = false;
passthru.entries = entries';
} ''
mkdir -p $out
cd $out
${lib.concatMapStrings (x: ''
mkdir -p "$(dirname ${lib.escapeShellArg x.name})"
ln -s ${lib.escapeShellArg "${x.path}"} ${lib.escapeShellArg x.name}
'') entries}
${lib.concatStrings linkCommands}
'';
/*

20
pkgs/development/compilers/asl/default.nix
View File

@ -1,19 +1,22 @@
{ lib
, stdenv
, fetchzip
, buildDocs ? false, tex
, tex
, buildDocs ? false
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "asl";
version = "142-bld211";
version = "142-bld232";
src = fetchzip {
src = let inherit (finalAttrs) pname version; in fetchzip {
name = "${pname}-${version}";
url = "http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-${version}.tar.bz2";
hash = "sha256-Sbm16JX7kC/7Ws7YgNBUXNqOCl6u+RXgfNjTODhCzSM=";
hash = "sha256-Q50GzXBxFMhbt5s9OgHPNH4bdqz2hhEmTnMmKowVn2E=";
};
outputs = [ "out" "doc" "man" ];
nativeBuildInputs = lib.optionals buildDocs [ tex ];
postPatch = lib.optionalString (!buildDocs) ''
@ -26,10 +29,10 @@ stdenv.mkDerivation rec {
preBuild = ''
bindir="${placeholder "out"}/bin" \
docdir="${placeholder "out"}/doc/asl" \
docdir="${placeholder "doc"}/share/doc/asl" \
incdir="${placeholder "out"}/include/asl" \
libdir="${placeholder "out"}/lib/asl" \
mandir="${placeholder "out"}/share/man" \
mandir="${placeholder "man"}/share/man" \
substituteAll ${./Makefile-nixos.def} Makefile.def
mkdir -p .objdir
'';
@ -47,8 +50,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
# TODO: multiple outputs
})
# TODO: cross-compilation support
# TODO: customize TeX input
# TODO: report upstream about `mkdir -p .objdir/`

18
pkgs/development/libraries/rure/Cargo.lock generated
View File

@ -4,18 +4,18 @@ version = 3
[[package]]
name = "aho-corasick"
version = "0.7.18"
version = "0.7.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
dependencies = [
"memchr",
]
[[package]]
name = "libc"
version = "0.2.125"
version = "0.2.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
[[package]]
name = "memchr"
@ -25,9 +25,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "regex"
version = "1.5.5"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
dependencies = [
"aho-corasick",
"memchr",
@ -36,13 +36,13 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.25"
version = "0.6.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
[[package]]
name = "rure"
version = "0.2.1"
version = "0.2.2"
dependencies = [
"libc",
"regex",

4
pkgs/development/libraries/rure/pin.json
View File

@ -1,5 +1,5 @@
{
"pname": "rure",
"version": "0.2.1",
"sha256": "18sd1dfagf2338mp32kfjbqpc3n0agm61p044jl7yhy299ws21r8"
"version": "0.2.2",
"sha256": "0n2c9b8arfgcq1l7gr8dfcmdvdbggvfd0msy6sbx3bln74wwbr06"
}

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "cypari2";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
version = "2.1.2";
version = "2.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a";
sha256 = "17beb467d3cb39fffec3227c468f0dd8db8a09129faeb95a6bb4c84b2b6c6683";
};
patches = [

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

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "6.2.2";
version = "6.2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -39,7 +39,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-194CaN7Ei3/ja55BWsUst4EN/B7/JUmJxtCmnN9Z/bI=";
hash = "sha256-YSzwcrWhqyKjdydwodf57S+HIGaKE124umJPtJKiM5g=";
};
patches = [

25
pkgs/development/python-modules/pysvn/default.nix
View File

@ -19,22 +19,22 @@
buildPythonPackage rec {
pname = "pysvn";
version = "1.9.12";
version = "1.9.18";
format = "other";
src = fetchurl {
url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";
sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q=";
hash = "sha256-lUPsNumMYwZoiR1Gt/hqdLLoHOZybRxwvu9+eU1CY78=";
};
patches = [
./replace-python-first.patch
];
buildInputs = [ bash subversion apr aprutil expat neon openssl ]
++ lib.optionals stdenv.isLinux [ e2fsprogs ]
++ lib.optionals stdenv.isDarwin [ gcc ];
postPatch = ''
sed -i "117s|append(|insert(0, |" Tests/benchmark_diff.py
'';
preConfigure = ''
cd Source
${python.interpreter} setup.py backport
@ -47,11 +47,10 @@ buildPythonPackage rec {
--apr-lib-dir=${apr.out}/lib \
--svn-lib-dir=${subversion.out}/lib \
--svn-bin-dir=${subversion.out}/bin
'' + (lib.optionalString (stdenv.isDarwin && !isPy3k) ''
sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile
'');
'';
checkInputs = [ glibcLocales ];
checkPhase = ''
runHook preCheck
@ -60,11 +59,12 @@ buildPythonPackage rec {
sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh
make -C ../Tests
${python.interpreter} -c "import pysvn"
runHook postCheck
'';
# FIXME https://github.com/NixOS/nixpkgs/issues/175227
# pythonImportsCheck = [ "pysvn" ];
installPhase = ''
dest=$(toPythonPath $out)/pysvn
mkdir -p $dest
@ -77,8 +77,9 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python bindings for Subversion";
homepage = "http://pysvn.tigris.org/";
homepage = "https://pysvn.sourceforge.io/";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
# g++: command not found
broken = stdenv.isDarwin;
};

13
pkgs/development/python-modules/pysvn/replace-python-first.patch Normal file
View File

@ -0,0 +1,13 @@
Index: Extension/Tests/benchmark_diff.py
===================================================================
--- Extension/Tests/benchmark_diff.py (revision 2093)
+++ Extension/Tests/benchmark_diff.py (working copy)
@@ -115,7 +115,7 @@
if self.python:
python_re = LiteralCaseBlindSearch( self.python )
- self.replacement_list.append(
+ self.replacement_list.insert(0,
(python_re, '<PYTHON>') )
if self.svn_bin:

18
pkgs/development/tools/nc4nix/default.nix
View File

@ -1,22 +1,34 @@
{ lib
, buildGoModule
, fetchFromGitLab
, nix
, makeWrapper
}:
buildGoModule rec {
pname = "nc4nix";
version = "unstable-2022-11-12";
version = "unstable-2022-11-13";
src = fetchFromGitLab {
domain = "git.project-insanity.org";
owner = "onny";
repo = "nc4nix";
rev = "d7f55a42b5ca0d02382349c6ec776eefe6079703";
sha256 = "sha256-MfMW2B+udXV/lQPGUBFuAE7jwmy4D1M+CYkCuJ088aM=";
rev = "857e789287692e42f3fcaae039d6f323b383543b";
sha256 = "sha256-ekuvqTyoaYiNju4yiQLPmxaXaGD4T3Wv9A8CHY1MZOI=";
};
vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M=";
nativeBuildInputs = [
makeWrapper
];
postInstall = ''
# Depends on nix-prefetch-url
wrapProgram $out/bin/nc4nix \
--prefix PATH : ${lib.makeBinPath [ nix ]}
'';
meta = with lib; {
description = "Packaging helper for Nextcloud apps";
homepage = "https://git.project-insanity.org/onny/nc4nix";

6
pkgs/development/tools/nil/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nil";
version = "2022-11-07";
version = "2022-11-15";
src = fetchFromGitHub {
owner = "oxalica";
repo = pname;
rev = version;
hash = "sha256-ioY9RvKx9DKnNTeMW8mAIEq23w7Y+lAOFWMkgUQ5fu4=";
hash = "sha256-KzQmGCEaOACOqaE1LsVZsqn18XpjlUbGWztDEI+o++w=";
};
cargoHash = "sha256-sL/bnLK3TifmVHy3LOsduETHh9SGz639vgEKkbHE0HQ=";
cargoHash = "sha256-t5HfL7DKMcWJGod6x30NoHYYlAza++fEdEVvfvFWems=";
CFG_DATE = version;
CFG_REV = "release";

6
pkgs/development/tools/ruff/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.118";
version = "0.0.119";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-th+ODoQVwzEN+pfuBcp18vbUBWCLEWwE/wOh+I0uoN4=";
sha256 = "sha256-aFyaDp7lghg1AlPB2WD4oJ85Qcj9Wwj07PMF0lbCkI8=";
};
cargoSha256 = "sha256-jFSCelFksJ4are7EjyAUJnLTgSlWviYOiV8UMgi4SA0=";
cargoSha256 = "sha256-LkNNKuhmRPZHQWTjfUoJSjgTVXLW6Tgg/yfhfjrEwSg=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

4
pkgs/servers/haste-server/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "haste-server";
version = "787d839086faee0b55c76ce5944fa207d22e85b4";
version = "20919c946602b8151157f647e475e30687a43727";
src = fetchFromGitHub {
owner = "toptal";
repo = "haste-server";
rev = version;
hash = "sha256-68IFY9YmXi4acTs9oXw6f5w7gg1lh+iakwYJciTPkQE=";
hash = "sha256-IPGsddPRu4/jT1NsUNOwUjSL3+ikGzMR3X3ohY66uAk=";
};
nativeBuildInputs = [

32
pkgs/servers/haste-server/node-deps.nix
View File

@ -841,13 +841,13 @@ let
sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==";
};
};
"pg-8.7.3" = {
"pg-8.8.0" = {
name = "pg";
packageName = "pg";
version = "8.7.3";
version = "8.8.0";
src = fetchurl {
url = "https://registry.npmjs.org/pg/-/pg-8.7.3.tgz";
sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==";
url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz";
sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==";
};
};
"pg-connection-string-2.5.0" = {
@ -868,13 +868,13 @@ let
sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==";
};
};
"pg-pool-3.5.1" = {
"pg-pool-3.5.2" = {
name = "pg-pool";
packageName = "pg-pool";
version = "3.5.1";
version = "3.5.2";
src = fetchurl {
url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz";
sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ==";
url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz";
sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==";
};
};
"pg-protocol-1.5.0" = {
@ -1198,7 +1198,7 @@ let
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==";
};
};
"util-deprecate-1.0.2" = {
@ -1207,7 +1207,7 @@ let
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==";
};
};
"utils-merge-1.0.1" = {
@ -1216,7 +1216,7 @@ let
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==";
};
};
"which-2.0.2" = {
@ -1270,7 +1270,7 @@ let
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==";
};
};
"xtend-4.0.2" = {
@ -1297,7 +1297,7 @@ let
version = "2.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==";
};
};
"yargs-16.2.0" = {
@ -1341,7 +1341,7 @@ let
name = "haste";
packageName = "haste";
version = "0.1.0";
src = ../../../../../../../../../nix/store/sa8y38xfqrbklwvwb484fgx0lgks9wa1-source;
src = ../../../../../../../../../nix/store/ksl6h7h03ks119z1skfipjh4irc8x80c-source;
dependencies = [
sources."@ungap/promise-all-settled-1.1.2"
sources."ansi-colors-4.1.1"
@ -1456,10 +1456,10 @@ let
sources."parseurl-1.3.3"
sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
sources."pg-8.7.3"
sources."pg-8.8.0"
sources."pg-connection-string-2.5.0"
sources."pg-int8-1.0.1"
sources."pg-pool-3.5.1"
sources."pg-pool-3.5.2"
sources."pg-protocol-1.5.0"
sources."pg-types-2.2.0"
sources."pgpass-1.0.5"

106
pkgs/servers/haste-server/node-env.nix
View File

@ -165,7 +165,11 @@ let
if(process.argv[2] == "development") {
replaceDependencies(packageObj.devDependencies);
}
else {
packageObj.devDependencies = {};
}
replaceDependencies(packageObj.optionalDependencies);
replaceDependencies(packageObj.peerDependencies);
/* Write the fixed package.json file */
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
@ -270,7 +274,7 @@ let
# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
reconstructPackageLock = writeTextFile {
name = "addintegrityfields.js";
name = "reconstructpackagelock.js";
text = ''
var fs = require('fs');
var path = require('path');
@ -280,25 +284,43 @@ let
var lockObj = {
name: packageObj.name,
version: packageObj.version,
lockfileVersion: 1,
lockfileVersion: 2,
requires: true,
packages: {
"": {
name: packageObj.name,
version: packageObj.version,
license: packageObj.license,
bin: packageObj.bin,
dependencies: packageObj.dependencies,
engines: packageObj.engines,
optionalDependencies: packageObj.optionalDependencies
}
},
dependencies: {}
};
function augmentPackageJSON(filePath, dependencies) {
function augmentPackageJSON(filePath, packages, dependencies) {
var packageJSON = path.join(filePath, "package.json");
if(fs.existsSync(packageJSON)) {
var packageObj = JSON.parse(fs.readFileSync(packageJSON));
packages[filePath] = {
version: packageObj.version,
integrity: "sha1-000000000000000000000000000=",
dependencies: packageObj.dependencies,
engines: packageObj.engines,
optionalDependencies: packageObj.optionalDependencies
};
dependencies[packageObj.name] = {
version: packageObj.version,
integrity: "sha1-000000000000000000000000000=",
dependencies: {}
};
processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
}
}
function processDependencies(dir, dependencies) {
function processDependencies(dir, packages, dependencies) {
if(fs.existsSync(dir)) {
var files = fs.readdirSync(dir);
@ -314,23 +336,84 @@ let
pkgFiles.forEach(function(entry) {
if(stats.isDirectory()) {
var pkgFilePath = path.join(filePath, entry);
augmentPackageJSON(pkgFilePath, dependencies);
augmentPackageJSON(pkgFilePath, packages, dependencies);
}
});
} else {
augmentPackageJSON(filePath, dependencies);
augmentPackageJSON(filePath, packages, dependencies);
}
}
});
}
}
processDependencies("node_modules", lockObj.dependencies);
processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
'';
};
# Script that links bins defined in package.json to the node_modules bin directory
# NPM does not do this for top-level packages itself anymore as of v7
linkBinsScript = writeTextFile {
name = "linkbins.js";
text = ''
var fs = require('fs');
var path = require('path');
var packageObj = JSON.parse(fs.readFileSync("package.json"));
var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
if(packageObj.bin !== undefined) {
fs.mkdirSync(path.join(nodeModules, ".bin"))
if(typeof packageObj.bin == "object") {
Object.keys(packageObj.bin).forEach(function(exe) {
if(fs.existsSync(packageObj.bin[exe])) {
console.log("linking bin '" + exe + "'");
fs.symlinkSync(
path.join("..", packageObj.name, packageObj.bin[exe]),
path.join(nodeModules, ".bin", exe)
);
}
else {
console.log("skipping non-existent bin '" + exe + "'");
}
})
}
else {
if(fs.existsSync(packageObj.bin)) {
console.log("linking bin '" + packageObj.bin + "'");
fs.symlinkSync(
path.join("..", packageObj.name, packageObj.bin),
path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
);
}
else {
console.log("skipping non-existent bin '" + packageObj.bin + "'");
}
}
}
else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
fs.mkdirSync(path.join(nodeModules, ".bin"))
fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
console.log("linking bin '" + exe + "'");
fs.symlinkSync(
path.join("..", packageObj.name, packageObj.directories.bin, exe),
path.join(nodeModules, ".bin", exe)
);
}
else {
console.log("skipping non-existent bin '" + exe + "'");
}
})
}
'';
};
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
let
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
@ -377,13 +460,18 @@ let
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
runHook postRebuild
if [ "''${dontNpmInstall-}" != "1" ]
then
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
fi
# Link executables defined in package.json
node ${linkBinsScript}
'';
# Builds and composes an NPM package including all its dependencies

122
pkgs/servers/nextcloud/packages/23.json Normal file
View File

@ -0,0 +1,122 @@
{
"bookmarks": {
"sha256": "511aadcda0b1f051191c20cfd7048150536cfb1e748deb11b568bec4e535a173",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v11.0.4/bookmarks-11.0.4.tar.gz",
"version": "11.0.4",
"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 v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0",
"homepage": "https://github.com/nextcloud/bookmarks",
"licenses": [
"agpl"
]
},
"calendar": {
"sha256": "d6edc166d63204e39135c0e9f00c0f7a6875db89d34a936e16b513c749ac8b8d",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.2/calendar-v3.5.2.tar.gz",
"version": "3.5.2",
"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 team’s 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* 🙈 **We’re 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/",
"licenses": [
"agpl"
]
},
"contacts": {
"sha256": "1938b266c5070573e0435ec31c08a19add96fd99c08c3c1f8309ee8e447093a0",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.2/contacts-v4.2.2.tar.gz",
"version": "4.2.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* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [
"agpl"
]
},
"deck": {
"sha256": "fd9ea1ce98c531c7442a784f693cb047d90fbaee313a820ee648f690697f5e13",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.6.4/deck-v1.6.4.tar.gz",
"version": "1.6.4",
"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",
"licenses": [
"agpl"
]
},
"keeweb": {
"sha256": "a3281fcfdb4058971a3b5c838870a8d5b533445c999b8e921fb8758b216dadbc",
"url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.10/keeweb-0.6.10.tar.gz",
"version": "0.6.10",
"description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.",
"homepage": "https://github.com/jhass/nextcloud-keeweb",
"licenses": [
"agpl"
]
},
"mail": {
"sha256": "0e2c5465436b894ac916222391d94d364592c18b4258fd3aa4b760afa8fa6ad7",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v1.14.3.alpha.1/mail-v1.14.3.alpha.1.tar.gz",
"version": "1.14.3-alpha.1",
"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- **🙈 We’re 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)!",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
"agpl"
]
},
"news": {
"sha256": "9551781fdbfb6d2c3cd77ee57eae0fb1583c7b54e9720bc955053f51541f4a86",
"url": "https://github.com/nextcloud/news/releases/download/19.0.0/news.tar.gz",
"version": "19.0.0",
"description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
"homepage": "https://github.com/nextcloud/news",
"licenses": [
"agpl"
]
},
"notes": {
"sha256": "adddee56456d0115f87a74405a6d62bd5e3af256e86199d87bbff3b2a6876299",
"url": "https://github.com/nextcloud/notes/releases/download/v4.5.1/notes.tar.gz",
"version": "4.5.1",
"description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/stefan-niedermann/nextcloud-notes), [iOS](https://github.com/owncloud/notes-iOS-App) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
"homepage": "https://github.com/nextcloud/notes",
"licenses": [
"agpl"
]
},
"onlyoffice": {
"sha256": "e7170f7cffb50547d51a17f0ad38dfab83040a25ebd80146a840d233093a27f0",
"url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.4.8/onlyoffice.tar.gz",
"version": "7.4.8",
"description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
"homepage": "https://www.onlyoffice.com",
"licenses": [
"apache"
]
},
"polls": {
"sha256": "b6ef0e8b34cdb5169341e30340bc9cefaa1254a1a6020e951f86e828f8591a11",
"url": "https://github.com/nextcloud/polls/releases/download/v3.8.3/polls.tar.gz",
"version": "3.8.3",
"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",
"licenses": [
"agpl"
]
},
"tasks": {
"sha256": "fdfa3168ac80eaef3e2de5009eee02a369acc8d35dfd8283d1f25423bdf3c532",
"url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz",
"version": "0.14.5",
"description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
"homepage": "https://github.com/nextcloud/tasks/",
"licenses": [
"agpl"
]
},
"twofactor_webauthn": {
"sha256": "291c20032cfc1f2fb081cc8721e272bc503d103987c6abb7ce442e497d278d0a",
"url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v0.3.3/twofactor_webauthn-v0.3.3.tar.gz",
"version": "0.3.3",
"description": "A two-factor provider for WebAuthn devices",
"homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
"licenses": [
"agpl"
]
}
}

122
pkgs/servers/nextcloud/packages/24.json Normal file
View File

@ -0,0 +1,122 @@
{
"bookmarks": {
"sha256": "511aadcda0b1f051191c20cfd7048150536cfb1e748deb11b568bec4e535a173",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v11.0.4/bookmarks-11.0.4.tar.gz",
"version": "11.0.4",
"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 v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0",
"homepage": "https://github.com/nextcloud/bookmarks",
"licenses": [
"agpl"
]
},
"calendar": {
"sha256": "d6edc166d63204e39135c0e9f00c0f7a6875db89d34a936e16b513c749ac8b8d",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.2/calendar-v3.5.2.tar.gz",
"version": "3.5.2",
"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 team’s 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* 🙈 **We’re 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/",
"licenses": [
"agpl"
]
},
"contacts": {
"sha256": "1938b266c5070573e0435ec31c08a19add96fd99c08c3c1f8309ee8e447093a0",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.2/contacts-v4.2.2.tar.gz",
"version": "4.2.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* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [
"agpl"
]
},
"deck": {
"sha256": "82d8816595a89e3d11be3e076d6d26ad75f0c9e31d91b89df5fb34acdc111aab",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.7.2/deck-v1.7.2.tar.gz",
"version": "1.7.2",
"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",
"licenses": [
"agpl"
]
},
"keeweb": {
"sha256": "a3281fcfdb4058971a3b5c838870a8d5b533445c999b8e921fb8758b216dadbc",
"url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.10/keeweb-0.6.10.tar.gz",
"version": "0.6.10",
"description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.",
"homepage": "https://github.com/jhass/nextcloud-keeweb",
"licenses": [
"agpl"
]
},
"mail": {
"sha256": "0e2c5465436b894ac916222391d94d364592c18b4258fd3aa4b760afa8fa6ad7",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v1.14.3.alpha.1/mail-v1.14.3.alpha.1.tar.gz",
"version": "1.14.3-alpha.1",
"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- **🙈 We’re 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)!",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
"agpl"
]
},
"news": {
"sha256": "9551781fdbfb6d2c3cd77ee57eae0fb1583c7b54e9720bc955053f51541f4a86",
"url": "https://github.com/nextcloud/news/releases/download/19.0.0/news.tar.gz",
"version": "19.0.0",
"description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
"homepage": "https://github.com/nextcloud/news",
"licenses": [
"agpl"
]
},
"notes": {
"sha256": "adddee56456d0115f87a74405a6d62bd5e3af256e86199d87bbff3b2a6876299",
"url": "https://github.com/nextcloud/notes/releases/download/v4.5.1/notes.tar.gz",
"version": "4.5.1",
"description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/stefan-niedermann/nextcloud-notes), [iOS](https://github.com/owncloud/notes-iOS-App) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
"homepage": "https://github.com/nextcloud/notes",
"licenses": [
"agpl"
]
},
"onlyoffice": {
"sha256": "6117b7b8c5c7133975e4ebf482814cdcd3f94a1b3c76ea1b5eed47bdd1fbfcbb",
"url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.5.8/onlyoffice.tar.gz",
"version": "7.5.8",
"description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
"homepage": "https://www.onlyoffice.com",
"licenses": [
"apache"
]
},
"polls": {
"sha256": "b6ef0e8b34cdb5169341e30340bc9cefaa1254a1a6020e951f86e828f8591a11",
"url": "https://github.com/nextcloud/polls/releases/download/v3.8.3/polls.tar.gz",
"version": "3.8.3",
"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",
"licenses": [
"agpl"
]
},
"tasks": {
"sha256": "fdfa3168ac80eaef3e2de5009eee02a369acc8d35dfd8283d1f25423bdf3c532",
"url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz",
"version": "0.14.5",
"description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
"homepage": "https://github.com/nextcloud/tasks/",
"licenses": [
"agpl"
]
},
"twofactor_webauthn": {
"sha256": "291c20032cfc1f2fb081cc8721e272bc503d103987c6abb7ce442e497d278d0a",
"url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v0.3.3/twofactor_webauthn-v0.3.3.tar.gz",
"version": "0.3.3",
"description": "A two-factor provider for WebAuthn devices",
"homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
"licenses": [
"agpl"
]
}
}

122
pkgs/servers/nextcloud/packages/25.json Normal file
View File

@ -0,0 +1,122 @@
{
"bookmarks": {
"sha256": "1jkbwzig4xd042jcbdbdh4whkpxb87f7ba0c89c78bdgcqzjv1a3",
"url": "https://github.com/nextcloud/bookmarks/releases/download/v11.0.4/bookmarks-11.0.4.tar.gz",
"version": "11.0.4",
"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 v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0",
"homepage": "https://github.com/nextcloud/bookmarks",
"licenses": [
"agpl"
]
},
"calendar": {
"sha256": "00rw09g2az0vly1lf1p67yl72cniigydwvvv698g38b34f2ca0i8",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.1.0/calendar-v4.1.0.tar.gz",
"version": "4.1.0",
"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 team’s 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* 🙈 **We’re 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/",
"licenses": [
"agpl"
]
},
"contacts": {
"sha256": "1mg714j8fjrgp80xzdygh313kvsag47ihckzrz95vzqkiq32la3b",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.1/contacts-v5.0.1.tar.gz",
"version": "5.0.1",
"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* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [
"agpl"
]
},
"deck": {
"sha256": "0lgbi8ha31zrc2sjqd3yrb9ms1jlmkcvrkvgapw4n932m4mvsrvs",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.1/deck-v1.8.1.tar.gz",
"version": "1.8.1",
"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",
"licenses": [
"agpl"
]
},
"keeweb": {
"sha256": "1g6bjbzk7rf9x7cblwsc7cmd3fx5zrkib5ra5xzsmqc9aqpy22zh",
"url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.10/keeweb-0.6.10.tar.gz",
"version": "0.6.10",
"description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.",
"homepage": "https://github.com/jhass/nextcloud-keeweb",
"licenses": [
"agpl"
]
},
"mail": {
"sha256": "1c2ddi49p4wni51sp6n9wb7jh42glgjbhsiabqbk2c0krpwwrcbh",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v2.1.0/mail-v2.1.0.tar.gz",
"version": "2.1.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- **🙈 We’re 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)!",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
"agpl"
]
},
"news": {
"sha256": "1afpszalvrqkaij6yp45y6a2skbhvqlp50fsb9f0ha6l3wli07qp",
"url": "https://github.com/nextcloud/news/releases/download/19.0.0/news.tar.gz",
"version": "19.0.0",
"description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
"homepage": "https://github.com/nextcloud/news",
"licenses": [
"agpl"
]
},
"notes": {
"sha256": "1jcgv3awr45jq3n3qv851qlpbdl2plixba0iq2s54dmhciypdckl",
"url": "https://github.com/nextcloud/notes/releases/download/v4.6.0/notes.tar.gz",
"version": "4.6.0",
"description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/stefan-niedermann/nextcloud-notes), [iOS](https://github.com/owncloud/notes-iOS-App) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
"homepage": "https://github.com/nextcloud/notes",
"licenses": [
"agpl"
]
},
"onlyoffice": {
"sha256": "0gy4n86q7b5qmy609ncibp94v1b3z9msc0129572qz2zyxfqxq3i",
"url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.6.8/onlyoffice.tar.gz",
"version": "7.6.8",
"description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
"homepage": "https://www.onlyoffice.com",
"licenses": [
"apache"
]
},
"polls": {
"sha256": "07jcw9hzn4b1h35d1yk2dvvsva8xw9cbl12g0n2frjmpzkiayc1r",
"url": "https://github.com/nextcloud/polls/releases/download/v4.0.0/polls.tar.gz",
"version": "4.0.0",
"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",
"licenses": [
"agpl"
]
},
"tasks": {
"sha256": "0jm13d6nm7cfsw27yfiq1il9xjlh0qrq8xby2yz9dmggn7lk1dx5",
"url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz",
"version": "0.14.5",
"description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
"homepage": "https://github.com/nextcloud/tasks/",
"licenses": [
"agpl"
]
},
"twofactor_webauthn": {
"sha256": "06ip0ks2ngpxirfybkc6j7nlnwsx2kf7f0rl855j648zf1y369hp",
"url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.0.0/twofactor_webauthn-v1.0.0.tar.gz",
"version": "1.0.0",
"description": "A two-factor provider for WebAuthn devices",
"homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
"licenses": [
"agpl"
]
}
}

44
pkgs/servers/nextcloud/packages/README.md Normal file
View File

@ -0,0 +1,44 @@
= Adding apps =
To extend the nextcloudPackages set, add a new line to the corresponding json
file with the id of the app:
- `nextcloud-apps.json` for apps
The app must be available in the official
[Nextcloud app store](https://apps.nextcloud.com).
https://apps.nextcloud.com. The id corresponds to the last part in the app url,
for example `breezedark` for the app with the url
`https://apps.nextcloud.com/apps/breezedark`.
To regenerate the nixpkgs nextcloudPackages set, run:
```
./generate.sh
```
After that you can commit and submit the changes.
= Usage with the Nextcloud module =
The apps will be available in the namespace `nextcloud25Packages.apps`.
Using it together with the Nextcloud module could look like this:
```
services.nextcloud = {
enable = true;
package = pkgs.nextcloud25;
hostName = "localhost";
config.adminpassFile = "${pkgs.writeText "adminpass" "hunter2"}";
extraApps = with pkgs.nextcloud25Packages.apps; [
mail
calendar
contacts
];
extraAppsEnable = true;
};
```
Adapt the version number in the Nextcloud package and nextcloudPackages set
according to the Nextcloud version you wish to use. There are several supported
stable Nextcloud versions available in the repository.

23
pkgs/servers/nextcloud/packages/default.nix Normal file
View File

@ -0,0 +1,23 @@
# Source: https://git.helsinki.tools/helsinki-systems/wp4nix/-/blob/master/default.nix
# Licensed under: MIT
# Slightly modified
{ lib, pkgs, newScope, apps }:
let packages = self:
let
generatedJson = {
inherit apps;
};
in {
# Create a derivation from the official Nextcloud apps.
# This takes the data generated from the go tool.
mkNextcloudDerivation = self.callPackage ({ }: { data }:
pkgs.fetchNextcloudApp {
inherit (data) url sha256;
}) {};
} // lib.mapAttrs (type: pkgs: lib.makeExtensible (_: lib.mapAttrs (pname: data: self.mkNextcloudDerivation { inherit data; }) pkgs)) generatedJson;
in (lib.makeExtensible (_: (lib.makeScope newScope packages))).extend (selfNC: superNC: {})

14
pkgs/servers/nextcloud/packages/generate.sh Executable file
View File

@ -0,0 +1,14 @@
#!/usr/bin/env nix-shell
#! nix-shell -I nixpkgs=../../../.. -i bash -p nc4nix
set -e
set -u
set -o pipefail
set -x
export NEXTCLOUD_VERSIONS=$(nix-instantiate --eval -E 'import ./nc-versions.nix {}' -A e)
APPS=`cat nextcloud-apps.json | jq -r '.[]' | sed -z 's/\n/,/g;s/,$/\n/'`
nc4nix -a $APPS
rm *.log

13
pkgs/servers/nextcloud/packages/nc-versions.nix Normal file
View File

@ -0,0 +1,13 @@
# Source: https://git.helsinki.tools/helsinki-systems/nc4nix/-/raw/main/nc-versions.nix
# Licensed under: MIT
# this file is used to figure out which versions of nextcloud we have in nixpkgs
{ pkgs ? import <nixpkgs> {}, lib ? pkgs.lib }:
let
n = lib.mapAttrsToList (_: v: v.version) (
lib.filterAttrs (k: v: builtins.match "nextcloud[0-9]+" k != null && (builtins.tryEval v.version).success)
pkgs);
in {
inherit n;
e = lib.concatStringsSep "," n;
}

14
pkgs/servers/nextcloud/packages/nextcloud-apps.json Normal file
View File

@ -0,0 +1,14 @@
[
"bookmarks"
, "calendar"
, "contacts"
, "deck"
, "keeweb"
, "mail"
, "news"
, "notes"
, "onlyoffice"
, "polls"
, "tasks"
, "twofactor_webauthn"
]

4
pkgs/servers/nosql/victoriametrics/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.83.0";
version = "1.83.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-bc13aIo2gCHZfBRbi5CoPLcCGoNJgTuWJbCwqX/QgtU=";
sha256 = "sha256-SfLqvVExP7qc2IDW6sJ0ykVRzL79FRv6zEVXivLpaVk=";
};
vendorSha256 = null;

6
pkgs/tools/cd-dvd/isolyzer/default.nix
View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "isolyzer";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "KBNLresearch";
repo = pname;
rev = version;
sha256 = "1fysm05cz0z54apn1p889xhbgjnfwax6fngi05yij5qp2zxqghf9";
rev = "refs/tags/${version}";
sha256 = "sha256-NqkjnEwpaoyguG5GLscKS9UQGtF9N4jUL5JhrMtKCFE=";
};
propagatedBuildInputs = with python3.pkgs; [ setuptools six ];

19
pkgs/tools/misc/dialog/default.nix
View File

@ -1,22 +1,23 @@
{ lib
, stdenv
, fetchurl
, libtool
, ncurses
, withLibrary ? false, libtool
, withLibrary ? false
, unicodeSupport ? true
, enableShared ? !stdenv.isDarwin
}:
assert withLibrary -> libtool != null;
assert unicodeSupport -> ncurses.unicodeSupport && ncurses != null;
assert unicodeSupport -> ncurses != null && ncurses.unicodeSupport;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "dialog";
version = "1.3-20211214";
version = "1.3-20220728";
src = fetchurl {
url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz";
hash = "sha256-zCll4FxqjDcHCza1ZBTqpWDfjYfyzqIXWeKJUOmyeks=";
url = "ftp://ftp.invisible-island.net/dialog/dialog-${finalAttrs.version}.tgz";
hash = "sha256-VEGJc9VZpGGwBpX6/mjfYvK8c9UGtDaCHXfKPfRUGQs=";
};
buildInputs = [
@ -25,9 +26,9 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-rpath-hacks"
(lib.withFeature withLibrary "libtool")
"--with-ncurses${lib.optionalString unicodeSupport "w"}"
"--${if withLibrary then "with" else "without"}-libtool"
"--with-libtool-opts=${lib.optionalString enableShared "-shared"}"
"--with-ncurses${lib.optionalString unicodeSupport "w"}"
];
installTargets = [
@ -41,4 +42,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ AndersonTorres spacefrogg ];
inherit (ncurses.meta) platforms;
};
}
})

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

@ -1557,7 +1557,10 @@ with pkgs;
emulationstation = callPackage ../applications/emulators/emulationstation { };
fceux = libsForQt5.callPackage ../applications/emulators/fceux { };
fceux = callPackage ../applications/emulators/fceux {
lua = lua5_1;
inherit (libsForQt5) wrapQtAppsHook;
};
firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };
@ -9591,6 +9594,16 @@ with pkgs;
inherit (callPackage ../servers/nextcloud {})
nextcloud23 nextcloud24 nextcloud25;
nextcloud23Packages = ( callPackage ../servers/nextcloud/packages {
apps = lib.importJSON ../servers/nextcloud/packages/23.json;
});
nextcloud24Packages = ( callPackage ../servers/nextcloud/packages {
apps = lib.importJSON ../servers/nextcloud/packages/24.json;
});
nextcloud25Packages = ( callPackage ../servers/nextcloud/packages {
apps = lib.importJSON ../servers/nextcloud/packages/25.json;
});
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };