From b49cfc8fbda919b4e19df7061091c86f65391d60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jan 2022 06:11:44 +0000 Subject: [PATCH 1/4] roundcube: 1.5.1 -> 1.5.2 (cherry picked from commit c630bcd3e7a3634d1b3ff6a6c3562073228ff864) --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 5fcd2f2d3bc0..285db86a133c 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-YRsNgCJ9C3AonHFXh7LYX9Fe2RXrVtWFwQTCQ3YDboM="; + sha256 = "sha256-8DloOBFW/nkNhYr34GnFVQqFd/uWT5ZiRDSJUnIFODg="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From 6bf1bd63509b15fa9a0ceb792f17e48d51035692 Mon Sep 17 00:00:00 2001 From: derjohn Date: Sun, 2 Jan 2022 14:26:29 +0100 Subject: [PATCH 2/4] ferdi: 5.6.4 -> 5.6.5 (#152239) (cherry picked from commit 64346a8685d366907680c53228e262983f4c0729) --- .../networking/instant-messengers/ferdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index a34d2c5d928a..2389aee53a99 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.4"; + version = "5.6.5"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-y3kuhSWoGysGkvDTV+bze6LSXVO4uDfDOos64eSYFf0="; + sha256 = "sha256-JeFPvU4xXHcv6/ApCDkejYWfA8lqsxwoFXnqIiOQ0+Y="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { From 4ce83cf7758f322914dea2eed2d774fa1d8f6a70 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 23 Dec 2021 23:43:28 +0100 Subject: [PATCH 3/4] gitea: 1.15.7 -> 1.15.9 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.15.8 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.15.9 (cherry picked from commit 8cb0ae287c810bb1d37f8ba67a8a978d968a3d94) --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 68cf76153707..6d856caecd96 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.7"; + version = "1.15.9"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-Ckg8XKCPnyp4a0kXJrqju2jAJvD4tzjomaeJxlFwYzg="; + sha256 = "sha256-DzPgAy7Curypc/66c1NqYSHFgtovpY5qEq/Le+0VYk4="; }; unpackPhase = '' From 08370e1e271f6fe00d302bebbe510fe0e2c611ca Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 18 Dec 2021 09:52:01 +0000 Subject: [PATCH 4/4] nncp: 7.7.0 -> 8.0.2 This update introduces an encrypted packet format that is incompatible with releases older than 8.0.0. Backport of commit 2d4524eb8cfc0d554d281fd932ff264d2c114f9e --- pkgs/tools/misc/nncp/default.nix | 34 ++++++++++++-------------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index 1a20c412edba..8470837278b0 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -1,32 +1,23 @@ -{ lib, stdenv -, go -, fetchurl -, redo-apenwarr -, curl -, perl -, genericUpdater -, writeShellScript -}: +{ lib, stdenv, go, fetchurl, redo-apenwarr, curl, perl, genericUpdater +, writeShellScript, nixosTests, cfgPath ? "/etc/nncp.hjson" }: stdenv.mkDerivation rec { pname = "nncp"; - version = "7.7.0"; + version = "8.0.2"; + outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; - sha256 = "ppKi/JY8sKRb/Vt/SXom0L1zhjBPn6PNUm3Gn8o5Ke4="; + sha256 = "sha256-hMb7bAdk3xFcUe5CTu9LnIR3VSJDUKbMSE86s8d5udM="; }; nativeBuildInputs = [ go redo-apenwarr ]; - buildPhase = '' - runHook preBuild - export GOCACHE=$PWD/.cache - export CFGPATH=/etc/nncp.hjson - export SENDMAIL=sendmail # default value for generated config file - redo ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}} - runHook postBuild - ''; + # Build parameters + CFGPATH = cfgPath; + SENDMAIL = "sendmail"; + + preConfigure = "export GOCACHE=$NIX_BUILD_TOP/gocache"; installPhase = '' runHook preInstall @@ -42,7 +33,7 @@ stdenv.mkDerivation rec { inherit pname version; versionLister = writeShellScript "nncp-versionLister" '' echo "# Versions for $1:" >> "$2" - ${curl}/bin/curl -s http://www.nncpgo.org/Tarballs.html | ${perl}/bin/perl -lne 'print $1 if /Release.*>([0-9.]+)([0-9.]+)