diff options
| author | ajs124 <ajs124@users.noreply.github.com> | 2021-06-15 17:43:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 17:43:34 +0200 |
| commit | e6d907f59e45724d56a81042849936fb8628c555 (patch) | |
| tree | f492d4c98f35a6acd27a4de2cf4c32f94c7374ce | |
| parent | Merge pull request #126956 from NixOS/backport-126892-to-release-21.05 (diff) | |
| parent | sope: 5.0.1 -> 5.1.1 (diff) | |
| download | nixpkgs-e6d907f59e45724d56a81042849936fb8628c555.tar.gz | |
Merge pull request #126951 from NixOS/backport-126741-to-release-21.05
[Backport release-21.05] sogo: 5.0.1 -> 5.1.1
| -rw-r--r-- | pkgs/development/libraries/sope/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/sogo/default.nix | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index b956967ee88e..25c65d82632d 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -4,13 +4,13 @@ with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.0.1"; + version = "5.1.1"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "031m8ydr4jhh29332mfbsw0i5d0cjfqfyfs55jm832dlmv4447gb"; + sha256 = "0pap7c38kgadyp1a6qkmf9xhk69ybpmhfd4kc2n5nafhdbvks985"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index 4a73c5770d2a..20fc0f6f0c0c 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -1,14 +1,14 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir -, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }: +, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config, nixosTests }: with lib; gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.0.1"; + version = "5.1.1"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "145hdlwnqds5zmpxbh4yainsbv5vy99ji93d6pl7xkbqwncfi80i"; + sha256 = "19qkznk20fi47zxvg24hqnim5bpjlawk76w04jgd93yqakidl8ax"; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; @@ -66,9 +66,11 @@ with lib; gnustep.stdenv.mkDerivation rec { done ''; + passthru.tests.sogo = nixosTests.sogo; + meta = { description = "A very fast and scalable modern collaboration suite (groupware)"; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Only lgpl21Only ]; homepage = "https://sogo.nu/"; platforms = platforms.linux; maintainers = with maintainers; [ ajs124 das_j ]; |