diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/scaleway-cli/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/graphics/pdfread/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/logstash/5.x.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/ponysay/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/pius/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/sha1collisiondetection/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/system/proot/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/typesetting/pdf2djvu/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tectonic/default.nix | 33 |
10 files changed, 69 insertions, 15 deletions
diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix new file mode 100644 index 000000000000..0e8aacea4ef2 --- /dev/null +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec{ + name = "scaleway-cli-${version}"; + version = "1.14"; + + goPackagePath = "github.com/scaleway/scaleway-cli"; + + src = fetchFromGitHub { + owner = "scaleway"; + repo = "scaleway-cli"; + rev = "v${version}"; + sha256 = "09rqw82clfdiixa9m3hphxh5v7w1gks3wicz1dvpay2sx28bpddr"; + }; + + meta = with stdenv.lib; { + description = "Interact with Scaleway API from the command line"; + homepage = https://github.com/scaleway/scaleway-cli; + license = licenses.mit; + maintainers = with maintainers; [ nickhu ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 3c43935e950d..8733b2c1caa0 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "PDF/DJVU to ebook format converter"; - homepage = http://www.mobileread.com/forums/showthread.php?t=21906; + homepage = https://www.mobileread.com/forums/showthread.php?t=21906; license = licenses.mit; }; } diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index 2628c777140d..d796b3952f68 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "1z3rwpwafrn6h0rzdsmripnwj8ad33v92ryxq8xf9y7331rqb2gs"; + sha256 = "04nrw7ikcjp02cmwvaa1swj0b66l91n9d8qbdicsa023js4mp14m"; }; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -r {Gemfile*,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out wrapProgram $out/bin/logstash \ --set JAVA_HOME "${jre}" diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index a09dfb4d4e47..0f5c15241439 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Cowsay reimplemention for ponies"; - homepage = http://terse.tk/ponysay/; + homepage = http://erkin.co/ponysay/; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ bodil ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 56324f4073db..6b252e9fe006 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -116,7 +116,7 @@ let a package, multi-user package management and easy setup of build environments. ''; - homepage = http://nixos.org/; + homepage = https://nixos.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index af27fb6cd01f..5e0c87c2f7d5 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.phildev.net/pius/; + homepage = https://www.phildev.net/pius/; description = "PGP Individual UID Signer (PIUS), quickly and easily sign UIDs on a set of PGP keys"; diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/tools/security/sha1collisiondetection/default.nix index de1796f431d3..38da14484147 100644 --- a/pkgs/tools/security/sha1collisiondetection/default.nix +++ b/pkgs/tools/security/sha1collisiondetection/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, libtool, which }: stdenv.mkDerivation rec { - pname = "sha1collisiondetection"; - version = "1.0.1"; - name = "${pname}-${version}"; + name = "sha1collisiondetection-${version}"; + version = "1.0.3"; src = fetchFromGitHub { owner = "cr-marcstevens"; - repo = pname; - rev = "development-v${version}"; - sha256 = "09vd5mgclcdx7yq3kwzxy1z7pbxcp0xljfly7hy4ixahmnn290h6"; + repo = "sha1collisiondetection"; + rev = "stable-v${version}"; + sha256 = "0xn31hkkqs0kj9203rzx6w4nr0lq8fnrlm5i76g0px3q4v2dzw1s"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 87c463bdac9a..5d65267311f4 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -34,11 +34,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://proot.me; + homepage = http://proot-me.github.io; description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ ianwookim nckx ]; }; } - diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 2318a146f62f..708bf46bbb06 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Creates djvu files from PDF files"; - homepage = http://code.google.com/p/pdf2djvu/; + homepage = https://jwilk.net/software/pdf2djvu; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; inherit version; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix new file mode 100644 index 000000000000..f6c3be63e033 --- /dev/null +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper +, fontconfig, harfbuzz-icu, openssl, pkgconfig }: + +with rustPlatform; + +buildRustPackage rec { + name = "tectonic-${version}"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "tectonic-typesetting"; + repo = "tectonic"; + rev = "v${version}"; + sha256 = "0k5vkn112bjwh4wnxryzqz79dlja64k7s105mf3yaik136hqnmqv"; + }; + + depsSha256 = "1vxvkh1v9x6j4ggbh6sysi5i3089hrs0mjbp910a1jljiav7l8nj"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ fontconfig harfbuzz-icu openssl ]; + + # tests fail due to read-only nix store + doCheck = false; + + meta = with stdenv.lib; { + description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; + homepage = https://tectonic-typesetting.github.io/; + license = with licenses; [ mit ]; + maintainers = [ maintainers.lluchs ]; + platforms = platforms.all; + }; +} |