ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 02:05:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-11-16 11:45:07 +01:00
commit be7125dde7
133 changed files with 1826 additions and 2024 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributing/submitting-changes.xml
View File

@ -441,7 +441,7 @@ Additional information.
<itemizedlist>
<listitem>
<para>
If you're cherry-picking a commit to a stable release branch, always use <command>git cherry-pick -xe</command> and ensure the message contains a clear description about why this needs to be included in the stable branch.
If you're cherry-picking a commit to a stable release branch (“backporting”), always use <command>git cherry-pick -xe</command> and ensure the message contains a clear description about why this needs to be included in the stable branch.
</para>
<para>
An example of a cherry-picked commit would look like this:

12
maintainers/maintainer-list.nix
View File

@ -2092,6 +2092,12 @@
email = "mpcervin@uncg.edu";
name = "Mabry Cervin";
};
equirosa = {
email = "eduardo@eduardoquiros.com";
github = "equirosa";
githubId = 39096810;
name = "Eduardo Quiros";
};
eqyiel = {
email = "ruben@maher.fyi";
github = "eqyiel";
@ -2631,6 +2637,12 @@
githubId = 9705357;
name = "Guillaume Bouchard";
};
GuillaumeDesforges = {
email = "aceus02@gmail.com";
github = "GuillaumeDesforges";
githubId = 1882000;
name = "Guillaume Desforges";
};
guillaumekoenig = {
email = "guillaume.edward.koenig@gmail.com";
github = "guillaumekoenig";

2
nixos/doc/manual/configuration/x-windows.xml
View File

@ -39,7 +39,7 @@
can select an alternative one by picking one of the following lines:
<programlisting>
<xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true;
<xref linkend="opt-services.xserver.displayManager.slim.enable"/> = true;
<xref linkend="opt-services.xserver.displayManager.gdm.enable"/> = true;
</programlisting>
</para>
<para>

10
nixos/doc/manual/development/option-declarations.xml
View File

@ -99,7 +99,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
<para>
As an example, we will take the case of display managers. There is a central
display manager module for generic display manager options and a module file
per display manager backend (slim, sddm, gdm ...).
per display manager backend (sddm, gdm ...).
</para>
<para>
@ -146,7 +146,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
/>), and to extend
it in each backend module
(<xref
linkend='ex-option-declaration-eot-backend-slim' />,
linkend='ex-option-declaration-eot-backend-gdm' />,
<xref
linkend='ex-option-declaration-eot-backend-sddm' />).
</para>
@ -167,11 +167,11 @@ services.xserver.displayManager.enable = mkOption {
};</screen>
</example>
<example xml:id='ex-option-declaration-eot-backend-slim'>
<title>Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module</title>
<example xml:id='ex-option-declaration-eot-backend-gdm'>
<title>Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>gdm</literal> module</title>
<screen>
services.xserver.displayManager.enable = mkOption {
type = with types; nullOr (enum [ "slim" ]);
type = with types; nullOr (enum [ "gdm" ]);
};</screen>
</example>

2
nixos/doc/manual/release-notes/rl-1909.xml
View File

@ -543,7 +543,7 @@
<listitem>
<para>
The <option>networking.useDHCP</option> option is unsupported in combination with
<option>networking.useNetworkd</option> in anticipation of defaulting to it by default.
<option>networking.useNetworkd</option> in anticipation of defaulting to it.
It has to be set to <literal>false</literal> and enabled per
interface with <option>networking.interfaces.&lt;name&gt;.useDHCP = true;</option>
</para>

13
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -71,7 +71,11 @@
<itemizedlist>
<listitem>
<para />
<para>
The kubernetes kube-proxy now supports a new hostname configuration
<literal>services.kubernetes.proxy.hostname</literal> which has to
be set if the hostname of the node should be non default.
</para>
</listitem>
</itemizedlist>
@ -138,6 +142,13 @@
Now, all bash code is held to the same high standard, and the rather complex stateful manipulation of the options can be discarded.
</para>
</listitem>
<listitem>
<para>
The SLIM Display Manager has been removed, as it has been unmaintained since 2013.
Consider migrating to a different display manager such as LightDM (current default in NixOS),
SDDM, GDM, or using the startx module which uses Xinitrc.
</para>
</listitem>
</itemizedlist>
</section>

1
nixos/lib/testing-python.nix
View File

@ -261,7 +261,6 @@ in rec {
inherit require;
virtualisation.memorySize = 1024;
services.xserver.enable = true;
services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.auto.enable = true;
services.xserver.windowManager.default = "icewm";
services.xserver.windowManager.icewm.enable = true;

1
nixos/lib/testing.nix
View File

@ -248,7 +248,6 @@ in rec {
inherit require;
virtualisation.memorySize = 1024;
services.xserver.enable = true;
services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.auto.enable = true;
services.xserver.windowManager.default = "icewm";
services.xserver.windowManager.icewm.enable = true;

2
nixos/modules/hardware/video/nvidia.nix
View File

@ -75,7 +75,7 @@ in
Note that this configuration will only be successful when a display manager
for which the <option>services.xserver.displayManager.setupCommands</option>
option is supported is used; notably, SLiM is not supported.
option is supported is used.
'';
};

12
nixos/modules/services/cluster/kubernetes/addons/dns.nix
View File

@ -3,7 +3,7 @@
with lib;
let
version = "1.5.0";
version = "1.6.4";
cfg = config.services.kubernetes.addons.dns;
ports = {
dns = 10053;
@ -55,9 +55,9 @@ in {
type = types.attrs;
default = {
imageName = "coredns/coredns";
imageDigest = "sha256:e83beb5e43f8513fa735e77ffc5859640baea30a882a11cc75c4c3244a737d3c";
imageDigest = "sha256:493ee88e1a92abebac67cbd4b5658b4730e0f33512461442d8d9214ea6734a9b";
finalImageTag = version;
sha256 = "15sbmhrxjxidj0j0cccn1qxpg6al175w43m6ngspl0mc132zqc9q";
sha256 = "0fm9zdjavpf5hni8g7fkdd3csjbhd7n7py7llxjc66sbii087028";
};
};
};
@ -68,7 +68,7 @@ in {
services.kubernetes.addonManager.bootstrapAddons = {
coredns-cr = {
apiVersion = "rbac.authorization.k8s.io/v1beta1";
apiVersion = "rbac.authorization.k8s.io/v1";
kind = "ClusterRole";
metadata = {
labels = {
@ -94,7 +94,7 @@ in {
};
coredns-crb = {
apiVersion = "rbac.authorization.k8s.io/v1beta1";
apiVersion = "rbac.authorization.k8s.io/v1";
kind = "ClusterRoleBinding";
metadata = {
annotations = {
@ -170,7 +170,7 @@ in {
};
coredns-deploy = {
apiVersion = "extensions/v1beta1";
apiVersion = "apps/v1";
kind = "Deployment";
metadata = {
labels = {

1
nixos/modules/services/cluster/kubernetes/flannel.nix
View File

@ -40,6 +40,7 @@ in
cni.config = mkDefault [{
name = "mynet";
type = "flannel";
cniVersion = "0.3.1";
delegate = {
isDefaultGateway = true;
bridge = "docker0";

4
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@ -92,7 +92,7 @@ in
default = [];
example = literalExample ''
[{
"cniVersion": "0.2.0",
"cniVersion": "0.3.1",
"name": "mynet",
"type": "bridge",
"bridge": "cni0",
@ -106,7 +106,7 @@ in
]
}
} {
"cniVersion": "0.2.0",
"cniVersion": "0.3.1",
"type": "loopback"
}]
'';

9
nixos/modules/services/cluster/kubernetes/proxy.nix
View File

@ -31,6 +31,12 @@ in
type = listOf str;
};
hostname = mkOption {
description = "Kubernetes proxy hostname override.";
default = config.networking.hostName;
type = str;
};
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy";
verbosity = mkOption {
@ -59,6 +65,7 @@ in
"--cluster-cidr=${top.clusterCidr}"} \
${optionalString (cfg.featureGates != [])
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
--hostname-override=${cfg.hostname} \
--kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
${cfg.extraOpts}
@ -69,6 +76,8 @@ in
};
};
services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName;
services.kubernetes.pki.certs = {
kubeProxyClient = top.lib.mkCert {
name = "kube-proxy-client";

2
nixos/modules/services/development/lorri.nix
View File

@ -41,5 +41,7 @@ in {
Restart = "on-failure";
};
};
environment.systemPackages = [ pkgs.lorri ];
};
}

1
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -232,7 +232,6 @@ in
security.pam.services.kdm.enableKwallet = true;
security.pam.services.lightdm.enableKwallet = true;
security.pam.services.sddm.enableKwallet = true;
security.pam.services.slim.enableKwallet = true;
xdg.portal.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];

12
nixos/modules/services/x11/display-managers/default.nix
View File

@ -1,9 +1,9 @@
# This module declares the options to define a *display manager*, the
# program responsible for handling X logins (such as xdm, gdb, or
# SLiM). The display manager allows the user to select a *session
# type*. When the user logs in, the display manager starts the
# program responsible for handling X logins (such as LightDM, GDM, or SDDM).
# The display manager allows the user to select a *session
# type*. When the user logs in, the display manager starts the
# *session script* ("xsession" below) to launch the selected session
# type. The session type defines two things: the *desktop manager*
# type. The session type defines two things: the *desktop manager*
# (e.g., KDE, Gnome or a plain xterm), and optionally the *window
# manager* (e.g. kwin or twm).
@ -196,7 +196,6 @@ let
fi
'') cfg.displayManager.extraSessionFilePackages}
${concatMapStrings (pkg: ''
if test -d ${pkg}/share/wayland-sessions; then
mkdir -p "$out/share/wayland-sessions"
@ -322,7 +321,7 @@ in
execCmd = mkOption {
type = types.str;
example = literalExample ''
"''${pkgs.slim}/bin/slim"
"''${pkgs.lightdm}/bin/lightdm"
'';
description = "Command to start the display manager.";
};
@ -330,7 +329,6 @@ in
environment = mkOption {
type = types.attrsOf types.unspecified;
default = {};
example = { SLIM_CFGFILE = "/etc/slim.conf"; };
description = "Additional environment variables needed by the display manager.";
};

160
nixos/modules/services/x11/display-managers/slim.nix
View File

@ -2,155 +2,15 @@
with lib;
let
dmcfg = config.services.xserver.displayManager;
cfg = dmcfg.slim;
slimConfig = pkgs.writeText "slim.cfg"
''
xauth_path ${dmcfg.xauthBin}
default_xserver ${dmcfg.xserverBin}
xserver_arguments ${toString dmcfg.xserverArgs}
sessiondir ${dmcfg.session.desktops}/share/xsessions
login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.wrapper} "%session"
halt_cmd ${config.systemd.package}/sbin/shutdown -h now
reboot_cmd ${config.systemd.package}/sbin/shutdown -r now
logfile /dev/stderr
${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)}
${optionalString (cfg.defaultUser != null) ("focus_password yes")}
${optionalString cfg.autoLogin "auto_login yes"}
${optionalString (cfg.consoleCmd != null) "console_cmd ${cfg.consoleCmd}"}
${cfg.extraConfig}
'';
# Unpack the SLiM theme, or use the default.
slimThemesDir =
let
unpackedTheme = pkgs.runCommand "slim-theme" { preferLocalBuild = true; }
''
mkdir -p $out
cd $out
unpackFile ${cfg.theme}
ln -s * default
'';
in if cfg.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;
in
{
###### interface
options = {
services.xserver.displayManager.slim = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable SLiM as the display manager.
'';
};
theme = mkOption {
type = types.nullOr types.path;
default = pkgs.fetchurl {
url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
};
defaultText = ''pkgs.fetchurl {
url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
}'';
example = literalExample ''
pkgs.fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz";
sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
}
'';
description = ''
The theme for the SLiM login manager. If not specified, SLiM's
default theme is used. See <link
xlink:href='http://slim.berlios.de/themes01.php'/> for a
collection of themes. TODO: berlios shut down.
'';
};
defaultUser = mkOption {
type = types.nullOr types.str;
default = null;
example = "login";
description = ''
The default user to load. If you put a username here you
get it automatically loaded into the username field, and
the focus is placed on the password.
'';
};
autoLogin = mkOption {
type = types.bool;
default = false;
description = ''
Automatically log in as the default user.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Extra configuration options for SLiM login manager. Do not
add options that can be configured directly.
'';
};
consoleCmd = mkOption {
type = types.nullOr types.str;
default = ''
${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ${pkgs.shadow}/bin/login
'';
defaultText = ''
''${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ''${pkgs.shadow}/bin/login
'';
description = ''
The command to run when "console" is given as the username.
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
services.xserver.displayManager.job =
{ environment =
{ SLIM_CFGFILE = slimConfig;
SLIM_THEMESDIR = slimThemesDir;
};
execCmd = "exec ${pkgs.slim}/bin/slim";
};
services.xserver.displayManager.sessionCommands =
''
# Export the config/themes for slimlock.
export SLIM_THEMESDIR=${slimThemesDir}
'';
# Allow null passwords so that the user can login as root on the
# installation CD.
security.pam.services.slim = { allowNullPassword = true; startSession = true; };
# Allow slimlock to work.
security.pam.services.slimlock = {};
environment.systemPackages = [ pkgs.slim ];
};
# added 2019-11-11
imports = [
(mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] ''
The SLIM project is abandoned and their last release was in 2013.
Because of this it poses a security risk to your system.
Other issues include it not fully supporting systemd and logind sessions.
Please use a different display manager such as LightDM, SDDM, or GDM.
You can also use the startx module which uses Xinitrc.
'')
];
}

1
nixos/modules/services/x11/xserver.nix
View File

@ -557,7 +557,6 @@ in
default = !( dmconf.auto.enable
|| dmconf.gdm.enable
|| dmconf.sddm.enable
|| dmconf.slim.enable
|| dmconf.xpra.enable );
in mkIf (default) true;

1
nixos/release-combined.nix
View File

@ -133,7 +133,6 @@ in rec {
(all nixos.tests.proxy)
(all nixos.tests.sddm.default)
(all nixos.tests.simple)
(all nixos.tests.slim)
(all nixos.tests.switchTest)
(all nixos.tests.udisks2)
(all nixos.tests.xfce)

1
nixos/tests/all-tests.nix
View File

@ -248,7 +248,6 @@ in
shiori = handleTest ./shiori.nix {};
signal-desktop = handleTest ./signal-desktop.nix {};
simple = handleTest ./simple.nix {};
slim = handleTest ./slim.nix {};
slurm = handleTest ./slurm.nix {};
smokeping = handleTest ./smokeping.nix {};
snapper = handleTest ./snapper.nix {};

1
nixos/tests/kubernetes/base.nix
View File

@ -53,6 +53,7 @@ let
services.flannel.iface = "eth1";
services.kubernetes = {
addons.dashboard.enable = true;
proxy.hostname = "${masterName}.${domain}";
easyCerts = true;
inherit (machine) roles;

2
nixos/tests/roundcube.nix
View File

@ -25,6 +25,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
roundcube.wait_for_unit("postgresql.service")
roundcube.wait_for_unit("phpfpm-roundcube.service")
roundcube.wait_for_unit("nginx.service")
roundcube.succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'")
roundcube.succeed("curl -sSL http://roundcube/ | grep 'Keep me logged in'")
'';
})

66
nixos/tests/slim.nix
View File

@ -1,66 +0,0 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "slim";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig ];
};
machine = { pkgs, ... }: {
imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.windowManager.default = "icewm";
services.xserver.windowManager.icewm.enable = true;
services.xserver.desktopManager.default = "none";
services.xserver.displayManager.slim = {
enable = true;
# Use a custom theme in order to get best OCR results
theme = pkgs.runCommand "slim-theme-ocr" {
nativeBuildInputs = [ pkgs.imagemagick ];
} ''
mkdir "$out"
convert -size 1x1 xc:white "$out/background.jpg"
convert -size 200x100 xc:white "$out/panel.jpg"
cat > "$out/slim.theme" <<EOF
background_color #ffffff
background_style tile
input_fgcolor #000000
msg_color #000000
session_color #000000
session_font Verdana:size=16:bold
username_msg Username:
username_font Verdana:size=16:bold
username_color #000000
username_x 50%
username_y 40%
password_msg Password:
password_x 50%
password_y 40%
EOF
'';
};
};
enableOCR = true;
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in ''
startAll;
$machine->waitForText(qr/Username:/);
$machine->sendChars("${user.name}\n");
$machine->waitForText(qr/Password:/);
$machine->sendChars("${user.password}\n");
$machine->waitForFile('${user.home}/.Xauthority');
$machine->succeed('xauth merge ${user.home}/.Xauthority');
$machine->waitForWindow('^IceWM ');
# Make sure SLiM doesn't create a log file
$machine->fail('test -e /var/log/slim.log');
'';
})

4
pkgs/applications/audio/avldrums-lv2/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "avldrums.lv2";
version = "0.3.5";
version = "0.4.0";
src = fetchFromGitHub {
owner = "x42";
repo = pname;
rev = "v${version}";
sha256 = "00n2varc7iwp0xbfi45hpq4vlpxxb2kbrdzvrc20qp2265994bqf";
sha256 = "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv";
fetchSubmodules = true;
};

14
pkgs/applications/audio/denemo/default.nix
View File

@ -2,7 +2,7 @@
, libjack2, gettext, intltool, guile_2_0, lilypond
, glib, libxml2, librsvg, libsndfile, aubio
, gtk3, gtksourceview, evince, fluidsynth, rubberband
, portaudio, portmidi, fftw, makeWrapper }:
, portaudio, portmidi, fftw, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "denemo";
@ -14,17 +14,21 @@ stdenv.mkDerivation rec {
};
buildInputs = [
libjack2 gettext guile_2_0 lilypond pkgconfig glib libxml2 librsvg libsndfile
libjack2 guile_2_0 lilypond glib libxml2 librsvg libsndfile
aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi
makeWrapper
];
postInstall = ''
wrapProgram $out/bin/denemo --prefix PATH : ${lilypond}/bin
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lilypond}/bin"
)
'';
nativeBuildInputs = [
wrapGAppsHook
intltool
gettext
pkgconfig
];
meta = with stdenv.lib; {

4
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View File

@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
version = "1.15.0";
version = "1.18.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
sha256 = "0r7gm7q7gj39v36jd5xz20931za94nf2fpf3clbghkhlbrm0kbnq";
sha256 = "1giy8xg1yfv7b7gh98dmfc05wh54xqpd53nanacwcc7lakzizqnn";
};
appimageContents = appimageTools.extractType2 {

55
pkgs/applications/display-managers/slim/default.nix
View File

@ -1,55 +0,0 @@
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng
, fontconfig, freetype, pam, dbus, makeWrapper }:
stdenv.mkDerivation rec {
name = "slim-1.3.6";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/${name}.tar.gz";
sha256 = "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1";
};
patches =
[ # Allow the paths of the configuration file and theme directory to
# be set at runtime.
./runtime-paths.patch
# Exit after the user's session has finished. This works around
# slim's broken PAM session handling (see
# http://developer.berlios.de/bugs/?func=detailbug&bug_id=19102&group_id=2663).
./run-once.patch
# Ensure that sessions appear in sort order, rather than in
# directory order.
./sort-sessions.patch
# Allow to set logfile to a special "/dev/stderr" in order to continue
# logging to stderr and thus to the journal.
./no-logfile.patch
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
url = "https://raw.githubusercontent.com/gentoo/musl/8eddda8072add075ebf56cf6d288bc1450d6b5f8/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch";
sha256 = "0f82672s2r2cmdqfn2mbg3di76mbla9n0ik20p2gv4igi6p866xm";
});
preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib";
cmakeFlags = [ "-DUSE_PAM=1" ];
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype -std=c++11";
enableParallelBuilding = true;
buildInputs =
[ cmake pkgconfig libjpeg libpng fontconfig freetype
pam dbus
xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper
];
NIX_CFLAGS_LINK = "-lXmu";
meta = {
homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2;
};
}

80
pkgs/applications/display-managers/slim/no-logfile.patch
View File

@ -1,80 +0,0 @@
diff --git a/log.cpp b/log.cpp
index b44677a..7c89dda 100644
--- a/log.cpp
+++ b/log.cpp
@@ -1,23 +1,31 @@
#include "log.h"
#include <iostream>
+#include <cstring>
bool
LogUnit::openLog(const char * filename)
{
- if (logFile.is_open()) {
+ if (isFile && logFile.is_open()) {
cerr << APPNAME
<< ": opening a new Log file, while another is already open"
<< endl;
- logFile.close();
+ closeLog();
}
- logFile.open(filename, ios_base::app);
- return !(logFile.fail());
+ if (strcmp(filename, "/dev/stderr") == 0) {
+ isFile = false;
+ return true;
+ } else {
+ logFile.open(filename, ios_base::app);
+ isFile = true;
+ return !(logFile.fail());
+ }
}
void
LogUnit::closeLog()
{
+ if (!isFile) return;
if (logFile.is_open())
logFile.close();
}
diff --git a/log.h b/log.h
index b7810be..ad548a2 100644
--- a/log.h
+++ b/log.h
@@ -9,11 +9,14 @@
#endif
#include "const.h"
#include <fstream>
+#include <iostream>
using namespace std;
static class LogUnit {
ofstream logFile;
+ bool isFile;
+ inline ostream &getStream() { return isFile ? logFile : cerr; }
public:
bool openLog(const char * filename);
void closeLog();
@@ -22,17 +25,17 @@ public:
template<typename Type>
LogUnit & operator<<(const Type & text) {
- logFile << text; logFile.flush();
+ getStream() << text; getStream().flush();
return *this;
}
LogUnit & operator<<(ostream & (*fp)(ostream&)) {
- logFile << fp; logFile.flush();
+ getStream() << fp; getStream().flush();
return *this;
}
LogUnit & operator<<(ios_base & (*fp)(ios_base&)) {
- logFile << fp; logFile.flush();
+ getStream() << fp; getStream().flush();
return *this;
}
} logStream;

12
pkgs/applications/display-managers/slim/run-once.patch
View File

@ -1,12 +0,0 @@
diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
--- slim-1.3.6-orig/app.cpp 2013-10-15 11:02:55.629263422 +0200
+++ slim-1.3.6/app.cpp 2013-10-15 13:00:10.141210784 +0200
@@ -816,7 +822,7 @@
StopServer();
RemoveLock();
while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
- Run();
+ exit(OK_EXIT);
}
void App::KillAllClients(Bool top) {

70
pkgs/applications/display-managers/slim/runtime-paths.patch
View File

@ -1,70 +0,0 @@
diff -ru slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
--- slim-1.3.6-orig/app.cpp 2013-10-02 00:38:05.000000000 +0200
+++ slim-1.3.6/app.cpp 2014-03-30 19:01:04.115414201 +0200
@@ -200,7 +200,9 @@
/* Read configuration and theme */
cfg = new Cfg;
- cfg->readConf(CFGFILE);
+ char *cfgfile = getenv("SLIM_CFGFILE");
+ if (!cfgfile) cfgfile = CFGFILE;
+ cfg->readConf(cfgfile);
string themebase = "";
string themefile = "";
string themedir = "";
@@ -208,7 +210,9 @@
if (testing) {
themeName = testtheme;
} else {
- themebase = string(THEMESDIR) + "/";
+ char *themesdir = getenv("SLIM_THEMESDIR");
+ if (!themesdir) themesdir = THEMESDIR;
+ themebase = string(themesdir) + "/";
themeName = cfg->getOption("current_theme");
string::size_type pos;
if ((pos = themeName.find(",")) != string::npos) {
diff -ru slim-1.3.6-orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
--- slim-1.3.6-orig/CMakeLists.txt 2013-10-02 00:38:05.000000000 +0200
+++ slim-1.3.6/CMakeLists.txt 2014-03-30 19:16:48.445069729 +0200
@@ -23,7 +23,7 @@
set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory")
set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim")
-set(SYSCONFDIR "/etc")
+set(SYSCONFDIR "$ENV{out}/etc")
set(LIBDIR "/lib")
set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
@@ -40,7 +40,7 @@
set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPACKAGE=\"slim\"")
set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DVERSION=\"${SLIM_VERSION}\"")
set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
-set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
+set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"/etc\"")
# Flags
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2")
Only in slim-1.3.6: CMakeLists.txt~
diff -ru slim-1.3.6-orig/slimlock.cpp slim-1.3.6/slimlock.cpp
--- slim-1.3.6-orig/slimlock.cpp 2013-10-02 00:38:05.000000000 +0200
+++ slim-1.3.6/slimlock.cpp 2014-03-30 19:01:04.115414201 +0200
@@ -106,13 +106,17 @@
unsigned int cfg_passwd_timeout;
// Read user's current theme
cfg = new Cfg;
- cfg->readConf(CFGFILE);
+ char *cfgfile = getenv("SLIM_CFGFILE");
+ if (!cfgfile) cfgfile = CFGFILE;
+ cfg->readConf(cfgfile);
cfg->readConf(SLIMLOCKCFG);
string themebase = "";
string themefile = "";
string themedir = "";
themeName = "";
- themebase = string(THEMESDIR) + "/";
+ char *themesdir = getenv("SLIM_THEMESDIR");
+ if (!themesdir) themesdir = THEMESDIR;
+ themebase = string(themesdir) + "/";
themeName = cfg->getOption("current_theme");
string::size_type pos;
if ((pos = themeName.find(",")) != string::npos) {

40
pkgs/applications/display-managers/slim/sort-sessions.patch
View File

@ -1,40 +0,0 @@
diff -ru -x '*~' slim-1.3.6-orig/cfg.cpp slim-1.3.6/cfg.cpp
--- slim-1.3.6-orig/cfg.cpp 2013-10-02 00:38:05.000000000 +0200
+++ slim-1.3.6/cfg.cpp 2016-01-30 10:35:51.108766802 +0100
@@ -14,6 +14,7 @@
#include <iostream>
#include <unistd.h>
#include <stdlib.h>
+#include <algorithm>
#include <sys/types.h>
#include <sys/stat.h>
@@ -293,6 +294,8 @@
sessions.clear();
+ typedef pair<string,string> session_t;
+
if( !strSessionDir.empty() ) {
DIR *pDir = opendir(strSessionDir.c_str());
@@ -325,7 +328,7 @@
}
}
desktop_file.close();
- pair<string,string> session(session_name,session_exec);
+ session_t session(session_name,session_exec);
sessions.push_back(session);
cout << session_exec << " - " << session_name << endl;
}
@@ -341,6 +344,10 @@
pair<string,string> session("","");
sessions.push_back(session);
}
+
+ std::sort(sessions.begin(), sessions.end(), [](session_t& a, session_t& b) -> bool{
+ return a.first < b.first;
+ });
}
pair<string,string> Cfg::nextSession() {

183
pkgs/applications/display-managers/slim/themes.nix
View File

@ -1,183 +0,0 @@
{ stdenv, fetchurl, slim }:
# Inspired on aspell buildDict expression
let
buildTheme =
{fullName, src, version ? "testing"}:
stdenv. mkDerivation rec {
name = "${fullName}-${version}";
inherit src;
buildInputs = [ slim ];
dontBuild = true;
installPhase = ''
install -dm755 $out/share/slim/themes/${name}
install -m644 * $out/share/slim/themes/${name}
'';
meta = {
description = "Slim theme for ${fullName}";
platforms = stdenv.lib.platforms.linux;
};
};
in {
archlinuxSimple = buildTheme {
fullName = "archlinux-simple";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-archlinux-simple.tar.gz";
sha256 = "7d60d6782fa86302646fe67253467c04692d247f89bdbe87178f690f32b270db";
};
};
capernoited = buildTheme {
fullName = "capernoited";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-capernoited.tar.gz";
sha256 = "fb9163c6a2656d60f088dc4f2173aa7556a6794495122acfa7d3be7182f16b41";
};
};
debianMoreblue = buildTheme {
fullName = "debian-moreblue";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-debian-moreblue.tar.bz2";
sha256 = "5b76929827d4a4d604ddca4f42668cca3309b6f7bd659901021c6f49d6d2c481";
};
};
fingerprint = buildTheme {
fullName = "fingerprint";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-fingerprint.tar.gz";
sha256 = "48b703f84ce7b814cda0824f65cafebf695cd71a14166b481bb44616097d3144";
};
};
flat = buildTheme {
fullName = "flat";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-flat.tar.gz";
sha256 = "0092d531540f9da8ef07ad173e527c4ef9c088d04962d142be3c11f0c5c0c5e9";
};
};
flower2 = buildTheme {
fullName = "flower2";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-flower2.tar.gz";
sha256 = "840faf6459ffd6c2c363160c85cb98000717f9a425102976336f5d8f68ed95ee";
};
};
gentooSimple = buildTheme {
fullName = "gentoo-simple";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-gentoo-simple.tar.bz2";
sha256 = "27c8614cc930ca200acf81f1192febc102501744939d5cbe997141e37c96d8c2";
};
};
lake = buildTheme {
fullName = "lake";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-lake.tar.gz";
sha256 = "f7d662e37068a6c64cbf910adf3c192f1b50724baa427a8c9487cb9f7ed95851";
};
};
lunar = buildTheme {
fullName = "lunar-0.4";
version = "";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-lunar-0.4.tar.bz2";
sha256 = "1543eb45e4d664377e0dd4f7f954aba005823034ba9692624398b3d58be87d76";
};
};
mindlock = buildTheme {
fullName = "mindlock";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-mindlock.tar.gz";
sha256 = "99a6e6acd55bf55ece18a3f644299517b71c1adc49efd87ce2d7e654fb67033c";
};
};
parallelDimensions = buildTheme {
fullName = "parallel-dimensions";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-parallel-dimensions.tar.gz";
sha256 = "2b17c3e6d3967a6a0744e20e6e05c9d3938f4ef04c62d49ddbd416bc4743046f";
};
};
previous = buildTheme {
fullName = "previous";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-previous.tar.gz";
sha256 = "1f2a69f8fc0dc8ed8eb86a4c1d1087ba7be486973fb81efab52a63c661d726f8";
};
};
rainbow = buildTheme {
fullName = "rainbow";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-rainbow.tar.gz";
sha256 = "d83e3afdb05be50cff7da037bb31208b2c152539d1a009740b13857f5f910072";
};
};
rear-window = buildTheme {
fullName = "rear-window";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-rear-window.tar.gz";
sha256 = "0b123706ccb67e94f626c183530ec5732b209bab155bc661d6a3f5cd5ee39511";
};
};
scotlandRoad = buildTheme {
fullName = "scotland-road";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-scotland-road.tar.gz";
sha256 = "fd60a434496ed39b968ffa1e5457b36cd12f64a4e2ecedffc675f97ca3f3bba1";
};
};
subway = buildTheme {
fullName = "subway";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-subway.tar.gz";
sha256 = "0205568e3e157973b113a83b26d8829ce9962a85ef7eb8a33d3ae2f3f9292253";
};
};
wave = buildTheme {
fullName = "wave";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz";
sha256 = "be75676da5bf8670daa48379bb9cc1be0b9a5faa09adbea967dfd7125320b959";
};
};
zenwalk = buildTheme {
fullName = "zenwalk";
src = fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-zenwalk.tar.gz";
sha256 = "f0f41d17ea505b0aa96a036e978fabaf673a51d3f81a919cb0d43364d4bc7a57";
};
};
nixosSlim = buildTheme {
fullName = "nixos-slim";
src = fetchurl {
url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
};
};
}

12
pkgs/applications/editors/android-studio/default.nix
View File

@ -13,14 +13,14 @@ let
sha256Hash = "0kcd6kd5rn4b76damkfddin18d1r0dck05piv8mq1ns7x1n4hf7q";
};
betaVersion = {
version = "3.6.0.15"; # "Android Studio 3.6 Beta 3"
build = "192.5982640";
sha256Hash = "0017g7nvjiadd64in9fl4wq5lf8b7pyrdasbnwzjcphpbzy1390x";
version = "3.6.0.16"; # "Android Studio 3.6 Beta 4"
build = "192.5994180";
sha256Hash = "0wyyr6r0jzb1l4rn1mfgp0nnzvgk3x62imq629z6vrdbymy8psf1";
};
latestVersion = { # canary & dev
version = "4.0.0.2"; # "Android Studio 4.0 Canary 2"
build = "192.5984562";
sha256Hash = "0p29a6np31396970lnb3di2yrcqi3z8nqcn27hcnb4c4g7kjm0qw";
version = "4.0.0.3"; # "Android Studio 4.0 Canary 3"
build = "192.5994236";
sha256Hash = "14ig352anjs0df72f41v4r6jl7mlm2n4pn9syanmykaj87dm4kf4";
};
in {
# Attributes are named by their corresponding release channels

2
pkgs/applications/misc/cmatrix/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
CMatrix simulates the display from "The Matrix" and is based
on the screensaver from the movie's website.
'';
homepage = http://www.asty.org/cmatrix/;
homepage = https://github.com/abishekvashok/cmatrix;
platforms = ncurses.meta.platforms;
maintainers = [ maintainers.AndersonTorres ];
};

2
pkgs/applications/misc/fetchmail/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
configureFlags = [ "--with-ssl=${openssl.dev}" ];
meta = {
homepage = http://www.fetchmail.info/;
homepage = https://www.fetchmail.info/;
description = "A full-featured remote-mail retrieval and forwarding utility";
longDescription = ''
A full-featured, robust, well-documented remote-mail retrieval and

4
pkgs/applications/misc/gpxsee/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
version = "7.16";
version = "7.17";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "1mkfhb2c9qafjpva600nyn6yik49l4q1k6id1xvrci37wsn6ijav";
sha256 = "10mch709m4ws73yzkrx9lm2hwzl179ggpk6xkbhkvnl7rsd2yz08";
};
nativeBuildInputs = [ qmake ];

72
pkgs/applications/misc/multibootusb/default.nix
View File

@ -1,21 +1,33 @@
{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5, runtimeShell }:
{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps,
python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }:
# Note: Multibootusb is tricky to maintain. It relies on the
# $PYTHONPATH variable containing some of their code, so that
# something like:
#
# from scripts import config
#
# works. It also relies on the current directory to find some runtime
# resources thanks to a use of __file__.
#
# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59
python36Packages.buildPythonApplication rec {
pname = "multibootusb";
name = "${pname}-${version}";
version = "9.2.0";
nativeBuildInputs = [
wrapQtAppsHook
];
buildInputs = [
python36Packages.dbus-python
python36Packages.pyqt5
python36Packages.pytest-shutil
python36Packages.python
python36Packages.pyudev
python36Packages.six
libxcb
mtools
p7zip
parted
procps
python36Packages.python
qt5.full
utillinux
];
@ -28,32 +40,42 @@ python36Packages.buildPythonApplication rec {
sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3";
};
# Skip the fixup stage where stuff is shrinked (can't shrink text files)
phases = [ "unpackPhase" "installPhase" ];
# Tests can't run inside the NixOS sandbox
# "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory"
doCheck = false;
installPhase = ''
share="$out/share/${pname}"
mkdir -p "$share"
cp -r data "$share/data"
cp -r scripts "$share/scripts"
cp "${pname}" "$share/${pname}"
pythonPath = [
python36Packages.dbus-python
python36Packages.pyqt5
python36Packages.pytest-shutil
python36Packages.pyudev
python36Packages.six
];
mkdir "$out/bin"
cat > "$out/bin/${pname}" <<EOF
#!${runtimeShell}
cd "$share"
export PYTHONPATH="$PYTHONPATH:$share"
export PATH="$PATH:${parted}/bin:${procps}/bin"
makeWrapperArgs = [
# Firstly, add all necessary QT variables
"\${qtWrapperArgs[@]}"
"${python36Packages.python}/bin/python" "${pname}"
EOF
chmod +x "$out/bin/${pname}"
# Then, add the installed scripts/ directory to the python path
"--prefix" "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages"
# Finally, move to directory that contains data
"--run" "\"cd $out/share/${pname}\""
];
postInstall = ''
# This script doesn't work and it doesn't add much anyway
rm $out/bin/multibootusb-pkexec
# The installed data isn't sufficient for whatever reason, missing gdisk/gdisk.exe
mkdir -p "$out/share/${pname}"
cp -r data "$out/share/${pname}/data"
'';
meta = with stdenv.lib; {
description = "Multiboot USB creator for Linux live disks";
homepage = http://multibootusb.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ jD91mZM2 ];
maintainers = []; # Looking for a maintainer!
};
}

4
pkgs/applications/misc/xmrig/proxy.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig-proxy";
version = "3.2.0";
version = "5.0.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
sha256 = "0scz78cc5zcdd6z4gm0zqsb36jf0z8fyn2ki52814ndxrk7nr4xg";
sha256 = "0h0yxzpar952ix94j10qyf31c20g45w0nxr02vfybjip48dvlf76";
};
nativeBuildInputs = [ cmake ];

2
pkgs/applications/networking/browsers/luakit/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Fast, small, webkit based browser framework extensible in Lua";
homepage = http://luakit.org;
homepage = https://luakit.github.io/;
license = licenses.gpl3;
platforms = platforms.linux; # Only tested linux
};

6
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "kubernetes";
version = "1.15.4";
version = "1.16.3";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p";
sha256 = "0s2k7ik2aa7knh25r0qki7ldr3g9h87dgi8nm64j8n0yy4xvg2h3";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
description = "Production-Grade Container Scheduling and Management";
license = licenses.asl20;
homepage = https://kubernetes.io;
maintainers = with maintainers; [johanot offline];
maintainers = with maintainers; [johanot offline saschagrunert];
platforms = platforms.unix;
};
}

4
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -112,8 +112,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic {
version = "0.12.14";
sha256 = "0pq4sfnnlj91gxyxvyzzrgglnvh8xpan90gnc9jvnnb23iv4q96l";
version = "0.12.15";
sha256 = "18kvgb2sjldis7bykb11zqzx6avr7a4ry91xsfq4v0iwbi5k383b";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});

2
pkgs/applications/networking/feedreaders/castget/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
castget is a simple, command-line based RSS enclosure downloader. It is
primarily intended for automatic, unattended downloading of podcasts.
'';
homepage = "http://castget.johndal.com/";
homepage = "https://castget.johndal.com/";
maintainers = with maintainers; [ doronbehar ];
license = licenses.gpl2;
platforms = platforms.linux;

8
pkgs/applications/networking/gns3/default.nix
View File

@ -1,16 +1,16 @@
{ callPackage }:
let
stableVersion = "2.2.2";
previewVersion = "2.2.2";
stableVersion = "2.2.3";
previewVersion = stableVersion;
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
guiSrcHash = "0i335fjbadixp39l75w0fl5iwz2cb8rcdj2xvx1my3vzhg8lijfl";
serverSrcHash = "1g6km8jc53y8ph14ifjxscbimdxma6bw5ir9gqzvkjn39k9fy1w6";
guiSrcHash = "1l40q3d3hsmhgwb4d8hj73vhgckm0dvsc6l6qzacypd202iq1v8a";
serverSrcHash = "1qcypb1rmfdl8fl3ykqf5phcapmjid6jrxd6xpncd5dhyl2hr94n";
in {
guiStable = mkGui {
stable = true;

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.97";
version = "0.0.98";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "17kwgk2kwrfqgjqmfv055gvlqq144gz7bywwrs6i2x7mimz4345x";
sha256 = "0raqsfakjbcsh7g280yi7sg2jsrmy2q4jldg73wb868z35radld4";
};
};
}.${branch}

28
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
View File

@ -1,26 +1,26 @@
{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } :
{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } :
let
version = "2018-08-03";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "purple-matrix-unstable";
inherit version;
version = "2019-06-06";
src = fetchgit {
url = "https://github.com/matrix-org/purple-matrix";
rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0";
sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "purple-matrix";
rev = "4494ba22b479917f0b1f96a3019792d3d75bcff1";
sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm";
};
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = [
# glib-2.62 deprecations
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"
# override "-O0 -Werror" set by build system
"-O3" "-Wno-error"
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];
hardeningDisable = [ "fortify" ]; # upstream compiles with -O0
makeFlags = [
"PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
"DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"

1
pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View File

@ -31,6 +31,7 @@ in yarn2nix-moretea.mkYarnPackage rec {
ln -s '${riot-web}' "$out/share/riot/webapp"
cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator"
cp -r './deps/riot-web' "$out/share/riot/electron"
cp -r './deps/riot-web/img' "$out/share/riot"
rm "$out/share/riot/electron/node_modules"
cp -r './node_modules' "$out/share/riot/electron"

2
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -114,7 +114,7 @@ in stdenv.mkDerivation rec {
'';
homepage = https://signal.org/;
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ixmatus primeos ];
maintainers = with lib.maintainers; [ ixmatus primeos equirosa ];
platforms = [ "x86_64-linux" ];
};
}

4
pkgs/applications/networking/newsreaders/quiterss/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "quiterss";
version = "0.18.12";
version = "0.19.0";
src = fetchFromGitHub {
owner = "QuiteRSS";
repo = "quiterss";
rev = version;
sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa";
sha256 = "1czz8n21f4iaazvkq37m867bqy40sdkj44bqggfjcw49pl60kvjn";
};
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];

17
pkgs/applications/office/gnumeric/default.nix
View File

@ -1,31 +1,22 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
, itstool, autoreconfHook
, itstool
}:
let
inherit (pythonPackages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook
version = "1.12.46";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h";
sha256 = "9fdc67377af52dfe69a7db4f533938024a75f454fc5d25ab43b8e6739be0b5e1";
};
patches = stdenv.lib.optional stdenv.isDarwin
# https://gitlab.gnome.org/GNOME/gnumeric/issues/402
(fetchurl {
name = "math-gamma.patch";
url = "https://gitlab.gnome.org/GNOME/gnumeric/uploads/cf8d162bc719de92e97d01cb0ba5b637/ppp";
sha256 = "17wiigs06qc86a1nghwcg3pcnpa28123jblgsxpy3j7drardgnlp";
});
configureFlags = [ "--disable-component" ];
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]
++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];
# ToDo: optional libgda, introspection?
buildInputs = [

2
pkgs/applications/science/biology/niftyseg/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
homepage = http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg;
description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.bsd3;
};

2
pkgs/applications/science/chemistry/octopus/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Real-space time dependent density-functional theory code";
homepage = http://octopus-code.org;
homepage = https://octopus-code.org;
maintainers = with maintainers; [ markuskowa ];
license = licenses.gpl2;
platforms = [ "x86_64-linux" ];

2
pkgs/applications/science/logic/aspino/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ gebner ma27 ];
platforms = platforms.unix;
license = licenses.asl20;
homepage = http://alviano.net/software/maxino/;
homepage = https://alviano.net/software/maxino/;
# See pkgs/applications/science/logic/glucose/default.nix
badPlatforms = [ "aarch64-linux" ];
};

4
pkgs/applications/science/math/glsurf/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "glsurf-3.3.1";
src = fetchurl {
url = "https://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz";
url = "https://raffalli.eu/~christophe/glsurf/glsurf-3.3.1.tar.gz";
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
};
@ -24,7 +24,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf;
homepage = https://raffalli.eu/~christophe/glsurf/;
description = "A program to draw implicit surfaces and curves";
license = stdenv.lib.licenses.lgpl21;
};

2
pkgs/applications/science/medicine/aliza/default.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation {
meta = {
description = "Medical imaging software with 2D, 3D and 4D capabilities";
homepage = http://www.aliza-dicom-viewer.com;
homepage = https://www.aliza-dicom-viewer.com;
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ mounium ];
platforms = platforms.linux;

4
pkgs/applications/version-management/gitea/default.nix
View File

@ -8,13 +8,13 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
version = "1.9.5";
version = "1.9.6";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
sha256 = "07isawbasshkgij2mh7pmp6h3ns758ysflngr18z0k2m38ny9h31";
sha256 = "0ql6hrrc339hrik4yk26bjn5x167c5q4s10kjld5fsgmn2k1nhdb";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''

2
pkgs/data/fonts/babelstone-han/default.nix
View File

@ -5,7 +5,7 @@ let
in fetchzip {
name = "babelstone-han-${version}";
url = http://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip;
url = https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip;
postFetch = ''
mkdir -p $out/share/fonts/truetype
unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype

4
pkgs/data/fonts/gohufont/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "2.1";
src = fetchurl {
url = "http://font.gohu.org/${pname}-${version}.tar.gz";
url = "https://font.gohu.org/${pname}-${version}.tar.gz";
sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm";
};
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
description = ''
A monospace bitmap font well suited for programming and terminal use
'';
homepage = http://font.gohu.org/;
homepage = https://font.gohu.org/;
license = licenses.wtfpl;
maintainers = with maintainers; [ epitrochoid rnhmjoj ];
};

2
pkgs/data/fonts/input-fonts/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation {
generous spacing, large punctuation, and easily distinguishable
characters — but without the limitations of a fixed width.
'';
homepage = http://input.fontbureau.com;
homepage = https://input.fontbureau.com;
license = licenses.unfree;
maintainers = with maintainers; [ romildo ];
platforms = platforms.all;

2
pkgs/desktops/enlightenment/ephoto.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
homepage = http://smhouston.us/ephoto/;
homepage = https://smhouston.us/projects/ephoto/;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ];

2
pkgs/desktops/xfce/core/exo.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ];
meta = with stdenv.lib; {
homepage = "http://www.xfce.org/projects/${p_name}";
homepage = "https://docs.xfce.org/xfce/${p_name}/start";
description = "Application library for the Xfce desktop environment";
license = licenses.gpl2Plus;
platforms = platforms.linux;

4
pkgs/development/compilers/factor-lang/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
src = fetchurl {
url = http://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip;
url = https://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip;
sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri";
};
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = http://factorcode.org;
homepage = https://factorcode.org;
license = licenses.bsd2;
description = "A concatenative, stack-based programming language";

6
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -74,7 +74,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "1ahjddwl8wfkhc5sj2j2snh3cq0vg4apgv2maq3wdncin8bj7my6";
sha256 = "04l1yrjq7n4nlzkmkg73xp6p7vpw1iq53mrmyb8162wqb7zapg4f";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -275,6 +275,7 @@ self: super: {
dlist = dontCheck super.dlist;
docopt = dontCheck super.docopt; # http://hydra.cryp.to/build/499172/log/raw
dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw
dotenv = dontCheck super.dotenv; # Tests fail because of missing test file on version 0.8.0.2 fixed on version 0.8.0.4
dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw
DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw
ed25519 = dontCheck super.ed25519;
@ -1314,4 +1315,7 @@ self: super: {
];
});
# Needs the corresponding version of haskell-src-exts.
haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_22_0; };
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

70
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -43,7 +43,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 14.13
# LTS Haskell 14.14
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -60,7 +60,7 @@ default-package-overrides:
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.2.0.0
- aeson-compat ==0.3.9
- aeson-diff ==1.1.0.7
- aeson-diff ==1.1.0.8
- aeson-extra ==0.4.1.3
- aeson-generic-compat ==0.0.1.3
- aeson-iproute ==0.2
@ -72,7 +72,7 @@ default-package-overrides:
- al ==0.1.4.2
- alarmclock ==0.7.0.2
- alerts ==0.1.2.0
- alex ==3.2.4
- alex ==3.2.5
- alg ==0.2.12.0
- algebraic-graphs ==0.4
- Allure ==0.9.5.0
@ -90,7 +90,7 @@ default-package-overrides:
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
- aos-signature ==0.1.1
- apecs ==0.8.1
- apecs ==0.8.2
- apecs-gloss ==0.2.3
- apecs-physics ==0.4.2
- api-field-json-th ==0.1.0.2
@ -111,7 +111,7 @@ default-package-overrides:
- asn1-parse ==0.9.5
- asn1-types ==0.3.3
- assert-failure ==0.1.2.2
- assoc ==1
- assoc ==1.0.1
- astro ==0.4.2.1
- async ==2.2.2
- async-extra ==0.2.0.0
@ -134,12 +134,12 @@ default-package-overrides:
- authenticate ==1.3.4
- authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1
- autoexporter ==1.1.14
- autoexporter ==1.1.15
- auto-update ==0.1.6
- avers ==0.0.17.1
- avers-api ==0.1.0
- avers-server ==0.1.0.1
- avro ==0.4.5.3
- avro ==0.4.5.4
- avwx ==0.3.0.2
- aws-cloudfront-signed-cookies ==0.2.0.1
- aws-lambda-haskell-runtime ==2.0.1
@ -311,7 +311,7 @@ default-package-overrides:
- chiphunk ==0.1.2.1
- choice ==0.2.2
- chronologique ==0.3.1.1
- chronos ==1.0.7
- chronos ==1.0.8
- chronos-bench ==0.2.0.2
- chunked-data ==0.3.1
- cipher-aes ==0.2.11
@ -513,7 +513,7 @@ default-package-overrides:
- deque ==0.4.3
- deriveJsonNoPrefix ==0.1.0.1
- deriving-compat ==0.5.7
- derulo ==1.0.5
- derulo ==1.0.7
- detour-via-sci ==1.0.0
- dhall ==1.24.0
- dhall-bash ==1.0.21
@ -521,7 +521,7 @@ default-package-overrides:
- diagrams ==1.4
- diagrams-contrib ==1.4.3
- diagrams-core ==1.4.2
- diagrams-lib ==1.4.2.3
- diagrams-lib ==1.4.3
- diagrams-postscript ==1.4.1
- diagrams-rasterific ==1.4.1.1
- diagrams-solve ==0.1.1
@ -532,7 +532,7 @@ default-package-overrides:
- digest ==0.0.1.2
- digits ==0.3.1
- dimensional ==1.3
- di-monad ==1.3
- di-monad ==1.3.1
- directory-tree ==0.12.1
- direct-sqlite ==2.3.24
- discount ==0.1.1
@ -550,7 +550,7 @@ default-package-overrides:
- doctemplates ==0.2.2.1
- doctest ==0.16.2
- doctest-discover ==0.2.0.0
- doctest-driver-gen ==0.3.0.1
- doctest-driver-gen ==0.3.0.2
- doldol ==0.4.1.2
- do-list ==1.0.1
- dom-parser ==3.1.0
@ -799,7 +799,7 @@ default-package-overrides:
- gingersnap ==0.3.1.0
- gi-pango ==1.0.22
- githash ==0.1.3.3
- github-release ==1.2.4
- github-release ==1.2.5
- github-types ==0.2.1
- github-webhooks ==0.10.1
- gitrev ==1.3.1
@ -876,7 +876,7 @@ default-package-overrides:
- haskey-btree ==0.3.0.1
- haskintex ==0.8.0.0
- haskoin-core ==0.9.6
- hasql ==1.4
- hasql ==1.4.0.1
- hasql-optparse-applicative ==0.3.0.5
- hasql-pool ==0.5.1
- hasql-transaction ==0.7.2
@ -895,7 +895,7 @@ default-package-overrides:
- hedgehog ==1.0.1
- hedgehog-corpus ==0.1.0
- hedgehog-fn ==1.0
- hedis ==0.12.8
- hedis ==0.12.9
- hedn ==0.2.0.1
- here ==1.2.13
- heredoc ==0.2.0.0
@ -1148,7 +1148,7 @@ default-package-overrides:
- js-jquery ==3.3.1
- json ==0.9.3
- json-alt ==1.0.0
- json-feed ==1.0.6
- json-feed ==1.0.7
- jsonpath ==0.1.0.2
- json-rpc ==1.0.0
- json-rpc-client ==0.2.5.0
@ -1176,7 +1176,7 @@ default-package-overrides:
- kraken ==0.1.0
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==1.0.9
- lackey ==1.0.10
- LambdaHack ==0.9.5.0
- lame ==0.2.0
- language-c ==0.8.3
@ -1225,7 +1225,7 @@ default-package-overrides:
- libmpd ==0.9.0.10
- liboath-hs ==0.0.1.1
- libraft ==0.5.0.0
- libyaml ==0.1.1.0
- libyaml ==0.1.1.1
- LibZip ==1.0.1
- lifted-async ==0.10.0.4
- lifted-base ==0.2.3.12
@ -1262,7 +1262,7 @@ default-package-overrides:
- lrucache ==1.2.0.1
- lrucaching ==0.3.3
- lsp-test ==0.6.1.0
- lucid ==2.9.11
- lucid ==2.9.12
- lucid-extras ==0.2.2
- lxd-client-config ==0.1.0.1
- lzma ==0.0.0.3
@ -1356,7 +1356,7 @@ default-package-overrides:
- monad-loops ==0.4.3
- monad-memo ==0.5.1
- monad-metrics ==0.2.1.4
- monad-par ==0.3.4.8
- monad-par ==0.3.5
- monad-parallel ==0.7.2.3
- monad-par-extras ==0.3.3
- monad-peel ==0.2.1.2
@ -1378,7 +1378,6 @@ default-package-overrides:
- mono-traversable-instances ==0.1.0.0
- mono-traversable-keys ==0.1.0
- more-containers ==0.2.1.2
- morpheus-graphql ==0.6.2
- mountpoints ==1.0.2
- mpi-hs ==0.5.3.0
- msgpack ==1.0.1.0
@ -1432,7 +1431,7 @@ default-package-overrides:
- network-conduit-tls ==1.3.2
- network-house ==0.1.0.2
- network-info ==0.2.0.10
- network-ip ==0.3.0.2
- network-ip ==0.3.0.3
- network-messagepack-rpc ==0.1.1.4
- network-multicast ==0.3.2
- network-simple ==0.4.5
@ -1452,7 +1451,7 @@ default-package-overrides:
- nonempty-containers ==0.3.2.0
- nonemptymap ==0.0.6.0
- non-empty-sequence ==0.2.0.2
- nonempty-vector ==0.1.0.0
- nonempty-vector ==0.2.0.1
- non-negative ==0.1.2
- not-gloss ==0.7.7.0
- no-value ==1.0.0.0
@ -1724,10 +1723,10 @@ default-package-overrides:
- rank2classes ==1.3.1.2
- Rasterific ==0.7.4.4
- rasterific-svg ==0.3.3.2
- ratel ==1.0.8
- ratel-wai ==1.1.0
- ratel ==1.0.9
- ratel-wai ==1.1.1
- rattle ==0.1
- rattletrap ==9.0.6
- rattletrap ==9.0.7
- rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0
- raw-strings-qq ==1.1
@ -1822,7 +1821,7 @@ default-package-overrides:
- salak-toml ==0.3.5.3
- salak-yaml ==0.3.5.3
- saltine ==0.1.0.2
- salve ==1.0.6
- salve ==1.0.8
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.3
@ -2033,7 +2032,7 @@ default-package-overrides:
- stripe-scotty ==1.0.0.0
- stripe-signature ==1.0.0.1
- stripe-wreq ==1.0.1.0
- strive ==5.0.8
- strive ==5.0.9
- structs ==0.1.2
- structured-cli ==2.5.1.0
- summoner ==1.3.0.1
@ -2126,7 +2125,7 @@ default-package-overrides:
- text-region ==0.3.1.0
- text-short ==0.1.3
- text-show ==3.8.2
- text-show-instances ==3.8.2
- text-show-instances ==3.8.3
- text-zipper ==0.10.1
- tfp ==1.0.1.1
- tf-random ==0.5
@ -2195,7 +2194,7 @@ default-package-overrides:
- transformers-bifunctors ==0.1
- transformers-compat ==0.6.5
- transformers-fix ==1.0
- traverse-with-class ==1.0.0.0
- traverse-with-class ==1.0.1.0
- tree-diff ==0.1
- tree-fun ==0.8.1.0
- trifecta ==2
@ -2391,7 +2390,7 @@ default-package-overrides:
- writer-cps-mtl ==0.1.1.6
- writer-cps-transformers ==0.5.6.1
- ws ==0.0.5
- wuss ==1.1.14
- wuss ==1.1.15
- X11 ==1.9.1
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
@ -2429,7 +2428,7 @@ default-package-overrides:
- xmonad-extras ==0.15.2
- xss-sanitize ==0.3.6
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.1.2
- yaml ==0.11.2.0
- yeshql ==4.1.0.1
- yeshql-core ==4.1.0.2
- yeshql-hdbc ==4.1.0.2
@ -4311,7 +4310,6 @@ broken-packages:
- domplate
- dot-linker
- dot2graphml
- dotenv
- dotfs
- doublify-toolkit
- dovin
@ -5188,6 +5186,8 @@ broken-packages:
- GrowlNotify
- grpc-api-etcd
- grpc-etcd-client
- grpc-haskell
- grpc-haskell-core
- gruff
- gruff-examples
- gsc-weighting
@ -6156,6 +6156,7 @@ broken-packages:
- http-dispatch
- http-enumerator
- http-grammar
- http-io-streams
- http-kinder
- http-monad
- http-pony-serve-wai
@ -7448,6 +7449,7 @@ broken-packages:
- NestedFunctor
- nestedmap
- net-mqtt
- net-mqtt-rpc
- net-spider
- net-spider-cli
- net-spider-pangraph
@ -8552,6 +8554,7 @@ broken-packages:
- rws
- RxHaskell
- s-expression
- S3
- SableCC2Hs
- safe-access
- safe-buffer-monad
@ -8684,6 +8687,7 @@ broken-packages:
- Semantique
- semdoc
- semi-iso
- semialign-extras
- semialign-indexed
- semialign-optics
- semibounded-lattices

21
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -297,10 +297,22 @@ self: super: builtins.intersectAttrs super {
);
llvm-hs =
let dontCheckDarwin = if pkgs.stdenv.isDarwin
then dontCheck
else pkgs.lib.id;
in dontCheckDarwin (super.llvm-hs.override { llvm-config = pkgs.llvm_8; });
let llvmHsWithLlvm8 = super.llvm-hs.override { llvm-config = pkgs.llvm_8; };
in
if pkgs.stdenv.isDarwin
then
overrideCabal llvmHsWithLlvm8 (oldAttrs: {
# One test fails on darwin.
doCheck = false;
# llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to
# the DYLD_LIBRARY_PATH environment variable. This messes up clang
# when called from GHC, probably because clang is version 7, but we are
# using LLVM8.
preCompileBuildDriver = oldAttrs.preCompileBuildDriver or "" + ''
substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
'';
})
else llvmHsWithLlvm8;
# Needs help finding LLVM.
spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
@ -624,5 +636,4 @@ self: super: builtins.intersectAttrs super {
# need it during the build itself, too.
cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
}

2263
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/libraries/boehm-gc/7.6.6.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
"http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
"https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
];
sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79";
@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
C or C++ programs, though that is not its primary goal.
'';
homepage = http://hboehm.info/gc/;
homepage = https://hboehm.info/gc/;
# non-copyleft, X11-style license
license = http://hboehm.info/gc/license.txt;
license = https://hboehm.info/gc/license.txt;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;

6
pkgs/development/libraries/boehm-gc/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
"http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
"https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
];
sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3";
};
@ -58,10 +58,10 @@ stdenv.mkDerivation rec {
C or C++ programs, though that is not its primary goal.
'';
homepage = http://hboehm.info/gc/;
homepage = https://hboehm.info/gc/;
# non-copyleft, X11-style license
license = http://hboehm.info/gc/license.txt;
license = https://hboehm.info/gc/license.txt;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;

15
pkgs/development/libraries/boost/1.71.nix Normal file
View File

@ -0,0 +1,15 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.71.0";
src = fetchurl {
#url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2";
urls = [
"mirror://sourceforge/boost/boost_1_71_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_71_0.html
sha256 = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee";
};
})

2
pkgs/development/libraries/c-blosc/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A blocking, shuffling and loss-less compression library";
homepage = http://www.blosc.org;
homepage = https://www.blosc.org;
license = licenses.bsd3;
platforms = platforms.all;
};

4
pkgs/development/libraries/fltk/1.4.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
url = "https://www.fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
};
@ -41,7 +41,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library";
homepage = http://www.fltk.org;
homepage = https://www.fltk.org;
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};

4
pkgs/development/libraries/fltk/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
url = "https://www.fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7";
};
@ -39,7 +39,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library";
homepage = http://www.fltk.org;
homepage = https://www.fltk.org;
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};

2
pkgs/development/libraries/freetds/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
homepage = http://www.freetds.org;
homepage = https://www.freetds.org;
license = licenses.lgpl2;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;

2
pkgs/development/libraries/geoip/default.nix
View File

@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ thoughtpolice raskin ];
license = licenses.lgpl21;
platforms = platforms.unix;
homepage = "http://maxmind.com";
homepage = "https://www.maxmind.com";
};
}

4
pkgs/development/libraries/goffice/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "goffice";
version = "0.10.45";
version = "0.10.46";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "702ba567e9ec0bbdd9b1a8161cd24648b4868d57a6cb89128f13c125f6f31947";
sha256 = "058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9";
};
nativeBuildInputs = [ pkgconfig intltool ];

3
pkgs/development/libraries/jitterentropy/default.nix
View File

@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
preInstall = ''
mkdir -p $out/include
substituteInPlace Makefile \
--replace "install -m 0755 -s" \
'install -m 0755 -s --strip-program $(STRIP)'
'';
installFlags = [

2
pkgs/development/libraries/liburing/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Userspace library for the Linux io_uring API";
homepage = http://git.kernel.dk/cgit/liburing/;
homepage = https://git.kernel.dk/cgit/liburing/;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ];

2
pkgs/development/libraries/linbox/default.nix
View File

@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.timokau];
platforms = stdenv.lib.platforms.unix;
homepage = http://linalg.org/;
homepage = https://linalg.org/;
};
}

2
pkgs/development/libraries/mapnik/default.nix
View File

@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An open source toolkit for developing mapping applications";
homepage = http://mapnik.org;
homepage = https://mapnik.org;
maintainers = with maintainers; [ hrdinka ];
license = licenses.lgpl21;
platforms = platforms.all;

4
pkgs/development/libraries/ntl/default.nix
View File

@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;
stdenv.mkDerivation rec {
pname = "ntl";
version = "11.3.4";
version = "11.4.1";
src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
sha256 = "0fdy63x6iglp20ypqhkpjj6wqjzpxlyl2wfw2dqlgiy6l6ibm4rd";
sha256 = "03k2hb6yn49d1f9cdig2ci7h5ga0x3nb3li60hh19wdqzg28f1m3";
};
buildInputs = [

2
pkgs/development/libraries/opencolorio/default.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
homepage = http://opencolorio.org;
homepage = https://opencolorio.org;
description = "A color management framework for visual effects and animation";
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu ];

2
pkgs/development/libraries/science/biology/nifticlib/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
homepage = https://sourceforge.net/projects/niftilib;
description = "Medical imaging format C API";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.publicDomain;
};
}

2
pkgs/development/ocaml-modules/easy-format/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A high-level and functional interface to the Format module of the OCaml standard library";
homepage = "http://mjambon.com/${pname}.html";
homepage = "https://github.com/ocaml-community/${pname}";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
};

35
pkgs/development/ocaml-modules/facile/default.nix
View File

@ -1,38 +1,19 @@
{ stdenv, fetchurl, ocaml, findlib }:
{ lib, fetchurl, buildDunePackage }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-facile-${version}";
version = "1.1.3";
buildDunePackage rec {
pname = "facile";
version = "1.1.4";
src = fetchurl {
url = "http://opti.recherche.enac.fr/facile/distrib/facile-${version}.tar.gz";
sha256 = "1v4apqcw4gm36ph5xwf1wxaaza0ggvihvgsdslnf33fa1pdkvdjw";
url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz";
sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp";
};
dontAddPrefix = 1;
buildInputs = [ ocaml findlib ];
createFindlibDestdir = true;
installFlags = [ "FACILEDIR=$(OCAMLFIND_DESTDIR)/facile" ];
postInstall = ''
cat > $OCAMLFIND_DESTDIR/facile/META <<EOF
version = "${version}"
name = "facile"
description = "A Functional Constraint Library"
requires = ""
archive(byte) = "facile.cma"
archive(native) = "facile.cmxa"
EOF
'';
doCheck = true;
meta = {
homepage = "http://opti.recherche.enac.fr/facile/";
license = stdenv.lib.licenses.lgpl21Plus;
license = lib.licenses.lgpl21Plus;
description = "A Functional Constraint Library";
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/development/ocaml-modules/iso8601/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
createFindlibDestdir = true;
meta = {
homepage = http://sagotch.github.io/ISO8601.ml/;
homepage = https://ocaml-community.github.io/ISO8601.ml/;
description = "ISO 8601 and RFC 3999 date parsing for OCaml";
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms or [];

3
pkgs/development/ocaml-modules/lwt/ppx.nix
View File

@ -5,8 +5,7 @@ buildDunePackage {
inherit (lwt) src version;
buildInputs = [ ppx_tools_versioned ];
propagatedBuildInputs = [ lwt ];
propagatedBuildInputs = [ lwt ppx_tools_versioned ];
meta = {
description = "Ppx syntax extension for Lwt";

2
pkgs/development/ocaml-modules/yojson/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation ({
meta = with stdenv.lib; {
description = "An optimized parsing and printing library for the JSON format";
homepage = "http://mjambon.com/${pname}.html";
homepage = "https://github.com/ocaml-community/${pname}";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];

2
pkgs/development/python-modules/ansi2html/default.nix
View File

@ -15,7 +15,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Convert text with ANSI color codes to HTML";
homepage = http://github.com/ralphbean/ansi2html;
homepage = https://github.com/ralphbean/ansi2html;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ davidtwco ];
platforms = platforms.all;

2
pkgs/development/python-modules/cssmin/default.nix
View File

@ -14,7 +14,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "A Python port of the YUI CSS compression algorithm";
homepage = http://github.com/zacharyvoase/cssmin;
homepage = https://github.com/zacharyvoase/cssmin;
license = licenses.bsd3;
};
}

2
pkgs/development/python-modules/dmenu/default.nix
View File

@ -17,7 +17,7 @@ buildPythonPackage rec {
meta = {
description = "A Python wrapper for dmenu";
homepage = http://dmenu.readthedocs.io;
homepage = https://dmenu.readthedocs.io;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.nico202 ];
};

2
pkgs/development/python-modules/eyed3/default.nix
View File

@ -44,7 +44,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "A Python module and command line program for processing ID3 tags";
homepage = http://eyed3.nicfit.net/;
homepage = https://eyed3.nicfit.net/;
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;

28
pkgs/development/python-modules/geopy/2.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy27
, geographiclib
}:
buildPythonPackage rec {
pname = "geopy";
version = "1.20.0";
disabled = !isPy27; # only Python 2.7
doCheck = false; # Needs network access
propagatedBuildInputs = [ geographiclib ];
src = fetchPypi {
inherit pname version;
sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2";
};
meta = with stdenv.lib; {
homepage = "https://github.com/geopy/geopy";
description = "Python Geocoding Toolbox";
license = licenses.mit;
maintainers = with maintainers; [GuillaumeDesforges];
};
}

33
pkgs/development/python-modules/geopy/default.nix
View File

@ -1,31 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy27
, mock
, tox
, pylint
, fetchFromGitHub
, isPy3k
, geographiclib
}:
buildPythonPackage rec {
pname = "geopy";
version = "1.20.0";
disabled = !isPy27;
pname = "geopy-unstable";
version = "2019-11-10";
src = fetchPypi {
inherit pname version;
sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2";
disabled = !isPy3k; # only Python 3
doCheck = false; # Needs network access
propagatedBuildInputs = [ geographiclib ];
src = fetchFromGitHub {
owner = "geopy";
repo = "geopy";
rev = "531b7de6126838a3e69370227aa7f2086ba52b89";
sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39";
};
doCheck = false; # too much
buildInputs = [ mock tox pylint ];
meta = with stdenv.lib; {
homepage = "https://github.com/geopy/geopy";
description = "Python Geocoding Toolbox";
license = licenses.mit;
broken = true;
maintainers = with maintainers; [GuillaumeDesforges];
};
}

4
pkgs/development/python-modules/pyspf/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyspf";
version = "2.0.13";
version = "2.0.12"; # version 2.0.13 should not be used, see #72791
src = fetchPypi {
inherit pname version;
sha256 = "16wjj99d2pikz6z1gwnl1jjvad6qjgpsf3a85lh47qqrjpiipp32";
sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la";
};
propagatedBuildInputs = [ pydns ];

2
pkgs/development/python-modules/rfc-bibtex/default.nix
View File

@ -12,7 +12,7 @@ buildPythonApplication rec {
disabled = !isPy3k;
meta = with stdenv.lib; {
homepage = ttps://github.com/iluxonchik/rfc-bibtex/;
homepage = https://github.com/iluxonchik/rfc-bibtex/;
description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts";
license = licenses.mit;
maintainers = with maintainers; [ teto ];

2
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -111,7 +111,7 @@ python3Packages.buildPythonApplication rec {
isCross = stdenv.targetPlatform != stdenv.hostPlatform;
meta = with lib; {
homepage = http://mesonbuild.com;
homepage = https://mesonbuild.com;
description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
license = licenses.asl20;
maintainers = with maintainers; [ mbe rasendubi ];

2
pkgs/development/tools/ocaml/cppo/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }:
let
pname = "cppo";
webpage = "http://mjambon.com/${pname}.html";
webpage = "https://github.com/ocaml-community/${pname}";
in
assert stdenv.lib.versionAtLeast ocaml.version "3.12";

4
pkgs/development/web/nodejs/v13.nix
View File

@ -5,8 +5,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "13.0.1";
sha256 = "1n9w1kvdzdg2j0a41wdkqcl893209lc018sd49xpy1cnr169h6vr";
version = "13.1.0";
sha256 = "0s6b2k7i89j9mxwyz271fvm6bf8jcz2v5kzmn0v5icrkpmn0ab6l";
patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-13_x.patch ];
}

4
pkgs/games/arx-libertatis/default.nix
View File

@ -47,14 +47,14 @@ stdenv.mkDerivation {
'' + optionalString withCrashReporter ''
wrapQtApp "$out/libexec/arxcrashreporter"
'';
meta = {
description = ''
A cross-platform, open source port of Arx Fatalis, a 2002
first-person role-playing game / dungeon crawler
developed by Arkane Studios.
'';
homepage = http://arx-libertatis.org/;
homepage = https://arx-libertatis.org/;
license = licenses.gpl3;
maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.linux;

8
pkgs/games/gcs/default.nix
View File

@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
cd ../toolkit
ant
cd ../gcs
ant
@ -60,15 +60,15 @@ in stdenv.mkDerivation rec {
mkdir -p $out/bin $out/share/java
find gcs/libraries toolkit/libraries apple_stubs/ \( -name '*.jar' -and -not -name '*-src.jar' \) -exec cp '{}' $out/share/java ';'
makeWrapper ${jre8}/bin/java $out/bin/gcs \
--set GCS_LIBRARY ${library} \
--add-flags "-cp $out/share/java/gcs-${version}.jar com.trollworks.gcs.app.GCS"
'';
'';
meta = with stdenv.lib; {
description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system";
homepage = http://gurpscharactersheet.com/;
homepage = https://gurpscharactersheet.com/;
license = licenses.mpl20;
platforms = platforms.all;
maintainers = with maintainers; [];

12
pkgs/misc/emulators/retroarch/default.nix
View File

@ -2,12 +2,14 @@
, ffmpeg, libGLU_combined, freetype, libxml2, python3
, libobjc, AppKit, Foundation
, alsaLib ? null
, libdrm ? null
, libpulseaudio ? null
, libv4l ? null
, libX11 ? null
, libXdmcp ? null
, libXext ? null
, libXxf86vm ? null
, mesa ? null
, SDL2 ? null
, udev ? null
, enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
@ -27,12 +29,12 @@ let
in stdenv.mkDerivation rec {
pname = "retroarch-bare";
version = "1.7.8.4";
version = "1.8.1";
src = fetchFromGitHub {
owner = "libretro";
repo = "RetroArch";
sha256 = "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph";
sha256 = "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7";
rev = "v${version}";
};
@ -43,11 +45,13 @@ in stdenv.mkDerivation rec {
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
++ optional withVulkan [ vulkan-loader ]
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
++ optionals stdenv.isLinux [ alsaLib libpulseaudio libv4l libX11
libXdmcp libXext libXxf86vm udev ];
++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11
libXdmcp libXext libXxf86vm mesa udev ];
enableParallelBuilding = true;
configureFlags = if stdenv.isLinux then [ "--enable-kms" ] else "";
postInstall = optionalString withVulkan ''
wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
'' + optionalString stdenv.targetPlatform.isDarwin ''

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