diff options
Diffstat (limited to 'pkgs')
146 files changed, 827 insertions, 567 deletions
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 77c0ba9b2d4..49d9e80be11 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fluidsynth GUI"; - homepage = http://sourceforge.net/projects/qsynth; + homepage = https://sourceforge.net/projects/qsynth; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index c75a8976b3f..5d06c2221b3 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = "-lXmu"; meta = { - homepage = http://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet + homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index a15b557f0e5..39d96775ebc 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/nedit; + homepage = https://sourceforge.net/projects/nedit; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index a15ffee3d4a..69ab67dffb7 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps} ''; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/xzgv/; + homepage = https://sourceforge.net/projects/xzgv/; description = "Picture viewer for X with a thumbnail-based selector"; license = licenses.gpl2; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ab106f6dcd9..d81e9ed4bbe 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.10.0"; + version = "3.12.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "01vb5xjis9ldva7rg1f720lwys5frkj00z8x7cajqwxliilhvais"; + sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq"; }; patches = [ diff --git a/pkgs/applications/misc/copyq/cmake-modules.patch b/pkgs/applications/misc/copyq/cmake-modules.patch deleted file mode 100644 index f21105763de..00000000000 --- a/pkgs/applications/misc/copyq/cmake-modules.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d910299e..69888477 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -99,6 +99,7 @@ endif() - - # Qt modules - if (WITH_QT5) -+ find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script) - qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules}) - else() - set(QT_USE_QTNETWORK TRUE) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 4fd30c547b5..37afea2bb6f 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,27 +1,23 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git +{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git , webkitSupport ? true }: stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.0.3"; + version = "3.1.2"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl"; + sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl"; }; - patches = [ - ./cmake-modules.patch - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ - git qt5.full libXfixes libXtst - ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit; + git qtbase qtscript libXfixes libXtst + ] ++ stdenv.lib.optional webkitSupport qtwebkit; meta = with stdenv.lib; { homepage = https://hluk.github.io/CopyQ; diff --git a/pkgs/applications/misc/ebook2cw/configfile.patch b/pkgs/applications/misc/ebook2cw/configfile.patch new file mode 100644 index 00000000000..c7aafe5227a --- /dev/null +++ b/pkgs/applications/misc/ebook2cw/configfile.patch @@ -0,0 +1,11 @@ +--- a/ebook2cw.c 2017-11-08 19:52:58.298131348 -0700 ++++ b/ebook2cw.c 2017-11-08 19:53:02.588231067 -0700 +@@ -136,7 +136,7 @@ + char isomap[256][4]; /* by these strings */ + char utf8map[256][8]; + +- char configfile[1025]; ++ char configfile[2048]; + + char id3_author[80], + id3_title[80], diff --git a/pkgs/applications/misc/ebook2cw/default.nix b/pkgs/applications/misc/ebook2cw/default.nix new file mode 100644 index 00000000000..cce10258cf3 --- /dev/null +++ b/pkgs/applications/misc/ebook2cw/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchsvn, lame, libvorbis }: + +stdenv.mkDerivation rec { + + name = "ebook2cw-${version}"; + version = "0.8.2"; + + src = fetchsvn { + url = "svn://svn.fkurz.net/ebook2cw/tags/${name}"; + sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw"; + }; + + buildInputs = [ lame libvorbis ]; + + patches = [ ./configfile.patch ]; + + postPatch = '' + substituteInPlace Makefile --replace gcc cc + ''; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + description = "Convert ebooks to Morse MP3s/OGGs"; + homepage = http://fkurz.net/ham/ebook2cw.html; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ earldouglas ]; + }; + +} diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index a45ab59ace8..56c1a8168a8 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "2.9.3"; + version = "2.9.4"; name = "electron-cash-${version}"; - src = fetchFromGitHub { - owner = "fyookball"; - repo = "electrum"; - rev = version; - sha256 = "1r39b5ag5fipzgr84pzb53cfm8a4dy53257608754dwr1gfpma3v"; + src = fetchurl { + url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz"; + # Verified using official SHA-1 and signature from + # https://github.com/fyookball/keys-n-hashes + sha256 = "1y8mzwa6bb8zj4l92wm4c2icnr42wmhbfz6z5ymh356gwll914vh"; }; propagatedBuildInputs = with python2Packages; [ @@ -42,8 +42,8 @@ python2Packages.buildPythonApplication rec { mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out rm -rf $out/lib/python2.7/site-packages/nix - substituteInPlace $out/share/applications/electron.desktop \ - --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" + substituteInPlace $out/share/applications/electron-cash.desktop \ + --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u" ''; doInstallCheck = true; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 5d13c18edc3..8936d3f222f 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open Street Map viewer"; - homepage = http://sourceforge.net/projects/gosmore/; + homepage = https://sourceforge.net/projects/gosmore/; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index ee06ea1ad6c..837a221be94 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -6,18 +6,17 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "25-git-2017-01-18"; + version = "26b"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "22740b9bca1c60ef18cf90538994ce4981539901"; - sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4"; + rev = "v${version}"; + sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj"; fetchSubmodules = false; }; nativeBuildInputs = [ pkgconfig makeWrapper ninja ]; - buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl - openjpeg mujs openssl freetype ncurses ]; + buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ]; dontStrip = true; @@ -32,7 +31,6 @@ in stdenv.mkDerivation rec { buildPhase = '' sh ./build.sh build ''; -# --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ installPhase = '' install -d $out/bin $out/lib diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index 06f8b78c2bc..3f7ce3cc5d5 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { Multitabbed lightweight terminal emulator based on rxvt. Supports transparency, backgroundimages, freetype fonts, ... "; - homepage = http://sourceforge.net/projects/materm; + homepage = https://sourceforge.net/projects/materm; license = "GPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index bf1fdbb9a8a..78e1d15481b 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov. Xfe aims to be the filemanager of choice for all the Unix addicts! ''; - homepage = http://sourceforge.net/projects/xfe/; + homepage = https://sourceforge.net/projects/xfe/; license = stdenv.lib.licenses.gpl2; maintainers = []; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 8db48a7b3e6..0eb33c845c3 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -18,15 +18,14 @@ , qtx11extras }: -let +mkDerivation rec { pname = "yakuake"; - version = "3.0.3"; -in mkDerivation rec { + version = "3.0.4"; name = "${pname}-${version}"; src = fetchurl { url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "ef51aa3325916d352fde17870cf706397e41105103e4c9289cc4032a1b8609a7"; + sha256 = "1q31p1cqhz8b2bikqjrr7fww86kaq723ib4ys2zwablfa1ybbqhh"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index abb7013d106..e6275b2f959 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { featureset might be considered "minimalistic", but not as minimalistic as being completely featureless. ''; - homepage = http://sourceforge.net/apps/trac/vimprobable; + homepage = https://sourceforge.net/apps/trac/vimprobable; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.aforemny ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 109ab2417af..4bd0f2e73e6 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical wireless scanning for Linux"; - homepage = http://sourceforge.net/projects/linssid/; + homepage = https://sourceforge.net/projects/linssid/; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix new file mode 100644 index 00000000000..a73feba97b6 --- /dev/null +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, cmake}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "clingo"; + version = "5.2.2"; + + src = fetchurl { + url = "https://github.com/potassco/clingo/releases/v${version}.tar.gz"; + sha256 = "1kxzb385g8p9mqm1x9wvjrigifa09w6vj0wl7kradibm5qagh7ns"; + }; + + buildInputs = []; + nativeBuildInputs = [cmake]; + + meta = { + inherit version; + description = "ASP system to ground and solve logic programs"; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://potassco.org/"; + downloadPage = "https://github.com/potassco/clingo/releases/"; + }; +} diff --git a/pkgs/applications/science/logic/potassco/clingo.upstream b/pkgs/applications/science/logic/potassco/clingo.upstream new file mode 100644 index 00000000000..062577d1451 --- /dev/null +++ b/pkgs/applications/science/logic/potassco/clingo.upstream @@ -0,0 +1,6 @@ +target clingo.nix +attribute_name clingo +url https://github.com/potassco/clingo/releases/ +ensure_choice +version '.*/v([0-9.]+)[.]tar[.].*' '\1' +minimize_overwrite diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 58a9e808923..75b53d2cfe0 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -84,6 +84,8 @@ rec { git-remote-hg = callPackage ./git-remote-hg { }; + git-secret = callPackage ./git-secret { }; + git-stree = callPackage ./git-stree { }; git2cl = callPackage ./git2cl { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix new file mode 100644 index 00000000000..3f64d9d86bb --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }: + +let + version = "0.2.2"; + repo = "git-secret"; + +in stdenv.mkDerivation { + name = "${repo}-${version}"; + + src = fetchFromGitHub { + inherit repo; + owner = "sobolevn"; + rev = "v${version}"; + sha256 = "0vn9jibp97z7kc828wka1k0d7a9wx4skd6cnqy60kagfc00l0bzh"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + install -D git-secret $out/bin/git-secret + + wrapProgram $out/bin/git-secret \ + --prefix PATH : "${lib.makeBinPath [ git gnupg ]}" + + mkdir $out/share + cp -r man $out/share + ''; + + meta = { + description = "A bash-tool to store your private data inside a git repository"; + homepage = http://git-secret.io; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.lo1tuma ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index a56eba3bf5a..8287a176ce6 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line tool to make a copy from a video DVD for private use"; - homepage = http://sourceforge.net/projects/lxdvdrip; + homepage = https://sourceforge.net/projects/lxdvdrip; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index 5fd0664d15b..f9d4d4698fa 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/mjpg-streamer/; + homepage = https://sourceforge.net/projects/mjpg-streamer/; description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 2852eeef2ed..fcf569a762a 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { meta = { description = "Sample UEFI firmware for QEMU and KVM"; - homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; + homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; license = stdenv.lib.licenses.bsd2; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 2a7b4810a24..0d4aa4783c6 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.13.1"; + version = "0.16.1"; name = "tini-${version}"; + src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="1g4n8v5d197zcb41fcpbhip2x342383zw1d2zkv57w73vkqgv6z6"; + sha256 ="1abvjwjk7xhsbx60niy4ykcj3xvrxcl6zx8z1v827jsn47wzpikp"; }; + patchPhase = "sed -i /tini-static/d CMakeLists.txt"; + NIX_CFLAGS_COMPILE = [ "-DPR_SET_CHILD_SUBREAPER=36" "-DPR_GET_CHILD_SUBREAPER=37" ]; + buildInputs = [ cmake glibc glibc.static ]; + meta = with stdenv.lib; { description = "A tiny but valid init for containers"; homepage = https://github.com/krallin/tini; diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix index dd3a8c1cb41..a1dd9210e73 100644 --- a/pkgs/build-support/fetchgit/private.nix +++ b/pkgs/build-support/fetchgit/private.nix @@ -1,19 +1,26 @@ -{ fetchgit, writeScript, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // { +{ fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // { SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success then builtins.toString <ssh-auth-sock> else null; - GIT_SSH = writeScript "fetchgit-ssh" '' - #! ${stdenv.shell} - exec -a ssh ${openssh}/bin/ssh -F ${let - sshConfigFile = if (builtins.tryEval <ssh-config-file>).success - then <ssh-config-file> - else builtins.trace '' - Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path. - Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access. + GIT_SSH = let + config = ''${let + sshConfigFile = if (builtins.tryEval <ssh-config-file>).success + then <ssh-config-file> + else builtins.trace '' + Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path. - You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user. - '' "/var/lib/empty/config"; - in builtins.toString sshConfigFile} "$@" - ''; + Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access. + + You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user. + '' "/var/lib/empty/config"; + in builtins.toString sshConfigFile}''; + + ssh-wrapped = runCommand "fetchgit-ssh" { + buildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@" + ''; + in "${ssh-wrapped}/bin/ssh"; }) diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix new file mode 100644 index 00000000000..b4ce653da63 --- /dev/null +++ b/pkgs/data/fonts/libertinus/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libertinus-${version}"; + version = "6.4"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "khaledhosny"; + repo = "libertinus"; + sha256 = "0acnq4vpplp2s7kdnhncz61diji3wmhca04g27yqpk03ahb40x9g"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/${name}/ + cp *.otf $out/share/fonts/opentype/ + cp *.txt $out/share/doc/${name}/ + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0yn526kwb4xjyf6gvf0wflqi45z5dlzicycz2q003a6if5fgqcz3"; + + meta = with stdenv.lib; { + description = "A fork of the Linux Libertine and Linux Biolinum fonts"; + longDescription = '' + Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts + that started as an OpenType math companion of the Libertine font family, + but grown as a full fork to address some of the bugs in the fonts. + ''; + homepage = https://github.com/khaledhosny/libertinus; + license = licenses.ofl; + maintainers = with maintainers; [ siddharthist ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index 4ae9ceac01d..fccb231f4ca 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -13,7 +13,7 @@ fetchzip { sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2"; meta = with stdenv.lib; { - homepage = http://sourceforge.net/adobe/sourcesans; + homepage = https://sourceforge.net/adobe/sourcesans; description = "A set of OpenType fonts designed by Adobe for UIs"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index d627d813daa..d58ccc33813 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1"; meta = with stdenv.lib; { - homepage = http://sourceforge.net/adobe/sourceserifpro; + homepage = https://sourceforge.net/adobe/sourceserifpro; description = "A set of OpenType fonts to complement Source Sans Pro"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch b/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch deleted file mode 100644 index 4c5696d4e17..00000000000 --- a/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/vteconv.cc b/src/vteconv.cc -index b78d3928..5cb63e7e 100644 ---- a/src/vteconv.cc -+++ b/src/vteconv.cc -@@ -771,7 +771,7 @@ int - main (int argc, - char *argv[]) - { -- g_test_init (&argc, &argv, NULL); -+ g_test_init (&argc, &argv, (char *)NULL); - - g_test_add_func ("/vte/conv/utf8/strlen", test_utf8_strlen); - g_test_add_func ("/vte/conv/utf8/validate", test_utf8_validate); -diff --git a/src/vtetypes.cc b/src/vtetypes.cc -index 1365a295..8f38c9d9 100644 ---- a/src/vtetypes.cc -+++ b/src/vtetypes.cc -@@ -407,7 +407,7 @@ test_util_smart_fd(void) - int - main(int argc, char *argv[]) - { -- g_test_init (&argc, &argv, NULL); -+ g_test_init (&argc, &argv, (char *)NULL); - - g_test_add_func("/vte/c++/grid/coords", test_grid_coords); - g_test_add_func("/vte/c++/grid/span", test_grid_span); diff --git a/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch b/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch deleted file mode 100644 index 70ef7faa782..00000000000 --- a/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/vteseq.cc b/src/vteseq.cc -index 2330939d..e0ac14eb 100644 ---- a/src/vteseq.cc -+++ b/src/vteseq.cc -@@ -3409,7 +3409,7 @@ vte_sequence_handler_iterm2_1337(VteTerminalPrivate *that, GValueArray *params) - #define VTE_SEQUENCE_HANDLER(name) name - - static const struct vteseq_n_struct * --vteseq_n_lookup (register const char *str, register unsigned int len); -+vteseq_n_lookup (register const char *str, register size_t len); - #include"vteseq-n.cc" - - #undef VTE_SEQUENCE_HANDLER diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix index 69f61eb7697..73bbba3e72b 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/desktops/gnome-3/core/vte/ng.nix @@ -2,22 +2,15 @@ gnome3.vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; - version = "0.46.1.a"; + version = "0.50.2.a"; src = fetchFromGitHub { owner = "thestinger"; repo = "vte-ng"; rev = version; - sha256 = "125fpibid1liz50d7vbxy71pnm8b01x90xnkr4z3419b90lybr0a"; + sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf"; }; - # The patches apply the changes from https://github.com/GNOME/vte/pull/7 and - # can be removed once the commits are merged into vte-ng. - patches = [ - ./fix_g_test_init_calls.patch - ./fix_vteseq_n_lookup_declaration.patch - ]; - preConfigure = oldAttrs.preConfigure + "; ./autogen.sh"; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix index 70665919400..88a34bd6fd6 100644 --- a/pkgs/development/compilers/avra/default.nix +++ b/pkgs/development/compilers/avra/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Assember for the Atmel AVR microcontroller family"; + description = "Assembler for the Atmel AVR microcontroller family"; homepage = http://avra.sourceforge.net/; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 592eaf38d87..17d91f36875 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , which , cmake , clang @@ -27,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw"; }; + patches = [ + (fetchpatch { + # glibc 2.26 + url = https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch; + sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq"; + }) + ]; + buildInputs = [ which cmake diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix index 4c4d9f4ff38..3483afc99ef 100644 --- a/pkgs/development/compilers/ghcjs/stage2.nix +++ b/pkgs/development/compilers/ghcjs/stage2.nix @@ -133,7 +133,7 @@ test-framework-hunit test-framework-quickcheck2 text unix ]; jailbreak = true; - homepage = http://github.com/tibbe/hashable; + homepage = https://github.com/tibbe/hashable; description = "A class for types that can be converted to a hash value"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146,7 +146,7 @@ doCheck = false; libraryHaskellDepends = [ base transformers ]; jailbreak = true; - homepage = http://github.com/ekmett/mtl; + homepage = https://github.com/ekmett/mtl; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -311,7 +311,7 @@ test-framework-hunit test-framework-quickcheck2 text ]; jailbreak = true; - homepage = http://github.com/ghcjs/ghcjs-base; + homepage = https://github.com/ghcjs/ghcjs-base; description = "Base library for GHCJS"; license = stdenv.lib.licenses.mit; }) {}; diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 7d3b6860c6e..eaf9949b52d 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://sourceforge.net/p/ghdl-updates/wiki/Home/; + homepage = https://sourceforge.net/p/ghdl-updates/wiki/Home/; description = "Free VHDL simulator"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; (if flavour == "llvm" then [ "i686-linux" "x86_64-linux" ] diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 743f243791b..6e7ef22392b 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , perl , groff , cmake @@ -39,6 +40,22 @@ in stdenv.mkDerivation rec { ../fix-llvm-config.patch ]; + postPatch = stdenv.lib.optionalString (stdenv ? glibc) '' + ( + cd projects/compiler-rt + patch -p1 -F3 < ${ + fetchpatch { + name = "sigaltstack.patch"; # for glibc-2.26 + url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; + sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; + } + } + + sed -i "s,#include <pthread.h>,&\n#include <signal.h>,g" \ + lib/asan/asan_linux.cc + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 94f39183345..26144e38619 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , perl , groff , cmake @@ -39,6 +40,22 @@ in stdenv.mkDerivation rec { --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" ''; + postPatch = stdenv.lib.optionalString (stdenv ? glibc) '' + ( + cd projects/compiler-rt + patch -p1 < ${ + fetchpatch { + name = "sigaltstack.patch"; # for glibc-2.26 + url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; + sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; + } + } + + sed -i "s,#include <pthread.h>,&\n#include <signal.h>,g" \ + lib/asan/asan_linux.cc + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index 1ac023ec534..f3d5fb3e934 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -18,7 +18,7 @@ in rec { m2Path = "/com/nequissimus/maven-hello/${version}"; meta = { - homepage = http://github.com/NeQuissimus/maven-hello/; + homepage = https://github.com/NeQuissimus/maven-hello/; description = "Maven Hello World"; license = stdenv.lib.licenses.unlicense; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index e1cfb488be8..9ec9e6284f8 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for ATK accessibility toolkit"; license = stdenv.lib.licenses.lgpl21Plus; - homepage = http://gtkmm.org; + homepage = https://gtkmm.org; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index 8cae07e2949..8098ac9f3ef 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -18,7 +18,7 @@ rec { meta = with stdenv.lib; { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; - homepage = http://sourceforge.net/projects/vamp; + homepage = https://sourceforge.net/projects/vamp; license = licenses.bsd3; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix index b64c6c84980..7cb7187a3ce 100644 --- a/pkgs/development/libraries/dirac/default.nix +++ b/pkgs/development/libraries/dirac/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/dirac; + homepage = https://sourceforge.net/projects/dirac; description = "A general-purpose video codec based on wavelets"; platforms = platforms.linux; license = with licenses; [ mpl11 gpl2 lgpl21 ]; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 63dd931a139..af543c4e197 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jasper-${version}"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { repo = "jasper"; owner = "mdadams"; rev = "version-${version}"; - sha256 = "1kd2xiszg9bxfavs3fadi4gi27m876d9zjjy0ns6mmbcjk109c0a"; + sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f"; }; # newer reconf to recognize a multiout flag diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index 7b7e96012ea..9059fe8f845 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; - homepage = http://sourceforge.net/projects/liblo; + homepage = https://sourceforge.net/projects/liblo; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 8bac0f41dde..2a53a1d0e7c 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "An abstraction library for audio visualisations"; - homepage = http://sourceforge.net/projects/libvisual/; + homepage = https://sourceforge.net/projects/libvisual/; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 1fb0605530d..6674f303739 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = http://sourceforge.net/projects/linuxwacom/; + homepage = https://sourceforge.net/projects/linuxwacom/; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; }; } diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 0d711514444..3a3d99b655d 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract Cell Data From Excel xls files"; - homepage = http://sourceforge.net/projects/libxls/; + homepage = https://sourceforge.net/projects/libxls/; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index b9ad506e20a..ce0b2506c57 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ protobuf zlib ]; meta = with stdenv.lib; { - homepage = http://github.com/protobuf-c/protobuf-c/; + homepage = https://github.com/protobuf-c/protobuf-c/; description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index 111b08b633a..016cc6f0472 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Small Footprint CIM Client Library"; - homepage = http://sourceforge.net/projects/sblim/; + homepage = https://sourceforge.net/projects/sblim/; maintainers = [ stdenv.lib.maintainers.deepfire ]; diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index 30f87d36ddf..ff1a7b57f4a 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the C++ Standard Library"; - homepage = http://sourceforge.net/projects/stlport/; + homepage = https://sourceforge.net/projects/stlport/; license = stdenv.lib.licenses.free; # seems BSD-like broken = true; # probably glibc-2.20 -related issue }; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 0d6674cce81..0156c64306c 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/libtirpc/; + homepage = https://sourceforge.net/projects/libtirpc/; description = "The transport-independent Sun RPC implementation (TI-RPC)"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index b274bba9c12..718554b20a4 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = http://sourceforge.net/projects/xlslib/; + homepage = https://sourceforge.net/projects/xlslib/; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 88d24fddf79..eef10f3323f 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -16,7 +16,7 @@ buildRustPackage rec { cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; meta = { - homepage = http://github.com/cgag/loc; + homepage = https://github.com/cgag/loc; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 91f6468b465..64131e52c8d 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -5816,7 +5816,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; + homepage = https://github.com/node-inspector/node-inspector; }; production = true; }; diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 99f2b08897f..e2c6caf78bb 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -29050,7 +29050,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; + homepage = https://github.com/node-inspector/node-inspector; }; production = true; }; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index e5a3c282e58..20b63e3a8ee 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = http://sourceforge.net/projects/ocamlfuse; + homepage = https://sourceforge.net/projects/ocamlfuse; description = "OCaml bindings for FUSE"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix index d0363abbf2c..6d1654f2b42 100644 --- a/pkgs/development/ocaml-modules/sqlexpr/default.nix +++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix @@ -12,7 +12,7 @@ buildOcaml rec { propagatedBuildInputs = [ ocaml_batteries csv ocaml_lwt ocaml_sqlite3 estring ]; meta = with stdenv.lib; { - homepage = http://github.com/mfp/ocaml-sqlexpr; + homepage = https://github.com/mfp/ocaml-sqlexpr; description = "Type-safe, convenient SQLite database access"; license = licenses.lgpl21; }; diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index 0a5c04ce7aa..ef9c254aba1 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = http://github.com/mlin/ocaml-sqlite3EZ; + homepage = https://github.com/mlin/ocaml-sqlite3EZ; description = "A thin wrapper for sqlite3-ocaml with a simplified interface"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index a9b5faf6006..5acb6cd5785 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library that lets you schedule your Python code to be executed"; - homepage = http://pypi.python.org/pypi/APScheduler/; + homepage = https://pypi.python.org/pypi/APScheduler/; license = licenses.mit; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index becb9ceae72..37d75fd45c0 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/saghul/aiodns; + homepage = https://github.com/saghul/aiodns; license = licenses.mit; description = "Simple DNS resolver for asyncio"; }; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index e40e3008563..364f4cf9a3a 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil ]; meta = with stdenv.lib; { - homepage = http://bitbucket.org/zzzeek/alembic; + homepage = https://bitbucket.org/zzzeek/alembic; description = "A database migration tool for SQLAlchemy"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index adefb06303c..f2e07eba0c4 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Namespace control and lazy-import mechanism"; - homepage = http://bitbucket.org/hpk42/apipkg; + homepage = https://bitbucket.org/hpk42/apipkg; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index 211d51c241d..866c91f7c68 100644 --- a/pkgs/development/python-modules/appdirs/default.nix +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "A python module for determining appropriate platform-specific dirs"; - homepage = http://github.com/ActiveState/appdirs; + homepage = https://github.com/ActiveState/appdirs; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix index a60109b6e8c..bdb12203de6 100644 --- a/pkgs/development/python-modules/asgi_ipc/default.nix +++ b/pkgs/development/python-modules/asgi_ipc/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Posix IPC-backed ASGI channel layer implementation"; license = licenses.bsd3; - homepage = http://github.com/django/asgi_ipc/; + homepage = https://github.com/django/asgi_ipc/; }; } diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix index 77a9af8645e..d4c9388f1a7 100644 --- a/pkgs/development/python-modules/asgi_redis/default.nix +++ b/pkgs/development/python-modules/asgi_redis/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Redis-backed ASGI channel layer implementation"; license = licenses.bsd3; - homepage = http://github.com/django/asgi_redis/; + homepage = https://github.com/django/asgi_redis/; }; } diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index fd742031d5a..86a0daa0456 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A abstract syntax tree for Python with inference support"; - homepage = http://bitbucket.org/logilab/astroid; + homepage = https://bitbucket.org/logilab/astroid; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix index 9ff3b2adfd9..9226fa1c5bf 100644 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://github.com/dursk/bitcoin-price-api; + homepage = https://github.com/dursk/bitcoin-price-api; description = "Price APIs for bitcoin exchanges"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix index dee19b45f44..f09a271faad 100644 --- a/pkgs/development/python-modules/bkcharts/default.nix +++ b/pkgs/development/python-modules/bkcharts/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "High level chart types built on top of Bokeh"; - homepage = http://github.com/bokeh/bkcharts; + homepage = https://github.com/bokeh/bkcharts; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix new file mode 100644 index 00000000000..a7fe8620a8a --- /dev/null +++ b/pkgs/development/python-modules/botocore/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, fetchPypi +, dateutil +, jmespath +, docutils +, ordereddict +, simplejson +, mock +, nose +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "botocore"; + version = "1.7.43"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wyyj7sk7dh9v7i1g5jc5maqdadvbs4khi7srz0095cywkjqpysc"; + }; + + propagatedBuildInputs = [ + dateutil + jmespath + docutils + ordereddict + simplejson + ]; + + checkInputs = [ mock nose ]; + + checkPhase = '' + nosetests -v + ''; + + # Network access + doCheck = false; + + meta = { + homepage = https://github.com/boto/botocore; + license = "bsd"; + description = "A low-level interface to a growing number of Amazon Web Services"; + }; +} diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index e182f55cdc0..7326f2cf3b4 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Composable style cycles"; - homepage = http://github.com/matplotlib/cycler; + homepage = https://github.com/matplotlib/cycler; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index c319e6535e9..70647b6377f 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Minimal task scheduling abstraction"; - homepage = http://github.com/ContinuumIO/dask/; + homepage = https://github.com/ContinuumIO/dask/; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index b980381edbb..32514f86226 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Powerful extensions to the standard datetime module"; - homepage = http://pypi.python.org/pypi/python-dateutil; + homepage = https://pypi.python.org/pypi/python-dateutil; license = "BSD-style"; }; } diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 424be07aa61..657a4db4115 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; - homepage = http://bitbucket.org/zzzeek/dogpile.cache; + homepage = https://bitbucket.org/zzzeek/dogpile.cache; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 89b554f3e68..0a006b77793 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Code checking using pep8 and pyflakes"; - homepage = http://pypi.python.org/pypi/flake8; + homepage = https://pypi.python.org/pypi/flake8; license = licenses.mit; maintainers = with maintainers; [ garbas ]; }; diff --git a/pkgs/development/python-modules/guessit/2.0.nix b/pkgs/development/python-modules/guessit/2.0.nix index 960babd84e2..59fb650c883 100644 --- a/pkgs/development/python-modules/guessit/2.0.nix +++ b/pkgs/development/python-modules/guessit/2.0.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; meta = { - homepage = http://pypi.python.org/pypi/guessit; + homepage = https://pypi.python.org/pypi/guessit; license = lib.licenses.lgpl3; description = "A library for guessing information from video files"; }; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index b0c0bb9496f..77c45d12335 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; meta = { - homepage = http://pypi.python.org/pypi/guessit; + homepage = https://pypi.python.org/pypi/guessit; license = lib.licenses.lgpl3; description = "A library for guessing information from video files"; }; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index cc8017f0cd8..89af8596edb 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/gunicorn; + homepage = https://pypi.python.org/pypi/gunicorn; description = "WSGI HTTP Server for UNIX"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index 0c54c3ab8ae..a5d7b2b711e 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://github.com/twisted/treq; + homepage = https://github.com/twisted/treq; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix index 29984eed9e9..85a5d1f3622 100644 --- a/pkgs/development/python-modules/mplleaflet/default.nix +++ b/pkgs/development/python-modules/mplleaflet/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Convert Matplotlib plots into Leaflet web maps"; - homepage = http://github.com/jwass/mplleaflet; + homepage = https://github.com/jwass/mplleaflet; license = with lib.licenses; [ bsd3 ]; }; } diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index d1c39210607..73d0f5a2dbe 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://github.com/mrocklin/multipledispatch/; + homepage = https://github.com/mrocklin/multipledispatch/; description = "A relatively sane approach to multiple dispatch in Python"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index d04e5c5eccb..c0b8b90bd08 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { checkPhase = '' mkdir tmp - LC_ALL=en_US.utf8 HOME=`realpath tmp` py.test -v + LC_ALL=en_US.UTF-8 HOME=`realpath tmp` py.test -v ''; meta = { diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index cf5c5ee06cd..3178b217a00 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "A module wrapper for os.path"; - homepage = http://github.com/jaraco/path.py; + homepage = https://github.com/jaraco/path.py; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix index 57dd687604d..48ea9bd6980 100644 --- a/pkgs/development/python-modules/phpserialize/default.nix +++ b/pkgs/development/python-modules/phpserialize/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "A port of the serialize and unserialize functions of PHP to Python"; - homepage = http://github.com/mitsuhiko/phpserialize; + homepage = https://github.com/mitsuhiko/phpserialize; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix index fc8fbcaa8d2..b1ee59a5cd4 100644 --- a/pkgs/development/python-modules/pycassa/default.nix +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "A python client library for Apache Cassandra"; - homepage = http://github.com/pycassa/pycassa; + homepage = https://github.com/pycassa/pycassa; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index e23cf7794b1..1004d70476c 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; - homepage = http://github.com/wmayner/pyemd; + homepage = https://github.com/wmayner/pyemd; license = licenses.mit; maintainers = with maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 8b15c63fb20..30dbbdba5a5 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { meta = { description = "Python interface to PROJ.4 library"; - homepage = http://github.com/jswhit/pyproj; + homepage = https://github.com/jswhit/pyproj; license = with lib.licenses; [ isc ]; }; } // (if proj == null then {} else { PROJ_DIR = proj; })) diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index f471c8b8730..ecd46bb1ff5 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Windows Remote Management"; - homepage = http://github.com/diyan/pywinrm/; + homepage = https://github.com/diyan/pywinrm/; license = licenses.mit; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index d8b380896cc..fa91184f1b7 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "GPGPU algorithms for PyCUDA and PyOpenCL"; - homepage = http://github.com/fjarri/reikna; + homepage = https://github.com/fjarri/reikna; license = stdenv.lib.licenses.mit; maintainer = stdenv.lib.maintainers.fridh; diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 2dd672c0109..582a4f6138a 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python unittest test suite for Robot Framework"; - homepage = http://github.com/collective/robotsuite/; + homepage = https://github.com/collective/robotsuite/; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix new file mode 100644 index 00000000000..8e5b30c26b4 --- /dev/null +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchPypi +, pythonOlder +, buildPythonPackage +, docutils +, mock +, nose +, coverage +, wheel +, unittest2 +, botocore +, futures +}: + +buildPythonPackage rec { + pname = "s3transfer"; + version = "0.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0yfrfnf404cxzn3iswibqjxklsl0b1lwgqiml6pwiqj79a7zbwbn"; + }; + + foo = 1; + + propagatedBuildInputs = + [ botocore + ] ++ stdenv.lib.optional (pythonOlder "3") futures; + + buildInputs = [ + docutils + mock + nose + coverage + wheel + unittest2 + ]; + + checkPhase = '' + pushd s3transfer/tests + nosetests -v unit/ functional/ + popd + ''; + + # version on pypi has no tests/ dir + doCheck = false; + + meta = { + homepage = https://github.com/boto/s3transfer; + license = stdenv.lib.licenses.asl20; + description = "A library for managing Amazon S3 transfers"; + }; +} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 818468d0fca..a65b0206ee5 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; - homepage = http://pypi.python.org/pypi/setuptools; + homepage = https://pypi.python.org/pypi/setuptools; license = with licenses; [ psfl zpl20 ]; platforms = platforms.all; priority = 10; diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 38117337d06..00fbbbc01eb 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "A Python 2 and 3 compatibility library"; - homepage = http://pypi.python.org/pypi/six/; + homepage = https://pypi.python.org/pypi/six/; license = lib.licenses.mit; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 7b432154b60..e786cb84329 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "A set of extensions to the Python standard library's unit testing framework"; - homepage = http://pypi.python.org/pypi/testtools; + homepage = https://pypi.python.org/pypi/testtools; license = lib.licenses.mit; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 31f69971e52..34c22132428 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Transaction management"; - homepage = http://pypi.python.org/pypi/transaction; + homepage = https://pypi.python.org/pypi/transaction; license = licenses.zpl20; }; } diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 6bd7355b34d..3144e8e4de9 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/twisted/treq; + homepage = https://github.com/twisted/treq; description = "A requests-like API built on top of twisted.web's Agent"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 1a5da395ee3..9b81a28f085 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/Unidecode/; + homepage = https://pypi.python.org/pypi/Unidecode/; description = "ASCII transliterations of Unicode text"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index fa6a7a61332..6923f876ff2 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Structured Configuration Library"; - homepage = http://pypi.python.org/pypi/ZConfig; + homepage = https://pypi.python.org/pypi/ZConfig; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 232acaec506..f704f305278 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope Object Database: object database and persistence"; - homepage = http://pypi.python.org/pypi/ZODB; + homepage = https://pypi.python.org/pypi/ZODB; license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 9438e8ca54f..53dd8680c31 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://pypi.python.org/pypi/zodbpickle; + homepage = https://pypi.python.org/pypi/zodbpickle; }; } diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 7f2af64d915..8358c861cba 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A flexible test runner with layer support"; - homepage = http://pypi.python.org/pypi/zope.testrunner; + homepage = https://pypi.python.org/pypi/zope.testrunner; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e15b212ebca..a1452d330be 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeScriptBin, coreutils, makeWrapper, which, python }: +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeScriptBin, coreutils, makeWrapper, which, python +# Always assume all markers valid (don't redownload dependencies). +# Also, don't clean up environment variables. +, enableNixHacks ? false +}: stdenv.mkDerivation rec { @@ -21,6 +25,8 @@ stdenv.mkDerivation rec { sourceRoot = "."; + patches = lib.optional enableNixHacks ./nix-hacks.patch; + # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. customBash = writeScriptBin "bash" '' @@ -74,7 +80,6 @@ stdenv.mkDerivation rec { ''; # Bazel expects gcc and java to be in the path. - installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin @@ -84,6 +89,12 @@ stdenv.mkDerivation rec { cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ ''; + # Save paths to hardcoded dependencies so Nix can detect them. + postFixup = '' + mkdir -p $out/nix-support + echo "${customBash} ${coreutils}" > $out/nix-support/depends + ''; + dontStrip = true; dontPatchELF = true; } diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index c79f238673e..11caff8ddab 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.02.02"; + version = "9.02.03"; src = fetchFromGitHub { - sha256 = "0f7w3b8r2h6ckgzc6wbfbw5yyxia0f3j3acmzi1yzylj6ak05mmd"; + sha256 = "1g3pdcd2i8n29rqwrdg6bd7qnsii55hi0rnma86hy0pm5cshpwi5"; rev = version; repo = "icmake"; owner = "fbb-git"; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index 636d8ef7b78..f7628cf181c 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { it is intended as a replacement for the venerable 'isql' program supplied by Sybase. ''; - homepage = http://sourceforge.net/projects/sqsh/; + homepage = https://sourceforge.net/projects/sqsh/; platforms = platforms.all; }; } diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 2e17d72ea9e..8ece92b4a3f 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -3558,7 +3558,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Portable Unix shell commands for Node.js"; - homepage = http://github.com/shelljs/shelljs; + homepage = https://github.com/shelljs/shelljs; license = "BSD-3-Clause"; }; production = true; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index a6f1c305c4e..a968526e5cd 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,7 +12,7 @@ let gtkName = if gtkClient then "-gtk" else ""; name = "freeciv"; - version = "2.5.7"; + version = "2.5.9"; in stdenv.mkDerivation { name = "${name}${sdlName}${gtkName}-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2"; - sha256 = "1lmydnnqraa947l7gdz6xgm0bgks1ywsivp9h4v8jr3avcv6gqzz"; + sha256 = "0a2rjw6065psh14bkk6ar4i19dcicn9lz63rffr9h278b9c76g5q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 856e4f6c6c1..d9263d2c2f5 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -32,6 +32,7 @@ let xdg_utils # Zoneinfo etc-zoneinfo + iana-etc ] ++ lib.optional withJava jdk ++ lib.optional withPrimus primus ++ extraPkgs pkgs; diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 735e73d5d49..81300049203 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Command line utility for Atmel maXTouch devices"; - homepage = http://github.com/atmel-maxtouch/mxt-app; + homepage = https://github.com/atmel-maxtouch/mxt-app; license = licenses.bsd2; maintainers = [ maintainers.colemickens ]; platforms = platforms.unix; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 5ce78702148..a9468e5356d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1742,7 +1742,7 @@ rec { meta = { description = "Fastest non utf-8 aware word and C completion engine for Vim"; - homepage = http://github.com/Valloric/YouCompleteMe; + homepage = https://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index 9ad37f3a63d..8f8c58ecc4a 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Displays text on your screen"; - homepage = http://sourceforge.net/projects/libxosd; + homepage = https://sourceforge.net/projects/libxosd; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 4b32697c6ae..09a346e4446 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform port of the macOS CoreFoundation"; - homepage = http://sourceforge.net/projects/opencflite/; + homepage = https://sourceforge.net/projects/opencflite/; license = stdenv.lib.licenses.apsl20; }; } diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 2f4689beea4..bbacd615cf2 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,22 +1,47 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchgit, runCommand, git, cacert, gnupg }: stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2017-07-05"; + version = "2017-10-09-${src.iwlRev}"; - # This repo is built by merging the latest versions of + # The src runCommand automates the process of building a merged repository of both + # # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ - # and # http://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/ - # for any given date. This gives us up to date iwlwifi firmware as well as + # + # This gives us up to date iwlwifi firmware as well as # the usual set of firmware. firmware/linux-firmware usually lags kernel releases # so iwlwifi cards will fail to load on newly released kernels. - src = fetchFromGitHub { - owner = "fpletz"; - repo = "linux-firmware"; - rev = version; - sha256 = "0vlk043y7c32g4d9hz93j64x372qqrwsq65mh8s5s5xrvamja2if"; - }; + # + # To update, go to the above repositories and look for latest tags / commits, then + # update version to the more recent commit date + + src = runCommand "firmware-linux-nonfree-src-merged-${version}" { + # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash + baseRev = "bf04291309d3169c0ad3b8db52564235bbd08e30"; + iwlRev = "iwlwifi-fw-2017-11-03"; + + # randomly mutate the hash to break out of fixed hash, when updating + outputHash = "11izv1vpq9ixlqdss19lzs5q289d7jxr5kgf6iymk4alxznffd8z"; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + buildInputs = [ git gnupg ]; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + } '' + git init src && ( + cd src + git config user.email "build-daemon@nixos.org" + git config user.name "Nixos Build Daemon $name" + git remote add base git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git + git remote add iwl git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git + git fetch base $baseRev + git checkout -b work FETCH_HEAD + git fetch iwl $iwlRev + git merge FETCH_HEAD) + rm -rf src/.git + cp -a src $out + ''; preInstall = '' mkdir -p $out diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 9605fb26999..e28a85ab0b2 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; - homepage = http://sourceforge.net/projects/zd1211/; + homepage = https://sourceforge.net/projects/zd1211/; license = "GPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index a8348acd5d7..d3654445332 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://sourceforge.net/projects/mingetty; + homepage = https://sourceforge.net/projects/mingetty; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix index 374300db460..ce9136e2ddb 100644 --- a/pkgs/os-specific/linux/mstpd/default.nix +++ b/pkgs/os-specific/linux/mstpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multiple Spanning Tree Protocol daemon"; - homepage = http://sourceforge.net/projects/mstpd/; + homepage = https://sourceforge.net/projects/mstpd/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index c22ffb60df8..e989a7837f9 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = "Ndis driver wrapper for the Linux kernel"; - homepage = http://sourceforge.net/projects/ndiswrapper; + homepage = https://sourceforge.net/projects/ndiswrapper; license = "GPL"; broken = true; }; diff --git a/pkgs/os-specific/linux/procps/watch.nix b/pkgs/os-specific/linux/procps/watch.nix index 5fdd1287a64..4511b9cf843 100644 --- a/pkgs/os-specific/linux/procps/watch.nix +++ b/pkgs/os-specific/linux/procps/watch.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin"; meta = { - homepage = http://sourceforge.net/projects/procps/; + homepage = https://sourceforge.net/projects/procps/; description = "Utility for watch the output of a given command at intervals"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 06144eedbf4..db23987d4aa 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,7 +1,7 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "0.26.0" "0.26.0" "1ywbmay0pwm7rj4y0yqk6a3a62lv32ncshwy5j02rq5b2nf7lbc3") + (fetchbower "uchiwa-web" "0.26.3" "0.26.3" "1qc69jk3730skdg2vdqncjwg15vywb1a9f8jqk6kwggmkwdklr0p") (fetchbower "angular" "1.6.6" "~1.6.3" "1hc71mpipbdz6ban4zkagdhmn3rw28ksjkr6nwmbzfcpk59gnzkb") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") (fetchbower "angular-cookies" "1.6.6" "~1.6.3" "0qfk0az32fmrn71ywjl63k7hgan0f0bb4d7fx7q5ch2kd75rzkfm") @@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3") (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71") (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb") - (fetchbower "ua-parser-js" "0.7.14" "~0.7.12" "0bpyfbaixz2dhkc19r7zgm61n4rncrvfyvj61c5kn6fmj68fdbz3") + (fetchbower "ua-parser-js" "0.7.17" "~0.7.12" "1dx46rm9han9fj409rjxrlnrk9zxmaqbnn62ljnh32ihngd4yxh0") (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x") (fetchbower "jquery" "3.2.1" ">= 1.9.0" "03vn0kq07yxl3i5shc6b0mjck1vdbz1x0jspd3wwb169mvlsxxn3") ]; } diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index 4b14eea17ff..924a92a2785 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "0.26.0-1"; - sha256 = "10f71wsv43jbbwvw3wicr8r1bml51smfakf4r10mi4zq1l37h77z"; + version = "0.26.3-1"; + sha256 = "13gklnrzhcj7s7j1ga5pa7ijwav0w9a96lqh4m7858mmm92v0bsk"; } diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh deleted file mode 100755 index 33e3dacdda5..00000000000 --- a/pkgs/servers/monitoring/uchiwa/update.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl.bin git.out jq.out nodePackages.bower2nix - -set -euo pipefail -IFS=$'\n\t' - -# set -x - -REPO=sensu/uchiwa -SHA="1111111111111111111111111111111111111111111111111111" - -write_src() { - cat <<_EOF > src.nix -{ - version = "${VERSION}"; - sha256 = "${SHA}"; -} -_EOF -} - -t=$(mktemp -d) - -LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r) -echo "Latest version: ${LATEST_VERSION}" - -VERSION=${1:-${LATEST_VERSION}} -echo "Updating to: ${VERSION}" - -write_src - -curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t/bower.json -bower2nix $t/bower.json $t/bower-packages.nix -mv $t/bower-packages.nix . -# sed -i 's@/@-@g' bower-packages.nix - -pushd $(git rev-parse --show-toplevel) -SHA=$(nix-prefetch-url -A uchiwa.src) -popd - -write_src - -rm -r $t diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 9c8ad94f61c..6752e5b80b7 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, python3Packages }: let - version = "2.1.6"; - sha256 = "1x76nvxjhjpagniyh075hqia4sl06972alnhi7628cjrq3pr4v9i"; + version = "2.1.8"; + sha256 = "0fnsk61s328dg16iv0chqxayni8ahkbcb84z012w0d9417i806lc"; in python3Packages.buildPythonApplication { diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index dd09985a07b..9e211b8df74 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "ONC RPC portmapper"; license = licenses.bsd3; platforms = platforms.unix; - homepage = http://sourceforge.net/projects/rpcbind/; + homepage = https://sourceforge.net/projects/rpcbind/; maintainers = with maintainers; [ abbradar ]; longDescription = '' Universal addresses to RPC program number mapper. diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 1f8a5649430..71bc0de6d91 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.6.20"; + version = "5.6.22"; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "0dqkyg9lpjgj2qwbm8blh7hvlm8656d6gihyxr37dx6ja8qlzcjl"; + sha256 = "1ffphdi4df3jhlcl68amb90f5pj7cwyrql4qwbswynh9d623880l"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index af055266293..cd190e8cabe 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://github.com/spwhitt/nix-zsh-completions; + homepage = https://github.com/spwhitt/nix-zsh-completions; description = "ZSH completions for Nix, NixOS, and NixOps"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix new file mode 100644 index 00000000000..6eee9826948 --- /dev/null +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, awscli +, prompt_toolkit +, boto3 +, configobj +, pygments +}: + +buildPythonPackage rec { + pname = "aws-shell"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; + }; + + # Why does it propagate packages that are used for testing? + propagatedBuildInputs = [ + awscli + prompt_toolkit + boto3 + configobj + pygments + ]; + + #Checks are failing due to missing TTY, which won't exist. + doCheck = false; + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/awslabs/aws-shell; + description = "An integrated shell for working with the AWS CLI"; + license = licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix new file mode 100644 index 00000000000..8061cbfded8 --- /dev/null +++ b/pkgs/tools/admin/awscli/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, botocore +, bcdoc +, s3transfer +, six +, colorama +, docutils +, rsa +, pyyaml +, groff +, less +}: + +let + colorama_3_7 = colorama.overrideAttrs (old: rec { + name = "${pname}-${version}"; + pname = "colorama"; + version = "0.3.7"; + src = fetchPypi { + inherit pname version; + sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; + }; + }); + +in buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "awscli"; + version = "1.11.185"; + namePrefix = ""; + + src = fetchPypi { + inherit pname version; + sha256 = "18rskl6sla456z4hkq2gmmm03fqc4rqw5pfiqdyc7a2v9kljv4ah"; + }; + + # No tests included + doCheck = false; + + propagatedBuildInputs = [ + botocore + bcdoc + s3transfer + six + colorama_3_7 + docutils + rsa + pyyaml + groff + less + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli + mkdir -p $out/share/zsh/site-functions + mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + rm $out/bin/aws.cmd + ''; + + meta = with stdenv.lib; { + homepage = https://aws.amazon.com/cli/; + description = "Unified tool to manage your AWS services"; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ muflax ]; + }; +} diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 7cec791ecc5..7d0fc5969bf 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; meta = { - homepage = http://sourceforge.net/projects/lsdvd/; + homepage = https://sourceforge.net/projects/lsdvd/; shortDescription = "Display information about audio, video, and subtitle tracks on a DVD"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index f20f9aa2bab..f929f354766 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "The FAT16/FAT32 non-destructive resizer"; - homepage = http://sourceforge.net/projects/fatresize; + homepage = https://sourceforge.net/projects/fatresize; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 3ca46851306..8a417cfe397 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://sourceforge.net/projects/fuseiso; + homepage = https://sourceforge.net/projects/fuseiso; description = "FUSE module to mount ISO filesystem images"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index fc504b3208d..7ff42c4d1f9 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; inherit version; - homepage = http://sourceforge.net/projects/smbnetfs/; + homepage = https://sourceforge.net/projects/smbnetfs/; }; } diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index e6773e42304..d3a8d19dfe2 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Little CMS ICC profile construction set"; - homepage = http://sourceforge.net/projects/lprof; + homepage = https://sourceforge.net/projects/lprof; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 67faf925a27..be1df0510d7 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { }; meta = { - homepage = http://github.com/bepasty/bepasty-server; + homepage = https://github.com/bepasty/bepasty-server; description = "Binary pastebin server"; license = lib.licenses.mit; maintainers = [ lib.maintainers.makefu ]; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 65a5b718e5f..eaa2c6e4942 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bibliography format interconversion"; longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters."; - homepage = http://sourceforge.net/p/bibutils/home/Bibutils/; + homepage = https://sourceforge.net/p/bibutils/home/Bibutils/; license = licenses.gpl2; maintainers = [ maintainers.garrison ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix index 9ba138bf0e9..a13f7160aa6 100644 --- a/pkgs/tools/misc/quota/default.nix +++ b/pkgs/tools/misc/quota/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to manage kernel-level quotas in Linux"; - homepage = http://sourceforge.net/projects/linuxquota/; + homepage = https://sourceforge.net/projects/linuxquota/; license = licenses.gpl2; # With some files being BSD as an exception platforms = platforms.linux; maintainers = [ maintainers.dezgeg ]; diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index 5c56f9accfc..ff606c6b72b 100644 --- a/pkgs/tools/misc/rkflashtool/default.nix +++ b/pkgs/tools/misc/rkflashtool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://sourceforge.net/projects/rkflashtool/; + homepage = https://sourceforge.net/projects/rkflashtool/; description = "Tools for flashing Rockchip devices"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 24a7e8d3f71..f30fdb1f119 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/timidity/; + homepage = https://sourceforge.net/projects/timidity/; license = licenses.gpl2; description = "A software MIDI renderer"; maintainers = [ maintainers.marcweber ]; diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index f87cecaf4d2..aedb89ce489 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://sourceforge.net/projects/sshpass/; + homepage = https://sourceforge.net/projects/sshpass/; description = "Non-interactive ssh password auth"; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 8161f700ce1..6a322f649ac 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,19 +2,21 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.5"; + version = "2.7"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "0irz54nvyq3cxa3fvjc5k2836a5nmly4wiiy4s5cwib1rnwg6r94"; + sha256 = "0fx964z73yv08b1lpymmjsigf6929zx9ax5bp34rcf2c5gk11l5m"; }; propagatedBuildInputs = with python3Packages; [ + appdirs keyring minidb pyyaml + pycodestyle requests ]; diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 7c72c2cd210..05dcf6dc594 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP benchmarking tool"; - homepage = http://github.com/wg/wrk; + homepage = https://github.com/wg/wrk; longDescription = '' wrk is a modern HTTP benchmarking tool capable of generating significant load when run on a single multi-core CPU. It diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix new file mode 100644 index 00000000000..55335927b36 --- /dev/null +++ b/pkgs/tools/security/doas/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, bison, pam }: + +stdenv.mkDerivation rec { + name = "doas-${version}"; + + version = "6.0"; + + src = fetchFromGitHub { + owner = "Duncaen"; + repo = "OpenDoas"; + rev = "v${version}"; + sha256 = "1j50l3jvbgvg8vmp1nx6vrjxkbj5bvfh3m01bymzfn25lkwwhz1x"; + }; + + # otherwise confuses ./configure + dontDisableStatic = true; + + postPatch = '' + sed -i '/\(chown\|chmod\)/d' bsd.prog.mk + ''; + + buildInputs = [ bison pam ]; + + meta = with lib; { + description = "Executes the given command as another user"; + homepage = "https://github.com/Duncaen/OpenDoas"; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 4a770f86e5c..3a6c09b9291 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A general purpose fuzzer"; longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; - homepage = http://github.com/aoh/radamsa; + homepage = https://github.com/aoh/radamsa; maintainers = [ stdenv.lib.maintainers.markWot ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 75a865917ec..1885940e7f3 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "A random number generator daemon"; - homepage = http://sourceforge.net/projects/gkernel; + homepage = https://sourceforge.net/projects/gkernel; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 5510ec0e948..171eff06b8d 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; meta = { - homepage = http://github.com/chneukirchen/lr; + homepage = https://github.com/chneukirchen/lr; description = "List files recursively"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 162f7e1a397..3c2b4f5e885 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jing-trang-${version}"; - version = "20150603"; + version = "20151127"; src = fetchFromGitHub { owner = "relaxng"; repo = "jing-trang"; - rev = "54b9b1f4e67cd79c7987750d8c9dcfc014af98c3"; # needed to compile with jdk8 - sha256 = "0wa569xjb7ihhcaazz32y2b0dv092lisjz77isz1gfb1wvf53di5"; + rev = "47a0cbdaec2d48824b78a1c19879ac7875509598"; # needed to compile with jdk8 + sha256 = "1hhn52z9mv1x9nyvyqnmzg5yrs2lzm9xac7i15izppv02wp32qha"; }; buildInputs = [ jdk ant saxon ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com # for downloads and call it the "project site". - homepage = http://www.thaiopensource.com/relaxng/jing.html; + homepage = "http://www.thaiopensource.com/relaxng/trang.html"; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 160936af5ae..36433738190 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -124,6 +124,8 @@ with pkgs; dump1090 = callPackage ../applications/misc/dump1090 { }; + ebook2cw = callPackage ../applications/misc/ebook2cw { }; + vsenv = callPackage ../build-support/vsenv { vs = vs90wrapper; }; @@ -511,13 +513,13 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; - awscli = pythonPackages.awscli; # Should be moved out of python-packages.nix + awscli = pythonPackages.callPackage ../tools/admin/awscli { }; awsebcli = callPackage ../tools/virtualization/awsebcli {}; awslogs = callPackage ../tools/admin/awslogs { }; - aws_shell = python2Packages.aws_shell; # Should be moved out of python-packages.nix + aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; azure-cli = nodePackages.azure-cli; @@ -885,6 +887,8 @@ with pkgs; clib = callPackage ../tools/package-management/clib { }; + clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; + colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; colpack = callPackage ../applications/science/math/colpack { }; @@ -1763,6 +1767,8 @@ with pkgs; inherit (perlPackages) PerlMagick; }; + doas = callPackage ../tools/security/doas { }; + docbook2x = callPackage ../tools/typesetting/docbook2x { inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; }; @@ -13388,6 +13394,8 @@ with pkgs; libertine = callPackage ../data/fonts/libertine { }; + libertinus = callPackage ../data/fonts/libertinus { }; + libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; @@ -14056,7 +14064,7 @@ with pkgs; confclerk = callPackage ../applications/misc/confclerk { }; - copyq = callPackage ../applications/misc/copyq { }; + copyq = libsForQt5.callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { inherit (gnome2) libgnomeui GConf; @@ -14841,7 +14849,7 @@ with pkgs; gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt; gitMinimal = git.override { withManual = false; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 01d2fc8e046..7cbc36d1cbb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -140,7 +140,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ AnyEvent ]; doCheck = false; # does an DNS lookup meta = { - homepage = http://github.com/potyl/perl-AnyEvent-CacheDNS; + homepage = https://github.com/potyl/perl-AnyEvent-CacheDNS; description = "Simple DNS resolver with caching"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -373,7 +373,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ParamsValidate ]; doCheck = false; meta = { - homepage = http://metacpan.org/release/Attribute-Params-Validate; + homepage = https://metacpan.org/release/Attribute-Params-Validate; description = "Define validation through subroutine attributes"; license = stdenv.lib.licenses.artistic2; }; @@ -694,7 +694,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ ModuleImplementation ModuleRuntime SubExporterProgressive ]; meta = { - homepage = http://metacpan.org/release/B-Hooks-EndOfScope; + homepage = https://metacpan.org/release/B-Hooks-EndOfScope; description = "Execute code after a scope finished compilation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1254,7 +1254,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; meta = { - homepage = http://metacpan.org/release/Catalyst-Plugin-AccessLog; + homepage = https://metacpan.org/release/Catalyst-Plugin-AccessLog; description = "Request logging from within Catalyst"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -2635,7 +2635,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants ]; doCheck = false; meta = { - homepage = http://github.com/jib/cpanplus-devel; + homepage = https://github.com/jib/cpanplus-devel; description = "Ameliorated interface to the CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3102,7 +3102,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ ParamsUtil SubInstall ]; meta = { - homepage = http://github.com/rjbs/data-optlist; + homepage = https://github.com/rjbs/data-optlist; description = "Parse and validate simple name/value option pairs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3202,7 +3202,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestRequires ]; propagatedBuildInputs = [ Moose PathClass SubExporter namespaceclean ]; meta = { - homepage = http://metacpan.org/release/Data-Stream-Bulk; + homepage = https://metacpan.org/release/Data-Stream-Bulk; description = "N at a time iteration API"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3283,7 +3283,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ NetDomainTLD ]; meta = { - homepage = http://metacpan.org/release/Data-Validate-Domain; + homepage = https://metacpan.org/release/Data-Validate-Domain; description = "Domain and host name validation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; @@ -3299,7 +3299,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestRequires ]; propagatedBuildInputs = [ NetAddrIP ]; meta = { - homepage = http://metacpan.org/release/Data-Validate-IP; + homepage = https://metacpan.org/release/Data-Validate-IP; description = "IPv4 and IPv6 validation methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; @@ -3565,7 +3565,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone PackageDeprecationManager ParamsValidate TryTiny ]; meta = { - homepage = http://metacpan.org/release/DateTime-Format-Strptime; + homepage = https://metacpan.org/release/DateTime-Format-Strptime; description = "Parse and format strp and strf time patterns"; license = stdenv.lib.licenses.artistic2; }; @@ -3607,7 +3607,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DistCheckConflicts TestFatal TestRequires TestWarnings ]; propagatedBuildInputs = [ DistCheckConflicts ListMoreUtils ParamsValidate ]; meta = { - homepage = http://metacpan.org/release/DateTime-Locale; + homepage = https://metacpan.org/release/DateTime-Locale; description = "Localization support for DateTime.pm"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3635,7 +3635,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ListAllUtils ModuleRuntime ParamsValidate TryTiny ]; meta = { - homepage = http://metacpan.org/release/DateTime-TimeZone; + homepage = https://metacpan.org/release/DateTime-TimeZone; description = "Time zone object base class and factory"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4082,7 +4082,7 @@ let self = _self // overrides; _self = with self; { sha256 = "e882ccd7f4cbab0d0cdad53897f3f3bf29bdcf47d2bdfde1ac07f1bc7d7ebd16"; }; meta = { - homepage = http://metacpan.org/release/Devel-StackTrace; + homepage = https://metacpan.org/release/Devel-StackTrace; description = "An object representing a stack trace"; license = stdenv.lib.licenses.artistic2; }; @@ -4276,7 +4276,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CaptureTiny DistZilla MooseAutobox perl ]; propagatedBuildInputs = [ DistZilla DistZillaPluginMojibakeTests DistZillaPluginNoTabsTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion JSONPP ListMoreUtils Moose PodCoverageTrustPod TestCPANMeta TestPerlCritic TestVersion namespaceautoclean ]; meta = { - homepage = http://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/; + homepage = https://metacpan.org/release/Dist-Zilla-PluginBundle-TestingMania/; description = "Test your dist with every testing plugin conceivable"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4377,7 +4377,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CPANChanges DistZilla ]; propagatedBuildInputs = [ CPANChanges DataSection DistZilla Moose ]; meta = { - homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/; + homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-CPAN-Changes/; description = "Release tests for your changelog"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4422,7 +4422,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; propagatedBuildInputs = [ DistZilla Moose TestDistManifest ]; meta = { - homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/; + homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-DistManifest/; description = "Release tests for the manifest"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4467,7 +4467,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DistZilla MooseAutobox TestOutput ]; propagatedBuildInputs = [ DistZilla Moose TestMinimumVersion ]; meta = { - homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/; + homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-MinimumVersion/; description = "Release tests for minimum required versions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4512,7 +4512,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; propagatedBuildInputs = [ DistZilla Moose TestPortabilityFiles ]; meta = { - homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/; + homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Portability/; description = "Release tests for portability"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4527,7 +4527,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; propagatedBuildInputs = [ DistZilla Moose TestSynopsis ]; meta = { - homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/; + homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-Synopsis/; description = "Release tests for synopses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4542,7 +4542,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ CaptureTiny DistZilla MooseAutobox TestOutput ]; propagatedBuildInputs = [ DistZilla Moose TestVars namespaceautoclean ]; meta = { - homepage = http://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/; + homepage = https://metacpan.org/release/Dist-Zilla-Plugin-Test-UnusedVars/; description = "Release tests for unused variables"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5553,7 +5553,7 @@ let self = _self // overrides; _self = with self; { --replace "/usr/share/file/magic.mgc" "${pkgs.file}/share/misc/magic.mgc" ''; meta = { - homepage = http://metacpan.org/release/File::LibMagic; + homepage = https://metacpan.org/release/File::LibMagic; description = "Determine MIME types of data or files using libmagic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; @@ -5680,7 +5680,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ FileShareDir ]; meta = { - homepage = http://github.com/ingydotnet/file-share-pm/tree; + homepage = https://github.com/ingydotnet/file-share-pm/tree; description = "Extend File::ShareDir to Local Libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; @@ -6549,7 +6549,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestDeep ]; propagatedBuildInputs = [ CacheCache CGI ClassContainer ExceptionClass HTMLParser LogAny ParamsValidate ]; meta = { - homepage = http://metacpan.org/release/HTML-Mason; + homepage = https://metacpan.org/release/HTML-Mason; description = "High-performance, dynamic web site authoring system"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7735,7 +7735,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ LinguaENFindNumber LinguaENInflect LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ]; meta = { - homepage = http://metacpan.org/release/Lingua-EN-Inflect-Phrase; + homepage = https://metacpan.org/release/Lingua-EN-Inflect-Phrase; description = "Inflect short English Phrases"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7750,7 +7750,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal TryTiny ]; propagatedBuildInputs = [ LinguaENFindNumber ]; meta = { - homepage = http://metacpan.org/release/Lingua-EN-Number-IsOrdinal; + homepage = https://metacpan.org/release/Lingua-EN-Number-IsOrdinal; description = "Detect if English number is ordinal or cardinal"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7870,7 +7870,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestLeakTrace ]; propagatedBuildInputs = [ ExporterTiny ModuleImplementation ]; meta = { - homepage = http://metacpan.org/release/List-SomeUtils; + homepage = https://metacpan.org/release/List-SomeUtils; description = "Provide the stuff missing in List::Util"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9225,7 +9225,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose ]; meta = { - homepage = http://metacpan.org/release/MooseX-ABC; + homepage = https://metacpan.org/release/MooseX-ABC; description = "Abstract base classes for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; @@ -9531,7 +9531,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestMoose ]; propagatedBuildInputs = [ BHooksEndOfScope Moose namespaceautoclean ]; meta = { - homepage = http://metacpan.org/release/MooseX-MarkAsMethods/; + homepage = https://metacpan.org/release/MooseX-MarkAsMethods/; description = "Mark overload code symbols as methods"; license = stdenv.lib.licenses.lgpl21; }; @@ -9614,7 +9614,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal TestMoose ]; propagatedBuildInputs = [ Moose ]; meta = { - homepage = http://github.com/sartak/MooseX-Role-Parameterized/tree; + homepage = https://github.com/sartak/MooseX-Role-Parameterized/tree; description = "Roles with composition parameters"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9629,7 +9629,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata]; propagatedBuildInputs = [ aliased Moose namespaceautoclean namespaceclean ]; meta = { - homepage = http://metacpan.org/release/MooseX-Role-WithOverloading; + homepage = https://metacpan.org/release/MooseX-Role-WithOverloading; description = "Roles which support overloading"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9871,7 +9871,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DateTime MooseXTypesDateTime TestFatal ]; propagatedBuildInputs = [ DevelPartialDump Moose MooseXTypes SubExporter ]; meta = { - homepage = http://metacpan.org/release/MooseX-Types-Structured; + homepage = https://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; @@ -10454,7 +10454,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CryptSSLeay LWPUserAgent NetOAuth URI ]; doCheck = false; meta = { - homepage = http://github.com/semifor/Net-Twitter-Lite; + homepage = https://github.com/semifor/Net-Twitter-Lite; description = "A perl interface to the Twitter API"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10633,7 +10633,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName namespaceautoclean ]; meta = { - homepage = http://metacpan.org/release/Package-DeprecationManager; + homepage = https://metacpan.org/release/Package-DeprecationManager; description = "Manage deprecation warnings for your distribution"; license = stdenv.lib.licenses.artistic2; }; @@ -10661,7 +10661,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; meta = { - homepage = http://metacpan.org/release/Package-Stash; + homepage = https://metacpan.org/release/Package-Stash; description = "Routines for manipulating stashes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10675,7 +10675,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestRequires TestFatal ]; meta = { - homepage = http://metacpan.org/release/Package-Stash-XS; + homepage = https://metacpan.org/release/Package-Stash-XS; description = "Faster and more correct implementation of the Package::Stash API"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10742,7 +10742,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; meta = { - homepage = http://metacpan.org/release/Params-Validate; + homepage = https://metacpan.org/release/Params-Validate; description = "Validate method/function parameters"; license = stdenv.lib.licenses.artistic2; }; @@ -10917,6 +10917,19 @@ let self = _self // overrides; _self = with self; { }; }; + Perlosnames = buildPerlPackage rec { + name = "Perl-osnames-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/${name}.tar.gz"; + sha256 = "fb22a1ed59dc2311f7f1ffca5685d90c0600020467f624f57b4dd3dba5bc659b"; + }; + meta = { + homepage = https://metacpan.org/release/Perl-osnames; + description = "List possible $^O ($OSNAME) values, with description"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PerlCritic = buildPerlModule rec { name = "Perl-Critic-1.130"; src = fetchurl { @@ -11247,6 +11260,21 @@ let self = _self // overrides; _self = with self; { }; }; + ProcFind = buildPerlPackage rec { + name = "Proc-Find-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/${name}.tar.gz"; + sha256 = "07d715c2b8644dc6d5b5a36ffcd2f02da017bf86a00027387aa47c53e2347a81"; + }; + buildInputs = [ Perlosnames ]; + propagatedBuildInputs = [ ProcProcessTable ]; + meta = { + homepage = https://metacpan.org/release/Proc-Find; + description = "Find processes by name, PID, or some other attributes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ProcSafeExec = buildPerlPackage { name = "Proc-SafeExec-1.5"; src = fetchurl { @@ -11508,7 +11536,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild ]; propagatedBuildInputs = [ self."if" ]; meta = { - homepage = http://github.com/timj/perl-Pod-LaTeX/tree/master; + homepage = https://github.com/timj/perl-Pod-LaTeX/tree/master; description = "Convert Pod data to formatted Latex"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11853,10 +11881,10 @@ let self = _self // overrides; _self = with self; { }; RoleTiny = buildPerlPackage rec { - name = "Role-Tiny-2.000005"; + name = "Role-Tiny-2.000006"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; - sha256 = "593a29b621e029bf0218d0154d5dfdf6ec502afc49adeeadae6afd0c70063115"; + sha256 = "cc73418c904a0286ecd8915eac11f5be2a8d1e17ea9cb54c9116b0340cd3e382"; }; meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; @@ -12158,7 +12186,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOstringy OLEStorage_Lite ]; meta = { - homepage = http://github.com/runrig/spreadsheet-parseexcel/; + homepage = https://github.com/runrig/spreadsheet-parseexcel/; description = "Read information from an Excel file"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12921,7 +12949,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ModuleBuild perl ]; propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify Inline InlineC ListMoreUtils Moo MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace YAMLLibYAML ]; meta = { - homepage = http://metacpan.org/release/Task-FreecellSolver-Testing; + homepage = https://metacpan.org/release/Task-FreecellSolver-Testing; description = "Install the CPAN dependencies of the Freecell Solver test suite"; license = stdenv.lib.licenses.mit; }; @@ -13187,7 +13215,7 @@ let self = _self // overrides; _self = with self; { doCheck = false; meta = { - homepage = http://sourceforge.net/projects/perl-trg/; + homepage = https://sourceforge.net/projects/perl-trg/; description = "Perl extension for the GNU Readline/History Library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13504,7 +13532,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0qfdn71562xzmgnhmkkdbpp3vj851ldl1zlmxvharxsr16gjh6s3"; }; meta = { - homepage = http://metacpan.org/release/Test-EOL; + homepage = https://metacpan.org/release/Test-EOL; description = "Check the correct line endings in your project"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; @@ -14237,7 +14265,7 @@ let self = _self // overrides; _self = with self; { sha256 = "8410438a2acf127bffcf1ab92205b747a615b487e80a48e8c3d0bb9fa0dbb2a8"; }; meta = { - homepage = http://github.com/audreyt/Test-use-ok/tree; + homepage = https://github.com/audreyt/Test-use-ok/tree; description = "Alternative to Test::More::use_ok"; license = "unrestricted"; }; @@ -15210,7 +15238,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ if_ ]; meta = { - homepage = http://metacpan.org/release/Try-Tiny; + homepage = https://metacpan.org/release/Try-Tiny; description = "Minimal try/catch with proper preservation of $@"; license = stdenv.lib.licenses.mit; }; @@ -15276,7 +15304,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ ModuleBuild ]; meta = { - homepage = http://metacpan.org/release/Unicode-CaseFold; + homepage = https://metacpan.org/release/Unicode-CaseFold; description = "Unicode case-folding for case-insensitive lookups"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15939,7 +15967,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Base class for SAX Drivers and Filters"; - homepage = http://github.com/grantm/XML-SAX-Base; + homepage = https://github.com/grantm/XML-SAX-Base; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 922b4b738cb..d33bd9479fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -421,7 +421,7 @@ in { buildInputs = with self; [ self.nose ]; meta = { - homepage = http://pypi.python.org/pypi/anyjson/; + homepage = https://pypi.python.org/pypi/anyjson/; description = "Wrapper that selects the best available JSON implementation"; }; }; @@ -439,7 +439,7 @@ in { buildInputs = with self; [ mock coverage nose-cover3 unittest2 ]; meta = { - homepage = http://github.com/celery/py-amqp; + homepage = https://github.com/celery/py-amqp; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; license = licenses.lgpl21; }; @@ -459,7 +459,7 @@ in { propagatedBuildInputs = with self; [ vine ]; meta = { - homepage = http://github.com/celery/py-amqp; + homepage = https://github.com/celery/py-amqp; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; license = licenses.lgpl21; }; @@ -735,91 +735,6 @@ in { }; }; - awscli = - let - colorama_3_7 = self.colorama.overrideAttrs (old: rec { - name = "${pname}-${version}"; - pname = "colorama"; - version = "0.3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; - }; - }); - in buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "awscli"; - version = "1.11.162"; - namePrefix = ""; - - src = fetchPypi { - inherit pname version; - sha256 = "0ff17fdzzncrzl7ps1cyrs0c5f82ncbvflnjz8sd1vkcmn9yij8r"; - }; - - # No tests included - doCheck = false; - - propagatedBuildInputs = with self; [ - botocore - bcdoc - s3transfer - six - colorama_3_7 - docutils - rsa - pyyaml - pkgs.groff - pkgs.less - ]; - - postInstall = '' - mkdir -p $out/etc/bash_completion.d - echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli - mkdir -p $out/share/zsh/site-functions - mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions - rm $out/bin/aws.cmd - ''; - - meta = { - homepage = https://aws.amazon.com/cli/; - description = "Unified tool to manage your AWS services"; - license = stdenv.lib.licenses.asl20; - maintainers = with maintainers; [ muflax ]; - }; - }; - - aws_shell = buildPythonPackage rec { - name = "aws-shell-${version}"; - version = "0.1.1"; - src = pkgs.fetchurl { - sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; - url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz"; - }; - - # Why does it propagate packages that are used for testing? - propagatedBuildInputs = with self; [ - awscli prompt_toolkit boto3 configobj pygments - ]; - - #Checks are failing due to missing TTY, which won't exist. - doCheck = false; - preCheck = '' - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - - disabled = isPy35; - - - meta = { - homepage = https://github.com/awslabs/aws-shell; - description = "An integrated shell for working with the AWS CLI"; - license = licenses.asl20; - maintainers = [ ]; - }; - }; - azure = buildPythonPackage rec { version = "0.11.0"; name = "azure-${version}"; @@ -1114,7 +1029,7 @@ in { meta = { description = "The Secure Sockets layer is only actually *secure*"; - homepage = http://bitbucket.org/brandon/backports.ssl_match_hostname; + homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname; }; }; @@ -1129,7 +1044,7 @@ in { meta = { description = "The Secure Sockets layer is only actually *secure*"; - homepage = http://bitbucket.org/brandon/backports.ssl_match_hostname; + homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname; }; }; @@ -1165,7 +1080,7 @@ in { }; meta = { - homepage = http://pypi.python.org/pypi/babelfish; + homepage = https://pypi.python.org/pypi/babelfish; description = "A module to work with countries and languages"; license = licenses.bsd3; }; @@ -1187,7 +1102,7 @@ in { meta = { description = "Get info about wireless interfaces using libiw"; - homepage = http://github.com/enkore/basiciw; + homepage = https://github.com/enkore/basiciw; platforms = platforms.linux; license = licenses.gpl2; }; @@ -2066,39 +1981,7 @@ in { }; }; - botocore = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "botocore"; - version = "1.7.20"; - - src = fetchPypi { - inherit pname version; - sha256 = "16sy35bp9i2g9785l8jzcd4ddc2nydqs3wnkqwi36xx6l3bdbn13"; - }; - - propagatedBuildInputs = with self; [ - dateutil - jmespath - docutils - ordereddict - simplejson - ]; - - checkInputs = with self; [ mock nose ]; - - checkPhase = '' - nosetests -v - ''; - - # Network access - doCheck = false; - - meta = { - homepage = https://github.com/boto/botocore; - license = "bsd"; - description = "A low-level interface to a growing number of Amazon Web Services"; - }; - }; + botocore = callPackage ../development/python-modules/botocore { }; bottle = buildPythonPackage rec { version = "0.12.11"; @@ -2364,7 +2247,7 @@ in { doCheck = false; # depends on the network meta = { - homepage = http://pypi.python.org/pypi/carrot; + homepage = https://pypi.python.org/pypi/carrot; description = "AMQP Messaging Framework for Python"; }; }; @@ -2764,7 +2647,7 @@ in { propagatedBuildInputs = with self; [ pyyaml ]; meta = { description = "Utilities for consistent command line tools"; - homepage = http://github.com/rca/cmdline; + homepage = https://github.com/rca/cmdline; license = licenses.asl20; }; }; @@ -2940,7 +2823,7 @@ in { meta = { description = "Config file reading, writing and validation"; - homepage = http://pypi.python.org/pypi/configobj; + homepage = https://pypi.python.org/pypi/configobj; license = licenses.bsd3; maintainers = with maintainers; [ garbas ]; }; @@ -3523,7 +3406,7 @@ in { meta = { description = "What is detox?"; - homepage = http://bitbucket.org/hpk42/detox; + homepage = https://bitbucket.org/hpk42/detox; }; }; @@ -4134,7 +4017,7 @@ in { meta = { description = "Darcsver, generate a version number from Darcs history"; - homepage = http://pypi.python.org/pypi/darcsver; + homepage = https://pypi.python.org/pypi/darcsver; license = "BSD-style"; }; @@ -4337,7 +4220,7 @@ in { meta = { description = "Persistent cache for requests library"; - homepage = http://pypi.python.org/pypi/requests-cache; + homepage = https://pypi.python.org/pypi/requests-cache; license = licenses.bsd3; }; }); @@ -4355,7 +4238,7 @@ in { meta = { description = "Instant coding answers via the command line"; - homepage = http://pypi.python.org/pypi/howdoi; + homepage = https://pypi.python.org/pypi/howdoi; license = licenses.mit; }; }); @@ -4383,7 +4266,7 @@ in { meta = { description = "Parameterized testing with any Python test framework"; - homepage = http://pypi.python.org/pypi/nose-parameterized; + homepage = https://pypi.python.org/pypi/nose-parameterized; license = licenses.bsd3; }; }); @@ -4435,7 +4318,7 @@ in { meta = { description = "Jalali datetime binding for python"; - homepage = http://pypi.python.org/pypi/jdatetime; + homepage = https://pypi.python.org/pypi/jdatetime; license = licenses.psfl; }; }); @@ -4464,7 +4347,7 @@ in { meta = { description = "Date parsing library designed to parse dates from HTML pages"; - homepage = http://pypi.python.org/pypi/dateparser; + homepage = https://pypi.python.org/pypi/dateparser; license = licenses.bsd3; broken = true; }; @@ -4490,7 +4373,7 @@ in { meta = { description = "Powerful extensions to the standard datetime module"; - homepage = http://pypi.python.org/pypi/python-dateutil; + homepage = https://pypi.python.org/pypi/python-dateutil; license = "BSD-style"; }; }); @@ -4526,7 +4409,7 @@ in { }; meta = { - homepage = http://pypi.python.org/pypi/decorator; + homepage = https://pypi.python.org/pypi/decorator; description = "Better living through Python with decorators"; license = licenses.mit; }; @@ -4742,7 +4625,7 @@ in { meta = { description = "Add flag to ignore unicode literal prefixes in doctests"; license = with licenses; [ asl20 ]; - homepage = http://github.com/gnublade/doctest-ignore-unicode; + homepage = https://github.com/gnublade/doctest-ignore-unicode; }; }; @@ -4760,7 +4643,7 @@ in { meta = { description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; - homepage = http://bitbucket.org/zzzeek/dogpile.core; + homepage = https://bitbucket.org/zzzeek/dogpile.core; license = licenses.bsd3; }; }; @@ -5463,7 +5346,7 @@ in { meta = { description = "An unofficial API for Google Play Music"; - homepage = http://pypi.python.org/pypi/gmusicapi/; + homepage = https://pypi.python.org/pypi/gmusicapi/; license = licenses.bsd3; }; }; @@ -6067,7 +5950,7 @@ in { meta = { description = "libthumbor is the python extension to thumbor"; - homepage = http://github.com/heynemann/libthumbor; + homepage = https://github.com/heynemann/libthumbor; license = licenses.mit; }; }; @@ -6510,7 +6393,7 @@ in { meta = { description = "Pattern matching and various utilities for file systems paths"; - homepage = http://github.com/gorakhargosh/pathtools; + homepage = https://github.com/gorakhargosh/pathtools; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; @@ -6772,7 +6655,7 @@ in { doCheck = false; meta = { - homepage = http://github.com/saghul/pycares; + homepage = https://github.com/saghul/pycares; description = "Interface for c-ares"; license = licenses.mit; }; @@ -7554,7 +7437,7 @@ in { meta = { description = "Python API and shell utilities to monitor file system events"; - homepage = http://github.com/gorakhargosh/watchdog; + homepage = https://github.com/gorakhargosh/watchdog; license = licenses.asl20; maintainers = with maintainers; [ goibhniu ]; }; @@ -7606,7 +7489,7 @@ in { meta = { description = "Validate dicts against a schema"; - homepage = http://github.com/sunlightlabs/validictory; + homepage = https://github.com/sunlightlabs/validictory; license = licenses.mit; }; }; @@ -7973,7 +7856,7 @@ in { meta = { description = "django-taggit is a reusable Django application for simple tagging"; - homepage = http://github.com/alex/django-taggit/tree/master/; + homepage = https://github.com/alex/django-taggit/tree/master/; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; @@ -8185,7 +8068,7 @@ in { meta = { description = "Add options to doctest examples while they are running"; - homepage = http://pypi.python.org/pypi/dtopt; + homepage = https://pypi.python.org/pypi/dtopt; }; # Test contain Python 2 print disabled = isPy3k; @@ -8248,7 +8131,7 @@ in { propagatedBuildInputs = with self; [ ]; meta = { - homepage = http://pypi.python.org/pypi/enum/; + homepage = https://pypi.python.org/pypi/enum/; description = "Robust enumerated type support in Python"; }; }; @@ -8362,7 +8245,7 @@ in { (with self; [ enum-compat ]) ; meta = { - homepage = http://pypi.python.org/pypi/eventlet/; + homepage = https://pypi.python.org/pypi/eventlet/; description = "A concurrent networking library for Python"; }; }; @@ -8384,7 +8267,7 @@ in { }; fastimport = callPackage ../development/python-modules/fastimport { }; - + feedgen = callPackage ../development/python-modules/feedgen { }; feedgenerator = callPackage ../development/python-modules/feedgenerator { @@ -8951,7 +8834,7 @@ in { Python module that provides a simple interface to FUSE and MacFUSE. It's just one file and is implemented using ctypes. ''; - homepage = http://github.com/terencehonles/fusepy; + homepage = https://github.com/terencehonles/fusepy; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; @@ -8962,11 +8845,11 @@ in { futures = buildPythonPackage rec { name = "futures-${version}"; - version = "3.0.5"; + version = "3.1.1"; src = pkgs.fetchurl { url = "mirror://pypi/f/futures/${name}.tar.gz"; - sha256 = "1pw1z4329xvlabdpwqa6b7v2fxf7hl64m4cgr22ckbym8m8m4hh5"; + sha256 = "1z9j05fdj2yszjmz4pmjhl2jdnwhdw80cjwfqq3ci0yx19gv9v2i"; }; # This module is for backporting functionality to Python 2.x, it's builtin in py3k @@ -9102,7 +8985,7 @@ in { ''; meta = { - homepage = http://github.com/gwik/geventhttpclient; + homepage = https://github.com/gwik/geventhttpclient; description = "HTTP client library for gevent"; license = licenses.mit; maintainers = with maintainers; [ koral ]; @@ -9380,7 +9263,7 @@ in { ''; meta = { - homepage = http://pypi.python.org/pypi/greenlet; + homepage = https://pypi.python.org/pypi/greenlet; description = "Module for lightweight in-process concurrent programming"; license = licenses.lgpl2; platforms = platforms.all; @@ -9658,7 +9541,7 @@ in { propagatedBuildInputs = with self; [ spark_parser xdis ]; meta = { description = "Python cross-version byte-code deparser"; - homepage = http://github.com/rocky/python-uncompyle6/; + homepage = https://github.com/rocky/python-uncompyle6/; license = licenses.mit; }; }; @@ -9897,7 +9780,7 @@ in { meta = { description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; - homepage = http://pypi.python.org/pypi/iptools; + homepage = https://pypi.python.org/pypi/iptools; }; }; @@ -9916,7 +9799,7 @@ in { meta = { description = "Class and tools for handling of IPv4 and IPv6 addresses and networks"; - homepage = http://pypi.python.org/pypi/IPy; + homepage = https://pypi.python.org/pypi/IPy; }; }; @@ -10079,7 +9962,7 @@ in { buildInputs = with self; [ pytest unicodecsv ]; meta = { - homepage = http://github.com/sunlightlabs/jellyfish; + homepage = https://github.com/sunlightlabs/jellyfish; description = "Approximate and phonetic matching of strings"; maintainers = with maintainers; [ koral ]; }; @@ -10793,7 +10676,7 @@ in { meta = { description = "A documentation builder"; - homepage = http://pypi.python.org/pypi/manuel; + homepage = https://pypi.python.org/pypi/manuel; license = licenses.zpl20; }; }; @@ -10981,7 +10864,7 @@ in { meta = { description = "A module for monitoring memory usage of a python program"; - homepage = http://pypi.python.org/pypi/memory_profiler; + homepage = https://pypi.python.org/pypi/memory_profiler; license = licenses.bsd3; }; }; @@ -11097,7 +10980,7 @@ in { meta = { description = "A dot-accessible dictionary (a la JavaScript objects)"; license = licenses.mit; - homepage = http://github.com/Infinidat/munch; + homepage = https://github.com/Infinidat/munch; }; }; @@ -11889,7 +11772,7 @@ in { meta = { description = "MySQL database binding for Python"; - homepage = http://sourceforge.net/projects/mysql-python; + homepage = https://sourceforge.net/projects/mysql-python; }; }; @@ -12315,7 +12198,7 @@ in { meta = { description = "Extends nose.plugins.cover to add Cobertura-style XML reports"; - homepage = http://github.com/cmheisel/nose-xcover/; + homepage = https://github.com/cmheisel/nose-xcover/; license = licenses.bsd3; }; @@ -12699,7 +12582,7 @@ in { meta = { description = "A client library for OAuth 2.0"; - homepage = http://github.com/google/oauth2client/; + homepage = https://github.com/google/oauth2client/; license = licenses.bsd2; }; }; @@ -14284,7 +14167,7 @@ in { meta = { description = "Appendable key-value storage"; license = with licenses; [ bsd3 ]; - homepage = http://github.com/dask/partd/; + homepage = https://github.com/dask/partd/; }; }; @@ -14867,7 +14750,7 @@ in { meta = { description = "Interface Python with pkg-config"; - homepage = http://github.com/matze/pkgconfig; + homepage = https://github.com/matze/pkgconfig; license = licenses.mit; }; @@ -15835,7 +15718,7 @@ in { meta = { description = "Media Meta Data retrieval framework"; - homepage = http://sourceforge.net/projects/mmpython/; + homepage = https://sourceforge.net/projects/mmpython/; license = licenses.gpl2; maintainers = with maintainers; [ ]; }; @@ -16245,7 +16128,7 @@ in { ''; meta = { - homepage = http://github.com/tobgu/pyrsistent/; + homepage = https://github.com/tobgu/pyrsistent/; description = "Persistent/Functional/Immutable data structures"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; @@ -16380,7 +16263,7 @@ in { ''; meta = { - homepage = http://github.com/ericflo/pynzb; + homepage = https://github.com/ericflo/pynzb; description = "Unified API for parsing NZB files"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; @@ -16708,7 +16591,7 @@ in { doCheck = false; meta = { - homepage = http://pypi.python.org/pypi/pyreport; + homepage = https://pypi.python.org/pypi/pyreport; license = "BSD"; description = "Pyreport makes notes out of a python script"; }; @@ -16942,7 +16825,7 @@ in { meta = { description = "A python client for Etcd"; - homepage = http://github.com/jplana/python-etcd; + homepage = https://github.com/jplana/python-etcd; license = licenses.mit; }; }; @@ -17596,7 +17479,7 @@ in { meta = { description = "Python Tools for Robot Framework and Test Libraries"; - homepage = http://bitbucket.org/userzimmermann/robotframework-tools; + homepage = https://bitbucket.org/userzimmermann/robotframework-tools; license = licenses.gpl3; platforms = platforms.linux; }; @@ -17843,38 +17726,7 @@ in { }; }; - s3transfer = buildPythonPackage rec { - version = "0.1.10"; - name = "s3transfer-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/s3transfer/${name}.tar.gz"; - sha256 = "1h8g9bknvxflxkpbnxyfxmk8pvgykbbk9ljdvhqh6z4vjc2926ms"; - }; - - foo = 1; - - propagatedBuildInputs = - [ self.botocore - ] ++ stdenv.lib.optional (pythonOlder "3") self.futures; - - buildInputs = with self; [ docutils mock nose coverage wheel unittest2 ]; - - checkPhase = '' - pushd s3transfer/tests - nosetests -v unit/ functional/ - popd - ''; - - # version on pypi has no tests/ dir - doCheck = false; - - meta = { - homepage = https://github.com/boto/s3transfer; - license = stdenv.lib.licenses.asl20; - description = "A library for managing Amazon S3 transfers"; - }; - }; + s3transfer = callPackage ../development/python-modules/s3transfer { }; seqdiag = callPackage ../development/python-modules/seqdiag { }; @@ -17980,7 +17832,7 @@ in { meta = { description = "A library for testing interactive command-line applications"; - homepage = http://pypi.python.org/pypi/ScriptTest/; + homepage = https://pypi.python.org/pypi/ScriptTest/; }; }; @@ -18853,7 +18705,7 @@ in { meta = { description = "Python subprocess interface"; - homepage = http://pypi.python.org/pypi/sh/; + homepage = https://pypi.python.org/pypi/sh/; }; }; @@ -19084,7 +18936,7 @@ in { meta = { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; - homepage = http://bitbucket.org/birkenfeld/sphinx-contrib; + homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; license = "BSD"; }; @@ -19102,7 +18954,7 @@ in { meta = { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = http://bitbucket.org/prometheus/sphinxcontrib-newsfeed; + homepage = https://bitbucket.org/prometheus/sphinxcontrib-newsfeed; license = licenses.bsd2; }; }); @@ -19122,7 +18974,7 @@ in { meta = { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; - homepage = http://bitbucket.org/birkenfeld/sphinx-contrib; + homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; license = with licenses; [ bsd2 ]; }; }); @@ -19178,7 +19030,7 @@ in { meta = { description = "Setuptools command for uploading Sphinx documentation to PyPI"; - homepage = http://bitbucket.org/jezdez/sphinx-pypi-upload/; + homepage = https://bitbucket.org/jezdez/sphinx-pypi-upload/; license = "BSD"; }; @@ -19314,7 +19166,7 @@ in { meta = { description = "Lightweight and extensible STOMP messaging client"; - homepage = http://bitbucket.org/hozn/stompclient; + homepage = https://bitbucket.org/hozn/stompclient; license = licenses.asl20; }; }); @@ -19455,7 +19307,7 @@ in { meta = { description = "A Python library to create SVG drawings"; - homepage = http://bitbucket.org/mozman/svgwrite; + homepage = https://bitbucket.org/mozman/svgwrite; license = licenses.mit; }; }; @@ -19855,7 +19707,7 @@ in { meta = { description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; - homepage = http://pypi.python.org/pypi/tmdb3; + homepage = https://pypi.python.org/pypi/tmdb3; license = licenses.bsd3; }; }; @@ -19916,7 +19768,7 @@ in { meta = { description = "Explicitly typed attributes for Python"; - homepage = http://pypi.python.org/pypi/traits; + homepage = https://pypi.python.org/pypi/traits; license = "BSD"; }; }; @@ -19938,7 +19790,7 @@ in { meta = { description = "Python implementation of the Transmission bittorent client RPC protocol"; - homepage = http://pypi.python.org/pypi/transmissionrpc/; + homepage = https://pypi.python.org/pypi/transmissionrpc/; license = licenses.mit; }; }; @@ -20222,7 +20074,7 @@ in { meta = { description = "A backport of the new features added to the unittest testing framework"; - homepage = http://pypi.python.org/pypi/unittest2; + homepage = https://pypi.python.org/pypi/unittest2; }; }; @@ -20882,7 +20734,7 @@ EOF meta = { description = "zbase32, a base32 encoder/decoder"; - homepage = http://pypi.python.org/pypi/zbase32; + homepage = https://pypi.python.org/pypi/zbase32; license = "BSD"; }; }); @@ -20909,7 +20761,7 @@ EOF meta = { description = "A daemon process control library and tools for Unix-based systems"; - homepage = http://pypi.python.org/pypi/zdaemon; + homepage = https://pypi.python.org/pypi/zdaemon; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; @@ -21095,7 +20947,7 @@ EOF meta = { description = "An event publishing system"; - homepage = http://pypi.python.org/pypi/zope.event; + homepage = https://pypi.python.org/pypi/zope.event; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; @@ -21118,7 +20970,7 @@ EOF meta = { description = "Exception interfaces and implementations"; - homepage = http://pypi.python.org/pypi/zope.exceptions; + homepage = https://pypi.python.org/pypi/zope.exceptions; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; @@ -21307,7 +21159,7 @@ EOF propagatedBuildInputs = with self; [ hglib ]; meta = { - homepage = http://pypi.python.org/pypi/hgsvn; + homepage = https://pypi.python.org/pypi/hgsvn; }; }; @@ -21796,7 +21648,7 @@ EOF }; meta = { - homepage = http://pypi.python.org/pypi/ujson; + homepage = https://pypi.python.org/pypi/ujson; description = "Ultra fast JSON encoder and decoder for Python"; license = licenses.bsd3; }; @@ -21826,7 +21678,7 @@ EOF meta = { description = "Python package to control BlinkStick USB devices"; - homepage = http://pypi.python.org/pypi/BlinkStick/; + homepage = https://pypi.python.org/pypi/BlinkStick/; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; @@ -22797,7 +22649,7 @@ EOF meta = { description = "DataDiff"; - homepage = http://sourceforge.net/projects/datadiff/; + homepage = https://sourceforge.net/projects/datadiff/; license = licenses.asl20; }; }; @@ -22812,7 +22664,7 @@ EOF meta = { description = "Termcolor"; - homepage = http://pypi.python.org/pypi/termcolor; + homepage = https://pypi.python.org/pypi/termcolor; license = licenses.mit; }; }; @@ -23523,7 +23375,7 @@ EOF meta = with stdenv.lib; { description = "Terminal based YouTube player and downloader"; - homepage = http://github.com/np1/mps-youtube; + homepage = https://github.com/np1/mps-youtube; license = licenses.gpl3; maintainers = with maintainers; [ odi ]; }; @@ -23606,7 +23458,7 @@ EOF meta = { description = "Python Import Magic - automagically add, remove and manage imports"; - homepage = http://github.com/alecthomas/importmagic; + homepage = https://github.com/alecthomas/importmagic; license = "bsd"; }; }; @@ -23663,7 +23515,7 @@ EOF sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f"; }; meta = { - homepage = http://bitbucket.org/thomaswaldmann/xstatic; + homepage = https://bitbucket.org/thomaswaldmann/xstatic; description = "Base packaged static files for python"; license = licenses.mit; maintainers = [ maintainers.makefu ]; |