diff options
31 files changed, 148 insertions, 394 deletions
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 350486e8c733..b8d3ba75b51a 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -26,4 +26,4 @@ foldl }; }) { } - [ 24 25 26 ] + [ 24 25 ] diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index d2978ec7bd32..ec2ded975fed 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.all; + broken = true; # on 2022-11-23 this package builds, but produces an executable that fails immediately }; } diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 0515809dffeb..72b931f1d11c 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -4,8 +4,8 @@ let pkgDescription = "A digital logic designer and circuit simulator."; - version = "0.29"; - buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date + version = "0.30"; + buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date desktopItem = makeDesktopItem { type = "Application"; @@ -24,7 +24,8 @@ let # inspect the .git folder to find the version number we are building, we then # provide that version number manually as a property. # (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481) - mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate}"; + # Also use the commit date as a build and output timestamp. + mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; in stdenv.mkDerivation rec { pname = "digital"; @@ -33,20 +34,16 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hneemann"; repo = "Digital"; - rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c"; - sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg="; + rev = "932791eb6486d04f2ea938d83bcdb71b56d3a3f6"; + sha256 = "cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM="; }; - # Use fixed dates in the pom.xml and upgrade the jar and assembly plugins to - # a version where they support reproducible builds - patches = [ ./pom.xml.patch ]; - # Fetching maven dependencies from "central" needs the network at build phase, # we do that in this extra derivation that explicitely specifies its # outputHash to ensure determinism. mavenDeps = stdenv.mkDerivation { name = "${pname}-${version}-maven-deps"; - inherit src nativeBuildInputs version patches postPatch; + inherit src nativeBuildInputs version; dontFixup = true; buildPhase = '' mvn package ${mvnOptions} -Dmaven.repo.local=$out @@ -62,15 +59,11 @@ stdenv.mkDerivation rec { ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI="; + outputHash = "1Cgw+5V2E/RENMRMm368+2yvY7y6v9gTlo+LRgrCXcE="; }; nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; - postPatch = '' - substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}" - ''; - buildPhase = '' mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps} ''; diff --git a/pkgs/applications/science/electronics/digital/pom.xml.patch b/pkgs/applications/science/electronics/digital/pom.xml.patch deleted file mode 100644 index cdc5a777c49d..000000000000 --- a/pkgs/applications/science/electronics/digital/pom.xml.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index d5f8330b4..58ed18b63 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -129,7 +130,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> -- <version>2.5</version> -+ <version>3.2.0</version> - <configuration> - <archive> - <manifest> -@@ -188,6 +189,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> -+ <version>3.2.0</version> - <configuration> - <finalName>Digital</finalName> - <appendAssemblyId>false</appendAssemblyId> -@@ -202,7 +204,7 @@ - </manifest> - <manifestEntries> - <Build-SCM-Revision>${git.commit.id.describe}</Build-SCM-Revision> -- <Build-Time>${maven.build.timestamp}</Build-Time> -+ <Build-Time>@buildDate@</Build-Time> - <SplashScreen-Image>icons/splash.png</SplashScreen-Image> - </manifestEntries> - </archive> diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 6d35279b6de2..392761a9bd25 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "poppler-data"; - version = "0.4.11"; + version = "0.4.12"; src = fetchurl { url = "https://poppler.freedesktop.org/${pname}-${version}.tar.gz"; - sha256 = "LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; + sha256 = "yDW2QKQM41fhuDZmqr2V7f+iTd3dSbja/2OtuFHNq3Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 5203e941b3d0..e2658423ad35 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "bullet"; - version = "3.24"; + version = "3.25"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; rev = version; - sha256 = "sha256-1zQZI1MdW0Ipg5XJeiFZQi/6cI0t6Ckralc5DE3auow="; + sha256 = "sha256-AGP05GoxLjHqlnW63/KkZe+TjO3IKcgBi+Qb/osQuCM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index ccae3037e092..d99e5150678e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "22.11.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.02.0"; # beware: updates often break cups-filters build, check texlive and scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-CTuphE7XdChVFzYcFeIaMbpN8nikmSY9RAPMp08tqCg="; + hash = "sha256-MxXdonD+KzXPH0HSdZSMOWUvqGO5DeB2b2spPZpVj8k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 4e22df60f533..99ee89edcac3 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.3"; + version = "2.38.4"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-QfAB0e1EjGk2s5Sp8g5GQO6/g6fwgmLfKFBPdBBgSlo="; + hash = "sha256-T0fqKaLU1fFe7z3J4tbG8Gfo3oY6P2RFXhzPlpPMHTY="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix deleted file mode 100644 index 454a972f177b..000000000000 --- a/pkgs/development/python-modules/bedup/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, btrfs-progs -, contextlib2 -, pyxdg -, pycparser -, alembic -, cffi -, pythonOlder -, isPyPy -}: - -buildPythonPackage rec { - version = "0.10.1"; - pname = "bedup"; - disabled = pythonOlder "3.3"; - - src = fetchFromGitHub { - owner = "g2p"; - repo = "bedup"; - rev = "v${version}"; - sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6"; - }; - - buildInputs = [ btrfs-progs ]; - propagatedBuildInputs = [ contextlib2 pyxdg pycparser alembic ] - ++ lib.optionals (!isPyPy) [ cffi ]; - - meta = with lib; { - description = "Deduplication for Btrfs"; - longDescription = '' - Deduplication for Btrfs. bedup looks for new and changed files, - making sure that multiple copies of identical files share space - on disk. It integrates deeply with btrfs so that scans are - incremental and low-impact. - ''; - homepage = "https://github.com/g2p/bedup"; - license = licenses.gpl2; - maintainers = with maintainers; [ bluescreen303 ]; - }; -} diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 8a53a9d1d58f..0b420e9362c9 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -1,7 +1,6 @@ { lib , autopep8 , buildPythonPackage -, contextlib2 , django , factory_boy , fetchFromGitHub @@ -72,7 +71,6 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - contextlib2 networkx pydot factory_boy diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix index b9c9e65a4fe6..6e225df0fd90 100644 --- a/pkgs/development/python-modules/duecredit/default.nix +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -2,13 +2,11 @@ , buildPythonPackage , fetchPypi , isPy27 -, contextlib2 , pytest , pytestCheckHook , vcrpy , citeproc-py , requests -, setuptools , six }: @@ -22,10 +20,9 @@ buildPythonPackage rec { sha256 = "f6192ce9315b35f6a67174761291e61d0831e496e8ff4acbc061731e7604faf8"; }; - # bin/duecredit requires setuptools at runtime - propagatedBuildInputs = [ citeproc-py requests setuptools six ]; + propagatedBuildInputs = [ citeproc-py requests six ]; - nativeCheckInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + nativeCheckInputs = [ pytest pytestCheckHook vcrpy ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index c1039db8829c..9fa13391b6ad 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, contextlib2 , cython , fuse , pkg-config @@ -29,8 +28,6 @@ buildPythonPackage rec { buildInputs = [ fuse ]; - propagatedBuildInputs = [ contextlib2 ]; - preConfigure = '' substituteInPlace setup.py \ --replace "'pkg-config'" "'${stdenv.cc.targetPrefix}pkg-config'" diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 9b290730be9d..77ed843d47cd 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nltk"; - version = "3.8"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-dLMIJqN9eNU0JxBbvQN92IAlG+Jp/KZO5TCDikbtVfw="; + hash = "sha256-GDTaPQaCy6Tyzt4vmq1rD6+2RhukUdsO+2+cOXmNZNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index e2d94ac02561..c020992bee22 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pytestCheckHook , coveralls , numpy -, contextlib2 , decopatch , more-itertools , nestedtext @@ -24,6 +24,14 @@ buildPythonPackage rec { sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j"; }; + patches = [ + (fetchpatch { + name = "replace contextlib2-with-contextlib.patch"; + url = "https://github.com/kalekundert/parametrize_from_file/commit/edee706770a713130da7c4b38b0a07de1bd79c1b.patch"; + hash = "sha256-VkPKGkYYTB5XCavtEEnFJ+EdNUUhITz/euwlYAPC/tQ="; + }) + ]; + # patch out coveralls since it doesn't provide us value preBuild = '' sed -i '/coveralls/d' ./pyproject.toml @@ -38,7 +46,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - contextlib2 decopatch more-itertools nestedtext diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index c8813208d5e8..a096973a9367 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -2,8 +2,8 @@ , stdenv , buildPythonPackage , pythonOlder -, fetchPypi , fetchFromGitHub +, setuptools , jinja2 , pygments , markupsafe @@ -14,17 +14,23 @@ buildPythonPackage rec { pname = "pdoc"; - version = "12.0.2"; + version = "12.3.1"; disabled = pythonOlder "3.7"; + format = "pyproject"; + # the Pypi version does not include tests src = fetchFromGitHub { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - sha256 = "FVfPO/QoHQQqg7QU05GMrrad0CbRR5AQVYUpBhZoRi0="; + sha256 = "sha256-SaLrE/eHxKnlm6BZYbcZZrbrUZMeHJ4eCcqMsFvyZ7I="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jinja2 pygments @@ -48,6 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pdoc" ]; meta = with lib; { + changelog = "https://github.com/mitmproxy/pdoc/blob/${src.rev}/CHANGELOG.md"; homepage = "https://pdoc.dev/"; description = "API Documentation for Python Projects"; license = licenses.unlicense; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index c095ea9ca921..008813330dc8 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage -, contextlib2 , fetchPypi , mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -19,8 +19,12 @@ buildPythonPackage rec { hash = "sha256-8GcXESxhiVyrxHB3UriHFuhCCogZ1xQEUB4RT5EEMZc="; }; - propagatedBuildInputs = [ - contextlib2 + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "contextlib2" ]; nativeCheckInputs = [ diff --git a/pkgs/development/tools/initool/default.nix b/pkgs/development/tools/initool/default.nix new file mode 100644 index 000000000000..ce8f769ae442 --- /dev/null +++ b/pkgs/development/tools/initool/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, mlton +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "initool"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "dbohdan"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pszlP9gy1zjQjNNr0L1NY0XViejUUuvUZH6JHtUxdJI="; + }; + + nativeBuildInputs = [ mlton ]; + + doCheck = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp initool $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + inherit (mlton.meta) platforms; + + description = "Manipulate INI files from the command line"; + homepage = "https://github.com/dbohdan/initool"; + license = licenses.mit; + maintainers = with maintainers; [ e1mo ]; + changelog = "https://github.com/dbohdan/initool/releases/tag/v${version}"; + }; +} + diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 5a088f34a4ce..98b8917f6e2b 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -33,15 +33,15 @@ }: let - version = "0.53.2"; - binary-deps-version = "6"; + version = "0.54.0"; + binary-deps-version = "8"; src = fetchFromGitHub { owner = "Unvanquished"; repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-VqMhA6GEYh/m+dzOgXS+5Jqo4x7RrQf4qIwstdTTU+E="; + sha256 = "sha256-X2c6BHI4W6fOurLiBWIBZzJrZ+7RHMEwN8GJGz6e350="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { @@ -50,8 +50,8 @@ let version = binary-deps-version; src = fetchzip { - url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2"; - sha256 = "sha256-ERfg89oTf9JTtv/qRnTRIzFP+zMpHT8W4WAIxqogy9E="; + url = "https://dl.unvanquished.net/deps/linux-amd64-default_${version}.tar.xz "; + sha256 = "sha256-6r9j0HRMDC/7i8f4f5bBK4NmwsTpSChHrRWwz0ENAZo="; }; dontPatchELF = true; @@ -119,7 +119,7 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256-MPqyqcZGc5KlkftGCspWhISBJ/h+Os29g7ZK6yWz0cQ="; + outputHash = "sha256-ua9Q5E5C4t8z/yNQp6qn1i9NNDAk4ohzvgpMbCBxb8Q="; outputHashMode = "recursive"; nativeBuildInputs = [ aria2 cacert ]; @@ -135,9 +135,10 @@ in stdenv.mkDerivation rec { inherit version src binary-deps-version; preConfigure = '' - mkdir daemon/external_deps/linux64-${binary-deps-version}/ - cp -r ${unvanquished-binary-deps}/* daemon/external_deps/linux64-${binary-deps-version}/ - chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/ + TARGET="linux-amd64-default_${binary-deps-version}" + mkdir daemon/external_deps/"$TARGET" + cp -r ${unvanquished-binary-deps}/* daemon/external_deps/"$TARGET"/ + chmod +w -R daemon/external_deps/"$TARGET"/ ''; nativeBuildInputs = [ @@ -202,7 +203,7 @@ in stdenv.mkDerivation rec { for f in daemon daemon-tty daemonded nacl_loader nacl_helper_bootstrap; do install -Dm0755 -t $out/lib/ $f done - install -Dm0644 -t $out/lib/ irt_core-x86_64.nexe + install -Dm0644 -t $out/lib/ irt_core-amd64.nexe mkdir $out/bin/ ${wrapBinary "daemon" "unvanquished"} diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 1bee79918927..2281031a6449 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "22.05.7.1"; + version = "22.05.8.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1hr62c9g0z3brgpa2l68pskraqxk52dk1iq1xkb0dr5w0cwhdpij"; + sha256 = "sha256-hL/FnHl+Fj62xGH1FVkB9jVtvrVxbPU73DlMWC6CyJ0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 29edb77fabd0..391644379ef3 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,18 +2,17 @@ let generic = { - version, hash, + version, sha256, eol ? false, extraVulnerabilities ? [] }: let major = lib.versions.major version; - prerelease = builtins.length (lib.versions.splitVersion version) > 3; in stdenv.mkDerivation rec { pname = "nextcloud"; inherit version; src = fetchurl { - url = "https://download.nextcloud.com/server/${if prerelease then "prereleases" else "release"}/${pname}-${version}.tar.bz2"; - inherit hash; + url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; + inherit sha256; }; patches = [ (./patches + "/v${major}/0001-Setup-remove-custom-dbuser-creation-behavior.patch") ]; @@ -52,19 +51,14 @@ in { nextcloud24 = generic { version = "24.0.9"; - hash = "sha256-WAozhMnAmu+46bQVU9IabiAAF5lUnb0lsx3qIR2X3R4="; + sha256 = "580a3384c9c09aefb8e9b41553d21a6e20001799549dbd25b31dea211d97dd1e"; }; nextcloud25 = generic { version = "25.0.3"; - hash = "sha256-SysUI3Nu+SRpCW/iT2HCTK2Ho04HwceoGzhdPqJcAOw="; + sha256 = "4b2b1423736ef92469096fe24f61c24cad87a34e07c1c7a81b385d3ea25c00ec"; }; - nextcloud26 = generic { - version = "26.0.0beta1"; - hash = "sha256-EfSfn0KjQzciHa3VcrDhGC/aZUw/KDjihXs+qVIcYX0="; - }; - - # tip: get hash with: - # nix hash to-sri --type sha256 $(curl https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256 | cut -d' ' -f1) + # tip: get the sha with: + # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/servers/nextcloud/packages/24.json b/pkgs/servers/nextcloud/packages/24.json index 7b45c83af8a1..0b775a81e88a 100644 --- a/pkgs/servers/nextcloud/packages/24.json +++ b/pkgs/servers/nextcloud/packages/24.json @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1996f97w74slmh7ihv8p1lxl32rri5nnzp90mbb1imclpgac2i63", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.4/contacts-v4.2.4.tar.gz", - "version": "4.2.4", + "sha256": "0qv3c7wmf9j74562xbjvhk6kbpna6ansiw3724dh4w8j5sldqysd", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.3/contacts-v4.2.3.tar.gz", + "version": "4.2.3", "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.", "homepa |