diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/neon | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/neon')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/neon/darwin-fix-configure.patch | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/neon/default.nix | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/neon/darwin-fix-configure.patch b/nixpkgs/pkgs/development/libraries/neon/darwin-fix-configure.patch index 87222a9c0ce0..b8bbd288f7a2 100644 --- a/nixpkgs/pkgs/development/libraries/neon/darwin-fix-configure.patch +++ b/nixpkgs/pkgs/development/libraries/neon/darwin-fix-configure.patch @@ -2,9 +2,9 @@ diff -Nuar neon-0.29.6/configure neon-0.29.6-darwin-fix-configure/configure --- neon-0.29.6/configure 2011-05-03 14:25:31.000000000 +0200 +++ neon-0.29.6-darwin-fix-configure/configure 2012-06-06 23:32:21.000000000 +0200 @@ -4184,7 +4184,7 @@ - $as_echo "$ne_cv_os_uname" >&6; } + case x"$ne_cv_os_uname" in #( + x"Darwin") : - if test "$ne_cv_os_uname" = "Darwin"; then - CPPFLAGS="$CPPFLAGS -no-cpp-precomp" + CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS -flat_namespace" diff --git a/nixpkgs/pkgs/development/libraries/neon/default.nix b/nixpkgs/pkgs/development/libraries/neon/default.nix index 5250dcddf845..f26dbf5ace45 100644 --- a/nixpkgs/pkgs/development/libraries/neon/default.nix +++ b/nixpkgs/pkgs/development/libraries/neon/default.nix @@ -3,6 +3,7 @@ , sslSupport ? true, openssl ? null , static ? stdenv.hostPlatform.isStatic , shared ? !stdenv.hostPlatform.isStatic +, bash }: assert compressionSupport -> zlib != null; @@ -14,20 +15,22 @@ let in stdenv.mkDerivation rec { - version = "0.32.2"; + version = "0.32.5"; pname = "neon"; src = fetchurl { url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-mGVmRoxilfxdD7FBpZgeMcn4LuOOk4N0q+2Ece8vsoY="; + sha256 = "sha256-SHLhL4Alct7dSwL4cAZYFLLVFB99va9wju2rgmtRpYo="; }; patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [libxml2 openssl] + buildInputs = [libxml2 openssl bash] ++ lib.optional compressionSupport zlib; + strictDeps = true; + configureFlags = [ (lib.enableFeature shared "shared") (lib.enableFeature static "static") |