summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlewo <lewo@abesis.fr>2020-01-21 08:43:05 +0100
committerGitHub <noreply@github.com>2020-01-21 08:43:05 +0100
commit2b4753182e6ff1ea12a6fe02cb2237e087c73bcf (patch)
tree7488172b5e817e06087a354dc6cce3a932a4183f
parentMerge pull request #78114 from cust0dian/tmuxinator-1.1.4 (diff)
parentsaldl: init at 40 (diff)
downloadnixpkgs-2b4753182e6ff1ea12a6fe02cb2237e087c73bcf.tar.gz
Merge pull request #77851 from zowoq/saldl
saldl: init at 40
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/tools/networking/saldl/default.nix48
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 56 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dc032e5edcd9..54ccd4072d2b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7856,6 +7856,12 @@
githubId = 1069303;
name = "Kim Simmons";
};
+ zowoq = {
+ email = "59103226+zowoq@users.noreply.github.com";
+ github = "zowoq";
+ githubId = 59103226;
+ name = "zowoq";
+ };
zraexy = {
email = "zraexy@gmail.com";
github = "zraexy";
diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix
new file mode 100644
index 000000000000..d51e5515bd63
--- /dev/null
+++ b/pkgs/tools/networking/saldl/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, wafHook
+, asciidoc
+, docbook_xml_dtd_45
+, docbook_xsl
+, libxml2
+, libxslt
+, curl
+, libevent
+}:
+
+stdenv.mkDerivation rec {
+ pname = "saldl";
+ version = "40";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "19ajci5h5gdnrvwf0l7xy5s58z2di68rrvcmqpsmpp4lfr37rk2l";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ wafHook
+ asciidoc
+ docbook_xml_dtd_45
+ docbook_xsl
+ libxml2
+ libxslt
+ ];
+
+ buildInputs = [ curl libevent ];
+
+ wafConfigureFlags = [ "--saldl-version ${version}" "--no-werror" ];
+
+ outputs = [ "out" "man" ];
+
+ meta = with stdenv.lib; {
+ description = "CLI downloader optimized for speed and early preview";
+ homepage = "https://saldl.github.io";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ zowoq ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ecbe6f21566..82317127dacb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6234,6 +6234,8 @@ in
sahel-fonts = callPackage ../data/fonts/sahel-fonts { };
+ saldl = callPackage ../tools/networking/saldl { };
+
salt = callPackage ../tools/admin/salt {};
salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};