b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into HEAD

Browse source
This commit is contained in:
Frederik Rietdijk 2017-08-14 09:34:10 +02:00
parent d87f53baf9 eb9f427d4e
commit 62dac1bdd9
270 changed files with 1294 additions and 449 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
doc/overlays.xml
View file

@ -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.</para>
<para>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.</para>
<!--============================================================-->
<section xml:id="sec-overlays-install">
<title>Installing Overlays</title>
<title>Installing overlays</title>
<para>The set of overlays is looked for in the following places. The
first one present is considered, and all the rest are ignored:
<para>The list of overlays is determined as follows:
<orderedlist>
<listitem>
<para>First, if an <varname>overlays</varname> argument to the nixpkgs function itself is given,
then that is used. This can be passed explicitly when importing nipxkgs, for example
<literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ] }</literal>.</para>
<para>As an argument of the imported attribute set. When importing Nixpkgs,
the <varname>overlays</varname> attribute argument can be set to a list of
functions, which is described in <xref linkend="sec-overlays-layout"/>.</para>
<para>On a NixOS system the value of the <literal>nixpkgs.overlays</literal> 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. <literal>nix-env</literal>), which are looked up independently.</para>
</listitem>
<listitem>
<para>Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal> exists and is a
directory, then the result is the set of overlays found in that directory, ordered lexicographically.</para>
<para>In the directory pointed to by the Nix search path entry
<literal>&lt;nixpkgs-overlays></literal>.</para>
<para>See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to
set a value for <literal>&lt;nixpkgs-overlays>.</literal></para>
</listitem>
<listitem>
<para>In the directory <filename>~/.config/nixpkgs/overlays/</filename>.</para>
<para>Otherwise, if <filename>~/.config/nixpkgs/overlays/</filename> exists and is a directory, then
the result is the set of overlays found in that directory, ordered lexicographically.</para>
</listitem>
</orderedlist>
</para>
<para>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
<filename>default.nix</filename>, or a symlink to one of those. The expressions should follow
the syntax described in <xref linkend="sec-overlays-layout"/>.</para>
<para>For the second and third options, overlays are extracted from the given directory as files,
directories containing a <filename>default.nix</filename>, or symlinks to one of those.</para>
<para>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.</para>
<para>To install an overlay using the last option, you can clone the overlay's repository and add
a symbolic link to it in <filename>~/.config/nixpkgs/overlays/</filename> directory.</para>
<para>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
<filename>~/.config/nixpkgs/overlays/</filename>.</para>
</section>
<!--============================================================-->
<section xml:id="sec-overlays-layout">
<title>Overlays Layout</title>
<section xml:id="sec-overlays-definition">
<title>Defining overlays</title>
<para>Overlays are expressed as Nix functions which accept 2 arguments and return a set of
packages.</para>
<para>Overlays are Nix functions which accept two arguments,
conventionally called <varname>self</varname> and <varname>super</varname>,
and return a set of packages. For example, the following is a valid overlay.</para>
<programlisting>
self: super:
@ -75,25 +78,31 @@ self: super:
}
</programlisting>
<para>The first argument, usually named <varname>self</varname>, corresponds to the final package
<para>The first argument (<varname>self</varname>) 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 <varname>rr</varname> in the example above come
from <varname>self</varname>, as well as the overridden dependencies used in the
<varname>boost</varname> override.</para>
<para>The second argument, usually named <varname>super</varname>,
<para>The second argument (<varname>super</varname>)
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 <varname>boost</varname>
in the above example, comes from <varname>super</varname>, as well as the
<varname>callPackage</varname> function.</para>
<para>The value returned by this function should be a set similar to
<filename>pkgs/top-level/all-packages.nix</filename>, which contains
<filename>pkgs/top-level/all-packages.nix</filename>, containing
overridden and/or new packages.</para>
<para>Overlays are similar to other methods for customizing Nixpkgs, in particular
the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>.
Indeed, <literal>packageOverrides</literal> acts as an overlay with only the
<varname>super</varname> argument. It is therefore appropriate for basic use,
but overlays are more powerful and easier to distribute.</para>
</section>
</chapter>

1
lib/maintainers.nix
View file

@ -521,6 +521,7 @@
schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>";
schristo = "Scott Christopher <schristopher@konputa.com>";
scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
sdll = "Sasha Illarionov <sasha.delly@gmail.com>";
sepi = "Raffael Mancini <raffael@mancini.lu>";
seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
shanemikel = "Shane Pearlman <shanemikel1@gmail.com>";

2
nixos/modules/misc/ids.nix
View file

@ -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;

1
nixos/modules/module-list.nix
View file

@ -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

6
nixos/modules/profiles/hardened.nix
View file

@ -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;
}

205
nixos/modules/services/databases/postage.nix Normal file
View file

@ -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.
</para><para>
Detailed information about PostgreSQL connection strings is available at:
<link xlink:href="http://www.postgresql.org/docs/current/static/libpq-connect.html"/>
</para><para>
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:
<link xlink:href="https://github.com/workflowproducts/postage/blob/master/INSTALL_NGINX.md"/>
'';
};
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;
};
};
};
}

4
nixos/modules/services/monitoring/munin.nix
View file

@ -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

98
nixos/modules/services/networking/ddclient.nix
View file

@ -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;
};
};
};

10
nixos/modules/services/ttys/agetty.nix
View file

@ -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;

2
pkgs/applications/audio/flac/default.nix
View file

@ -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 ];

2
pkgs/applications/audio/fldigi/default.nix
View file

@ -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;

2
pkgs/applications/audio/iannix/default.nix
View file

@ -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 ];

2
pkgs/applications/audio/mixxx/default.nix
View file

@ -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

13
pkgs/applications/audio/mixxx/sqlite.patch Normal file
View file

@ -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 <sqlite3.h>
#endif
class TrackInfoObject;

2
pkgs/applications/audio/mp3splt/default.nix
View file

@ -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;

3
pkgs/applications/audio/pd-plugins/zexy/default.nix
View file

@ -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 .

2
pkgs/applications/editors/aseprite/default.nix
View file

@ -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;
};

6
pkgs/applications/editors/eclipse/plugins.nix
View file

@ -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; {

2
pkgs/applications/editors/focuswriter/default.nix
View file

@ -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/;
};
}

8
pkgs/applications/editors/vscode/default.nix
View file

@ -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";

2
pkgs/applications/graphics/fontmatrix/default.nix
View file

@ -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;
};

2
pkgs/applications/graphics/freecad/default.nix
View file

@ -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;

2
pkgs/applications/graphics/gimp/2.8.nix
View file

@ -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;
};

2
pkgs/applications/misc/cdrtools/default.nix
View file

@ -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;

2
pkgs/applications/misc/dockbarx/default.nix
View file

@ -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;

157
pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch Normal file
View file

@ -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 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"
+ "http://colorer.sf.net/2003/hrc.dtd">
+<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd">
+
+ <type name="nix">
+
+ <annotation><documentation>
+ Nix
+ </documentation></annotation>
+
+ <import type="def"/>
+
+ <region name="Code" parent="def:Text"/>
+ <region name="StringEscape" parent="def:StringContent"/>
+ <region name='Import' parent='def:Directive'/>
+ <region name='ImportOutline' parent='def:Outlined'/>
+ <region name="Path" parent="def:Path"/>
+ <region name="URL" parent="def:String"/>
+ <region name="LiteralKeyword" parent="def:Keyword"/>
+ <region name='Interpolation' parent='def:StringEdge'/>
+ <region name="Ident" parent="def:Identifier"/> <!-- Label -->
+
+ <scheme name="TabsAsErrors" if="tabs-as-errors">
+ <regexp match="/\t+/" region='def:Error'/>
+ </scheme>
+
+ <scheme name="SpacesAsErrors" if="spaces-as-errors">
+ <regexp match="/\x20+$/" region='def:Error'/>
+ </scheme>
+
+ <scheme name="NotNestedComment">
+ <inherit scheme="TabsAsErrors"/>
+ <inherit scheme="SpacesAsErrors"/>
+ <inherit scheme="Comment"/>
+ </scheme>
+
+ <scheme name="String">
+ <inherit scheme="TabsAsErrors"/>
+ <inherit scheme="SpacesAsErrors"/>
+<!-- <regexp match="/\\[xX]0*[\da-fA-F]{1,2}/" region0="StringEscape"/> -->
+ <regexp match="/\\./" region0="StringEscape"/>
+ <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
+ </scheme>
+
+ <scheme name="BlockString">
+ <inherit scheme="TabsAsErrors"/>
+ <inherit scheme="SpacesAsErrors"/>
+
+ <regexp match="/&apos;&apos;\$/" region0="StringEscape"/>
+ <regexp match="/&apos;&apos;&apos;/" region0="StringEscape"/>
+ <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
+ </scheme>
+
+ <scheme name="NixIdent">
+ <regexp match="/\w[\w\d-]*'*/" region0="Ident"/>
+ </scheme>
+
+ <scheme name="NixExpression">
+ <inherit scheme="TabsAsErrors"/>
+ <inherit scheme="SpacesAsErrors"/>
+
+ <inherit scheme="def:unixCommentDirective"/>
+ <block start="/#/" end="/\s*$/" scheme="Comment" region="LineComment" region10="def:Error"/>
+ <block start="/\/\*/" end="/\*\//" scheme="NotNestedComment" region="Comment" region00="PairStart" region10="PairEnd"/>
+
+ <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
+ <block start="/(\{)/" end="/(\})/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>
+ <block start="/(\()/" end="/(\))/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>
+ <block start="/(\[)/" end="/(\])/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>
+
+ <regexp match="/(\.\.|\.|\~|)\/[\w\d.+=?-]+(\/[\w\d.+=?-]+)*/" region0="Path"/>
+ <regexp match="/&lt;[\w\d\/.-]+&gt;/" region0="Path"/>
+ <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/" region0="URL"/>
+ <block start="/(&quot;)/" end="/(&quot;)/" scheme="String" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
+ <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
+
+ <keywords region="Keyword">
+ <word name="assert"/>
+ <word name="else"/>
+ <word name="if"/>
+ <word name="in"/>
+ <word name="inherit"/>
+ <word name="import"/>
+ <word name="let"/>
+ <word name="rec"/>
+ <word name="then"/>
+ <word name="throw"/>
+ <word name="with"/>
+ </keywords>
+ <keywords region="LiteralKeyword">
+ <word name="true"/>
+ <word name="false"/>
+ <word name="null"/>
+ </keywords>
+ <keywords region="Symbol">
+ <symb name="."/>
+ <symb name=":"/>
+ <symb name=","/>
+ <symb name=";"/>
+
+ <symb name="*"/>
+ <symb name="/"/>
+ <symb name="%"/>
+ <symb name="+"/>
+ <symb name="-"/>
+ <symb name="!"/>
+ <symb name="?"/>
+ <symb name="@"/>
+ <symb name="&lt;"/>
+ <symb name="&gt;"/>
+ <symb name="&amp;"/>
+ <symb name="|"/>
+ <symb name="="/>
+ <symb name="..."/>
+ </keywords>
+
+ <inherit scheme="def:Number"/>
+ <inherit scheme="NixIdent"/>
+
+ <regexp match="/[^\)\}\]\s]/" region='def:Error'/>
+
+ </scheme>
+
+ <scheme name="nix">
+ <inherit scheme="NixExpression"/>
+ </scheme>
+
+ </type>
+</hrc>
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 @@
<location link="jar:common.jar!base/lua.hrc"/>
<filename>/\.(w?lua)$/i</filename>
</prototype>
+ <prototype name="nix" group="main" description="Nix">
+ <location link="nix.hrc"/>
+ <filename>/\.(nix)$/i</filename>
+ <parameters>
+ <param name="tabs-as-errors" value="true" description="Shows tabulation symbol as error"/>
+ <param name="spaces-as-errors" value="true" description="Shows trailing spaces as error"/>
+ </parameters>
+ </prototype>
<prototype name="ruby" group="main" description="Ruby">
<location link="jar:common.jar!base/ruby.hrc"/>
<filename>/\.(rb|rbw|ruby|rake)$/i</filename>

10
pkgs/applications/misc/far2l/default.nix
View file

@ -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;

2
pkgs/applications/misc/gammu/default.nix
View file

@ -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;

2
pkgs/applications/misc/girara/default.nix
View file

@ -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

32
pkgs/applications/misc/gkrellm/default.nix
View file

@ -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;

2
pkgs/applications/misc/gmrun/default.nix
View file

@ -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;

2
pkgs/applications/misc/gpsprune/default.nix
View file

@ -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;

4
pkgs/applications/misc/josm/default.nix
View file

@ -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" ];

2
pkgs/applications/misc/keepassx/2.0.nix
View file

@ -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;

2
pkgs/applications/misc/keepassx/default.nix
View file

@ -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;

27
pkgs/applications/misc/postage/default.nix Normal file
View file

@ -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 ];
};
}

2
pkgs/applications/networking/browsers/dillo/default.nix
View file

@ -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.

2
pkgs/applications/networking/browsers/jumanji/default.nix
View file

@ -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 ];
};

6
pkgs/applications/networking/cluster/helm/default.nix
View file

@ -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}";

2
pkgs/applications/networking/feedreaders/canto-curses/default.nix
View file

@ -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 ];

2
pkgs/applications/networking/feedreaders/canto-daemon/default.nix
View file

@ -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 ];

2
pkgs/applications/networking/flexget/default.nix
View file

@ -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 ];

2
pkgs/applications/networking/ftp/filezilla/default.nix
View file

@ -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 = ''

2
pkgs/applications/networking/ids/bro/default.nix
View file

@ -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;

2
pkgs/applications/networking/instant-messengers/bitlbee/default.nix
View file

@ -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 ];

2
pkgs/applications/networking/irc/hexchat/default.nix
View file

@ -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 ];

4
pkgs/applications/networking/mailreaders/notmuch/default.nix
View file

@ -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 = [

2
pkgs/applications/networking/p2p/gnunet/default.nix
View file

@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
network are rewarded with better service.
'';
homepage = http://gnunet.org/;
homepage = https://gnunet.org/;
license = licenses.gpl2Plus;

2
pkgs/applications/networking/p2p/gnunet/svn.nix
View file

@ -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;

4
pkgs/applications/science/biology/bcftools/default.nix
View file

@ -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 ];

4
pkgs/applications/science/biology/samtools/default.nix
View file

@ -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 ];

4
pkgs/applications/science/logic/alt-ergo/default.nix
View file

@ -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 ];

7
pkgs/applications/science/math/mathematica/default.nix
View file

@ -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 = ''

6
pkgs/applications/science/misc/motu-client/default.nix
View file

@ -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; {

2
pkgs/applications/version-management/git-and-tools/cgit/default.nix
View file

@ -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;

2
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -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;

2
pkgs/applications/version-management/git-up/default.nix
View file

@ -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 ];

2
pkgs/applications/video/coriander/default.nix
View file

@ -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];

2
pkgs/applications/video/dvb-apps/default.nix
View file

@ -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;
};

2
pkgs/applications/video/kodi/default.nix
View file

@ -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;

12
pkgs/applications/video/kodi/plugins.nix
View file

@ -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 ];
};

4
pkgs/applications/video/obs-studio/default.nix
View file

@ -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 ];

2
pkgs/applications/virtualization/docker/default.nix
View file

@ -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 ];

2
pkgs/applications/window-managers/bspwm/default.nix
View file

@ -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;

2
pkgs/applications/window-managers/compiz/default.nix
View file

@ -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;

2
pkgs/applications/window-managers/i3/lock-color.nix
View file

@ -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;

2
pkgs/applications/window-managers/i3/lock.nix
View file

@ -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;

2
pkgs/build-support/fetchurl/mirrors.nix
View file

@ -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/

2
pkgs/data/documentation/man-pages/default.nix
View file

@ -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;

2
pkgs/data/fonts/anonymous-pro/default.nix
View file

@ -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

2
pkgs/data/fonts/iosevka/default.nix
View file

@ -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

2
pkgs/data/fonts/kawkab-mono/default.nix
View file

@ -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;
};

2
pkgs/data/fonts/open-dyslexic/default.nix
View file

@ -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];
};

2
pkgs/data/fonts/opensans-ttf/default.nix
View file

@ -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 = [ ];

2
pkgs/data/fonts/source-code-pro/default.nix
View file

@ -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;
};
}

2
pkgs/data/icons/hicolor-icon-theme/default.nix
View file

@ -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;
};
}

2
pkgs/data/misc/cacert/default.nix
View file

@ -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 ];

2
pkgs/desktops/gnome-2/desktop/vte/default.nix
View file

@ -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

2
pkgs/desktops/gnome-2/platform/gtkglext/default.nix
View file

@ -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

2
pkgs/desktops/gnome-3/3.22/core/evince/default.nix
View file

@ -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 = ''

2
pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
View file

@ -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;
};

2
pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
View file

@ -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;

2
pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
View file

@ -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;

2
pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
View file

@ -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

2
pkgs/desktops/gnome-3/3.22/core/vte/default.nix
View file

@ -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

2
pkgs/development/compilers/ccl/default.nix
View file

@ -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;

2
pkgs/development/compilers/edk2/default.nix
View file

@ -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"];
};

2
pkgs/development/compilers/elm/packages/elm-package.nix
View file

@ -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;
}

8
pkgs/development/compilers/gcc/5/default.nix
View file

@ -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"

2
pkgs/development/compilers/gnu-cobol/default.nix
View file

@ -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;

2
pkgs/development/compilers/julia/0.5.nix
View file

@ -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" ];

2
pkgs/development/compilers/julia/default.nix
View file

@ -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" ];

2
pkgs/development/compilers/julia/git.nix
View file

@ -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" ];

6
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View file

@ -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;

6
pkgs/development/haskell-modules/hackage-packages.nix
View file

@ -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;
}) {};

2
pkgs/development/interpreters/clojure/default.nix
View file

@ -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

2
pkgs/development/libraries/blitz/default.nix
View file

@ -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 ];

2
pkgs/development/libraries/buddy/default.nix
View file

@ -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";

2
pkgs/development/libraries/cfitsio/default.nix
View file

@ -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

2
pkgs/development/libraries/chromaprint/default.nix
View file

@ -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;

Some files were not shown because too many files have changed in this diff Show more