diff options
117 files changed, 360 insertions, 157 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 7d70ce4a2abf..4daf488bb28f 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -200,7 +200,7 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th doCheck = false; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; @@ -245,7 +245,7 @@ with import <nixpkgs> {}; doCheck = false; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; }; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5d485bbee473..91df639ee850 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1722,6 +1722,11 @@ github = "IvanMalison"; name = "Ivan Malison"; }; + imalsogreg = { + email = "imalsogreg@gmail.com"; + github = "imalsogreg"; + name = "Greg Hale"; + }; infinisil = { email = "infinisil@icloud.com"; github = "infinisil"; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index b8a420b7d745..bfcd81d62159 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -171,8 +171,12 @@ in default = config.boot.zfs.enableUnstable; description = '' Request encryption keys or passwords for all encrypted datasets on import. - Dataset encryption is only supported in zfsUnstable at the moment. + For root pools the encryption key can be supplied via both an + interactive prompt (keylocation=prompt) and from a file + (keylocation=file://). Note that for data pools the encryption key can + be only loaded from a file and not via interactive prompt since the + import is processed in a background systemd service. ''; }; @@ -394,6 +398,7 @@ in script = '' zpool_cmd="${packages.zfsUser}/sbin/zpool" ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" + ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""} ''; }; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 760b04bef005..96330d4e9557 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://xiph.org/paranoia; + homepage = https://xiph.org/paranoia; description = "A tool and library for reading digital audio from CDs"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index d881afa7f5f0..e57d85de05a9 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.rosegardenmusic.com/; + homepage = https://www.rosegardenmusic.com/; description = "Music composition and editing environment"; longDescription = '' Rosegarden is a music composition and editing environment based around diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 6b9af119859e..f815ac02e6e5 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { A set of command-line tools to manipulate Ogg Vorbis audio files, notably the `ogg123' player and the `oggenc' encoder. ''; - homepage = http://xiph.org/vorbis/; + homepage = https://xiph.org/vorbis/; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index c3e8efae7fe9..2e335e6b10e9 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake mpd_clientlib openssl ]; meta = { - homepage = http://www.ympd.org; + homepage = https://www.ympd.org; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; maintainers = [ stdenv.lib.maintainers.siddharthist ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix index f82d467066a6..7867226ff806 100644 --- a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix +++ b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An Emacs mode for editing Scala code"; - homepage = http://www.scala-lang.org/node/354; + homepage = https://www.scala-lang.org/node/354; # non-copyleft, BSD-style license = "permissive"; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 76a00c44ebbe..e9b6f7387632 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.scintilla.org/SciTE.html; + homepage = https://www.scintilla.org/SciTE.html; description = "SCIntilla based Text Editor"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index eb7daf2797bf..dad378affbea 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.26.3"; + version = "2.26.4"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz"; + sha256 = "15a7hjg7xwj1hsw3c5k18psvvmbqgn4g79qq03bsvibzl4kqakq7"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index 9225bd86492e..c826bb1dc951 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Parser for VCalendar and ICalendar files, usable from the command line"; - homepage = http://waynemorrison.com/software/; + homepage = https://waynemorrison.com/software/; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index 143ec518ac51..27376f4db81c 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A DAB/DAB+ Software Radio"; - homepage = http://www.welle.io/; + homepage = https://www.welle.io/; maintainers = with maintainers; [ ck3d ]; license = licenses.gpl2; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index ca0d7775ecef..ff7c6a9e9767 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility for switching between keyboard layouts"; - homepage = http://xneur.ru; + homepage = https://xneur.ru; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 7ca1e595c35d..ca4014ed31c3 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -31,7 +31,7 @@ pythonPackages.buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://deluge-torrent.org; + homepage = https://deluge-torrent.org; description = "Torrent client"; license = licenses.gpl3Plus; maintainers = with maintainers; [ domenkozar ebzzry ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 683eeaf0b6ae..337c166a79ac 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; - homepage = http://rclone.org; + homepage = https://rclone.org; license = licenses.mit; maintainers = with maintainers; [ danielfullmer ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4eecf7f4a1f8..029158caf4b5 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://syncplay.pl/; + homepage = https://syncplay.pl/; description = "Free software that synchronises media players"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index e38ba36b9253..f84058dd4fc3 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { This means that vnStat won't actually be sniffing any traffic and also ensures light use of system resources. ''; - homepage = http://humdi.net/vnstat/; + homepage = https://humdi.net/vnstat/; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index d1b333587a68..655962ea5b31 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced IRC bouncer"; - homepage = http://wiki.znc.in/ZNC; + homepage = https://wiki.znc.in/ZNC; maintainers = with maintainers; [ viric schneefux lnl7 ]; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index a6f0bccec96b..ac1bf18e9999 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = http://www.scribus.net; + homepage = https://www.scribus.net; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 9ae5d75c4577..b677927a8eff 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://workcraft.org/; + homepage = https://workcraft.org/; description = "Framework for interpreted graph modeling, verification and synthesis"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 2da53d1da893..8753d4f6f571 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Infrastructure for exploration, analysis, and manipulation of source code"; - homepage = http://www.srcml.org; + homepage = https://www.srcml.org; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 75dbb06235b9..107939086325 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.5.0"; + name = "smplayer-18.6.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0fxd8zmp5dyk7y9yymjhj2i5218nfvfqb4830pgzzjqz1zdax8rn"; + sha256 = "0pb862l175ycm6fm90nryzgbqy8kbwpv3i6cbn13h7jh1yrz8nqx"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index d76412df0624..9f1e565d1666 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "0r0irzm5y9xvqxrr8gvvn4x9c56qwgynljnzba4mh5s5dpbmz0iq"; + sha256 = "0k6r72qgns8i2y1ks0k9fwlabgndww5rssd13mis5bvkqla8j9i9"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with stdenv.lib; { - description = "DWM status service which dynamically updates when needed"; + description = "Highly performant and configurable DWM status service"; homepage = https://github.com/Gerschtli/dwm-status; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 4a15e3236168..298031b8b305 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference implementation of a Wayland compositor"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index cc993af82080..f07f68241794 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec { meta = with stdenv.lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; - homepage = http://www.ponylang.org; + homepage = https://www.ponylang.org; license = licenses.bsd2; maintainers = with maintainers; [ doublec kamilchm patternspandemic ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index bac36d61068d..86b6a942403b 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = http://www.scala-lang.org/; + homepage = https://www.scala-lang.org/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; branch = "2.10"; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index a25d4f6e6544..92690649bff6 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = http://www.scala-lang.org/; + homepage = https://www.scala-lang.org/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index aae1041a224a..9cc0377f925f 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -28,7 +28,7 @@ with stdenv.lib; let majorVersion = "3.7"; minorVersion = "0"; - minorVersionSuffix = "rc1"; + minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1dqb1in7xlvq7959pvvxpm50nz5jk7ifxza2x4hfvqr31jvbkky9"; + sha256 = "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 83e8f1d00302..1244ad5ecd2e 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Perl 6 implementation"; - homepage = "http://www.rakudo.org"; + homepage = https://www.rakudo.org; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra ]; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index b079ff003347..e15e0926aedf 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.rascal-mpl.org/; + homepage = https://www.rascal-mpl.org/; description = "Command-line REPL for the Rascal metaprogramming language"; license = stdenv.lib.licenses.epl10; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 36047759baae..56ff02831741 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ uralbash ]; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.bsd3; - homepage = http://www.red-lang.org/; + homepage = https://www.red-lang.org/; }; } diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 220aa9abe558..4dff7e6974ef 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; - homepage = http://renpy.org/; + homepage = https://renpy.org/; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 1e2017ef0e7f..432e49c4354f 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -20,19 +20,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ glog ] + buildInputs = [ eigen glog ] ++ stdenv.lib.optional (google-gflags != null) google-gflags; - inherit eigen; - doCheck = runTests; checkTarget = "test"; - cmakeFlags = " - -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 - "; - meta = with stdenv.lib; { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index d26b15176aa6..a70cba625a89 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The not-so trivial database"; - homepage = http://tdb.samba.org/; + homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix new file mode 100644 index 000000000000..4cc607345e8c --- /dev/null +++ b/pkgs/development/libraries/phash/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "pHash"; + version = "0.9.4"; + + buildInputs = [ cimg ]; + + # CImg.h calls to external binary `convert` from the `imagemagick` package + # at runtime + propagatedBuildInputs = [ imagemagick ]; + + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"]; + postInstall = '' + cp ${cimg}/include/CImg.h $out/include/ + ''; + + src = fetchFromGitHub { + owner = "clearscene"; + repo = "pHash"; + rev = version; + sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Compute the perceptual hash of an image"; + license = licenses.gpl3; + maintainers = [maintainers.imalsogreg]; + platforms = platforms.all; + homepage = http://www.phash.org; + downloadPage = "https://github.com/clearscene/pHash"; + updateWalker = true; + }; +} diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index bb36d942a69b..90389055a415 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://rocksdb.org; + homepage = https://rocksdb.org; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; platforms = platforms.x86_64; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 364a4d4794a8..c9ba339ae0ea 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; - homepage = http://www.breakfastquay.com/rubberband/index.html; + homepage = https://www.breakfastquay.com/rubberband/index.html; # commercial license available as well, see homepage. You'll get some more optimized routines license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index a96e808a97e4..c7f8787c1fda 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; meta = with stdenv.lib; { - homepage = http://www.speex.org/; + homepage = https://www.speex.org/; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index e8f0d61b2f4f..30d9a38a35df 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; - homepage = http://tdb.samba.org/; + homepage = https://tdb.samba.org/; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index d372c61dbe28..dc3c2c157138 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { uses locking internally to keep writers from trampling on each other. TDB is also extremely small. ''; - homepage = http://tdb.samba.org/; + homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index df5c76abd7cd..9ca2481c3b01 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { passthru.python = python2; meta = { - homepage = http://telepathy.freedesktop.org; + homepage = https://telepathy.freedesktop.org; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 154db61894fa..12576eed14ce 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An event system based on the talloc memory management library"; - homepage = http://tevent.samba.org/; + homepage = https://tevent.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index ba6e437ca3c3..9e4ac7e22ca9 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; meta = { - homepage = "http://sourceforge.net/projects/opencore-amr/"; + homepage = https://sourceforge.net/projects/opencore-amr/; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; license = "stdenv.lib.licenses.apache"; maintainers = [ stdenv.lib.maintainers.Esteth ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index b9b18dc79103..0d9bc3ca345a 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 4c6d95e67c0f..efb365958eb8 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of the wayland protocol"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ codyopel wkennington ]; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index c1065b20e6b4..4bb7cd153cf3 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Wayland protocol extensions"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 09c2171945e4..17855011297e 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; - homepage = http://xapian.org/; + homepage = https://xapian.org/; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 8f99c0d75d34..8229c1edce8a 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -25,8 +25,8 @@ buildPythonPackage rec { applications which address the needs of current and future work in bioinformatics. ''; - homepage = http://biopython.org/wiki/Documentation; + homepage = https://biopython.org/wiki/Documentation; maintainers = with lib.maintainers; [ luispedro ]; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 5dd9d10961bb..d1eef11869a8 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://pythonhosted.org/blinker/; + homepage = https://pythonhosted.org/blinker/; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 4f9bc3183581..4855a07a479b 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { meta = { description = "Statistical and novel interactive HTML plots for Python"; - homepage = "http://github.com/bokeh/bokeh"; + homepage = https://github.com/bokeh/bokeh; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ orivej ]; }; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index b7b9820b7a98..372f16bec743 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchPypi, buildPythonPackage, persistent, zope_interface, transaction }: +{ stdenv +, fetchPypi +, buildPythonPackage +, persistent +, zope_interface +, transaction +, zope_testrunner +}: buildPythonPackage rec { pname = "BTrees"; @@ -7,6 +14,7 @@ buildPythonPackage rec { buildInputs = [ transaction ]; propagatedBuildInputs = [ persistent zope_interface ]; + checkInputs = [ zope_testrunner ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 3001b687556b..61b1d0d1cd98 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple Python implementation of the Git file formats and protocols"; - homepage = http://samba.org/~jelmer/dulwich/; + homepage = https://samba.org/~jelmer/dulwich/; license = licenses.gpl2Plus; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index 397d1e03ee82..95e457de81d3 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { ''; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = http://pythonhosted.org/Flask-AutoIndex/; + homepage = https://pythonhosted.org/Flask-AutoIndex/; }; } diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index c54c015af123..ec7e65aa4e43 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { patchPhase = if isPy3k then '' rm tests/test_crypto.py tests/test_paging.py '' else null; +# Disable test broken with aniso > 3.0.0, can be removed when updating to a flask-restful version with commit 54979f0 + preCheck = '' + substituteInPlace "./tests/test_inputs.py" --replace "test_bad_isointervals" "disabled_bad_isointervals" + ''; buildInputs = [ nose mock blinker ]; propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index e75b04e97923..94b9861daa97 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; - homepage = http://github.com/scikit-learn-contrib/hdbscan; + homepage = https://github.com/scikit-learn-contrib/hdbscan; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index eedbed250a12..1b61863d37a8 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Lightweight pipelining: using Python functions as pipeline jobs"; - homepage = http://pythonhosted.org/joblib/; + homepage = https://pythonhosted.org/joblib/; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index bab7cc052b9d..9b1a2df48bbb 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; - homepage = "http://pythonhosted.org/mt-940/"; + homepage = https://pythonhosted.org/mt-940/; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index f6aec993c3c7..c8bd85d5fed1 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.logilab.org/project/pylint; + homepage = https://www.logilab.org/project/pylint; description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 038b12b3a9e7..838adeac8a8e 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "http://github.com/mongodb/mongo-python-driver"; + homepage = https://github.com/mongodb/mongo-python-driver; license = licenses.asl20; description = "Python driver for MongoDB "; }; diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix index 3e2f90aa9d30..3a74a1fe6fa7 100644 --- a/pkgs/development/python-modules/pyro/default.nix +++ b/pkgs/development/python-modules/pyro/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Distributed object middleware for Python (IPC/RPC)"; - homepage = http://pythonhosted.org/Pyro/; + homepage = https://pythonhosted.org/Pyro/; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index d1e40e5037e3..ee62188d505d 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib;{ description = "py.test plugin to abort hanging tests"; - homepage = http://bitbucket.org/pytest-dev/pytest-timeout/; + homepage = https://bitbucket.org/pytest-dev/pytest-timeout/; license = licenses.mit; maintainers = with maintainers; [ makefu ]; }; diff --git a/pkgs/development/python-modules/python-openid/default.nix b/pkgs/development/python-modules/python-openid/default.nix index f25a89c65d44..fee511991d2b 100644 --- a/pkgs/development/python-modules/python-openid/default.nix +++ b/pkgs/development/python-modules/python-openid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OpenID support for modern servers and consumers"; - homepage = http://github.com/openid/python-openid; + homepage = https://github.com/openid/python-openid; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 8e68570c5bfe..2ffb28482f48 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "d587a520182f9d8aef7659cca429f4382881589c8883a0a55322b2f94970bdb3"; }; meta = { - homepage = http://arthurdejong.org/python-stdnum/; + homepage = https://arthurdejong.org/python-stdnum/; description = "Python module to handle standardized numbers and codes"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index b0ac4e070935..16e7d8a40498 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -62,7 +62,7 @@ in buildPythonPackage rec { meta = { description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration."; - homepage = http://pytorch.org/; + homepage = https://pytorch.org/; license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 08930ed4d460..0769517db71f 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "ReStructuredText viewer"; - homepage = http://mg.pov.lt/restview/; + homepage = https://mg.pov.lt/restview/; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ koral ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index c605d43888c1..0053b125bcb1 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; - homepage = http://github.com/dask/s3fs/; + homepage = https://github.com/dask/s3fs/; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 5a0bf981684f..5e57dd3f093d 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; - homepage = http://www.scipy.org/; + homepage = https://www.scipy.org/; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index f33acc79a2bb..35eff76bbf09 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; - homepage = http://scrapy.org/; + homepage = https://scrapy.org/; license = licenses.bsd3; maintainers = with maintainers; [ drewkett ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index eff799e0d014..ad7916856d15 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tornado ]; meta = with lib; { - homepage = http://github.com/mrjoes/sockjs-tornado/; + homepage = https://github.com/mrjoes/sockjs-tornado/; description = "SockJS python server implementation on top of Tornado framework"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 08500aeb4ad1..2d2f066eaedc 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "SPAKE2 password-authenticated key exchange library"; - homepage = "http://github.com/warner/python-spake2"; + homepage = https://github.com/warner/python-spake2; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 0fc14024903e..2a3da903b542 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec{ ''; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = https://github.com/pytoolz/toolz/; description = "List processing tools and functional utilities"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 5dace76c9b2c..0915bc300c54 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "PyTorch vision library"; - homepage = http://pytorch.org/; + homepage = https://pytorch.org/; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ericsagnes ]; }; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 4a23a1b88cba..6c679bc9cf40 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://twistedmatrix.com/; + homepage = https://twistedmatrix.com/; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index d90ada606321..081108634c2e 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pythonhosted.org/uncertainties/; + homepage = https://pythonhosted.org/uncertainties/; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; maintainers = with maintainers; [ rnhmjoj ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index a5a7957e8ec1..147668da376c 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = http://github.com/miracle2k/webassets/; + homepage = https://github.com/miracle2k/webassets/; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index 7e2a571b1bba..b0350da63fad 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast, pure-Python full text indexing, search, and spell checking library."; - homepage = "http://bitbucket.org/mchaput/whoosh"; + homepage = https://bitbucket.org/mchaput/whoosh; license = licenses.bsd2; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix index c414e0a070ae..d884f12bdbf1 100644 --- a/pkgs/development/python-modules/xstatic-jquery/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = http://jquery.org; + homepage = https://jquery.org; description = "jquery packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index a69f50c8c795..916a6882a17a 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Inter-process locks"; - homepage = http://www.python.org/pypi/zc.lockfile; + homepage = https://www.python.org/pypi/zc.lockfile; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 01caa59fe4c3..d0d20362236b 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { preCheck = "export HOME=$TMPDIR"; meta = { - homepage = http://rr-project.org/; + homepage = https://rr-project.org/; description = "Records nondeterministic executions and debugs them deterministically"; longDescription = '' rr aspires to be your primary debugging tool, replacing -- well, diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 76d099625626..8db0cc0d54f3 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.scala-sbt.org/; + homepage = https://www.scala-sbt.org/; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; maintainers = with maintainers; [ nequissimus rickynils ]; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index a19fecc9c33a..a5fd8f5cf64d 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check"; meta = with stdenv.lib; { - homepage = http://strace.io/; + homepage = https://strace.io/; description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix index 2e2fc1ad9273..8f9087ee3b3a 100644 --- a/pkgs/development/tools/valadoc/default.nix +++ b/pkgs/development/tools/valadoc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "valadoc is a documentation generator for generating API documentation from Vala source code"; - homepage = http://valadoc.org; + homepage = https://valadoc.org; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ sternenseemann ]; platforms = with platforms; linux; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 2196fede32fc..52f476fa447d 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut +{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGLU_combined, physfs }: @@ -10,17 +10,18 @@ let ]); in stdenv.mkDerivation rec { - version = "0.9.23"; + version = "0.9.24.1"; name = "hedgewars-${version}"; src = fetchurl { url = "http://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; - sha256 = "12df5ar3zk186ah51c3myr4hlzyybcshmf1w1wf6vr9b0h44jbns"; + sha256 = "1f2vbndh9fnwklwjicrhy5zv2ciyhadfsny2cdqnc6lim90hldl1"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL2_ttf SDL2_net cmake lua5_1 SDL2 SDL2_mixer SDL2_image fpc - qt4 ghc ffmpeg freeglut makeWrapper physfs + ghc ffmpeg freeglut makeWrapper physfs + qt5.qttools qt5.qtbase ]; postPatch = '' diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 9ce5c7db83fb..83a85415664d 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://springrts.com/; + homepage = https://springrts.com/; description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix new file mode 100644 index 000000000000..882bf13f4eaf --- /dev/null +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: + +stdenv.mkDerivation rec { + name = "firebird-emu-${version}"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "nspire-emus"; + repo = "firebird"; + rev = "v${version}"; + sha256 = "0pdca6bgnmzfgf5kp83as99y348gn4plzbxnqxjs61vp489baahq"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtbase qtdeclarative ]; + + makeFlags = [ "INSTALL_ROOT=$(out)" ]; + + # Attempts to install to /usr/bin and /usr/share/applications, which Nix does + # not use. + prePatch = '' + substituteInPlace firebird.pro \ + --replace '/usr/' '/' + ''; + + meta = { + homepage = https://github.com/nspire-emus/firebird; + description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ pneumaticat ]; + # Only tested on Linux, but likely possible to build on, e.g. macOS + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 125df39ae8a6..df13c15562dd 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An operating function"; - homepage = http://urbit.org; + homepage = https://urbit.org; license = licenses.mit; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 06047d91b7d5..68d0bb69b343 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2908,7 +2908,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/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme index d61fdff0f08d..278343dab6e0 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme @@ -9,7 +9,7 @@ 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/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 252fe5abf49f..910f1b91c215 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -46,5 +46,5 @@ in lib.makeExtensible (self: { xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "9.4")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "8.2")}"; }) diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 63d389fdb1f8..8bb42dff0945 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,12 +2,12 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - version = "0.8.5"; + version = "0.9.0"; name = "nftables-${version}"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "08z3xaxdryi0i9gcfifs77c96xs8ljynkr2hbfgf3w67l60az6wf"; + sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd"; }; configureFlags = [ diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index 554401438705..a9f5ba6f7b2c 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -49,7 +49,7 @@ let postInstall = "$out/bin/twistd --help > /dev/null"; meta = with stdenv.lib; { - homepage = http://twistedmatrix.com/; + homepage = https://twistedmatrix.com/; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 466c3873c600..63925d30c644 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Server for synchronising Taskwarrior clients"; - homepage = http://taskwarrior.org; + homepage = https://taskwarrior.org; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index da2d1388c469..d3816cf1ecdb 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -65,7 +65,7 @@ in meta = { inherit branch; description = "An enterprise-class open source distributed monitoring solution"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; @@ -82,7 +82,7 @@ in meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 1cc604f6491b..bc5556d4bc00 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -77,7 +77,7 @@ in meta = { inherit branch; description = "An enterprise-class open source distributed monitoring solution"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; @@ -94,7 +94,7 @@ in meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix index 332e139f4283..69b3577720f5 100644 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -29,7 +29,7 @@ in meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index 2925a8f2dc53..4c3479d8662e 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Zipkin distributed tracing system"; - homepage = "http://zipkin.io/"; + homepage = https://zipkin.io/; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.hectorj ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 4980a6fb2bfd..bf1ccbd06d56 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://redis.io; + homepage = https://redis.io; description = "An open source, advanced key-value store"; license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index 91b1c8f95c1c..4d9fc46dcf7f 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; meta = { - homepage = http://www.samba.org/; + homepage = https://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; platforms = stdenv.lib.platforms.linux; knownVulnerabilities = [ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index ee14ec6443bf..0ff7f88911f2 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.samba.org/; + homepage = https://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix index 1206e50926ed..c6eb4013c5ce 100644 --- a/pkgs/servers/sql/postgresql/pgtap/default.nix +++ b/pkgs/servers/sql/postgresql/pgtap/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It can also be used in the xUnit testing style. ''; maintainers = with maintainers; [ willibutz ]; - homepage = http://pgtap.org; + homepage = https://pgtap.org; inherit (postgresql.meta) platforms; }; } diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 6f584bfabd3d..b3714c7a0c28 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based news feed (RSS/Atom) aggregator"; license = licenses.gpl2Plus; - homepage = http://tt-rss.org; + homepage = https://tt-rss.org; maintainers = with maintainers; [ globin zohl ]; platforms = platforms.all; }; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 4c728d2e3e79..06f54fd52073 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -29,7 +29,7 @@ xorgserver.overrideAttrs (oldAttrs: { meta = { description = "An X server for interfacing X11 apps with the Wayland protocol"; - homepage = http://wayland.freedesktop.org/xserver.html; + homepage = https://wayland.freedesktop.org/xserver.html; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index a20b7d69f3dc..ad51b6be51d7 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvdpau ]; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~aplattner/vdpau/; + homepage = https://people.freedesktop.org/~aplattner/vdpau/; description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index f69d5d80649b..59ddac0eca15 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; meta = { - homepage = http://www.semicomplete.com/projects/xdotool/; + homepage = https://www.semicomplete.com/projects/xdotool/; description = "Fake keyboard/mouse input, window management, and more"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 46b4ada3d573..edb67c13b9cd 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.06.13"; + version = "2018.06.23"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0mmr0wfdwx9vfz17gp0arspv835l5gka78hm5hkri4h3cvxpflfy"; + sha256 = "0487dlw9v4ayb929w8bk71fs4nbcs1liyk59g6sfr4yn6dx2sl2d"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index ad1b80410419..8773121e6461 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://rzip.samba.org/; + homepage = https://rzip.samba.org/; description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix index 54c78874dd2e..7ceafe127932 100644 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ b/pkgs/tools/misc/appdata-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureScript = "./autogen.sh"; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~hughsient/appdata; + homepage = https://people.freedesktop.org/~hughsient/appdata; description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index e9ed5c0450af..66ddd0548a8c 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source firmware for mp3 players"; - homepage = http://www.rockbox.org; + homepage = https://www.rockbox.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu jgeerds ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 91eeb6b0a511..39d3ea1c2086 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced Power Management for Linux"; - homepage = http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; + homepage = https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 33e9841eb058..6d26cf591bae 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.11"; + name = "iperf-2.0.12"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1lm5inayc8fkqncj55fvzl9611rkmkj212lknmby7c3bgk851mmp"; + sha256 = "0ii6sgp62x9ly2gyk00w58dy9qwcw2kvhhcfa7v16jr6n4gnazrn"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix new file mode 100644 index 000000000000..eb2fe70cf4ba --- /dev/null +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "shadowfox-${version}"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "SrKomodo"; + repo = "shadowfox-updater"; + rev = "v${version}"; + sha256 = "07695hba72q722d18q75pwa45azg9jibj6vqnhwb7mnwz2i7hkkc"; + }; + + goPackagePath = "github.com/SrKomodo/shadowfox-updater"; + goDeps = ./deps.nix; + + buildFlags = "--tags release"; + + meta = with stdenv.lib; { + description = '' + This project aims at creating a universal dark theme for Firefox while + adhering to the modern design principles set by Mozilla. + ''; + homepage = "https://overdodactyl.github.io/ShadowFox/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/tools/networking/shadowfox/deps.nix b/pkgs/tools/networking/shadowfox/deps.nix new file mode 100644 index 000000000000..f3a824af686e --- /dev/null +++ b/pkgs/tools/networking/shadowfox/deps.nix @@ -0,0 +1,75 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "b3cebc399d6f98536af845ed8a5144ab586f6759"; + sha256 = "1kbf08msh4bjbdwnj1cjmddl5jfiarswfim3q085x77bcb43l0qa"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "cec2bdc49009247305a260b082a18e802d0fe292"; + sha256 = "0d4ab6v83w5ya4rnnaymasmza4p2jl0lqf4xcgsmsk6lnnrwm5s8"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "d9cec903b20cbeda6062366e460c2c1bdc717e4d"; + sha256 = "1j8nxi71v0qplfx6alfdx8rm2dxrcfk2k27gjrh2aksa322cmryb"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; + sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + }; + } + { + goPackagePath = "github.com/rivo/tview"; + fetch = { + type = "git"; + url = "https://github.com/rivo/tview"; + rev = "306abd9cb98c97417ab6c58aa0400b2e5daac88b"; + sha256 = "00q8hymxa36a178hbzylsw3ald6a7gyg8adnki3flyv1jg3dnahx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5cec4b58c438bd98288aeb248bab2c1840713d21"; + sha256 = "19iyz2nppicvwap5lv796sbzd82glk2jn4yn5w6z6zymwnykfzds"; + }; + } +] diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index a9c1a1a33b3c..5ac13fc42cfd 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "cargo-tree-${version}"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "0lq14w11a4zl0rvv7rsd79k51dwk3w78fbsi6klkqknad02qmx3r"; + sha256 = "16vsw392qs3ag2brvcan19km7ds0s9s7505p3hnfjvjrzgdliir3"; }; - cargoSha256 = "0zi4qbadlx4l6zhb0f892ic3mdmyjjjzrirks18pl6qrn3dgny1x"; + cargoSha256 = "0g6afhqqdf76axbcs5wj9gydsabd3d5ja8qd8z8y6wbp7n0y4h6a"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index a6999942e0c6..ef98341c5bac 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.rsyslog.com/; + homepage = https://www.rsyslog.com/; description = "Enhanced syslog implementation"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8968df66875..b05ab4926050 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2399,6 +2399,8 @@ with pkgs; fio = callPackage ../tools/system/fio { }; + firebird-emu = libsForQt5.callPackage ../misc/emulators/firebird-emu { }; + flamerobin = callPackage ../applications/misc/flamerobin { }; flashtool = callPackage_i686 ../development/mobile/flashtool { @@ -4080,6 +4082,8 @@ with pkgs; pasystray = callPackage ../tools/audio/pasystray { }; + phash = callPackage ../development/libraries/phash { }; + pnmixer = callPackage ../tools/audio/pnmixer { }; pulsemixer = callPackage ../tools/audio/pulsemixer { }; @@ -9282,7 +9286,7 @@ with pkgs; else if name == "uclibc" then targetPackages.uclibcCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 - else if targetPlatform.useiOSPrebuilt then targetPackages.iosSdkPkgs.libraries + else if targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; @@ -17988,6 +17992,8 @@ with pkgs; setbfree = callPackage ../applications/audio/setbfree { }; + shadowfox = callPackage ../tools/networking/shadowfox { }; + shfmt = callPackage ../tools/text/shfmt { }; shutter = callPackage ../applications/graphics/shutter { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2018b5065a1c..675c27c23e11 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -358,7 +358,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { - homepage = http://sqitch.org/; + homepage = https://sqitch.org/; description = "Sane database change management"; license = stdenv.lib.licenses.mit; }; @@ -2345,7 +2345,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Engine for tidyall, your all-in-one code tidier and validator"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "http://metacpan.org/release/Code-TidyAll"; + homepage = https://metacpan.org/release/Code-TidyAll; }; }; @@ -9740,7 +9740,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Generate Kwalitee ratings for a distribution"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "http://cpants.cpanauthors.org"; + homepage = https://cpants.cpanauthors.org; }; }; @@ -10069,7 +10069,7 @@ let self = _self // overrides; _self = with self; { sha256 = "70c5f211ba81982752eae189ca7aea0ea14fb7534449114d0a3d47d96c0d05c4"; }; meta = { - homepage = http://mojolicious.org; + homepage = https://mojolicious.org/; description = "Real-time web framework"; license = with stdenv.lib.licenses; [ artistic2 ]; }; @@ -11895,7 +11895,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Build an optimized subroutine parameter validator once, use it forever"; license = with stdenv.lib.licenses; [ artistic2 ]; - homepage = "http://metacpan.org/release/Params-ValidationCompiler"; + homepage = https://metacpan.org/release/Params-ValidationCompiler; }; }; @@ -13643,7 +13643,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Type constraints and coercions for Perl"; license = with stdenv.lib.licenses; [ artistic2 ]; - homepage = "http://metacpan.org/release/Specio"; + homepage = https://metacpan.org/release/Specio; }; }; @@ -13658,7 +13658,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Path::Tiny types and coercions for Specio"; license = with stdenv.lib.licenses; [ asl20 ]; - homepage = "http://metacpan.org/release/Specio-Library-Path-Tiny"; + homepage = https://metacpan.org/release/Specio-Library-Path-Tiny; }; }; @@ -13873,7 +13873,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0fs2n9zw6isfkha2kbqrvl9mwg572x1x0jlfaps0qsyynn846bcv"; }; meta = { - homepage = http://plackperl.org; + homepage = https://plackperl.org; description = "Temporary buffer to save bytes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14859,7 +14859,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Fail if tests warn"; license = with stdenv.lib.licenses; [ artistic2 ]; - homepage = "http://metacpan.org/release/Test2-Plugin-NoWarnings"; + homepage = https://metacpan.org/release/Test2-Plugin-NoWarnings; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7033d31d044..80ca395a0265 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2040,7 +2040,7 @@ in { meta = { description = "Complete yet simple CSS parser for Python"; license = licenses.bsd3; - homepage = http://pythonhosted.org/tinycss/; + homepage = https://pythonhosted.org/tinycss/; }; }; @@ -2686,7 +2686,7 @@ in { }; meta = { - homepage = http://docs.python.org/3/library/functools.html; + homepage = https://docs.python.org/3/library/functools.html; }; }; @@ -8075,7 +8075,7 @@ in { disabled = isPy3k; src = pkgs.fetchurl { - url = http://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2; + url = https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2; sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6"; }; @@ -8084,7 +8084,7 @@ in { meta = { description = "Utilities for use with console mail clients, like mutt"; - homepage = http://www.blacktrash.org/hg/muttils; + homepage = https://www.blacktrash.org/hg/muttils; license = licenses.gpl2Plus; }; }); @@ -8232,7 +8232,7 @@ in { meta = { description = "Tool to measure, monitor and analyze memory behavior"; - homepage = http://pythonhosted.org/Pympler/; + homepage = https://pythonhosted.org/Pympler/; license = licenses.asl20; }; }; @@ -8716,7 +8716,7 @@ in { meta = { description = "A Python wrapper around notmuch"; - homepage = http://notmuchmail.org/; + homepage = https://notmuchmail.org/; maintainers = with maintainers; [ garbas ]; }; }; @@ -12322,7 +12322,7 @@ in { propagatedBuildInputs = with self; [ pyasn1 ]; meta = { - homepage = "http://stuvel.eu/rsa"; + homepage = https://stuvel.eu/rsa; license = licenses.asl20; description = "A pure-Python RSA implementation"; }; @@ -13530,7 +13530,7 @@ in { doCheck = false; meta = { description = "Sphinx spelling extension"; - homepage = "http://bitbucket.org/dhellmann/sphinxcontrib-spelling"; + homepage = https://bitbucket.org/dhellmann/sphinxcontrib-spelling; maintainers = with maintainers; [ nand0p ]; license = licenses.bsd2; }; @@ -13802,7 +13802,7 @@ in { meta = { description = "Utility belt for automated testing"; - homepage = "http://falcao.it/sure/"; + homepage = https://falcao.it/sure/; license = licenses.gpl3Plus; }; }; @@ -13882,7 +13882,7 @@ in { propagatedBuildInputs = with self; [ six dateutil pytz ]; meta = { - homepage = http://github.com/ralphbean/taskw; + homepage = https://github.com/ralphbean/taskw; description = "Python bindings for your taskwarrior database"; license = licenses.gpl3Plus; platforms = platforms.all; @@ -16148,7 +16148,7 @@ EOF ''; meta = { - homepage = http://pythonhosted.org/Logbook/; + homepage = https://pythonhosted.org/Logbook/; description = "A logging replacement for Python"; license = licenses.bsd3; }; @@ -17015,7 +17015,7 @@ EOF meta = { description = "Free console XMPP client"; - homepage = http://poez.io; + homepage = https://poez.io; license = licenses.mit; maintainers = [ maintainers.lsix ]; }; @@ -17088,7 +17088,7 @@ EOF meta = with stdenv.lib; { description = "Lightweight SOAP client (Jurko's fork)"; - homepage = "http://bitbucket.org/jurko/suds"; + homepage = https://bitbucket.org/jurko/suds; }; }; @@ -17527,7 +17527,7 @@ EOF doCheck = false; meta = { description = "A client side encrypted pastebin"; - homepage = "http://0bin.net/"; + homepage = https://0bin.net/; license = licenses.wtfpl; }; }; |