diff --git a/doc/overlays.xml b/doc/overlays.xml index f8f554bb556..ad31b90299e 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -8,59 +8,62 @@ overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to compose the set of all packages. +Nixpkgs can be configured with a list of overlays, which are +applied in order. This means that the order of the overlays can be significant +if multiple layers override the same package. +
-Installing Overlays +Installing overlays -The set of overlays is looked for in the following places. The -first one present is considered, and all the rest are ignored: +The list of overlays is determined as follows: + First, if an overlays argument to the nixpkgs function itself is given, + then that is used. This can be passed explicitly when importing nipxkgs, for example + import <nixpkgs> { overlays = [ overlay1 overlay2 ] }. - As an argument of the imported attribute set. When importing Nixpkgs, - the overlays attribute argument can be set to a list of - functions, which is described in . - + On a NixOS system the value of the nixpkgs.overlays option, if present, + is passed to the system Nixpkgs in this way. Note that this does not affect the overlays for + non-NixOS operations (e.g. nix-env), which are looked up independently. + Otherwise, if the Nix path entry <nixpkgs-overlays> exists and is a + directory, then the result is the set of overlays found in that directory, ordered lexicographically. - In the directory pointed to by the Nix search path entry - <nixpkgs-overlays>. + See the section on NIX_PATH in the Nix manual for more details on how to + set a value for <nixpkgs-overlays>. - - In the directory ~/.config/nixpkgs/overlays/. + Otherwise, if ~/.config/nixpkgs/overlays/ exists and is a directory, then + the result is the set of overlays found in that directory, ordered lexicographically. -For the second and third options, the directory should contain Nix expressions defining the -overlays. Each overlay can be a file, a directory containing a -default.nix, or a symlink to one of those. The expressions should follow -the syntax described in . +For the second and third options, overlays are extracted from the given directory as files, +directories containing a default.nix, or symlinks to one of those. -The order of the overlay layers can influence the recipe of packages if multiple layers override -the same recipe. In the case where overlays are loaded from a directory, they are loaded in -alphabetical order. - -To install an overlay using the last option, you can clone the overlay's repository and add -a symbolic link to it in ~/.config/nixpkgs/overlays/ directory. +The last option provides a convenient way to install an overlay from a repository, +by cloning the overlay's repository and adding a symbolic link to it in +~/.config/nixpkgs/overlays/.
-
-Overlays Layout +
+Defining overlays -Overlays are expressed as Nix functions which accept 2 arguments and return a set of -packages. +Overlays are Nix functions which accept two arguments, +conventionally called self and super, +and return a set of packages. For example, the following is a valid overlay. self: super: @@ -75,25 +78,31 @@ self: super: } -The first argument, usually named self, corresponds to the final package +The first argument (self) corresponds to the final package set. You should use this set for the dependencies of all packages specified in your overlay. For example, all the dependencies of rr in the example above come from self, as well as the overridden dependencies used in the boost override. -The second argument, usually named super, +The second argument (super) corresponds to the result of the evaluation of the previous stages of Nixpkgs. It does not contain any of the packages added by the current -overlay nor any of the following overlays. This set should be used either +overlay, nor any of the following overlays. This set should be used either to refer to packages you wish to override, or to access functions defined in Nixpkgs. For example, the original recipe of boost in the above example, comes from super, as well as the callPackage function. The value returned by this function should be a set similar to -pkgs/top-level/all-packages.nix, which contains +pkgs/top-level/all-packages.nix, containing overridden and/or new packages. +Overlays are similar to other methods for customizing Nixpkgs, in particular +the packageOverrides attribute described in . +Indeed, packageOverrides acts as an overlay with only the +super argument. It is therefore appropriate for basic use, +but overlays are more powerful and easier to distribute. +
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0f4e6fe2261..5efd472d5f8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -521,6 +521,7 @@ schneefux = "schneefux "; schristo = "Scott Christopher "; scolobb = "Sergiu Ivanov "; + sdll = "Sasha Illarionov "; sepi = "Raffael Mancini "; seppeljordan = "Sebastian Jordan "; shanemikel = "Shane Pearlman "; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 6ec3c1a112d..859838182ed 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -335,7 +335,7 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; - #ddclient = 30; # unused + ddclient = 30; davfs2 = 31; disnix = 33; osgi = 34; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1da1ea5ae11..bfc554cc936 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -185,6 +185,7 @@ ./services/databases/neo4j.nix ./services/databases/openldap.nix ./services/databases/opentsdb.nix + ./services/databases/postage.nix ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 0a0838431da..0ab210cc4c3 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -59,4 +59,10 @@ with lib; # the feature at runtime. Attempting to create a user namespace # with unshare will then fail with "no space left on device". boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0; + + # Raise ASLR entropy for 64bit & 32bit, respectively. + # + # Note: mmap_rnd_compat_bits may not exist on 64bit. + boot.kernel.sysctl."vm.mmap_rnd_bits" = mkDefault 32; + boot.kernel.sysctl."vm.mmap_rnd_compat_bits" = mkDefault 16; } diff --git a/nixos/modules/services/databases/postage.nix b/nixos/modules/services/databases/postage.nix new file mode 100644 index 00000000000..d49c9a83a46 --- /dev/null +++ b/nixos/modules/services/databases/postage.nix @@ -0,0 +1,205 @@ +{ lib, pkgs, config, ... } : + +with lib; + +let + cfg = config.services.postage; + + confFile = pkgs.writeTextFile { + name = "postage.conf"; + text = '' + connection_file = ${postageConnectionsFile} + + allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections} + + postage_port = ${toString cfg.port} + + super_only = ${builtins.toJSON cfg.superOnly} + + ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"} + + login_timeout = ${toString cfg.loginTimeout} + + web_root = ${cfg.package}/etc/postage/web_root + + data_root = ${cfg.dataRoot} + + ${optionalString (!isNull cfg.tls) '' + tls_cert = ${cfg.tls.cert} + tls_key = ${cfg.tls.key} + ''} + + log_level = ${cfg.logLevel} + ''; + }; + + postageConnectionsFile = pkgs.writeTextFile { + name = "postage-connections.conf"; + text = concatStringsSep "\n" + (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections); + }; + + postage = "postage"; +in { + + options.services.postage = { + enable = mkEnableOption "PostgreSQL Administration for the web"; + + package = mkOption { + type = types.package; + default = pkgs.postage; + defaultText = "pkgs.postage"; + description = '' + The postage package to use. + ''; + }; + + connections = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + "nuc-server" = "hostaddr=192.168.0.100 port=5432 dbname=postgres"; + "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require"; + }; + description = '' + Postage requires at least one PostgreSQL server be defined. + + Detailed information about PostgreSQL connection strings is available at: + + + Note that you should not specify your user name or password. That + information will be entered on the login screen. If you specify a + username or password, it will be removed by Postage before attempting to + connect to a database. + ''; + }; + + allowCustomConnections = mkOption { + type = types.bool; + default = false; + description = '' + This tells Postage whether or not to allow anyone to use a custom + connection from the login screen. + ''; + }; + + port = mkOption { + type = types.int; + default = 8080; + description = '' + This tells Postage what port to listen on for browser requests. + ''; + }; + + localOnly = mkOption { + type = types.bool; + default = true; + description = '' + This tells Postage whether or not to set the listening socket to local + addresses only. + ''; + }; + + superOnly = mkOption { + type = types.bool; + default = true; + description = '' + This tells Postage whether or not to only allow super users to + login. The recommended value is true and will restrict users who are not + super users from logging in to any PostgreSQL instance through + Postage. Note that a connection will be made to PostgreSQL in order to + test if the user is a superuser. + ''; + }; + + loginGroup = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + This tells Postage to only allow users in a certain PostgreSQL group to + login to Postage. Note that a connection will be made to PostgreSQL in + order to test if the user is a member of the login group. + ''; + }; + + loginTimeout = mkOption { + type = types.int; + default = 3600; + description = '' + Number of seconds of inactivity before user is automatically logged + out. + ''; + }; + + dataRoot = mkOption { + type = types.str; + default = "/var/lib/postage"; + description = '' + This tells Postage where to put the SQL file history. All tabs are saved + to this location so that if you get disconnected from Postage you + don't lose your work. + ''; + }; + + tls = mkOption { + type = types.nullOr (types.submodule { + options = { + cert = mkOption { + type = types.str; + description = "TLS certificate"; + }; + key = mkOption { + type = types.str; + description = "TLS key"; + }; + }; + }); + default = null; + description = '' + These options tell Postage where the TLS Certificate and Key files + reside. If you use these options then you'll only be able to access + Postage through a secure TLS connection. These options are only + necessary if you wish to connect directly to Postage using a secure TLS + connection. As an alternative, you can set up Postage in a reverse proxy + configuration. This allows your web server to terminate the secure + connection and pass on the request to Postage. You can find help to set + up this configuration in: + + ''; + }; + + logLevel = mkOption { + type = types.enum ["error" "warn" "notice" "info"]; + default = "error"; + description = '' + Verbosity of logs + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.postage = { + description = "postage - PostgreSQL Administration for the web"; + wants = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = postage; + Group = postage; + ExecStart = "${pkgs.postage}/sbin/postage -c ${confFile}" + + optionalString cfg.localOnly " --local-only=true"; + }; + }; + users = { + users."${postage}" = { + name = postage; + group = postage; + home = cfg.dataRoot; + createHome = true; + }; + groups."${postage}" = { + name = postage; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index b26bcba6405..723b04dc0fe 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -26,7 +26,9 @@ let for file in $out/*; do case "$file" in - plugin.sh) continue;; + */plugin.sh|*/plugins.history) + chmod +x "$file" + continue;; esac # read magic makers from the file diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 28c96a9baef..9e56545f746 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -1,17 +1,33 @@ { config, pkgs, lib, ... }: let + cfg = config.services.ddclient; + boolToStr = bool: if bool then "yes" else "no"; - inherit (lib) mkOption mkIf singleton; - inherit (pkgs) ddclient; - - stateDir = "/var/spool/ddclient"; - ddclientUser = "ddclient"; - ddclientFlags = "-foreground -file ${config.services.ddclient.configFile}"; - ddclientPIDFile = "${stateDir}/ddclient.pid"; + configText = '' + # This file can be used as a template for configFile or is automatically generated by Nix options. + daemon=${toString cfg.interval} + cache=${cfg.homeDir}/ddclient.cache + pid=/run/ddclient/ddclient.pid + foreground=NO + use=${cfg.use} + login=${cfg.username} + password=${cfg.password} + protocol=${cfg.protocol} + ${let server = cfg.server; in + lib.optionalString (server != "") "server=${server}"} + ssl=${boolToStr cfg.ssl} + wildcard=YES + quiet=${boolToStr cfg.quiet} + verbose=${boolToStr cfg.verbose} + ${cfg.domain} + ${cfg.extraConfig} + ''; in +with lib; + { ###### interface @@ -28,6 +44,12 @@ in ''; }; + homeDir = mkOption { + default = "/var/lib/ddclient"; + type = str; + description = "Home directory for the daemon user."; + }; + domain = mkOption { default = ""; type = str; @@ -52,6 +74,12 @@ in ''; }; + interval = mkOption { + default = 600; + type = int; + description = "The interval at which to run the check and update."; + }; + configFile = mkOption { default = "/etc/ddclient.conf"; type = path; @@ -126,37 +154,24 @@ in config = mkIf config.services.ddclient.enable { - environment.systemPackages = [ ddclient ]; + users = { + extraGroups.ddclient.gid = config.ids.gids.ddclient; - users.extraUsers = singleton { - name = ddclientUser; - uid = config.ids.uids.ddclient; - description = "ddclient daemon user"; - home = stateDir; + extraUsers.ddclient = { + uid = config.ids.uids.ddclient; + description = "ddclient daemon user"; + group = "ddclient"; + home = cfg.homeDir; + createHome = true; + }; }; environment.etc."ddclient.conf" = { - enable = config.services.ddclient.configFile == "/etc/ddclient.conf"; + enable = cfg.configFile == "/etc/ddclient.conf"; uid = config.ids.uids.ddclient; + gid = config.ids.gids.ddclient; mode = "0600"; - text = '' - # This file can be used as a template for configFile or is automatically generated by Nix options. - daemon=600 - cache=${stateDir}/ddclient.cache - pid=${ddclientPIDFile} - use=${config.services.ddclient.use} - login=${config.services.ddclient.username} - password=${config.services.ddclient.password} - protocol=${config.services.ddclient.protocol} - ${let server = config.services.ddclient.server; in - lib.optionalString (server != "") "server=${server}"} - ssl=${if config.services.ddclient.ssl then "yes" else "no"} - wildcard=YES - quiet=${if config.services.ddclient.quiet then "yes" else "no"} - verbose=${if config.services.ddclient.verbose then "yes" else "no"} - ${config.services.ddclient.domain} - ${config.services.ddclient.extraConfig} - ''; + text = configText; }; systemd.services.ddclient = { @@ -166,17 +181,14 @@ in restartTriggers = [ config.environment.etc."ddclient.conf".source ]; serviceConfig = { - # Uncomment this if too many problems occur: - # Type = "forking"; - User = ddclientUser; - Group = "nogroup"; #TODO get this to work - PermissionsStartOnly = "true"; - PIDFile = ddclientPIDFile; - ExecStartPre = '' - ${pkgs.stdenv.shell} -c "${pkgs.coreutils}/bin/mkdir -m 0755 -p ${stateDir} && ${pkgs.coreutils}/bin/chown ${ddclientUser} ${stateDir}" - ''; - ExecStart = "${ddclient}/bin/ddclient ${ddclientFlags}"; - #ExecStartPost = "${pkgs.coreutils}/bin/rm -r ${stateDir}"; # Should we have this? + RuntimeDirectory = "ddclient"; + # we cannot run in forking mode as it swallows all the program output + Type = "simple"; + User = "ddclient"; + Group = "ddclient"; + ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -foreground -file ${cfg.configFile}"; + ProtectSystem = "full"; + PrivateTmp = true; }; }; }; diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index f8dd75ea2c4..3429397d2cc 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -85,12 +85,18 @@ in }; systemd.services."container-getty@" = - { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM") + ]; restartIfChanged = false; }; systemd.services."console-getty" = - { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM") + ]; serviceConfig.Restart = "always"; restartIfChanged = false; enable = mkDefault config.boot.isContainer; diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 9d10627afce..425b2b866a5 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; meta = with stdenv.lib; { - homepage = http://xiph.org/flac/; + homepage = https://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; maintainers = [ maintainers.mornfall ]; diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 2ee03a3f399..545e7c5047a 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem program"; - homepage = http://sourceforge.net/projects/fldigi/; + homepage = https://sourceforge.net/projects/fldigi/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index d72a2b13c42..d56ac753405 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical open-source sequencer,"; - homepage = http://www.iannix.org/; + homepage = https://www.iannix.org/; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 33265e1b3e8..0bf7472ea11 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71"; }; + patches = [ ./sqlite.patch ]; # from: https://bugs.gentoo.org/show_bug.cgi?id=622776 + buildInputs = [ chromaprint fftw flac libid3tag libmad libopus libshout libsndfile libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4 diff --git a/pkgs/applications/audio/mixxx/sqlite.patch b/pkgs/applications/audio/mixxx/sqlite.patch new file mode 100644 index 00000000000..ed9f4ee5143 --- /dev/null +++ b/pkgs/applications/audio/mixxx/sqlite.patch @@ -0,0 +1,13 @@ +diff -urN old/src/library/trackcollection.h mixxx-2.0.0/src/library/trackcollection.h +--- old/src/library/trackcollection.h 2017-07-30 00:04:48.511029517 -0400 ++++ mixxx-2.0.0/src/library/trackcollection.h 2017-07-30 00:05:03.378699826 -0400 +@@ -34,8 +34,7 @@ + #include "library/dao/libraryhashdao.h" + + #ifdef __SQLITE3__ +-typedef struct sqlite3_context sqlite3_context; +-typedef struct Mem sqlite3_value; ++#include + #endif + + class TrackInfoObject; diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index 0fa9022f67b..f2922e7eecf 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; - homepage = http://sourceforge.net/projects/mp3splt/; + homepage = https://sourceforge.net/projects/mp3splt/; license = licenses.gpl2; maintainers = [ maintainers.bosu ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 7cd244c9ea4..8b7c2121bd7 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake puredata ]; - patchPhase = '' + preBuild = '' + export LD=$CXX cd src/ for i in ${puredata}/include/pd/*; do ln -s $i . diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 51a2a874f23..9945fd53719 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Animated sprite editor & pixel art tool"; - homepage = http://www.aseprite.org/; + homepage = https://www.aseprite.org/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 44c1ebcecfd..a3b4193edc6 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -129,16 +129,16 @@ rec { autodetect-encoding = buildEclipsePlugin rec { name = "autodetect-encoding-${version}"; - version = "1.8.3.201610171338"; + version = "1.8.4.201708052053"; srcFeature = fetchurl { url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar"; - sha256 = "09xfn5j6vr9r7n0riqs5ja5ms98ax9pyi3f7irnv80flhzagdv7f"; + sha256 = "1gbvib5dd75pp5mr17ckj2y66gnxjvpc067im5nsl9fyljdw867c"; }; srcPlugin = fetchurl { url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar"; - sha256 = "0l2zw4whx1a7j0jl7i6n6igr2ki6jh6nwggx53n3ipzg7cgdcg0y"; + sha256 = "0728zsbfs1mc4qvx2p92hkxpnknckqk0xvqlmzivsnr62b5qd5im"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 6ad92b109dd..28106cf876b 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.all; - homepage = http://gottcode.org/focuswriter/; + homepage = https://gottcode.org/focuswriter/; }; } diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 45a734216cf..a22f4627c99 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile }: let - version = "1.14.2"; + version = "1.15.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0ladqwgy37imq957mmbdfslaxcnx8gcl9nb1q5p8r91vldvf31zd"; - "x86_64-linux" = "1nb9n6511v2p1nwcwh6kbpxgydfs66yn7q2nf1rmh42ha5yzqkja"; - "x86_64-darwin" = "0yk2yd8rzhmsh276xfgywp1gjjkvxypgnjhs8jaxvrgsj7aw1s39"; + "i686-linux" = "1ny4n6xbwvw88fy6k59dd2g4h8z9a9r7m6fbpgs6lwv0a6cill01"; + "x86_64-linux" = "16mm9yks271p81nsp6yhfgdy5b1w7cs12cwn2z919kj0i4i09fk1"; + "x86_64-darwin" = "1dwpnllff72yd8a6gc9xv4j7fxwsjgwjvdss0ld4m6kx17zm43qm"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index ced6a5f7258..8ca093b90c3 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; - homepage = http://github.com/fontmatrix/fontmatrix; + homepage = https://github.com/fontmatrix/fontmatrix; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 6b49f975b1b..80f893e7c3c 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - homepage = http://www.freecadweb.org/; + homepage = https://www.freecadweb.org/; license = licenses.lgpl2Plus; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 47004a02500..ff87b70a0c1 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { meta = { description = "The GNU Image Manipulation Program"; - homepage = http://www.gimp.org/; + homepage = https://www.gimp.org/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index be6989b7e33..a46565eb76b 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/cdrtools/; + homepage = https://sourceforge.net/projects/cdrtools/; description = "Highly portable CD/DVD/BluRay command line recording software"; license = with licenses; [ gpl2 lgpl2 cddl ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 60bd5134e8a..cfe76701ceb 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { ++ [ keybinder ]; meta = with stdenv.lib; { - homepage = http://launchpad.net/dockbar/; + homepage = https://launchpad.net/dockbar/; description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch new file mode 100644 index 00000000000..68a16b196fa --- /dev/null +++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch @@ -0,0 +1,157 @@ +diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc +new file mode 100644 +index 0000000..1bd9bb5 +--- /dev/null ++++ b/colorer/configs/base/hrc/nix.hrc +@@ -0,0 +1,132 @@ ++ ++ ++ ++ ++ ++ ++ ++ Nix ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc +index 11e493b..2a67263 100644 +--- a/colorer/configs/base/hrc/proto.hrc ++++ b/colorer/configs/base/hrc/proto.hrc +@@ -156,6 +156,14 @@ + + /\.(w?lua)$/i + ++ ++ ++ /\.(nix)$/i ++ ++ ++ ++ ++ + + + /\.(rb|rbw|ruby|rake)$/i diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 87709ec102b..1097780723e 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -2,21 +2,23 @@ xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }: stdenv.mkDerivation rec { - rev = "ab240373f69824c56e9255d452b689cff3b1ecfb"; - build = "2017-05-09-${builtins.substring 0 10 rev}"; + rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed"; + build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}"; name = "far2l-2.1.${build}"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = rev; - sha256 = "1b6w6xhja3xkfzhrdy8a8qpbhxws75khm1zhwz8sc8la9ykd541q"; + sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8"; }; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; buildInputs = [ wxGTK30 glib pcre ]; + patches = [ ./add-nix-syntax-highlighting.patch ]; + postPatch = '' echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh @@ -62,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An orthodox file manager"; - homepage = http://github.com/elfmz/far2l; + homepage = https://github.com/elfmz/far2l; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 10ce0c17758..939b38ca29f 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://wammu.eu/gammu/; + homepage = https://wammu.eu/gammu/; description = "Command line utility and library to control mobile phones"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 7585ef6710a..cef8640d958 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://pwmt.org/projects/girara/; + homepage = https://pwmt.org/projects/girara/; description = "User interface library"; longDescription = '' girara is a library that implements a GTK+ based VIM-like user interface diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 8654e7f3a26..b9cbf8064a0 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE +{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which , IOKit ? null }: with stdenv.lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig which ]; buildInputs = [gettext glib gtk2 libX11 libSM libICE] ++ optionals stdenv.isDarwin [ IOKit ]; @@ -20,23 +20,23 @@ stdenv.mkDerivation rec { # Makefiles are patched to fix references to `/usr/X11R6' and to add # `-lX11' to make sure libX11's store path is in the RPATH. patchPhase = '' - echo "patching makefiles..." - for i in Makefile src/Makefile server/Makefile - do - sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" - done ''; + echo "patching makefiles..." + for i in Makefile src/Makefile server/Makefile + do + sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" + done + ''; - installPhase = '' - make DESTDIR=$out install - ''; + makeFlags = [ "STRIP=-s" ]; + installFlags = [ "DESTDIR=$(out)" ]; - meta = { + meta = { description = "Themeable process stack of system monitors"; - longDescription = - '' GKrellM is a single process stack of system monitors which supports - applying themes to match its appearance to your window manager, Gtk, - or any other theme. - ''; + longDescription = '' + GKrellM is a single process stack of system monitors which + supports applying themes to match its appearance to your window + manager, Gtk, or any other theme. + ''; homepage = http://gkrellm.srcbox.net; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 025be1e4564..3be2704896e 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { Also, supports CTRL-R / CTRL-S / "!" for searching through history. Running commands in a terminal with CTRL-Enter. URL handlers. ''; - homepage = http://sourceforge.net/projects/gmrun/; + homepage = https://sourceforge.net/projects/gmrun/; license = "GPL"; maintainers = []; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 07fcf31ed26..a51ec8c1b04 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Application for viewing, editing and converting GPS coordinate data"; - homepage = http://activityworkshop.net/software/gpsprune/; + homepage = https://activityworkshop.net/software/gpsprune/; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 2431e7b7cbb..e03abb8bf95 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "12450"; + version = "12545"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1l817mclbzyin9yh16q9jcqi31cz0qy6yi31hc8jp5ablknk979j"; + sha256 = "0817mjc4118b5hhfvx67bib1lhcg8mdkzibrpa2mb7hrv38q56y4"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 030b1d326e1..f6814119b5a 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = http://www.keepassx.org/; + homepage = https://www.keepassx.org/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index d0bddbc1610..ed706b138cc 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = http://www.keepassx.org/; + homepage = https://www.keepassx.org/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/postage/default.nix new file mode 100644 index 00000000000..17f718182e2 --- /dev/null +++ b/pkgs/applications/misc/postage/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } : + +stdenv.mkDerivation rec { + name = "postage-${version}"; + version = "3.2.17"; + + src = fetchFromGitHub { + owner = "workflowproducts"; + repo = "postage"; + rev = "eV${version}"; + sha256 = "1c9ss5vx8s05cgw68z7y224qq8z8kz8rxfgcayd2ny200kqyn5bl"; + }; + + buildInputs = [ postgresql openssl ]; + + meta = with stdenv.lib; { + description = "A fast replacement for PGAdmin"; + longDescription = '' + At the heart of Postage is a modern, fast, event-based C-binary, built in + the style of NGINX and Node.js. This heart makes Postage as fast as any + PostgreSQL interface can hope to be. + ''; + homepage = http://www.workflowproducts.com/postage.html; + license = licenses.asl20; + maintainers = [ maintainers.basvandijk ]; + }; +} diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index a54e5e0c370..b056bdedb41 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = "--enable-ssl"; meta = with stdenv.lib; { - homepage = http://www.dillo.org/; + homepage = https://www.dillo.org/; description = "A fast graphical web browser with a small footprint"; longDescription = '' Dillo is a small, fast web browser, tailored for older machines. diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index b1d77afa8f1..7383e0ec044 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimal web browser"; - homepage = http://pwmt.org/projects/jumanji/; + homepage = https://pwmt.org/projects/jumanji/; platforms = platforms.all; maintainers = [ maintainers.koral ]; }; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index dc7d2b8b2ea..0ac872c35c9 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,10 +4,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd" - else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj"; + then "1hkr5s1c72sqf156lk6gsnbfs75jnpqs42f64a7mz046c06kv98f" + else "00xw0c66x58g915989fc72mwliysxi5glrkdafi3gcfmlhrnc68i"; pname = "helm"; - version = "2.5.0"; + version = "2.5.1"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 3db20d3de4c..438efdc813c 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -24,7 +24,7 @@ python34Packages.buildPythonApplication rec { unreadable white text. An interface with almost infinite customization and extensibility using the excellent Python programming language. ''; - homepage = http://codezen.org/canto-ng/; + homepage = https://codezen.org/canto-ng/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index 18837299e93..c50647ac7b0 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -24,7 +24,7 @@ python34Packages.buildPythonApplication rec { unreadable white text. An interface with almost infinite customization and extensibility using the excellent Python programming language. ''; - homepage = http://codezen.org/canto-ng/; + homepage = https://codezen.org/canto-ng/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 6c3731b82a4..814f6bb5548 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { ++ lib.optional (transmission != null) transmissionrpc; meta = { - homepage = http://flexget.com/; + homepage = https://flexget.com/; description = "Multipurpose automation tool for content like torrents"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ domenkozar tari ]; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index e64561bc4c9..6643f385074 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { pugixml libfilezilla nettle ]; meta = with stdenv.lib; { - homepage = http://filezilla-project.org/; + homepage = https://filezilla-project.org/; description = "Graphical FTP, FTPS and SFTP client"; license = licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 946d0dedba0..4117d409b93 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Powerful network analysis framework that is much different from the typical IDS you may know"; - homepage = http://www.bro.org/; + homepage = https://www.bro.org/; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index abb0a117297..fa1c64ba0ad 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { Messenger, AIM and ICQ. ''; - homepage = http://www.bitlbee.org/; + homepage = https://www.bitlbee.org/; license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington pSub ]; diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index f8acc180700..baa0b10fd75 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A popular and easy to use graphical IRC (chat) client"; - homepage = http://hexchat.github.io/; + homepage = https://hexchat.github.io/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ romildo jgeerds ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 606e5593593..d9af01bdad4 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - version = "0.24.2"; + version = "0.25"; name = "notmuch-${version}"; passthru = { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0lfchvapk11qazdgsxj42igp9mpp83zbd0h1jj6r3ifmhikajxma"; + sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5"; }; buildInputs = [ diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 6b91956e5e3..d1834217724 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { network are rewarded with better service. ''; - homepage = http://gnunet.org/; + homepage = https://gnunet.org/; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index be385c5bc8b..8c8d95169c8 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { network are rewarded with better service. ''; - homepage = http://gnunet.org/; + homepage = https://gnunet.org/; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 97e081f908e..cfd72601d1e 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - major = "1.4"; + major = "1.5"; version = "${major}.0"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2"; - sha256 = "0k93mq3lf73dch81p4zxi0bdll567acxfa81qzbzkqflgsjb1ccg"; + sha256 = "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz"; }; buildInputs = [ zlib bzip2 lzma perl ]; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 827c1448693..f8391a2d6b3 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - major = "1.4"; + major = "1.5"; version = "${major}.0"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2"; - sha256 = "1x73c0lxvd58ghrmaqqyp56z7bkmp28a71fk4ap82j976pw5pbls"; + sha256 = "1xidmv0jmfy7l0kb32hdnlshcxgzi1hmygvig0cqrq1fhckdlhl5"; }; buildInputs = [ zlib ncurses ]; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 7cf0aeb203d..8cf4bb9b6d2 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.30"; src = fetchurl { - url = "http://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; + url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; name = "${name}.tar.gz"; sha256 = "025pacb4ax864fn5x8k78mw6hiig4jcazblj18gzxspg4f1l5n1g"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "High-performance theorem prover and SMT solver"; - homepage = "http://alt-ergo.ocamlpro.com/"; + homepage = "https://alt-ergo.ocamlpro.com/"; license = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index f11a23def6a..1e23cfea27f 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { unixODBC libxml2 libuuid + zlib ] ++ (with xorg; [ libX11 libXext @@ -93,6 +94,12 @@ stdenv.mkDerivation rec { echo "=== Running MathInstaller ===" ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent + + # Fix library paths + cd $out/libexec/Mathematica/Executables + for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do + sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path + done ''; preFixup = '' diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix index b5e9fa6a51e..0d5c79fde90 100644 --- a/pkgs/applications/science/misc/motu-client/default.nix +++ b/pkgs/applications/science/misc/motu-client/default.nix @@ -1,11 +1,11 @@ { python27Packages, fetchurl, lib } : python27Packages.buildPythonApplication rec { name = "motu-client-${version}"; - version = "1.0.8"; + version = "1.4.00"; src = fetchurl { - url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz"; - sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2"; + url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz"; + sha256 = "0v0h90mylhaamd1vm4nc64q63vmlafhijm47hs0xfam33y1q2yvb"; }; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index e7511e10d40..518db7708b7 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://git.zx2c4.com/cgit/about/; + homepage = https://git.zx2c4.com/cgit/about/; repositories.git = git://git.zx2c4.com/cgit; description = "Web frontend for git repositories"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 7cc2c8b778a..746801eb908 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -198,7 +198,7 @@ EOF enableParallelBuilding = true; meta = { - homepage = http://git-scm.com/; + homepage = https://git-scm.com/; description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index c93ee924466..4b6ba9398b4 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -26,7 +26,7 @@ python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/msiemens/PyGitUp; + homepage = https://github.com/msiemens/PyGitUp; description = "A git pull replacement that rebases all local branches when pulling."; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 6eb9e94e969..60c31cf07f9 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { - homepage = http://damien.douxchamps.net/ieee1394/coriander/; + homepage = https://damien.douxchamps.net/ieee1394/coriander/; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 5e8e63564f4..8ceb7875be4 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Linux DVB API applications and utilities"; - homepage = http://linuxtv.org/; + homepage = https://linuxtv.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 33e64c65cf4..09cdf20ace0 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -138,7 +138,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://kodi.tv/; + homepage = https://kodi.tv/; description = "Media center"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index c5ad331987b..e98500f8e76 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -19,7 +19,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://forum.kodi.tv/showthread.php?tid=85724; + homepage = https://forum.kodi.tv/showthread.php?tid=85724; description = "A program launcher for Kodi"; longDescription = '' Advanced Launcher allows you to start any Linux, Windows and @@ -49,7 +49,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://forum.kodi.tv/showthread.php?tid=287826; + homepage = https://forum.kodi.tv/showthread.php?tid=287826; description = "A program launcher for Kodi"; longDescription = '' Advanced Emulator Launcher is a multi-emulator front-end for Kodi @@ -129,7 +129,7 @@ rec { sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; }; meta = with stdenv.lib; { - homepage = http://forum.kodi.tv/showthread.php?tid=258159; + homepage = https://forum.kodi.tv/showthread.php?tid=258159; description = "A ROM launcher for Kodi that uses HyperSpin assets."; maintainers = with maintainers; [ edwtjo ]; }; @@ -184,7 +184,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://forum.kodi.tv/showthread.php?tid=67110; + homepage = https://forum.kodi.tv/showthread.php?tid=67110; description = "Watch content from SVT Play"; longDescription = '' With this addon you can stream content from SVT Play @@ -234,7 +234,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://forum.kodi.tv/showthread.php?tid=157499; + homepage = https://forum.kodi.tv/showthread.php?tid=157499; description = "Launch Steam in Big Picture Mode from Kodi"; longDescription = '' This add-on will close/minimise Kodi, launch Steam in Big @@ -263,7 +263,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://forum.kodi.tv/showthread.php?tid=187421; + homepage = https://forum.kodi.tv/showthread.php?tid=187421; descritpion = "A comic book reader"; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index b0214f4faa3..3707f32c9d3 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -26,13 +26,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "20.0.0"; + version = "20.0.1"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "07xjrr86722b05f88z77hzcrkkdlcz3pndaw600ip5xqhsyjy330"; + sha256 = "1f701rh4w88ba48b50y16fvmzzsyv4y5nv30mrx3pb2ni7wyanld"; }; patches = [ ./find-xcb.patch ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 74feae05b41..b381a2547be 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -161,7 +161,7 @@ rec { ''; meta = { - homepage = http://www.docker.com/; + homepage = https://www.docker.com/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook vdemeester ]; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 83e1ea3e88d..16c624b09cc 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager based on binary space partitioning"; - homepage = http://github.com/baskerville/bspwm; + homepage = https://github.com/baskerville/bspwm; maintainers = with maintainers; [ meisternu epitrochoid ]; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index dc6c30d00e4..412cdf91e0b 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = { description = "Compoziting window manager"; - homepage = http://launchpad.net/compiz/; + homepage = https://launchpad.net/compiz/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index ade6182ec7b..fd47a104326 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "A simple screen locker like slock"; - homepage = http://i3wm.org/i3lock/; + homepage = https://i3wm.org/i3lock/; maintainers = with maintainers; [ garbas malyn ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 9d7b4502565..a979797d080 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple screen locker like slock"; - homepage = http://i3wm.org/i3lock/; + homepage = https://i3wm.org/i3lock/; maintainers = with maintainers; [ garbas malyn domenkozar ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 41bfc84c247..4861d4b7c35 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -132,7 +132,7 @@ rec { http://ftp.riken.jp/net/samba ]; - # BitlBee mirrors, see http://www.bitlbee.org/main.php/mirrors.html . + # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . bitlbee = [ http://get.bitlbee.org/ http://get.bitlbee.be/ diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index def57149f22..b77b79338c7 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux development manual pages"; - homepage = http://www.kernel.org/doc/man-pages/; + homepage = https://www.kernel.org/doc/man-pages/; repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index ff8813f7813..3ac2c943299 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -14,7 +14,7 @@ in fetchzip rec { sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f"; meta = with stdenv.lib; { - homepage = http://www.marksimonson.com/fonts/view/anonymous-pro; + homepage = https://www.marksimonson.com/fonts/view/anonymous-pro; description = "TrueType font set intended for source code"; longDescription = '' Anonymous Pro (2009) is a family of four fixed-width fonts diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 0626ab8e489..b72e5a27391 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { sha256 = "0w35jkvfnzn4clm3010wv13sil2yj6pxffx40apjp7yhh19c4sw7"; meta = with stdenv.lib; { - homepage = http://be5invis.github.io/Iosevka/; + homepage = https://be5invis.github.io/Iosevka/; downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' Slender monospace sans-serif and slab-serif typeface inspired by Pragmata diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index bfc76b69b65..852fdec82f8 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -14,7 +14,7 @@ fetchzip rec { meta = { description = "An arab fixed-width font"; - homepage = http://makkuk.com/kawkab-mono/; + homepage = https://makkuk.com/kawkab-mono/; license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 1320ad8438f..9b132463972 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -18,7 +18,7 @@ in fetchzip { meta = with stdenv.lib; { homepage = http://opendyslexic.org/; description = "Font created to increase readability for readers with dyslexia"; - license = "Bitstream Vera License (http://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; + license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; maintainers = [maintainers.rycee]; }; diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix index 2807bd6d435..6f3762c971c 100644 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -19,7 +19,7 @@ fetchzip { Open Sans is a humanist sans serif typeface designed by Steve Matteson, Type Director of Ascender Corp. ''; - homepage = http://en.wikipedia.org/wiki/Open_Sans; + homepage = https://en.wikipedia.org/wiki/Open_Sans; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index 08c330809e8..95c56882187 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -18,7 +18,7 @@ in fetchzip { description = "A set of monospaced OpenType fonts designed for coding environments"; maintainers = with stdenv.lib.maintainers; [ relrod ]; platforms = with stdenv.lib.platforms; all; - homepage = http://blog.typekit.com/2012/09/24/source-code-pro/; + homepage = https://blog.typekit.com/2012/09/24/source-code-pro/; license = stdenv.lib.licenses.ofl; }; } diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 083ea80a69d..e5a3faf7742 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Default fallback theme used by implementations of the icon theme specification"; - homepage = http://icon-theme.freedesktop.org/releases/; + homepage = https://icon-theme.freedesktop.org/releases/; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 22cd14fe4ab..275ae6dc2d8 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://curl.haxx.se/docs/caextract.html; + homepage = https://curl.haxx.se/docs/caextract.html; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; maintainers = with maintainers; [ wkennington fpletz ]; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 7b23d91e549..dc8181414ce 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.gnome.org/; + homepage = https://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index de06c671e72..d5be7137c8f 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gtkglext/; + homepage = https://projects.gnome.org/gtkglext/; description = "GtkGLExt, an OpenGL extension to GTK+"; longDescription = '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix index 340825cd666..559e9b8575a 100644 --- a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { doCheck = false; # would need pythonPackages.dogTail, which is missing meta = with stdenv.lib; { - homepage = http://www.gnome.org/projects/evince/; + homepage = https://www.gnome.org/projects/evince/; description = "GNOME's document viewer"; longDescription = '' diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix index d3b2d814b16..1729ec06623 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gconf/; + homepage = https://projects.gnome.org/gconf/; description = "A system for storing application preferences"; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix index c329d68674a..f22f4665c14 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Disks; + homepage = https://en.wikipedia.org/wiki/GNOME_Disks; description = "A udisks graphical front-end"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix index 7daf9a7a310..34f8cee625a 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; + homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; description = "Utility used in the GNOME desktop environment for taking screenshots"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix index cbb52c9aaa1..4f56439311e 100644 --- a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix +++ b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.gnome.org/; + homepage = https://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix index 3181348d843..09b83e14923 100644 --- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.gnome.org/; + homepage = https://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 76caf12ffd3..7ece0ffda53 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Clozure Common Lisp"; - homepage = http://ccl.clozure.com/; + homepage = https://ccl.clozure.com/; maintainers = with maintainers; [ raskin muflax tohl ]; platforms = attrNames options; license = licenses.lgpl21; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index f51e3af25ee..1e6e0e8c1f6 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -34,7 +34,7 @@ edk2 = stdenv.mkDerivation { meta = { description = "Intel EFI development kit"; - homepage = http://sourceforge.net/projects/edk2/; + homepage = https://sourceforge.net/projects/edk2/; license = stdenv.lib.licenses.bsd2; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix index 4f1f2947931..4a60b3dfb38 100644 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ b/pkgs/development/compilers/elm/packages/elm-package.nix @@ -29,7 +29,7 @@ mkDerivation { zip-archive ]; jailbreak = true; - homepage = http://github.com/elm-lang/elm-package; + homepage = https://github.com/elm-lang/elm-package; description = "Package manager for Elm libraries"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e95ef92c3f6..c9780077835 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -325,7 +325,13 @@ stdenv.mkDerivation ({ NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + preConfigure = + # Not sure why this is causing problems, now that the stdenv + # exports CPP=cpp the build fails with strange errors on darwin. + # https://github.com/NixOS/nixpkgs/issues/27889 + stdenv.lib.optionalString stdenv.cc.isClang '' + unset CPP + '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index e5ec3659f0b..f82fc17634d 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source COBOL compiler"; - homepage = http://sourceforge.net/projects/open-cobol/; + homepage = https://sourceforge.net/projects/open-cobol/; license = licenses.gpl3; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index 2a7bf39c45c..1ce60d40716 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = http://julialang.org/; + homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 0df7da4a43f..63252084b5d 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = http://julialang.org/; + homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 4dfe5dc0dc3..cfddb862f59 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = http://julialang.org/; + homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ffa7030d98b..74e1c21c581 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -164,6 +164,12 @@ self: super: { vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ]; + # vector with ghc < 8.0 needs semigroups + vector = addBuildDepend super.vector self.semigroups; + + # too strict dependency on directory + tasty-ant-xml = doJailbreak super.tasty-ant-xml; + # https://github.com/thoughtpolice/hs-ed25519/issues/13 ed25519 = dontCheck super.ed25519; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a879b465d2f..3590fed19d2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -31584,7 +31584,7 @@ self: { executableHaskellDepends = [ base criterion optparse-applicative silently text turtle ]; - homepage = "http://github.com/Gabriel439/bench"; + homepage = "https://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -31602,7 +31602,7 @@ self: { executableHaskellDepends = [ base criterion optparse-applicative silently text turtle ]; - homepage = "http://github.com/Gabriel439/bench"; + homepage = "https://github.com/Gabriel439/bench"; description = "Command-line benchmark tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -63655,7 +63655,7 @@ self: { http-types mtl network optparse-applicative pretty process text time unordered-containers vector zip-archive ]; - homepage = "http://github.com/elm-lang/elm-package"; + homepage = "https://github.com/elm-lang/elm-package"; description = "Package manager for Elm libraries"; license = stdenv.lib.licenses.bsd3; }) {}; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index c088f02ed69..8c724577359 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "A Lisp dialect for the JVM"; - homepage = http://clojure.org/; + homepage = https://clojure.org/; license = stdenv.lib.licenses.bsd3; longDescription = '' Clojure is a dynamic programming language that targets the Java diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 96b53e1ad63..4ae47d338a6 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast multi-dimensional array library for C++"; - homepage = http://sourceforge.net/projects/blitz/; + homepage = https://sourceforge.net/projects/blitz/; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.aherrmann ]; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 809d373233d..313ac086726 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://sourceforge.net/projects/buddy/; + homepage = https://sourceforge.net/projects/buddy/; description = "Binary decision diagram package"; license = "as-is"; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index d49bd7eac1b..93c187ec35e 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -14,7 +14,7 @@ ''; meta = with stdenv.lib; { - homepage = http://heasarc.gsfc.nasa.gov/fitsio/; + homepage = https://heasarc.gsfc.nasa.gov/fitsio/; description = "Library for reading and writing FITS data files"; longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index e1e4604e51f..41bde5374e8 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ]; meta = with stdenv.lib; { - homepage = http://acoustid.org/chromaprint; + homepage = https://acoustid.org/chromaprint; description = "AcoustID audio fingerprinting library"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index f97dd80d741..8d2c4bb7dd3 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; meta = { - homepage = http://sourceforge.net/apps/mediawiki/cppunit/; + homepage = https://sourceforge.net/apps/mediawiki/cppunit/; description = "C++ unit testing framework"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index ed6728482aa..b486a327466 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ]; meta = with stdenv.lib; { - homepage = http://libopenraw.freedesktop.org/wiki/Exempi/; + homepage = https://libopenraw.freedesktop.org/wiki/Exempi/; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 43a5eb2103d..59dc4721812 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A high-quality implementation of the AAC codec from Android"; - homepage = http://sourceforge.net/projects/opencore-amr/; + homepage = https://sourceforge.net/projects/opencore-amr/; license = licenses.asl20; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 5aa62a638fe..6b95d0f1692 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ffmpeg ]; meta = with stdenv.lib; { - homepage = http://github.com/FFMS/ffms2/; + homepage = https://github.com/FFMS/ffms2/; description = "Libav/ffmpeg based source library for easy frame accurate access"; license = licenses.mit; maintainers = with maintainers; [ fuuzetsu ]; diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix index f33c889e56c..d4afc7ad481 100644 --- a/pkgs/development/libraries/ftgl/2.1.2.nix +++ b/pkgs/development/libraries/ftgl/2.1.2.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://sourceforge.net/apps/mediawiki/ftgl/; + homepage = https://sourceforge.net/apps/mediawiki/ftgl/; description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index d303beeb4ea..5e94618376b 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [freetype mesa]; meta = { - homepage = http://sourceforge.net/apps/mediawiki/ftgl/; + homepage = https://sourceforge.net/apps/mediawiki/ftgl/; description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index cf27249064f..0d53d00737b 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (rec { meta = { description = "The Git linkable library"; - homepage = http://libgit2.github.com/; + homepage = https://libgit2.github.com/; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 84c04468277..071941d66c3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library of programming buildings blocks"; - homepage = http://www.gtk.org/; + homepage = https://www.gtk.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 0b966c65f38..5c318c9b46a 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the GLib library"; - homepage = http://gtkmm.org/; + homepage = https://gtkmm.org/; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index 1cb7fd42cce..36067cc0786 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -60,7 +60,7 @@ let self = stdenv.mkDerivation rec { asymptotically faster algorithms. ''; - homepage = http://gmplib.org/; + homepage = https://gmplib.org/; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 9a69932d9bd..b39b56ec116 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -51,7 +51,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://gmplib.org/; + homepage = https://gmplib.org/; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 34119a3f153..e3bacc86d58 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -50,7 +50,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://gmplib.org/; + homepage = https://gmplib.org/; description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index c6240c40578..e3b345b31ee 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNU EFI development toolchain"; - homepage = http://sourceforge.net/projects/gnu-efi/; + homepage = https://sourceforge.net/projects/gnu-efi/; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index a1e28efbff4..a4169565511 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface for GStreamer"; - homepage = http://gstreamer.freedesktop.org/bindings/cplusplus.html; + homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html; license = licenses.lgpl21Plus; maintainers = with maintainers; [ romildo ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 9c5de42194e..16882c8a57d 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gstreamer pkgconfig ]; meta = { - homepage = http://gstreamer.freedesktop.org/modules/gnonlin.html; + homepage = https://gstreamer.freedesktop.org/modules/gnonlin.html; description = "Gstreamer Non-Linear Multimedia Editing Plugins"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 3fbaa9ad4e8..953f8900ade 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); meta = { - homepage = http://gstreamer.freedesktop.org/releases/gst-ffmpeg; + homepage = https://gstreamer.freedesktop.org/releases/gst-ffmpeg; description = "GStreamer's plug-in using FFmpeg"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index f181aa029bd..8acaefcedf4 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ bindings for the GStreamer streaming multimedia library"; - homepage = http://www.gtkmm.org/; + homepage = https://www.gtkmm.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ plcplc ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 3e94016d057..f312a14de24 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -4,7 +4,7 @@ }: # Note that since gst-libav-1.6, libav is actually ffmpeg. See -# http://gstreamer.freedesktop.org/releases/1.6/ for more info. +# https://gstreamer.freedesktop.org/releases/1.6/ for more info. assert withSystemLibav -> libav != null; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index f6e718d82e9..45222b7d7fc 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; - homepage = http://www.gtk.org/; + homepage = https://www.gtk.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 94f603bced2..1071af61448 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { royalties. ''; - homepage = http://www.gtk.org/; + homepage = https://www.gtk.org/; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 1ec2a7cd6f0..469c6adc6f7 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { tutorial. ''; - homepage = http://gtkmm.org/; + homepage = https://gtkmm.org/; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 49055f6b4a9..89230fab658 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { tutorial. ''; - homepage = http://gtkmm.org/; + homepage = https://gtkmm.org/; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 5116e39562c..0157fa1762c 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "GLib libusb wrapper"; - homepage = http://people.freedesktop.org/~hughsient/releases/; + homepage = https://people.freedesktop.org/~hughsient/releases/; license = stdenv.lib.licenses.lgpl21; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 497dfe2bb92..37c00f3e2aa 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -75,7 +75,7 @@ let meta = with stdenv.lib; { inherit longDescription; description = "Hunspell dictionary for ${shortDescription} from Dicollecte"; - homepage = http://www.dicollecte.org/home.php?prj=fr; + homepage = https://www.dicollecte.org/home.php?prj=fr; license = licenses.mpl20; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -118,7 +118,7 @@ let name = "hunspell-dict-${shortName}-linguistico-${version}"; readmeFile = dictFileName + "_README.txt"; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/linguistico/; + homepage = https://sourceforge.net/projects/linguistico/; license = licenses.gpl3; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 88586cdabba..f465cf1cc44 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { make make install popd + + sed -i "$out/lib/libldns.la" -e "s,-L${openssl.dev},-L${openssl.out},g" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index ee57859acc3..3a1c8938405 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { programs to output audio using a simple API on a wide variety of platforms. ''; - homepage = http://xiph.org/ao/; + homepage = https://xiph.org/ao/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 28d435fbb9c..94ebaed9c2a 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -118,7 +118,7 @@ let passthru = { inherit vdpauSupport; }; meta = with stdenv.lib; { - homepage = http://libav.org/; + homepage = https://libav.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 51f62b9bd5f..ab8b507e98b 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; - homepage = http://sourceforge.net/projects/libavc1394/; + homepage = https://sourceforge.net/projects/libavc1394/; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 83bd81456c0..a427bd99dd5 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://github.com/binaryanalysisplatform/bap-bindings; + homepage = https://github.com/binaryanalysisplatform/bap-bindings; description = "A C library for interacting with BAP"; maintainers = [ stdenv.lib.maintainers.maurer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 792a29eb1fb..5e906c7ac5d 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Common functions found on BSD systems"; - homepage = http://libbsd.freedesktop.org/; + homepage = https://libbsd.freedesktop.org/; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 22bda89c603..e217f5d96db 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { a file pointer. For handling of the parsed data a convenient API is available. ''; - homepage = http://sourceforge.net/projects/libcue/; + homepage = https://sourceforge.net/projects/libcue/; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index e20b1c95a19..57b56c37233 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C++ SDK which contains an implementation of DAP"; - homepage = http://www.opendap.org/download/libdap; + homepage = https://www.opendap.org/download/libdap; license = licenses.lgpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 2222825433e..75cf69035cb 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { cmakeFlags = "-DWITH_DOC=OFF"; meta = with stdenv.lib; { - homepage = http://launchpad.net/libdbusmenu-qt; + homepage = https://launchpad.net/libdbusmenu-qt; description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 036adcef74c..be7852e6cdd 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/libdc1394/; + homepage = https://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; license = licenses.lgpl21Plus; maintainers = [ maintainers.viric ]; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 8fe7ef4609a..96d346ad77e 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; meta = { - homepage = http://dri.freedesktop.org/libdrm/; + homepage = https://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index e8c374297d3..a5058de597e 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; - homepage = http://sourceforge.net/projects/libdv/; + homepage = https://sourceforge.net/projects/libdv/; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index f40f45d0e41..5f422f7018b 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.flamingspork.com/projects/libeatmydata/; + homepage = https://www.flamingspork.com/projects/libeatmydata/; license = stdenv.lib.licenses.gpl3Plus; description = "Small LD_PRELOAD library to disable fsync and friends"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 7b7f880ab9e..40d80329291 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extensible Binary Meta Language library"; license = licenses.lgpl21; - homepage = http://dl.matroska.org/downloads/libebml/; + homepage = https://dl.matroska.org/downloads/libebml/; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 06f0bc89c2b..ec53b50b5af 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for support of the Expert Witness Compression Format"; - homepage = http://sourceforge.net/projects/libewf/; + homepage = https://sourceforge.net/projects/libewf/; license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.raskin ] ; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 47814ef2f25..9639f4008f5 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Foreign function call library"; - homepage = http://www.haible.de/bruno/packages-ffcall.html; + homepage = https://www.haible.de/bruno/packages-ffcall.html; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 180aab09188..17cf93473d6 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to talk to FTDI chips using libusb"; - homepage = http://www.intra2net.com/en/developer/libftdi/; + homepage = https://www.intra2net.com/en/developer/libftdi/; license = with licenses; [ lgpl2 gpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index f0d05c0b263..2f499d3af87 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A library to talk to FTDI chips using libusb"; - homepage = http://www.intra2net.com/en/developer/libftdi/; + homepage = https://www.intra2net.com/en/developer/libftdi/; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 389f899e3ef..3d49fa06450 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; - homepage = http://www.remotesensing.org/geotiff/geotiff.html; + homepage = https://www.remotesensing.org/geotiff/geotiff.html; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index f2f062785b6..6e036522b1c 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME's Structured File Library"; - homepage = http://www.gnome.org/projects/libgsf; + homepage = https://www.gnome.org/projects/libgsf; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index 6a8af9ccac6..970cb8a530f 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libibumad ]; meta = with stdenv.lib; { - homepage = http://www.openfabrics.org/; + homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index 2f6a574c989..a7950de3aef 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.openfabrics.org/; + homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index aa76505c3a0..331422dd892 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = { - homepage = http://github.com/lastfm/liblastfm; + homepage = https://github.com/lastfm/liblastfm; repositories.git = git://github.com/lastfm/liblastfm.git; description = "Official LastFM library"; inherit (qt4.meta) platforms; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 37823af12e9..f6df090e8b5 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/mad/; + homepage = https://sourceforge.net/projects/mad/; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 81fa9011e30..9ad959ae22e 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to parse Matroska files"; - homepage = http://matroska.org/; + homepage = https://matroska.org/; license = licenses.lgpl21; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 8e684f7af1f..d36d483b92c 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { Whilst Profanity will run against libstrophe, libmesode provides extra TLS functionality such as manual SSL certificate verification. ''; - homepage = http://github.com/boothj5/libmesode/; + homepage = https://github.com/boothj5/libmesode/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 54cef0c4f5c..7e5ac2a2297 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-pcre"; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/mp3splt/; + homepage = https://sourceforge.net/projects/mp3splt/; description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; maintainers = with maintainers; [ bosu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 09d41c8bbe9..67aec7fc974 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { meta = { description = "A de/compression library for various Microsoft formats"; - homepage = http://www.cabextract.org.uk/libmspack; + homepage = https://www.cabextract.org.uk/libmspack; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index 1e445b20f68..a93c16d784d 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://github.com/sam-github/libnet; + homepage = https://github.com/sam-github/libnet; description = "Portable framework for low-level network packet construction"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 09be1b41353..7e9ae1608d2 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gupnp_igd ]; meta = { - homepage = http://nice.freedesktop.org/wiki/; + homepage = https://nice.freedesktop.org/wiki/; description = "The GLib ICE implementation"; longDescription = '' Libnice is an implementation of the IETF's Interactice Connectivity diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 15f58135040..c5cb85d91ba 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; meta = with stdenv.lib; { - homepage = http://xiph.org/ogg/; + homepage = https://xiph.org/ogg/; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 83bb80cc320..ed46919f26c 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; meta = { - homepage = http://xiph.org/oggz/; + homepage = https://xiph.org/oggz/; description = "A C library and tools for manipulating with Ogg files and streams"; longDescription = '' Oggz comprises liboggz and the tool oggz, which provides commands to diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 6328494c17e..5140402eacb 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./fedora-fixes.patch ]; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/omxil/; + homepage = https://sourceforge.net/projects/omxil/; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index f1c421b4bf7..98853d08cfe 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { }; meta = { - homepage = http://github.com/JonathanBeck/libplist; + homepage = https://github.com/JonathanBeck/libplist; platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix index add0a5bc2bb..a5e4c4410c0 100644 --- a/pkgs/development/libraries/libqrencode/default.nix +++ b/pkgs/development/libraries/libqrencode/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://fukuchi.org/works/qrencode/; + homepage = https://fukuchi.org/works/qrencode/; description = "A C library for encoding data in a QR Code symbol"; longDescription = '' diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 0047f30aad2..63a6b697eb2 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; - homepage = http://www.libraw.org/; + homepage = https://www.libraw.org/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 88666310158..945e11d1bce 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; - homepage = http://sourceforge.net/projects/lrdf/; + homepage = https://sourceforge.net/projects/lrdf/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix index 97aa0145956..877d8ed434c 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.0.10"; - sha256 = "1x5gvajplmwx869avlpx8p3c12pzi6wkgqaxmj5049nvw57l00kl"; + version = "1.0.11"; + sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i"; }) diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index b6f7411a1c2..06d9994a529 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenGL utility library"; - homepage = http://cgit.freedesktop.org/mesa/glu/; + homepage = https://cgit.freedesktop.org/mesa/glu/; license = stdenv.lib.licenses.sgi-b-20; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index a74905b5ba1..5a08e32e7e9 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; version = "${major}.0"; pname = "htslib"; - major = "1.4"; + major = "1.5"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2"; - sha256 = "0l1ki3sqfhawfn7fx9v7i2pm725jki4c5zij9j96xka5zwc8iz2w"; + sha256 = "0bcjmnbwp2bib1z1bkrp95w9v2syzdwdfqww10mkb1hxlmg52ax0"; }; buildInputs = [ zlib bzip2 lzma curl ]; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 92fe4b4ab27..fe90d41ccb2 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://github.com/opencollab/arpack-ng; + homepage = https://github.com/opencollab/arpack-ng; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue problems. diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 4a40806c4eb..48c2428bbcd 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A clean C library for processing UTF-8 Unicode data"; - homepage = http://julialang.org/utf8proc; + homepage = https://julialang.org/utf8proc; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.ftrvxmtrx ]; diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix new file mode 100644 index 00000000000..f2c6c649a83 --- /dev/null +++ b/pkgs/development/python-modules/cymem/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, cython +, python +}: +buildPythonPackage rec { + name = "cymem-${version}"; + version = "1.31.2"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "cymem"; + rev = "1.31.2"; + sha256 = "0miznr4kbdzw8yik3m96jmrlmln4qv7z3i3qdp7wjqr51zpqfm1k"; + }; + + propagatedBuildInputs = [ + cython + ]; + + checkPhase = '' + cd cymem/tests + ${python.interpreter} -m unittest discover -p "*test*" + ''; + + meta = with stdenv.lib; { + description = "Cython memory pool for RAII-style memory management"; + homepage = https://github.com/explosion/cymem; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix new file mode 100644 index 00000000000..13f35d110c7 --- /dev/null +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, vobject, mock, tox, pytestcov, pytest-django, pytest, shortuuid +, django, six +}: + +buildPythonPackage rec { + pname = "django-extensions"; + version = "1.8.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "${pname}"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "08rd9zswvjb9dixzyd3p3l3hw3wwhqkgyjvid65niybzjl1xdb5h"; + }; + + buildInputs = [ vobject mock tox pytestcov pytest-django pytest shortuuid ]; + + propagatedBuildInputs = [ django six ]; + + meta = with stdenv.lib; { + description = "A collection of custom extensions for the Django Framework"; + homepage = https://github.com/django-extensions/django-extensions; + licenses = [ licenses.mit ]; + }; +} diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix new file mode 100644 index 00000000000..c0aea987781 --- /dev/null +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, html5lib +, wcwidth +, nose +, python +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "ftfy"; + version = "4.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; + }; + + propagatedBuildInputs = [ html5lib wcwidth]; + + buildInputs = [ + nose + ]; + + checkPhase = '' + nosetests -v + ''; + + meta = with stdenv.lib; { + description = "Given Unicode text, make its representation consistent and possibly less broken."; + homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/python-modules/gst-python/default.nix similarity index 71% rename from pkgs/development/libraries/gstreamer/python/default.nix rename to pkgs/development/python-modules/gst-python/default.nix index 4c3cdd90127..9a4a19d5961 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,12 +1,11 @@ -{ fetchurl, stdenv, pkgconfig, pythonPackages -, gst-plugins-base -, ncurses +{ fetchurl, stdenv, pkgconfig, python, pygobject3 +, gst-plugins-base, ncurses }: -let - inherit (pythonPackages) python pygobject3; -in stdenv.mkDerivation rec { - name = "gst-python-1.10.4"; +stdenv.mkDerivation rec { + pname = "gst-python"; + version = "1.10.4"; + name = "${pname}-${version}"; src = fetchurl { urls = [ @@ -26,11 +25,14 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses ]; preConfigure = '' - export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides" + export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.sitePackages}/gi/overrides" ''; propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; + # Needed for python.buildEnv + passthru.pythonPath = []; + meta = { homepage = http://gstreamer.freedesktop.org; diff --git a/pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch b/pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch similarity index 100% rename from pkgs/development/libraries/gstreamer/python/different-path-with-pygobject.patch rename to pkgs/development/python-modules/gst-python/different-path-with-pygobject.patch diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix new file mode 100644 index 00000000000..aa5e3358866 --- /dev/null +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, cython +, python +}: + +buildPythonPackage rec { + name = "murmurhash-${version}"; + version = "0.26.4"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "murmurhash"; + rev = "0.26.4"; + sha256 = "0n2j0glhlv2yh3fjgbg4d79j1c1fpchgjd4vnpw908l9mzchhmdv"; + }; + + buildInputs = [ + cython + ]; + + checkPhase = '' + cd murmurhash/tests + ${python.interpreter} -m unittest discover -p "*test*" + ''; + + meta = with stdenv.lib; { + description = "Cython bindings for MurmurHash2"; + homepage = https://github.com/explosion/murmurhash; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix new file mode 100644 index 00000000000..4ca6d0e08d1 --- /dev/null +++ b/pkgs/development/python-modules/plac/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "plac"; + version = "0.9.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "16zqpalx4i1n1hrcvaj8sdixapy2g76fc13bbahz0xc106d72gxs"; + }; + + checkPhase = '' + cd doc + ${python.interpreter} -m unittest discover -p "*test_plac*" + ''; + + meta = with stdenv.lib; { + description = "Parsing the Command Line the Easy Way"; + homepage = https://github.com/micheles/plac; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix new file mode 100644 index 00000000000..d82408e620e --- /dev/null +++ b/pkgs/development/python-modules/preshed/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, cython +, cymem +, python +}: +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "preshed"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pdl4p2d32ficfh18xdkgsj6ajzdxc6mxhhf84z0wq1l8viskcx6"; + }; + + propagatedBuildInputs = [ + cython + cymem + ]; + buildInputs = [ + pytest + ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + meta = with stdenv.lib; { + description = "Cython hash tables that assume keys are pre-hashed"; + homepage = https://github.com/explosion/preshed; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix new file mode 100644 index 00000000000..452f3f1d923 --- /dev/null +++ b/pkgs/development/python-modules/spacy/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, pkgs +, buildPythonPackage +, python +, fetchPypi +, fetchFromGitHub +, pytest +, cython +, cymem +, preshed +, pathlib2 +, numpy +, murmurhash +, plac +, six +, ujson +, dill +, requests +, ftfy +, thinc +, pip +}: +let + enableDebugging = true; + regexLocked = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "regex"; + version = "2017.04.05"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c95gf3jzz8mv52lkgq0h7sbasjwvdhghm4s0phmy5k9sr78f4fq"; + }; + }; +in buildPythonPackage rec { + name = "spacy-${version}"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "spaCy"; + rev = "v${version}"; + sha256 = "0v3bmmar31a6968y4wl0lmgnc3829l2mnwd8s959m4pqw1y1w648"; + }; + + propagatedBuildInputs = [ + cython + cymem + pathlib2 + preshed + numpy + murmurhash + plac + six + ujson + dill + requests + regexLocked + ftfy + thinc + pytest + pip + ]; + + doCheck = false; + # checkPhase = '' + # ${python.interpreter} -m pytest spacy/tests --vectors --models --slow + # ''; + + meta = with stdenv.lib; { + description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; + homepage = https://github.com/explosion/spaCy; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix new file mode 100644 index 00000000000..817ea6388f9 --- /dev/null +++ b/pkgs/development/python-modules/thinc/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, pkgs +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, pytest +, cython +, cymem +, preshed +, numpy +, python +, murmurhash +, hypothesis +, tqdm +, cytoolz +, plac +, six +, mock +, termcolor +, wrapt +, dill +}: + +let + enableDebugging = true; + + pathlibLocked = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pathlib"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; + }; + + doCheck = false; # fails to import support from test + }; +in buildPythonPackage rec { + name = "thinc-${version}"; + version = "6.5.1"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "thinc"; + rev = "v${version}"; + sha256 = "008kmjsvanh6qgnpvsn3qacfcyprxirxbw4yfd8flyg7mxw793ws"; + }; + + propagatedBuildInputs = [ + cython + cymem + preshed + numpy + murmurhash + pytest + hypothesis + tqdm + cytoolz + plac + six + mock + termcolor + wrapt + dill + pathlibLocked + ]; + + doCheck = false; + + # fails to import some modules + # checkPhase = '' + # ${python.interpreter} -m pytest thinc/tests + # # cd thinc/tests + # # ${python.interpreter} -m unittest discover -p "*test*" + # ''; + + meta = with stdenv.lib; { + description = "Practical Machine Learning for NLP in Python"; + homepage = https://github.com/explosion/thinc; + license = licenses.mit; + maintainers = with maintainers; [ sdll ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index dcdc55f0aef..989d8bc7003 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.4.5"; meta = with stdenv.lib; { - homepage = http://github.com/bazelbuild/bazel/; + homepage = https://github.com/bazelbuild/bazel/; description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; maintainers = [ maintainers.philandstuff ]; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 1e5fb8458e5..05bf8e76db7 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://leiningen.org/; + homepage = https://leiningen.org/; description = "Project automation for Clojure"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix index 439e224c455..95f992e490f 100644 --- a/pkgs/development/tools/dcadec/default.nix +++ b/pkgs/development/tools/dcadec/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DTS Coherent Acoustics decoder with support for HD extensions"; maintainers = with maintainers; [ edwtjo ]; - homepage = http://github.com/foo86/dcadec; + homepage = https://github.com/foo86/dcadec; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index b46b0be748a..50668408834 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.gtk.org/gtk-doc; + homepage = https://www.gtk.org/gtk-doc; description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix index e6c7dcbd362..c2bf7e0a831 100644 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ b/pkgs/development/tools/misc/automoc4/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 ]; meta = with stdenv.lib; { - homepage = http://techbase.kde.org/Development/Tools/Automoc4; + homepage = https://techbase.kde.org/Development/Tools/Automoc4; description = "KDE Meta Object Compiler"; license = licenses.bsd2; maintainers = [ maintainers.sander ]; diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index eb81b7136f3..77cb8676669 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2; description = "Translator between GDB's remote debug protocol and the AVR JTAG ICE protocol"; - homepage = http://sourceforge.net/projects/avarice/files/avarice/; + homepage = https://sourceforge.net/projects/avarice/files/avarice/; maintainers = [ stdenv.lib.maintainers.smironov ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 2cc8e640631..51610349c45 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://sourceforge.net/projects/cbrowser/; + homepage = https://sourceforge.net/projects/cbrowser/; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 563d7693088..2564b42731b 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://sourceforge.net/projects/checkbaskisms/; + homepage = https://sourceforge.net/projects/checkbaskisms/; description = "Check shell scripts for non-portable syntax"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index e7c6b108cdd..f9a640d4703 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line shell and Unix scripting interface for Drupal"; - homepage = http://github.com/drush-ops/drush; + homepage = https://github.com/drush-ops/drush; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 30cbc0daab9..a6de652f900 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib dbus dbus_glib ]; meta = { - homepage = http://hal.freedesktop.org/releases/; + homepage = https://hal.freedesktop.org/releases/; description = "D-Bus bindings for GObject"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 537541e37bb..cb64bd602b7 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Translation helper tool"; - homepage = http://launchpad.net/intltool/; + homepage = https://launchpad.net/intltool/; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index ef8ac133b2c..f3f137da757 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { over configuration to provide a productive and stream-lined development experience. ''; - homepage = http://grails.org/; + homepage = https://grails.org/; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 2c54d9ef828..f61b8bc1dcf 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source game of ancient warfare -- data files"; - homepage = http://wildfiregames.com/0ad/; + homepage = https://wildfiregames.com/0ad/; license = licenses.cc-by-sa-30; platforms = platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 35d6487f21e..c1b69eb3120 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source game of ancient warfare"; - homepage = http://wildfiregames.com/0ad/; + homepage = https://wildfiregames.com/0ad/; license = with licenses; [ gpl2 lgpl21 mit cc-by-sa-30 licenses.zlib # otherwise masked by pkgs.zlib diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 93f341298a8..3f490b2976c 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://sourceforge.net/projects/btanks/; + homepage = https://sourceforge.net/projects/btanks/; description = "Fast 2d tank arcade game"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 0a94a1c433d..41110195509 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes. ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://sourceforge.net/projects/extremetuxracer/; + homepage = https://sourceforge.net/projects/extremetuxracer/; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 3be2d9757c0..d94a1f9a8d4 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ioquake3.org/; + homepage = https://ioquake3.org/; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 430a5348398..0bd40721c4e 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ghostscript and cups printer drivers"; - homepage = http://sourceforge.net/projects/gimp-print/; + homepage = https://sourceforge.net/projects/gimp-print/; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index be9a39e47e0..936378b05d6 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { - NEC's PC Engine, SuperGrafx; - Bandai' WonderSwan, WonderSwan Color. ''; - homepage = http://byuu.org/higan/; + homepage = https://byuu.org/higan/; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 319003400d0..c2ec16081e8 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -33,7 +33,7 @@ let meta = with stdenv.lib; { inherit description; - homepage = http://www.libretro.com/; + homepage = https://www.libretro.com/; license = licenses.gpl3Plus; maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index ac27f0f1505..479726e1304 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -32,15 +32,15 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.13"; + version = "2.14"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "1y3yb01lg90pi8a9qjmymg7kikwkmvpkjxi6bbk1q1lvs7fs7g3g"; + sha256 = "1ilmhwm7vlp4fbl5a5m3rwwfw8g821gkjkd01ih2ixw1a7ck9y83"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1ivjx5pf0xqqmdc1k5skg9saxgqzh3x01vjgypls7czmnpp3aylb"; + sha256 = "0mbklg0q3k5iavmwfbrwq4p8589ayikwq5q9wk87885xv32g176g"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index ae94c3de41b..6f3957379e5 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation { preConfigure = '' cd src sed -i "/^STRIP/d" configure + sed -i "/\$STRIP/d" configure ''; configureFlags = [ "--enable-release" ]; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 2467420046b..524121a898e 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { passthru = { inherit version; }; meta = { - homepage = http://www.ghostscript.com/; + homepage = https://www.ghostscript.com/; description = "PostScript interpreter (mainline version)"; longDescription = '' diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix index 17aa60162ad..dbc0beb1872 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/misc/themes/blackbird/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; - homepage = http://github.com/shimmerproject/Blackbird; + homepage = https://github.com/shimmerproject/Blackbird; license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index b815cd778fa..6dae0f6bb38 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { the "old" `apm' command on ACPI systems. It includes battery and thermal information. ''; - homepage = http://sourceforge.net/projects/acpiclient/; + homepage = https://sourceforge.net/projects/acpiclient/; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.mornfall ]; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 3a1407aae1f..9105f635ae9 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, information distribution tool"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 5f659eb9884..7ea8cf6d1bf 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 4270f37594e..4514e18f44f 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 2548e33bf4c..8adad41fb3b 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.27.1"; + name = "busybox-1.26.2"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468"; + sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns"; }; hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tiny versions of common UNIX utilities in a single small executable"; - homepage = http://busybox.net/; + homepage = https://busybox.net/; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index 13c1218e90c..0f8826ecf8d 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://github.com/grondo/edac-utils; + homepage = https://github.com/grondo/edac-utils; description = "Handles the reporting of hardware-related memory errors"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 54ca7d9e324..9e61c377ecf 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = ''http://www.gentoo.org/proj/en/eudev/''; + homepage = ''https://www.gentoo.org/proj/en/eudev/''; downloadPage = ''http://dev.gentoo.org/~blueness/eudev/''; updateWalker = true; }; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index e9af25809ed..9230e6920f9 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://l3net.wordpress.com/projects/firejail/; + homepage = https://l3net.wordpress.com/projects/firejail/; downloadPage = "http://sourceforge.net/projects/firejail/files/firejail/"; }; } diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index fa63cddfcdb..0f0eab1fa20 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; - homepage = http://sourceforge.net/projects/hdparm/; + homepage = https://sourceforge.net/projects/hdparm/; platforms = platforms.linux; license = licenses.bsd2; maintainers = [ maintainers.fuuzetsu ]; diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 014fe41afc8..c3730dd8de5 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)"; - homepage = http://sourceforge.net/projects/linux-ima/; + homepage = https://sourceforge.net/projects/linux-ima/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 0700191e7a8..6a070610662 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { - Asynchronous background rendering of the next page - Customizable multi-threaded caching ''; - homepage = http://seasonofcode.com/pages/jfbview.html; + homepage = https://seasonofcode.com/pages/jfbview.html; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix index 1cbba85b7ba..a7b6442cb6e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12.6"; + version = "4.12.7"; extraMeta.branch = "4.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ywkzqjl9rq672nwn74cw2d871hpzxkrlyx40lkkp4z1y440ijh1"; + sha256 = "14xyh5wyvp4pmvw4mz9lccw1ijshm7500ijmxzhc9ipjnmp5rhky"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 597d87c63fb..40c99cbfd88 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.42"; + version = "4.9.43"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ivq75vksd8rca881zyfimb6n43clr93gbgkd9w8p4qcj797f18a"; + sha256 = "1h0fv24pmrwmnpa6zzknqk7swq15z7dhkvy1hvzkjz4bfqgb28mx"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index c295293fa2c..70544ff9294 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -207,7 +207,7 @@ let + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches)) + ")"); license = stdenv.lib.licenses.gpl2; - homepage = http://www.kernel.org/; + homepage = https://www.kernel.org/; repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; maintainers = [ maintainers.thoughtpolice diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 5d0dca7b6be..c55ebffa829 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/; + homepage = https://www.kernel.org/pub/linux/utils/kernel/kmod/; description = "Tools for loading and managing Linux kernel modules"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 622bf4fbd5c..3adedf8c1dd 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; - homepage = http://linuxtv.org/projects.php; + homepage = https://linuxtv.org/projects.php; license = licenses.lgpl21Plus; maintainers = with maintainers; [ codyopel viric ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6d3ad657140..48389a758b7 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -107,6 +107,8 @@ in stdenv.mkDerivation rec { rm -rf $out/share/zfs/zfs-tests ''; + outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; + meta = { description = "ZFS Filesystem Linux Kernel module"; longDescription = '' diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index 8478804a7b0..d83e32bcb39 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.tinkerforge.com/; + homepage = https://www.tinkerforge.com/; description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages"; maintainers = [ stdenv.lib.maintainers.qknight ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix index caf3792e983..b4cbca22c30 100644 --- a/pkgs/servers/consul/ui.nix +++ b/pkgs/servers/consul/ui.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.consul.io/; + homepage = https://www.consul.io/; description = "A tool for service discovery, monitoring and configuration"; maintainers = with maintainers; [ cstrahan wkennington ]; license = licenses.mpl20 ; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 7e4c69e3862..4480d950766 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.22.0"; + version = "3.2.26.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0vc9391q1mi16k05yl5lqs2cmsgcid339pbqm9fyqzm33fk7d73r"; + sha256 = "04d06640g56f894ypxyp7q5ikbp29nw19w6z136b5kdjy97b6idr"; }; buildInputs = with pkgs; [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "MediaBrowser - Bring together your videos, music, photos, and live television"; - homepage = http://emby.media/; + homepage = https://emby.media/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.fadenb ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix index 3e097c0ebd4..3f600b5a122 100644 --- a/pkgs/servers/fleet/default.nix +++ b/pkgs/servers/fleet/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A distributed init system"; - homepage = http://coreos.com/using-coreos/clustering/; + homepage = https://coreos.com/using-coreos/clustering/; license = licenses.asl20; maintainers = with maintainers; [ cstrahan diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 5c72ac97bc0..a48ee83755b 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client library for MPD (music player daemon)"; - homepage = http://www.musicpd.org/libs/libmpdclient/; + homepage = https://www.musicpd.org/libs/libmpdclient/; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ mornfall ehmry ]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 5c9737660c4..97e7a9daf65 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; - homepage = http://freeswitch.org/; + homepage = https://freeswitch.org/; license = stdenv.lib.licenses.mpl11; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 7b725bfeb57..7868c2726ec 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/Bumblebee-Project/Bumblebee; + homepage = https://github.com/Bumblebee-Project/Bumblebee; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index eeaf5dac7c6..9de29da9b44 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows you to compose wallpapers ('root pixmaps') for X"; - homepage = http://thegraveyard.org/hsetroot.html; + homepage = https://thegraveyard.org/hsetroot.html; license = licenses.gpl2Plus; maintainers = [ maintainers.henrytill ]; platforms = platforms.unix; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 7a1eec92bbe..2e9d8cafdc0 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.cabextract.org.uk/; + homepage = https://www.cabextract.org.uk/; description = "Free Software for extracting Microsoft cabinet files"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index b8341204e92..ba029814f39 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6"; src = fetchurl { - url = "http://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" + url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" + "${name}.tar.gz"; sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; meta = with stdenv.lib; { - homepage = http://acoustid.org/fingerprinter; + homepage = https://acoustid.org/fingerprinter; description = "Audio fingerprinting tool using chromaprint"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index f7382997f16..91f7637e1bc 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; - homepage = http://brettcsmith.org/2007/dtrx/; + homepage = https://brettcsmith.org/2007/dtrx/; license = licenses.gpl3Plus; maintainers = [ maintainers.spwhitt ]; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 1eedff5c011..61c7f26db1e 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { User documentation is in Documentation/bcache.txt in the Linux kernel tree. ''; - homepage = http://bcache.evilpiepirate.org/; + homepage = https://bcache.evilpiepirate.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 2eeb2003a19..dc6bcca597b 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; - homepage = http://www.daniel-baumann.ch/software/dosfstools/; + homepage = https://www.daniel-baumann.ch/software/dosfstools/; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index dd49b19358c..c1502a3227d 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }: stdenv.mkDerivation rec { - version = "2.9"; + version = "2.10"; # Temporary (need to add libfuse 3.x first) name = "sshfs-fuse-${version}"; src = fetchFromGitHub { - repo = "sshfs"; owner = "libfuse"; + repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "1n0cq72ps4dzsh72fgfprqn8vcfr7ilrkvhzpy5500wjg88diapv"; + sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1"; }; buildInputs = [ pkgconfig glib fuse autoreconfHook ]; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/libfuse/sshfs; + inherit (src.meta) homepage; description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH"; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index ba28b67d75b..a5045f97b45 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://sourceforge.net/projects/briss/; + homepage = https://sourceforge.net/projects/briss/; description = "Java application for cropping PDF files"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 2b88ada21aa..8c53882ff1b 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Context-free design grammar - a tool for graphics generation"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - homepage = http://contextfreeart.org/; - downloadPage = "http://contextfreeart.org/mediawiki/index.php/Download_page"; + homepage = https://contextfreeart.org/; + downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page"; }; } diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/tools/graphics/cfdg/src-info-for-default.nix index 42295c82216..0e2018b6bfd 100644 --- a/pkgs/tools/graphics/cfdg/src-info-for-default.nix +++ b/pkgs/tools/graphics/cfdg/src-info-for-default.nix @@ -1,5 +1,5 @@ { - downloadPage = "http://contextfreeart.org/mediawiki/index.php/Download_page"; + downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page"; baseName = "cfdg"; sourceRegexp = ''.*[.]tgz''; versionExtractorSedScript = ''s/[^0-9]*([0-9.]*)[.]tgz/\1/''; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 95acb08fbf0..86848f95883 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://cgit.freedesktop.org/xorg/app/editres/; + homepage = https://cgit.freedesktop.org/xorg/app/editres/; description = "A dynamic resource editor for X Toolkit applications"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index fe01a9459ec..e4163cd93a8 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; meta = { - homepage = http://www.kernel.org/pub/software/graphics/pngtoico/; + homepage = https://www.kernel.org/pub/software/graphics/pngtoico/; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 40f61253306..104e423bd72 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = { - homepage = http://fukuchi.org/works/qrencode/; + homepage = https://fukuchi.org/works/qrencode/; description = "QR code encoder"; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 53aec187bb7..d1139259922 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "aescrypt-${version}"; src = fetchurl { - url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz"; + url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz"; sha256 = "1a1rs7xmbxh355qg3v02rln3gshvy3j6wkx4g9ir72l22mp6zkc7"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; - homepage = http://www.aescrypt.com/; + homepage = https://www.aescrypt.com/; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 43f69a82e7f..dc67c96ca1a 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -44,7 +44,7 @@ in }; meta = { - homepage = http://github.com/phillipberndt/autorandr/; + homepage = https://github.com/phillipberndt/autorandr/; description = "Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.coroa ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index d00e1abc7a5..82ae4d40f2d 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.112"; + version = "5.121"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "0avv1s8dh3z6rzkf1mn1375v3im1qc9c63w09yvwxdlcq5xznrsd"; + sha256 = "0rbwb7kh0f458ad51grrhz56889g6xj1c29c838pi37cjdgl3wjx"; }; doCheck = true; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index e34f4bc8f2f..a70cba3f3d0 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "1.0.1"; + version = "1.2.5"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "0y0igi5r5x2gxglm0aarn2mhdfn6whakm6359i3h0wkn6qw1p1l2"; + sha256 = "0yjljpqpcbi84ibbrxbm5cbgs16ada4cmvir744hygrdl948zzk3"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 396d26a6cd1..86a8d3f234b 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.4.1"; + version = "0.4.2"; name = "dateutils-${version}"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; - sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c"; + sha256 = "0sxl5rz9rw02dfn5mdww378hjgnnbxavs52viyfyx620b29finpc"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index 25e083b6bf5..8219d110f2e 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -8,7 +8,7 @@ bundlerEnv { meta = with lib; { description = "A data collector"; - homepage = http://www.fluentd.org/; + homepage = https://www.fluentd.org/; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix new file mode 100644 index 00000000000..24841a2bac7 --- /dev/null +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +let + goPackagePath = "github.com/github/gh-ost"; + version = "1.0.36"; + sha256 = "0qa7k50bf87bx7sr6iwqri8l49f811gs0bj3ivslxfibcs1z5d4h"; + +in { + gh-ost = buildGoPackage ({ + name = "gh-ost-${version}"; + inherit goPackagePath; + + src = fetchFromGitHub { + owner = "github"; + repo = "gh-ost"; + rev = "v${version}"; + inherit sha256; + }; + + meta = with stdenv.lib; { + description = "Triggerless online schema migration solution for MySQL"; + homepage = https://github.com/github/gh-ost; + license = licenses.mit; + platforms = platforms.linux; + }; + }); +} diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 634022e88e0..5b9130bbe0e 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper +, gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont , zfs ? null , efiSupport ? false , zfsSupport ? true @@ -30,18 +30,7 @@ let canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.x-2015-11-16"; - - unifont_bdf = fetchurl { - url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; - sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; - }; - - po_src = fetchurl { - name = "grub-2.02-beta2.tar.gz"; - url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz"; - sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm"; - }; + version = "2.02"; in ( @@ -52,13 +41,12 @@ assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { name = "grub-${version}"; - src = fetchFromSavannah { - repo = "grub"; - rev = "50d6f38febe80d4d3088dae1ee639b341787ab71"; - sha256 = "1pyn2qa8hwiabhgnzj86y4b69y4a37dh5n0j4csmm7xmgc13vvww"; + src = fetchurl { + url = "mirror://gnu/grub/${name}.tar.xz"; + sha256 = "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1"; }; - nativeBuildInputs = [ autogen flex bison python autoconf automake ]; + nativeBuildInputs = [ bison flex python ]; buildInputs = [ ncurses libusb freetype gettext devicemapper ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -68,6 +56,10 @@ stdenv.mkDerivation rec { # Work around a bug in the generated flex lexer (upstream flex bug?) NIX_CFLAGS_COMPILE = "-Wno-error"; + postPatch = '' + substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' + ''; + preConfigure = '' for i in "tests/util/"*.in do @@ -89,16 +81,6 @@ stdenv.mkDerivation rec { unset CPP # setting CPP intereferes with dependency calculation ''; - prePatch = - '' tar zxf ${po_src} grub-2.02~beta2/po - rm -rf po - mv grub-2.02~beta2/po po - sh autogen.sh - gunzip < "${unifont_bdf}" > "unifont.bdf" - sed -i "configure" \ - -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" - ''; - patches = [ ./fix-bash-completion.patch ]; configureFlags = optional zfsSupport "--enable-libzfs" diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 2a4de41332e..e50df02a118 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Manga downloader"; - homepage = http://sourceforge.net/projects/hakuneko/; + homepage = https://sourceforge.net/projects/hakuneko/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 192da26b452..ea71def3619 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; - homepage = http://www.hdfgroup.org/HDF5/; + homepage = https://www.hdfgroup.org/HDF5/; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index 1d1ff991f3b..9706e3f0288 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libibmad ]; meta = with stdenv.lib; { - homepage = http://www.openfabrics.org/; + homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c9b70ee0e64..4d292abc9ac 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { optional gnutlsSupport gnutls ++ optional scpSupport libssh2; - # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html + # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure rm src/tool_hugehelp.c @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line tool for transferring files with URL syntax"; - homepage = http://curl.haxx.se/; + homepage = https://curl.haxx.se/; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 333292d9fab..6d3ca27df1d 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -11,31 +11,31 @@ buildPerlPackage rec { outputs = [ "out" ]; - buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ]; + buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 ]; patches = [ ./ddclient-line-buffer-stdout.patch ]; # Use iproute2 instead of ifconfig preConfigure = '' touch Makefile.PL - substituteInPlace ddclient --replace 'in the output of ifconfig' 'in the output of ip addr show' - substituteInPlace ddclient --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' - substituteInPlace ddclient --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' + substituteInPlace ddclient \ + --replace 'in the output of ifconfig' 'in the output of ip addr show' \ + --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \ + --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' ''; installPhase = '' - mkdir -p $out/bin - cp ddclient $out/bin + install -Dm755 ddclient $out/bin/ddclient ''; + # there are no tests distributed with ddclient doCheck = false; meta = with stdenv.lib; { - homepage = https://sourceforge.net/p/ddclient/wiki/Home/; description = "Client for updating dynamic DNS service entries"; - license = licenses.gpl2Plus; - + homepage = https://sourceforge.net/p/ddclient/wiki/Home/; + license = licenses.gpl2Plus; # Mostly since `iproute` is Linux only. - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index beffb0c05e8..7204ddd5e06 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; - homepage = http://roy.marples.name/projects/dhcpcd; + homepage = https://roy.marples.name/projects/dhcpcd; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ eelco fpletz ]; }; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index c7a6fbcfd7c..d8c60882cd4 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Command line SMTP client"; license = with lib.licenses; [ gpl2 ]; - homepage = http://deanproxy.com/code; + homepage = https://deanproxy.com/code; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 84420aa3efb..b445dd93c4c 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A command line HTTP client whose goal is to make CLI human-friendly"; - homepage = http://httpie.org/; + homepage = https://httpie.org/; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ]; }; diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index 557fce6d94b..a7d42b77317 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = ""; - homepage = http://sourceforge.net/projects/hyenae/; + homepage = https://sourceforge.net/projects/hyenae/; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index fba6ae92b03..6f2ca96d120 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://sourceforge.net/projects/iperf/; + homepage = https://sourceforge.net/projects/iperf/; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index e95cba18e10..b9abba2cd0d 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.bsd3; - homepage = http://www.kernel.org/pub/software/network/tftp/; + homepage = https://www.kernel.org/pub/software/network/tftp/; }; passthru = { updateInfo = { - downloadPage = "http://www.kernel.org/pub/software/network/tftp/"; + downloadPage = "https://www.kernel.org/pub/software/network/tftp/"; }; }; } diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index cd9499d9146..795a605b3b6 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "1.7.0"; + version = "1.8.0"; name = "clib-${version}"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "08n2i3dyh5vnrb74a6wlqqn67c9nwkq0v0v651zzha495mqbciq7"; + sha256 = "0w1qiwq0jjrk8p848bmwxq4wvzhbd2zghq3qm8ylaj3z0xdw7ppk"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 0d7a5449d6e..d262253a51f 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Debian package manager"; - homepage = http://wiki.debian.org/Teams/Dpkg; + homepage = https://wiki.debian.org/Teams/Dpkg; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ mornfall nckx ]; diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index fdd49cc3c27..298dd336be1 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast password cracker"; - homepage = "http://hashcat.net/hashcat/"; + homepage = "https://hashcat.net/hashcat/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix index 1cb028a1a33..7a0d7241bbf 100644 --- a/pkgs/tools/security/hashcat/hashcat3/default.nix +++ b/pkgs/tools/security/hashcat/hashcat3/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast password cracker"; - homepage = http://hashcat.net/hashcat/; + homepage = https://hashcat.net/hashcat/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.kierdavis ]; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 506b1d398d5..8530aab4e70 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchurl, trousers, openssl, zlib }: stdenv.mkDerivation rec { - name = "tboot-1.8.2"; + name = "tboot-${version}"; + version = "1.9.6"; src = fetchurl { url = "mirror://sourceforge/tboot/${name}.tar.gz"; - sha256 = "1l9ccm7ik9fs7kzg1bjc5cjh0pcf4v0k1c84dmyr51r084i7p31m"; + sha256 = "0f9afz260xhycpd0x5zz6jn8ha14i8j98rck0fhb55l1rbbfwm8v"; }; + patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ]; + buildInputs = [ trousers openssl zlib ]; - patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ]; + enableParallelBuilding = true; hardeningDisable = [ "pic" "stackprotector" ]; @@ -27,8 +30,7 @@ stdenv.mkDerivation rec { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; homepage = http://sourceforge.net/projects/tboot/; license = licenses.bsd3; - maintainers = [ maintainers.ak ]; + maintainers = with maintainers; [ ak ]; platforms = platforms.linux; }; } - diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 185645763fd..4c1a5431f3e 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = ''The classical Unix `at' job scheduling command''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://packages.qa.debian.org/at; + homepage = https://packages.qa.debian.org/at; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index d2d14ddd110..13c2938f63b 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { different by pre-loading a small library which modifies the time, gettimeofday and clock_gettime system calls. ''; - homepage = http://packages.qa.debian.org/d/datefudge.html; + homepage = https://packages.qa.debian.org/d/datefudge.html; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 7b2ca93cc0d..80d6f6a42f8 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake gettext ]; meta = { - homepage = http://projects.gw-computing.net/projects/dfc; + homepage = https://projects.gw-computing.net/projects/dfc; description = "Displays file system space usage using graphs and colors"; license="free"; maintainers = with stdenv.lib.maintainers; [qknight]; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 7661db22cc1..381dc8dd457 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; - homepage = http://www.colordiff.org/; + homepage = https://www.colordiff.org/; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index aff11fd6127..5f926f771c5 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { This package contains the fop command line tool. ''; - homepage = http://xmlgraphics.apache.org/fop/; + homepage = https://xmlgraphics.apache.org/fop/; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ndowens ]; diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index 84cd2cf921a..f0ed44351a2 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "halibut-1.2"; src = fetchurl { - url = "http://www.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz"; + url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz"; sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Documentation production system for software manuals"; - homepage = http://www.chiark.greenend.org.uk/~sgtatham/halibut/; + homepage = https://www.chiark.greenend.org.uk/~sgtatham/halibut/; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6ae62db18d..3b507cfe74d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1049,6 +1049,8 @@ with pkgs; genromfs = callPackage ../tools/filesystems/genromfs { }; + gh-ost = callPackage ../tools/misc/gh-ost { }; + gist = callPackage ../tools/text/gist { }; glide = callPackage ../development/tools/glide { }; @@ -6336,6 +6338,7 @@ with pkgs; python = python2; python2 = python27; python3 = python36; + pypy = pypy27; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -6369,17 +6372,22 @@ with pkgs; self = python36; }; - # Should eventually be moved inside Python interpreters. - python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; - - pypy = pypy27; - pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; python = python27.override{x11Support=true;}; db = db.override { dbmSupport = true; }; }; + # Python package sets. + python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); + python34Packages = python34.pkgs; + python35Packages = python35.pkgs; + python36Packages = recurseIntoAttrs python36.pkgs; + pypyPackages = pypy.pkgs; + + # Should eventually be moved inside Python interpreters. + python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; + python2nix = callPackage ../tools/package-management/python2nix { }; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); @@ -10914,20 +10922,6 @@ with pkgs; sqitchModule = perlPackages.AppSqitch; }; - ### DEVELOPMENT / PYTHON MODULES - - # Python package sets. - - python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); - - python34Packages = python34.pkgs; - - python35Packages = python35.pkgs; - - python36Packages = recurseIntoAttrs python36.pkgs; - - pypyPackages = pypy.pkgs; - ### DEVELOPMENT / R MODULES R = callPackage ../applications/science/math/R { @@ -18746,6 +18740,8 @@ with pkgs; opkg-utils = callPackage ../tools/package-management/opkg-utils { }; + postage = callPackage ../applications/misc/postage { }; + pgadmin = callPackage ../applications/misc/pgadmin { }; pgf = pgf2; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index ac4c5eaac64..fe3f89ef804 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -443,7 +443,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Excel-DNA is an independent project to integrate .NET into Excel"; - homepage = "http://excel-dna.net/"; + homepage = "https://excel-dna.net/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39c73e6f6e0..c152c71adf1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3333,7 +3333,7 @@ in { doCheck = false; meta = { - description = "Python client for Consul (http://www.consul.io/)"; + description = "Python client for Consul (https://www.consul.io/)"; homepage = https://github.com/cablehead/python-consul; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; @@ -6393,7 +6393,7 @@ in { }; }; - gst-python = callPackage ../development/libraries/gstreamer/python { + gst-python = callPackage ../development/python-modules/gst-python { gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -8970,6 +8970,8 @@ in { }; }; + django_extensions = callPackage ../development/python-modules/django-extensions { }; + django_guardian = callPackage ../development/python-modules/django_guardian.nix { }; django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; @@ -28717,6 +28719,19 @@ EOF gensim = callPackage ../development/python-modules/gensim { }; + cymem = callPackage ../development/python-modules/cymem { }; + + ftfy = callPackage ../development/python-modules/ftfy { }; + + murmurhash = callPackage ../development/python-modules/murmurhash { }; + + plac = callPackage ../development/python-modules/plac { }; + + preshed = callPackage ../development/python-modules/preshed { }; + + thinc = callPackage ../development/python-modules/thinc { }; + + spacy = callPackage ../development/python-modules/spacy { }; }); in fix' (extends overrides packages)