diff --git a/pkgs/by-name/li/libcutl/package.nix b/pkgs/by-name/li/libcutl/package.nix new file mode 100644 index 000000000000..b6620c955537 --- /dev/null +++ b/pkgs/by-name/li/libcutl/package.nix @@ -0,0 +1,40 @@ +{ + build2, + fetchgit, + gccStdenv, + lib, + xercesc, +}: + +gccStdenv.mkDerivation (finalAttrs: { + pname = "libcutl"; + version = "1.11.0"; + + src = fetchgit { + url = "https://git.codesynthesis.com/libcutl/libcutl.git"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-LY2ZyxduI6xftVjVqjNkhYPFTL5bvHC289Qcei1Kiw4="; + }; + + nativeBuildInputs = [ build2 ]; + + buildInputs = [ xercesc ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = { + description = "C++ utility library from Code Synthesis"; + longDescription = '' + libcutl is a C++ utility library. + It contains a collection of generic and independent components such as + meta-programming tests, smart pointers, containers, compiler building blocks, etc. + ''; + homepage = "https://codesynthesis.com/projects/libcutl/"; + changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/log/"; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.xzfc ]; + license = lib.licenses.mit; + }; +}) diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix deleted file mode 100644 index f514d3c00a68..000000000000 --- a/pkgs/development/libraries/libcutl/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, gccStdenv, fetchurl, xercesc }: - -let - stdenv = gccStdenv; -in -stdenv.mkDerivation rec { - pname = "libcutl"; - version = "1.10.0"; - - meta = with lib; { - description = "C++ utility library from Code Synthesis"; - longDescription = '' - libcutl is a C++ utility library. - It contains a collection of generic and independent components such as - meta-programming tests, smart pointers, containers, compiler building blocks, etc. - ''; - homepage = "https://codesynthesis.com/projects/libcutl/"; - changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}"; - platforms = platforms.all; - maintainers = [ ]; - license = licenses.mit; - }; - - majmin = builtins.head ( builtins.match "([[:digit:]]\\.[[:digit:]]+).*" "${version}" ); - src = fetchurl { - url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2"; - sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j"; - }; - - buildInputs = [ xercesc ]; - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fc2b8dcda14..5e44930b5a1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21221,8 +21221,6 @@ with pkgs; libcue = callPackage ../development/libraries/libcue { }; - libcutl = callPackage ../development/libraries/libcutl { }; - libcxxrt = callPackage ../development/libraries/libcxxrt { stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildPackages.llvmPackages.tools.clangNoLibcxx