mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-13 08:23:25 +00:00
{sogo,sope}: 5.11.0 -> 5.11.2 (#349490)
This commit is contained in:
commit
cc5d4970cf
@ -5,14 +5,14 @@
|
||||
, libwbxml }:
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "sogo";
|
||||
version = "5.11.0";
|
||||
version = "5.11.2";
|
||||
|
||||
# always update the sope package as well, when updating sogo
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alinto";
|
||||
repo = pname;
|
||||
rev = "SOGo-${version}";
|
||||
hash = "sha256-2/0OaCAQkdnDPGOVERZs2Oz+bCpQN3MTLzp2pz0WB08=";
|
||||
hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ];
|
||||
|
@ -3,23 +3,15 @@
|
||||
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "sope";
|
||||
version = "5.9.0";
|
||||
version = "5.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inverse-inc";
|
||||
owner = "Alinto";
|
||||
repo = pname;
|
||||
rev = "SOPE-${version}";
|
||||
hash = "sha256-JZh8sC/w2MRy3UyWYGMvU47XtWKGnLuUlCsVyyxd7zg=";
|
||||
hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch { # https://github.com/Alinto/sope/pull/66
|
||||
name = "sope-fix-gnustep-1.29.0+.patch";
|
||||
url = "https://github.com/Alinto/sope/pull/66/commits/9ec2744cc851b11886c3ebb723138e4d672bd5c7.patch";
|
||||
hash = "sha256-JgYRwjmjlitgzYz9Jfei5XJRThP1TunPjI0g5M2wZPA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gnustep.make ];
|
||||
buildInputs = [ gnustep.base libxml2 openssl ]
|
||||
++ lib.optional (openldap != null) openldap
|
||||
@ -45,7 +37,7 @@ gnustep.stdenv.mkDerivation rec {
|
||||
|
||||
env = {
|
||||
GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf";
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion";
|
||||
};
|
||||
|
||||
# Move over the makefiles (see comment over preConfigure)
|
||||
@ -54,11 +46,11 @@ gnustep.stdenv.mkDerivation rec {
|
||||
find /build/Makefiles -mindepth 1 -maxdepth 1 -not -type l -exec cp -r '{}' $out/share/GNUstep/Makefiles \;
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Extensive set of frameworks which form a complete Web application server environment";
|
||||
license = licenses.publicDomain;
|
||||
license = lib.licenses.publicDomain;
|
||||
homepage = "https://github.com/inverse-inc/sope";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ jceb ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user