diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-08-31 06:54:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-31 06:54:45 +0100 |
commit | 95f87793c4be44369f6dccfb39e13f08d05028df (patch) | |
tree | c95e950e1df1f8445cd46e5c4c2ac91e7a1b1e16 /pkgs | |
parent | 353fd706fdb4d21621f0b88ec2452406eb526d8b (diff) | |
parent | d725486a67194372fcb09ae3025bd34b6315f459 (diff) | |
download | nixpkgs-95f87793c4be44369f6dccfb39e13f08d05028df.tar nixpkgs-95f87793c4be44369f6dccfb39e13f08d05028df.tar.gz nixpkgs-95f87793c4be44369f6dccfb39e13f08d05028df.tar.bz2 nixpkgs-95f87793c4be44369f6dccfb39e13f08d05028df.tar.lz nixpkgs-95f87793c4be44369f6dccfb39e13f08d05028df.tar.xz nixpkgs-95f87793c4be44369f6dccfb39e13f08d05028df.tar.zst nixpkgs-95f87793c4be44369f6dccfb39e13f08d05028df.zip |
Merge pull request #96480 from Izorkin/dar
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libthreadar/default.nix | 35 | ||||
-rw-r--r-- | pkgs/tools/backup/dar/default.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 55 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix new file mode 100644 index 00000000000..ed19fab6d99 --- /dev/null +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "1.3.0"; + pname = "libthreadar"; + + src = fetchurl { + url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; + sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z"; + }; + + outputs = [ "out" "dev" ]; + + configureFlags = [ + "--disable-build-html" + ]; + + postInstall = '' + # Disable html help + rm -r "$out"/share + ''; + + meta = { + homepage = "http://libthreadar.sourceforge.net/"; + description = '' + Libthreadar is a C++ library providing a small set of C++ classes to manipulate + threads in a very simple and efficient way from your C++ code. + ''; + maintainers = with maintainers; [ izorkin ]; + license = licenses.lgpl3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index a439bbf41b1..1f379feece4 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }: +{ stdenv, fetchurl +, attr, e2fsprogs +, curl, librsync, libthreadar +, gpgme, libgcrypt, openssl +, bzip2, lzo, xz, zlib +}: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.9"; + version = "2.6.10"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "1jzqq54w1dix2qdlj4hr9dpq9fnp23h102bk8d2gq6k7n2zgaj6v"; + sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n"; }; - buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ optionals stdenv.isLinux [ attr e2fsprogs ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ + curl librsync libthreadar + gpgme libgcrypt openssl + bzip2 lzo xz zlib + ] ++ optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-birthtime" @@ -23,7 +33,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' - rm -r "$out"/share/dar # Disable html help + # Disable html help + rm -r "$out"/share/dar ''; enableParallelBuilding = true; @@ -33,6 +44,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dar.linux.free.fr"; description = "Disk ARchiver, allows backing up files into indexed archives"; + maintainers = with maintainers; [ izorkin ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f65c1cc2f7..d73a5c31313 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13980,6 +13980,8 @@ in libtheora = callPackage ../development/libraries/libtheora { }; + libthreadar = callPackage ../development/libraries/libthreadar { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; |