From 6922a48fe13e7a79ff684cc89d5e0766062100de Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Mon, 21 Aug 2017 22:49:10 +0200 Subject: tectonic: init at 0.1.6 --- pkgs/tools/typesetting/tectonic/default.nix | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/tools/typesetting/tectonic/default.nix (limited to 'pkgs/tools') 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; + }; +} -- cgit 1.4.1 From 7354913c2d105e41d2486ff11305c0012302dafb Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Mon, 21 Aug 2017 22:19:39 +0200 Subject: sha1collisiondetection: 1.0.1 -> 1.0.3 --- pkgs/tools/security/sha1collisiondetection/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'pkgs/tools') 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)" ]; -- cgit 1.4.1 From fcd8950520e41c51c76737f387d24e2a6e1a6712 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Tue, 22 Aug 2017 14:14:37 +0100 Subject: scaleway-cli: init at v1.14 --- pkgs/tools/admin/scaleway-cli/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/admin/scaleway-cli/default.nix (limited to 'pkgs/tools') 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73aba9ab34df..8145a3dbe802 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17461,6 +17461,8 @@ with pkgs; sauerbraten = callPackage ../games/sauerbraten {}; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; + scid = callPackage ../games/scid { tcl = tcl-8_5; tk = tk-8_5; -- cgit 1.4.1 From 2eacddf0dc27c6eca637c628b3842aec2bf59c0e Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Tue, 22 Aug 2017 13:50:04 -0500 Subject: treewide: homepage URL fixes (#28475) * pgadmin: use https homepage * msn-pecan: move homepage to github google code is now unavailable * pidgin-latex: use https for homepage * pidgin-opensteamworks: use github for homepage google code is unavailable * putty: use https for homepage * ponylang: use https for homepage * picolisp: use https for homepage * phonon: use https for homepage * pugixml: use https for homepage * pioneer: use https for homepage * packer: use https for homepage * pokerth: usee https for homepage * procps-ng: use https for homepage * pycaml: use https for homepage * proot: move homepage to .github.io * pius: use https for homepage * pdfread: use https for homepage * postgresql: use https for homepage * ponysay: move homepage to new site * prometheus: use https for homepage * powerdns: use https for homepage * pm-utils: use https for homepage * patchelf: move homepage to https * tesseract: move homepage to github * quodlibet: move homepage from google code * jbrout: move homepage from google code * eiskaltdcpp: move homepage to github * nodejs: use https to homepage * nix: use https for homepage * pdf2djvu: move homepage from google code * game-music-emu: move homepage from google code * vacuum: move homepae from google code --- pkgs/applications/audio/game-music-emu/default.nix | 2 +- pkgs/applications/audio/quodlibet/default.nix | 2 +- pkgs/applications/graphics/jbrout/default.nix | 2 +- pkgs/applications/graphics/tesseract/4.x.nix | 2 +- pkgs/applications/graphics/tesseract/default.nix | 2 +- pkgs/applications/misc/pgadmin/default.nix | 4 ++-- .../instant-messengers/pidgin-plugins/msn-pecan/default.nix | 2 +- .../instant-messengers/pidgin-plugins/pidgin-latex/default.nix | 2 +- .../pidgin-plugins/pidgin-opensteamworks/default.nix | 2 +- pkgs/applications/networking/instant-messengers/vacuum/default.nix | 2 +- pkgs/applications/networking/p2p/eiskaltdcpp/default.nix | 2 +- pkgs/applications/networking/remote/putty/default.nix | 2 +- pkgs/development/compilers/ponyc/pony-stable.nix | 2 +- pkgs/development/interpreters/picolisp/default.nix | 2 +- pkgs/development/libraries/phonon/backends/gstreamer.nix | 2 +- pkgs/development/libraries/phonon/backends/vlc.nix | 2 +- pkgs/development/libraries/phonon/default.nix | 2 +- pkgs/development/libraries/pugixml/default.nix | 2 +- pkgs/development/ocaml-modules/pycaml/default.nix | 2 +- pkgs/development/tools/misc/patchelf/default.nix | 2 +- pkgs/development/tools/misc/patchelf/unstable.nix | 2 +- pkgs/development/tools/node-webkit/nw12.nix | 2 +- pkgs/development/tools/packer/default.nix | 2 +- pkgs/development/web/csslint/default.nix | 2 +- pkgs/development/web/nodejs/nodejs.nix | 2 +- pkgs/games/pioneer/default.nix | 2 +- pkgs/games/pokerth/default.nix | 2 +- pkgs/os-specific/linux/pm-utils/default.nix | 2 +- pkgs/os-specific/linux/procps-ng/default.nix | 2 +- pkgs/servers/dns/powerdns/default.nix | 2 +- pkgs/servers/monitoring/prometheus/default.nix | 2 +- pkgs/servers/sql/postgresql/default.nix | 2 +- pkgs/servers/sql/postgresql/jdbc/default.nix | 2 +- pkgs/tools/graphics/pdfread/default.nix | 2 +- pkgs/tools/misc/ponysay/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 2 +- pkgs/tools/system/proot/default.nix | 3 +-- pkgs/tools/typesetting/pdf2djvu/default.nix | 2 +- 39 files changed, 40 insertions(+), 41 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 4f22ca62c1a8..a0a79785283c 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://code.google.com/p/game-music-emu/; + homepage = https://bitbucket.org/mpyne/game-music-emu/wiki/Home; description = "A collection of video game music file emulators"; license = licenses.lgpl21Plus; platforms = platforms.all; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index fa582d852157..2e6d61b693de 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -75,6 +75,6 @@ in buildPythonApplication { ''; maintainers = [ stdenv.lib.maintainers.coroa ]; - homepage = http://code.google.com/p/quodlibet/; + homepage = https://quodlibet.readthedocs.io/en/latest/; }; } diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 705d983c83aa..f120f8b13d40 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -34,7 +34,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ]; meta = { - homepage = http://code.google.com/p/jbrout; + homepage = http://manatlan.com/jbrout/; description = "Photo manager"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/4.x.nix index 577bff91e353..156c911b9b86 100644 --- a/pkgs/applications/graphics/tesseract/4.x.nix +++ b/pkgs/applications/graphics/tesseract/4.x.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; - homepage = http://code.google.com/p/tesseract-ocr/; + homepage = https://github.com/tesseract-ocr/tesseract; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index a5643da8c3a8..eb9a63838612 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; - homepage = http://code.google.com/p/tesseract-ocr/; + homepage = https://github.com/tesseract-ocr/tesseract; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 968071e454e2..15313befb628 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { "--with-libxslt=${libxslt.dev}" ]; - meta = with stdenv.lib; { + meta = with stdenv.lib; { description = "PostgreSQL administration GUI tool"; - homepage = http://www.pgadmin.org; + homepage = https://www.pgadmin.org; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar wmertens ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index 4a86ea9e0682..3b8cdd7a8cc5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { meta = { description = "Alternative MSN protocol plug-in for Pidgin IM"; - homepage = http://code.google.com/p/msn-pecan/; + homepage = https://github.com/felipec/msn-pecan; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 4a53513061ae..59b1d463c9d2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/pidgin-latex/; + homepage = https://sourceforge.net/projects/pidgin-latex/; description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 2324ad464ed2..fbfd36a59282 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ]; meta = with stdenv.lib; { - homepage = https://code.google.com/p/pidgin-opensteamworks; + homepage = https://github.com/EionRobb/pidgin-opensteamworks; description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 3e5a3fb87b63..1f1a19394b31 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = http://code.google.com/p/vacuum-im/; + homepage = http://www.vacuum-im.org; }; } diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 8c7958ecaaa2..e8df906217a0 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform program that uses the Direct Connect and ADC protocols"; - homepage = https://code.google.com/p/eiskaltdc/; + homepage = https://github.com/eiskaltdcpp/eiskaltdcpp; license = licenses.gpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 503632c009b0..5e675c148bcd 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { platforms, along with an xterm terminal emulator. It is written and maintained primarily by Simon Tatham. ''; - homepage = http://www.chiark.greenend.org.uk/~sgtatham/putty/; + homepage = https://www.chiark.greenend.org.uk/~sgtatham/putty/; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 4353c425489e..21488361f4a9 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple dependency manager for the Pony language."; - homepage = http://www.ponylang.org; + homepage = https://www.ponylang.org; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 2a5d9d2f5744..4618d0da9dd3 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple Lisp with an integrated database"; - homepage = http://picolisp.com/; + homepage = https://picolisp.com/; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ raskin tohl ]; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index e0f24fbc822a..b29388790d02 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = with stdenv.lib; { - homepage = http://phonon.kde.org/; + homepage = https://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index f296e34e783a..53281ddc6578 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = with stdenv.lib; { - homepage = http://phonon.kde.org/; + homepage = https://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 696cd6a36e5e..171acea90b34 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { - homepage = http://phonon.kde.org/; + homepage = https://phonon.kde.org/; description = "Multimedia API for Qt"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index d9d0afa2bde8..dd33f63c913c 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; - homepage = http://pugixml.org/; + homepage = https://pugixml.org; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index 5a313ce4e1bd..7421e2fa0b1a 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://github.com/chemoelectric/pycaml; + homepage = https://github.com/chemoelectric/pycaml; description = "Bindings for python and ocaml"; license = "LGPL"; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 807b2a9a49db..787b434df3ce 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { #doCheck = true; # problems when loading libc.so.6 meta = { - homepage = http://nixos.org/patchelf.html; + homepage = https://nixos.org/patchelf.html; license = "GPL"; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 5f434c13abc6..2443c2804435 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://nixos.org/patchelf.html; + homepage = https://nixos.org/patchelf.html; license = "GPL"; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 30c40331a0f9..8e2953839b71 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app runtime based on Chromium and node.js"; - homepage = http://nwjs.io/; + homepage = https://nwjs.io/; platforms = ["i686-linux" "x86_64-linux"]; maintainers = [ maintainers.offline ]; license = licenses.bsd3; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index e1b52102907b..11909ec1a19b 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; - homepage = http://www.packer.io; + homepage = https://www.packer.io; license = licenses.mpl20; maintainers = with maintainers; [ cstrahan zimbatm ]; platforms = platforms.unix; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index d5a6889c06af..4e8cb2b8829c 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { rules to the code that look for problematic patterns or signs of inefficiency. The rules are all pluggable, so you can easily write your own or omit ones you don't want. ''; - homepage = http://nodejs.org; + homepage = https://nodejs.org; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 0b6ec87f00aa..d7917c52c99c 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -67,7 +67,7 @@ in meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = http://nodejs.org; + homepage = https://nodejs.org; license = licenses.mit; maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 6aff76969956..51f2b6a8c4e4 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century"; - homepage = http://pioneerspacesim.net; + homepage = https://pioneerspacesim.net; license = with licenses; [ gpl3 cc-by-sa-30 ]; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index e34f05402f77..24a0281a874b 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.pokerth.net/; + homepage = https://www.pokerth.net; description = "Open Source Poker client and server"; license = licenses.gpl3; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index e2257642d0b1..1053e07559e8 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://pm-utils.freedesktop.org/wiki/; + homepage = https://pm-utils.freedesktop.org/wiki/; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 2fcf6dbf3c00..4023ea5c69f9 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-modern-top" ]; meta = { - homepage = http://sourceforge.net/projects/procps-ng/; + homepage = https://sourceforge.net/projects/procps-ng/; description = "Utilities that give information about processes using the /proc filesystem"; priority = 10; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 8b838a58b279..bcbb6bb120ef 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Authoritative DNS server"; - homepage = http://www.powerdns.com/; + homepage = https://www.powerdns.com; platforms = platforms.linux; # cannot find postgresql libs on macos x license = licenses.gpl2; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 63ea093b4bb0..8d5450127d65 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -34,7 +34,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Service monitoring system and time series database"; - homepage = http://prometheus.io; + homepage = https://prometheus.io; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b9c940a01cdf..85edbbf442a4 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -80,7 +80,7 @@ let }; meta = with lib; { - homepage = http://www.postgresql.org/; + homepage = https://www.postgresql.org; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; maintainers = [ maintainers.ocharles ]; diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index 35ec5b0c1100..39b574ae96d1 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://jdbc.postgresql.org/; + homepage = https://jdbc.postgresql.org/; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; license = licenses.bsd3; platforms = platforms.unix; 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/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/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; -- cgit 1.4.1 From 09bde4a2cdeed27dca8a145502d405d4c986a304 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 23 Aug 2017 01:58:12 +0200 Subject: elk: 5.4.2 -> 5.5.2 Release notes: * https://www.elastic.co/guide/en/elasticsearch/reference/5.5/release-notes-5.5.2.html * https://www.elastic.co/guide/en/logstash/5.5/logstash-5-5-2.html * https://www.elastic.co/guide/en/kibana/current/release-notes-5.5.2.html --- nixos/release.nix | 1 + pkgs/development/tools/misc/kibana/5.x.nix | 6 +++--- pkgs/misc/logging/beats/default.nix | 2 +- pkgs/servers/search/elasticsearch/5.x.nix | 2 +- pkgs/tools/misc/logstash/5.x.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) (limited to 'pkgs/tools') diff --git a/nixos/release.nix b/nixos/release.nix index 9604da5a4d70..761a151e12e2 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -239,6 +239,7 @@ in rec { tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; + tests.elk = callTest tests/elk.nix {}; tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 71e21d31bb7a..69a19987020d 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "0b3kxd2s66pps5262khnh9yvp2mlwan6461ggxba380hfm7xxi6y"; - "i686-linux" = "1vfl1xmzvrr064nbsbwr597r7hbxyh27397n981scgb1j1y7qja9"; - "x86_64-darwin" = "19iw39qi7i8685s3mg3y6wsqnsddc6fj06g80vqbg76x8160z7dl"; + "x86_64-linux" = "0nmx7r6i54x7pii4ryh3wzzbwvnmcb3f1hn6ch96r24xi4v9m1sb"; + "i686-linux" = "0am6wmbcsh7zxzdrl1q9jbjrb7y4apvi6sr70j61xcx07pbickpp"; + "x86_64-darwin" = "0kjnlzsz4i2fca3jgfsr1kknqzaypb0r78a7cxz2m7daj3bmpvpl"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix index ec2fc975b339..2b555978edc3 100644 --- a/pkgs/misc/logging/beats/default.nix +++ b/pkgs/misc/logging/beats/default.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "03pvzikl5wa6agf3aszx96xvd6yjbvdf0kdwjsr4vfga0h797s32"; + sha256 = "0vzjlgc0sym3kh6nflf2iyy2k3gxd7zwq8ma0cd7kpf42vxwhvqy"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 6f9895509ee0..781f505f4690 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "0l31i6dp3q6d6gqsnji1ym0abqphzf1yxswwn4s3na8s216i41h2"; + sha256 = "1wavcqhwx4nj5v1ba8136009asnhrnhpm87zdsbxlvifqz0f4w08"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbb8855678ab..41889c8fb22b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1806,7 +1806,7 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.4.2"; + elk5Version = "5.5.2"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; -- cgit 1.4.1