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/cppcms | |
| 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/cppcms')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/cppcms/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cppcms/default.nix b/nixpkgs/pkgs/development/libraries/cppcms/default.nix index e0f9ed599123..718c73fd3f5f 100644 --- a/nixpkgs/pkgs/development/libraries/cppcms/default.nix +++ b/nixpkgs/pkgs/development/libraries/cppcms/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, cmake, pcre, zlib, python2, openssl }: +{ lib, stdenv, fetchurl, cmake, pcre, zlib, python3, openssl }: stdenv.mkDerivation rec { pname = "cppcms"; - version = "1.2.1"; + version = "2.0.0.beta2"; src = fetchurl { - url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; - sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh"; + url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2"; + sha256 = "sha256-aXAxx9FB/dIVxr5QkLZuIQamO7PlLwnugSDo78bAiiE="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ pcre zlib python2 openssl ]; + buildInputs = [ pcre zlib python3 openssl ]; strictDeps = true; @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://cppcms.com"; description = "High Performance C++ Web Framework"; - platforms = platforms.linux ; - license = licenses.lgpl3; + platforms = platforms.linux; + license = licenses.mit; maintainers = [ maintainers.juliendehos ]; }; } - |