Merge branch 'master' into staging
Hydra: ?compare=1428079
This commit is contained in:
Vladimír Čunát
commit
a94c7ba096
@ -540,6 +540,7 @@
|
||||
./services/networking/ssh/lshd.nix
|
||||
./services/networking/ssh/sshd.nix
|
||||
./services/networking/strongswan.nix
|
||||
./services/networking/stunnel.nix
|
||||
./services/networking/supplicant.nix
|
||||
./services/networking/supybot.nix
|
||||
./services/networking/syncthing.nix
|
||||
|
||||
@ -17,7 +17,7 @@ let
|
||||
|
||||
search_lan = entry.searchLAN;
|
||||
use_sync_trash = entry.useSyncTrash;
|
||||
known_hosts = knownHosts;
|
||||
known_hosts = entry.knownHosts;
|
||||
}) cfg.sharedFolders;
|
||||
|
||||
configFile = pkgs.writeText "config.json" (builtins.toJSON ({
|
||||
|
||||
221
nixos/modules/services/networking/stunnel.nix
Normal file
221
nixos/modules/services/networking/stunnel.nix
Normal file
@ -0,0 +1,221 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.stunnel;
|
||||
yesNo = val: if val then "yes" else "no";
|
||||
|
||||
verifyChainPathAssert = n: c: {
|
||||
assertion = c.verifyHostname == null || (c.verifyChain || c.verifyPeer);
|
||||
message = "stunnel: \"${n}\" client configuration - hostname verification " +
|
||||
"is not possible without either verifyChain or verifyPeer enabled";
|
||||
};
|
||||
|
||||
serverConfig = {
|
||||
options = {
|
||||
accept = mkOption {
|
||||
type = types.int;
|
||||
description = "On which port stunnel should listen for incoming TLS connections.";
|
||||
};
|
||||
|
||||
connect = mkOption {
|
||||
type = types.int;
|
||||
description = "To which port the decrypted connection should be forwarded.";
|
||||
};
|
||||
|
||||
cert = mkOption {
|
||||
type = types.path;
|
||||
description = "File containing both the private and public keys.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
clientConfig = {
|
||||
options = {
|
||||
accept = mkOption {
|
||||
type = types.string;
|
||||
description = "IP:Port on which connections should be accepted.";
|
||||
};
|
||||
|
||||
connect = mkOption {
|
||||
type = types.string;
|
||||
description = "IP:Port destination to connect to.";
|
||||
};
|
||||
|
||||
verifyChain = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Check if the provided certificate has a valid certificate chain (against CAPath).";
|
||||
};
|
||||
|
||||
verifyPeer = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Check if the provided certificate is contained in CAPath.";
|
||||
};
|
||||
|
||||
CAPath = mkOption {
|
||||
type = types.path;
|
||||
default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
description = "Path to a file containing certificates to validate against.";
|
||||
};
|
||||
|
||||
verifyHostname = mkOption {
|
||||
type = with types; nullOr string;
|
||||
default = null;
|
||||
description = "If set, stunnel checks if the provided certificate is valid for the given hostname.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.stunnel = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to enable the stunnel TLS tunneling service.";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = with types; nullOr string;
|
||||
default = "nobody";
|
||||
description = "The user under which stunnel runs.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = with types; nullOr string;
|
||||
default = "nogroup";
|
||||
description = "The group under which stunnel runs.";
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
type = types.enum [ "emerg" "alert" "crit" "err" "warning" "notice" "info" "debug" ];
|
||||
default = "info";
|
||||
description = "Verbosity of stunnel output.";
|
||||
};
|
||||
|
||||
fipsMode = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable FIPS 140-2 mode required for compliance.";
|
||||
};
|
||||
|
||||
enableInsecureSSLv3 = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable support for the insecure SSLv3 protocol.";
|
||||
};
|
||||
|
||||
|
||||
servers = mkOption {
|
||||
description = "Define the server configuations.";
|
||||
type = with types; attrsOf (submodule serverConfig);
|
||||
example = {
|
||||
fancyWebserver = {
|
||||
enable = true;
|
||||
accept = 443;
|
||||
connect = 8080;
|
||||
cert = "/path/to/pem/file";
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
};
|
||||
|
||||
clients = mkOption {
|
||||
description = "Define the client configurations.";
|
||||
type = with types; attrsOf (submodule clientConfig);
|
||||
example = {
|
||||
foobar = {
|
||||
accept = "0.0.0.0:8080";
|
||||
connect = "nixos.org:443";
|
||||
verifyChain = false;
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = concatLists [
|
||||
(singleton {
|
||||
assertion = (length (attrValues cfg.servers) != 0) || ((length (attrValues cfg.clients)) != 0);
|
||||
message = "stunnel: At least one server- or client-configuration has to be present.";
|
||||
})
|
||||
|
||||
(mapAttrsToList verifyChainPathAssert cfg.clients)
|
||||
];
|
||||
|
||||
environment.systemPackages = [ pkgs.stunnel ];
|
||||
|
||||
environment.etc."stunnel.cfg".text = ''
|
||||
${ if cfg.user != null then "setuid = ${cfg.user}" else "" }
|
||||
${ if cfg.group != null then "setgid = ${cfg.group}" else "" }
|
||||
|
||||
debug = ${cfg.logLevel}
|
||||
|
||||
${ optionalString cfg.fipsMode "fips = yes" }
|
||||
${ optionalString cfg.enableInsecureSSLv3 "options = -NO_SSLv3" }
|
||||
|
||||
; ----- SERVER CONFIGURATIONS -----
|
||||
${ lib.concatStringsSep "\n"
|
||||
(lib.mapAttrsToList
|
||||
(n: v: ''
|
||||
[${n}]
|
||||
accept = ${toString v.accept}
|
||||
connect = ${toString v.connect}
|
||||
cert = ${v.cert}
|
||||
|
||||
'')
|
||||
cfg.servers)
|
||||
}
|
||||
|
||||
; ----- CLIENT CONFIGURATIONS -----
|
||||
${ lib.concatStringsSep "\n"
|
||||
(lib.mapAttrsToList
|
||||
(n: v: ''
|
||||
[${n}]
|
||||
client = yes
|
||||
accept = ${v.accept}
|
||||
connect = ${v.connect}
|
||||
verifyChain = ${yesNo v.verifyChain}
|
||||
verifyPeer = ${yesNo v.verifyPeer}
|
||||
${optionalString (v.CAPath != null) "CApath = ${v.CAPath}"}
|
||||
${optionalString (v.verifyHostname != null) "checkHost = ${v.verifyHostname}"}
|
||||
OCSPaia = yes
|
||||
|
||||
'')
|
||||
cfg.clients)
|
||||
}
|
||||
'';
|
||||
|
||||
systemd.services.stunnel = {
|
||||
description = "stunnel TLS tunneling service";
|
||||
after = [ "network.target" ];
|
||||
wants = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
restartTriggers = [ config.environment.etc."stunnel.cfg".source ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.stunnel}/bin/stunnel ${config.environment.etc."stunnel.cfg".source}";
|
||||
Type = "forking";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -3,9 +3,7 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
xcfg = config.services.xserver;
|
||||
pcfg = config.hardware.pulseaudio;
|
||||
cfg = xcfg.desktopManager.xfce;
|
||||
cfg = config.services.xserver.desktopManager.xfce;
|
||||
in
|
||||
|
||||
{
|
||||
@ -52,82 +50,93 @@ in
|
||||
description = "Application used by XFCE to lock the screen.";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs.xfce // pkgs; [
|
||||
# Get GTK+ themes and gtk-update-icon-cache
|
||||
gtk2.out
|
||||
|
||||
config = mkIf (xcfg.enable && cfg.enable) {
|
||||
# Supplies some abstract icons such as:
|
||||
# utilities-terminal, accessories-text-editor
|
||||
gnome3.defaultIconTheme
|
||||
|
||||
services.xserver.desktopManager.session = singleton
|
||||
{ name = "xfce";
|
||||
bgSupport = true;
|
||||
start =
|
||||
''
|
||||
${cfg.extraSessionCommands}
|
||||
hicolor_icon_theme
|
||||
tango-icon-theme
|
||||
xfce4-icon-theme
|
||||
|
||||
# Set GTK_PATH so that GTK+ can find the theme engines.
|
||||
export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
|
||||
desktop_file_utils
|
||||
shared_mime_info
|
||||
|
||||
# Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
|
||||
export GTK_DATA_PREFIX=${config.system.path}
|
||||
# Needed by Xfce's xinitrc script
|
||||
# TODO: replace with command -v
|
||||
which
|
||||
|
||||
${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} &
|
||||
waitPID=$!
|
||||
'';
|
||||
};
|
||||
exo
|
||||
garcon
|
||||
gtk-xfce-engine
|
||||
gvfs
|
||||
libxfce4ui
|
||||
tumbler
|
||||
xfconf
|
||||
|
||||
mousepad
|
||||
ristretto
|
||||
xfce4-appfinder
|
||||
xfce4-screenshooter
|
||||
xfce4-session
|
||||
xfce4-settings
|
||||
xfce4-terminal
|
||||
|
||||
(thunar.override { thunarPlugins = cfg.thunarPlugins; })
|
||||
thunar-volman # TODO: drop
|
||||
] ++ (if config.hardware.pulseaudio.enable
|
||||
then [ xfce4-mixer-pulse xfce4-volumed-pulse ]
|
||||
else [ xfce4-mixer xfce4-volumed ])
|
||||
# TODO: NetworkManager doesn't belong here
|
||||
++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ]
|
||||
++ optionals config.powerManagement.enable [ xfce4-power-manager ]
|
||||
++ optionals cfg.enableXfwm [ xfwm4 ]
|
||||
++ optionals (!cfg.noDesktop) [
|
||||
xfce4-panel
|
||||
xfce4-notifyd
|
||||
xfdesktop
|
||||
];
|
||||
|
||||
environment.pathsToLink = [
|
||||
"/share/xfce4"
|
||||
"/share/themes"
|
||||
"/share/mime"
|
||||
"/share/desktop-directories"
|
||||
"/share/gtksourceview-2.0"
|
||||
];
|
||||
|
||||
environment.variables = {
|
||||
GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
|
||||
GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
|
||||
};
|
||||
|
||||
services.xserver.desktopManager.session = [{
|
||||
name = "xfce";
|
||||
bgSupport = true;
|
||||
start = ''
|
||||
${cfg.extraSessionCommands}
|
||||
|
||||
# Set GTK_PATH so that GTK+ can find the theme engines.
|
||||
export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
|
||||
|
||||
# Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
|
||||
export GTK_DATA_PREFIX=${config.system.path}
|
||||
|
||||
${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} &
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
|
||||
services.xserver.updateDbusEnvironment = true;
|
||||
|
||||
environment.systemPackages =
|
||||
[ pkgs.gtk2.out # To get GTK+'s themes and gtk-update-icon-cache
|
||||
pkgs.hicolor_icon_theme
|
||||
pkgs.tango-icon-theme
|
||||
pkgs.shared_mime_info
|
||||
pkgs.which # Needed by the xfce's xinitrc script.
|
||||
pkgs."${cfg.screenLock}"
|
||||
pkgs.xfce.exo
|
||||
pkgs.xfce.gtk_xfce_engine
|
||||
pkgs.xfce.mousepad
|
||||
pkgs.xfce.ristretto
|
||||
pkgs.xfce.terminal
|
||||
(pkgs.xfce.thunar.override { thunarPlugins = cfg.thunarPlugins; })
|
||||
pkgs.xfce.xfce4icontheme
|
||||
pkgs.xfce.xfce4session
|
||||
pkgs.xfce.xfce4settings
|
||||
(if pcfg.enable then pkgs.xfce.xfce4mixer_pulse else pkgs.xfce.xfce4mixer)
|
||||
(if pcfg.enable then pkgs.xfce.xfce4volumed_pulse else pkgs.xfce.xfce4volumed)
|
||||
pkgs.xfce.xfce4-screenshooter
|
||||
pkgs.xfce.xfconf
|
||||
# This supplies some "abstract" icons such as
|
||||
# "utilities-terminal" and "accessories-text-editor".
|
||||
pkgs.gnome3.defaultIconTheme
|
||||
pkgs.desktop_file_utils
|
||||
pkgs.xfce.libxfce4ui
|
||||
pkgs.xfce.garcon
|
||||
pkgs.xfce.thunar_volman
|
||||
pkgs.xfce.gvfs
|
||||
pkgs.xfce.xfce4_appfinder
|
||||
pkgs.xfce.tumbler # found via dbus
|
||||
]
|
||||
++ optional cfg.enableXfwm pkgs.xfce.xfwm4
|
||||
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager
|
||||
++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
|
||||
++ optionals (!cfg.noDesktop)
|
||||
[ pkgs.xfce.xfce4panel
|
||||
pkgs.xfce.xfdesktop
|
||||
pkgs.xfce.xfce4notifyd # found via dbus
|
||||
];
|
||||
|
||||
environment.pathsToLink =
|
||||
[ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
|
||||
|
||||
environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
|
||||
environment.variables.GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
|
||||
|
||||
# Enable helpful DBus services.
|
||||
services.udisks2.enable = true;
|
||||
services.upower.enable = config.powerManagement.enable;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cava-${version}";
|
||||
version = "0.4.2";
|
||||
version = "0.6.0";
|
||||
|
||||
buildInputs = [
|
||||
alsaLib
|
||||
@ -16,14 +16,16 @@ stdenv.mkDerivation rec {
|
||||
owner = "karlstav";
|
||||
repo = "cava";
|
||||
rev = version;
|
||||
sha256 = "1c5gl8ghmd89f6097rjd2dzrgh1z4i4v9m4vn5wkpnnm68b96yyc";
|
||||
sha256 = "01maaq5pfd4a7zilgarwr1nl7jbqyrvir6w7ikchggsckrlk23wr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace Makefile \
|
||||
substituteInPlace Makefile.am \
|
||||
--replace "-L/usr/local/lib -Wl,-rpath /usr/local/lib" ""
|
||||
substituteInPlace configure.ac \
|
||||
--replace "/usr/share/consolefonts" "$out/share/consolefonts"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft
|
||||
, version ? "2016-10-08"
|
||||
, rev ? "a17c4a9c2a1af2de0a756fe16d482e0db88c0541"
|
||||
, sha256 ? "03xmfzlijz4gbmr7l0pb1gl9kmlz1ab3hr8d51innvlasy4g6xgj"
|
||||
}:
|
||||
{ stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
version = "2017-10-27";
|
||||
name = "deadpixi-sam-unstable-${version}";
|
||||
src = fetchFromGitHub {
|
||||
inherit sha256 rev;
|
||||
owner = "deadpixi";
|
||||
repo = "sam";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deadpixi";
|
||||
repo = "sam";
|
||||
rev = "51693780fb1457913389db6634163998f9b775b8";
|
||||
sha256 = "0nfkj93j4bgli4ixbk041nwi14rabk04kqg8krq4mj0044m1qywr";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace config.mk.def \
|
||||
--replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2"
|
||||
--replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \
|
||||
--replace "CC=gcc" ""
|
||||
'';
|
||||
|
||||
CFLAGS = "-D_DARWIN_C_SOURCE";
|
||||
makeFlags = [ "DESTDIR=$(out)" ];
|
||||
buildInputs = [ libX11 libXt libXft ];
|
||||
buildInputs = [ libX11 libXi libXt libXft ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Updated version of the sam text editor";
|
||||
license = with licenses; lpl-102;
|
||||
maintainers = with maintainers; [ ramkromberg ];
|
||||
platforms = with platforms; linux;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -100,6 +100,7 @@ let
|
||||
kdepim-runtime = callPackage ./kdepim-runtime.nix {};
|
||||
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
|
||||
kdf = callPackage ./kdf.nix {};
|
||||
kdialog = callPackage ./kdialog.nix {};
|
||||
keditbookmarks = callPackage ./keditbookmarks.nix {};
|
||||
kget = callPackage ./kget.nix {};
|
||||
kgpg = callPackage ./kgpg.nix {};
|
||||
|
||||
18
pkgs/applications/kde/kdialog.nix
Normal file
18
pkgs/applications/kde/kdialog.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kinit, kguiaddons, kwindowsystem
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "kdialog";
|
||||
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2 fdl12 ];
|
||||
maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
||||
propagatedBuildInputs = [ kinit kguiaddons kwindowsystem ];
|
||||
}
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/bash-completion/completions"
|
||||
ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/"
|
||||
ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash"
|
||||
mkdir -p "$out/share/fish/vendor_completions.d"
|
||||
ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/"
|
||||
'';
|
||||
|
||||
@ -1,30 +1,33 @@
|
||||
{ callPackage, stdenv }:
|
||||
|
||||
let
|
||||
stableVersion = "2.1.2";
|
||||
previewVersion = "2.1.2";
|
||||
stableVersion = "2.1.3";
|
||||
# Currently there is no preview version.
|
||||
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 = "1yya0alc4ifgikka513ps243l8211rvifm0xz1ymx8nck0s6sj35";
|
||||
serverSrcHash = "16d698gpj2r3z7qvvlrsx8ylgb1nfkmia2pcvk22068p3ajwypx1";
|
||||
in {
|
||||
guiStable = mkGui {
|
||||
stable = true;
|
||||
sha256Hash = "1p3z1dlank0nzj5yyap2n2gv1xa66x9iqi4q7vvy0xcxbqzmqszk";
|
||||
sha256Hash = guiSrcHash;
|
||||
};
|
||||
guiPreview = mkGui {
|
||||
stable = false;
|
||||
sha256Hash = "1p3z1dlank0nzj5yyap2n2gv1xa66x9iqi4q7vvy0xcxbqzmqszk";
|
||||
sha256Hash = guiSrcHash;
|
||||
};
|
||||
|
||||
serverStable = mkServer {
|
||||
stable = true;
|
||||
sha256Hash = "0nd7j33ns94hh65b9j0m177b7h25slpny74ga8qppghvv2iqsbp8";
|
||||
sha256Hash = serverSrcHash;
|
||||
};
|
||||
serverPreview = mkServer {
|
||||
stable = false;
|
||||
sha256Hash = "0nd7j33ns94hh65b9j0m177b7h25slpny74ga8qppghvv2iqsbp8";
|
||||
sha256Hash = serverSrcHash;
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@ let
|
||||
}));
|
||||
yarl = (stdenv.lib.overrideDerivation pythonPackages.yarl
|
||||
(oldAttrs:
|
||||
{ propagatedBuildInputs = [ multidict_3_1_3 ]; }));
|
||||
{ propagatedBuildInputs = [ multidict_3_1_3 pythonPackages.idna ]; }));
|
||||
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
|
||||
(oldAttrs:
|
||||
rec {
|
||||
|
||||
42
pkgs/applications/science/chemistry/molden/default.nix
Normal file
42
pkgs/applications/science/chemistry/molden/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ stdenv, fetchurl, which, gfortran, mesa_glu, xorg } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.7";
|
||||
name = "molden-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
|
||||
sha256 = "0gaq11gm09ax25lvgfrvxv9dxvi76hps116fp6k7sqgvdd68vf0s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
buildInputs = [ gfortran mesa_glu xorg.libX11 xorg.libXmu ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \
|
||||
--replace '-I/usr/X11R6/include' "" \
|
||||
--replace '/usr/local/' $out/ \
|
||||
--replace 'sudo' "" \
|
||||
--replace '-C surf depend' '-C surf'
|
||||
sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Display and manipulate molecular structures";
|
||||
homepage = http://www.cmbi.ru.nl/molden/;
|
||||
license = {
|
||||
fullName = "Free for academic/non-profit use";
|
||||
url = http://www.cmbi.ru.nl/molden/CopyRight.html;
|
||||
free = false;
|
||||
};
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ markuskowa ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,106 +1,208 @@
|
||||
{ config, pkgs, newScope }:
|
||||
{ lib, pkgs }:
|
||||
|
||||
let
|
||||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
#### NixOS support
|
||||
|
||||
callPackage = newScope (deps // xfce_self);
|
||||
|
||||
deps = { # xfce-global dependency overrides should be here
|
||||
inherit (pkgs.gnome2) libglade libwnck vte gtksourceview;
|
||||
inherit (pkgs.gnome3) dconf;
|
||||
inherit (pkgs.perlPackages) URI;
|
||||
|
||||
gtk = pkgs.gtk2;
|
||||
};
|
||||
|
||||
xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach
|
||||
# Samba is a rather heavy dependency
|
||||
gvfs = pkgs.gvfs.override { samba = null; };
|
||||
|
||||
#### NixOS support
|
||||
xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
|
||||
|
||||
gvfs = pkgs.gvfs.override { samba = null; }; # samba is a rather heavy dependency
|
||||
xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc";
|
||||
#### CORE
|
||||
|
||||
#### CORE from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"
|
||||
exo = callPackage ./core/exo.nix { };
|
||||
|
||||
exo = callPackage ./core/exo.nix { };
|
||||
garcon = callPackage ./core/garcon.nix { };
|
||||
gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix
|
||||
{ withGtk3 = false; }; # = true; was completely breaking GTK3 app layout
|
||||
libxfce4ui = callPackage ./core/libxfce4ui.nix { };
|
||||
libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
|
||||
libxfce4util = callPackage ./core/libxfce4util.nix { };
|
||||
libxfcegui4 = callPackage ./core/libxfcegui4.nix { };
|
||||
thunar-build = callPackage ./core/thunar-build.nix { };
|
||||
thunar = callPackage ./core/thunar.nix { };
|
||||
thunarx-2-dev = thunar-build; # Plugins need only the `thunarx-2` part of the package. Awaiting multiple outputs.
|
||||
thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now
|
||||
thunar-archive-plugin
|
||||
= callPackage ./thunar-plugins/archive { };
|
||||
thunar-dropbox-plugin
|
||||
= callPackage ./thunar-plugins/dropbox { };
|
||||
tumbler = callPackage ./core/tumbler.nix { };
|
||||
xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
|
||||
xfce4panel_gtk3 = xfce4panel.override { withGtk3 = true; };
|
||||
xfce4session = callPackage ./core/xfce4-session.nix { };
|
||||
xfce4settings = callPackage ./core/xfce4-settings.nix { };
|
||||
xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { };
|
||||
xfce4_power_manager_gtk3 = callPackage ./core/xfce4-power-manager.nix { withGtk3 = true; };
|
||||
xfconf = callPackage ./core/xfconf.nix { };
|
||||
xfdesktop = callPackage ./core/xfdesktop.nix { };
|
||||
xfwm4 = callPackage ./core/xfwm4.nix { };
|
||||
garcon = callPackage ./core/garcon.nix { };
|
||||
|
||||
xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { };
|
||||
xfce4_dev_tools = callPackage ./core/xfce4-dev-tools.nix { }; # only if autotools are needed
|
||||
# When built with GTK+3, it was breaking GTK+3 app layout
|
||||
gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; };
|
||||
|
||||
#### APPLICATIONS from "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"
|
||||
libxfce4ui = callPackage ./core/libxfce4ui.nix { };
|
||||
|
||||
libxfce4util = callPackage ./core/libxfce4util.nix { };
|
||||
|
||||
libxfcegui4 = callPackage ./core/libxfcegui4.nix { };
|
||||
|
||||
thunar-bare = callPackage ./core/thunar-build.nix { };
|
||||
|
||||
thunar = callPackage ./core/thunar.nix { };
|
||||
|
||||
# NB: thunar already has it
|
||||
thunar-volman = callPackage ./core/thunar-volman.nix { };
|
||||
|
||||
thunar-archive-plugin = callPackage ./thunar-plugins/archive { };
|
||||
|
||||
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
|
||||
|
||||
tumbler = callPackage ./core/tumbler.nix { };
|
||||
|
||||
# TODO: impure plugins from /run/current-system/sw/lib/xfce4
|
||||
xfce4-panel = callPackage ./core/xfce4-panel.nix { };
|
||||
|
||||
xfce4-session = callPackage ./core/xfce4-session.nix { };
|
||||
|
||||
xfce4-settings = callPackage ./core/xfce4-settings.nix { };
|
||||
|
||||
xfce4-power-manager = callPackage ./core/xfce4-power-manager.nix { };
|
||||
|
||||
xfconf = callPackage ./core/xfconf.nix { };
|
||||
|
||||
xfdesktop = callPackage ./core/xfdesktop.nix { };
|
||||
|
||||
xfwm4 = callPackage ./core/xfwm4.nix { };
|
||||
|
||||
xfce4-appfinder = callPackage ./core/xfce4-appfinder.nix { };
|
||||
|
||||
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools.nix { };
|
||||
|
||||
#### APPLICATIONS
|
||||
|
||||
gigolo = callPackage ./applications/gigolo.nix { };
|
||||
|
||||
mousepad = callPackage ./applications/mousepad.nix { };
|
||||
|
||||
orage = callPackage ./applications/orage.nix { };
|
||||
|
||||
parole = callPackage ./applications/parole.nix { };
|
||||
|
||||
ristretto = callPackage ./applications/ristretto.nix { };
|
||||
|
||||
xfce4-mixer = callPackage ./applications/xfce4-mixer.nix { };
|
||||
|
||||
xfce4-mixer-pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; };
|
||||
|
||||
xfce4-notifyd = callPackage ./applications/xfce4-notifyd.nix { };
|
||||
|
||||
xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager.nix { };
|
||||
|
||||
xfce4-terminal = callPackage ./applications/terminal.nix { };
|
||||
|
||||
gigolo = callPackage ./applications/gigolo.nix { };
|
||||
mousepad = callPackage ./applications/mousepad.nix { };
|
||||
orage = callPackage ./applications/orage.nix { };
|
||||
parole = callPackage ./applications/parole.nix { };
|
||||
ristretto = callPackage ./applications/ristretto.nix { };
|
||||
terminal = xfce4terminal; # it has changed its name
|
||||
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
|
||||
xfce4mixer_pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; };
|
||||
xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { };
|
||||
xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
|
||||
xfce4terminal = callPackage ./applications/terminal.nix { };
|
||||
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { };
|
||||
xfce4volumed = callPackage ./applications/xfce4-volumed.nix { };
|
||||
xfce4volumed_pulse = callPackage ./applications/xfce4-volumed-pulse.nix { };
|
||||
|
||||
#### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"
|
||||
xfce4-volumed = callPackage ./applications/xfce4-volumed.nix { };
|
||||
|
||||
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
|
||||
xfwm4themes = callPackage ./art/xfwm4-themes.nix { };
|
||||
xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse.nix { };
|
||||
|
||||
#### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}"
|
||||
#### ART
|
||||
|
||||
xfce4-icon-theme = callPackage ./art/xfce4-icon-theme.nix { };
|
||||
|
||||
xfwm4-themes = callPackage ./art/xfwm4-themes.nix { };
|
||||
|
||||
#### PANEL PLUGINS
|
||||
|
||||
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
|
||||
|
||||
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { };
|
||||
|
||||
xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
|
||||
|
||||
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { };
|
||||
|
||||
xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
|
||||
|
||||
xfce4-dict-plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { };
|
||||
|
||||
xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { };
|
||||
|
||||
xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { };
|
||||
|
||||
xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { };
|
||||
|
||||
xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { };
|
||||
|
||||
xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { };
|
||||
|
||||
xfce4_battery_plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
|
||||
xfce4_clipman_plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { };
|
||||
xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
|
||||
xfce4_cpugraph_plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { };
|
||||
xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
|
||||
xfce4_dict_plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { };
|
||||
xfce4_dockbarx_plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { };
|
||||
xfce4_embed_plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { };
|
||||
xfce4_eyes_plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { };
|
||||
xfce4_fsguard_plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { };
|
||||
xfce4_genmon_plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { };
|
||||
xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { };
|
||||
xfce4_namebar_plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
|
||||
xfce4_netload_plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { };
|
||||
xfce4_notes_plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
|
||||
xfce4_mailwatch_plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { };
|
||||
xfce4_mpc_plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { };
|
||||
xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { };
|
||||
xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
|
||||
xfce4_timer_plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { };
|
||||
xfce4_verve_plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { };
|
||||
xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { };
|
||||
xfce4_weather_plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { };
|
||||
xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
|
||||
xfce4_windowck_plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { };
|
||||
xfce4_pulseaudio_plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { };
|
||||
|
||||
}; # xfce_self
|
||||
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
|
||||
|
||||
in xfce_self
|
||||
xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { };
|
||||
|
||||
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
|
||||
|
||||
xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix { };
|
||||
|
||||
xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin.nix { };
|
||||
|
||||
xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { };
|
||||
|
||||
xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
|
||||
|
||||
xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { };
|
||||
|
||||
xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { };
|
||||
|
||||
xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { };
|
||||
|
||||
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { };
|
||||
|
||||
xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
|
||||
|
||||
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { };
|
||||
|
||||
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { };
|
||||
|
||||
#### GTK+3 (deprecated, see NixOS/nixpkgs#32763)
|
||||
|
||||
libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
|
||||
|
||||
xfce4panel_gtk3 = xfce4-panel.override { withGtk3 = true; };
|
||||
|
||||
xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; };
|
||||
|
||||
#### ALIASES - added 2018-01
|
||||
|
||||
terminal = xfce4-terminal;
|
||||
thunar-build = thunar-bare;
|
||||
thunarx-2-dev = thunar-build;
|
||||
thunar_volman = thunar-volman;
|
||||
xfce4panel = xfce4-panel;
|
||||
xfce4session = xfce4-session;
|
||||
xfce4settings = xfce4-settings;
|
||||
xfce4_power_manager = xfce4-power-manager;
|
||||
xfce4_appfinder = xfce4-appfinder;
|
||||
xfce4_dev_tools = xfce4-dev-tools;
|
||||
xfce4mixer = xfce4-mixer;
|
||||
xfce4mixer_pulse = xfce4-mixer-pulse;
|
||||
xfce4notifyd = xfce4-notifyd;
|
||||
xfce4taskmanager = xfce4-taskmanager;
|
||||
xfce4terminal = xfce4-terminal;
|
||||
xfce4volumed = xfce4-volumed;
|
||||
xfce4volumed_pulse = xfce4-volumed-pulse;
|
||||
xfce4icontheme = xfce4-icon-theme;
|
||||
xfwm4themes = xfwm4-themes;
|
||||
|
||||
xfce4_battery_plugin = xfce4-battery-plugin;
|
||||
xfce4_clipman_plugin = xfce4-clipman-plugin;
|
||||
xfce4_cpufreq_plugin = xfce4-cpufreq-plugin;
|
||||
xfce4_cpugraph_plugin = xfce4-cpugraph-plugin;
|
||||
xfce4_datetime_plugin = xfce4-datetime-plugin;
|
||||
xfce4_dict_plugin = xfce4-dict-plugin;
|
||||
xfce4_dockbarx_plugin = xfce4-dockbarx-plugin;
|
||||
xfce4_embed_plugin = xfce4-embed-plugin;
|
||||
xfce4_eyes_plugin = xfce4-eyes-plugin;
|
||||
xfce4_fsguard_plugin = xfce4-fsguard-plugin;
|
||||
xfce4_genmon_plugin = xfce4-genmon-plugin;
|
||||
xfce4_hardware_monitor_plugin = xfce4-hardware-monitor-plugin;
|
||||
xfce4_namebar_plugin = xfce4-namebar-plugin;
|
||||
xfce4_netload_plugin = xfce4-netload-plugin;
|
||||
xfce4_notes_plugin = xfce4-notes-plugin;
|
||||
xfce4_mailwatch_plugin = xfce4-mailwatch-plugin;
|
||||
xfce4_mpc_plugin = xfce4-mpc-plugin;
|
||||
xfce4_sensors_plugin = xfce4-sensors-plugin;
|
||||
xfce4_systemload_plugin = xfce4-systemload-plugin;
|
||||
xfce4_timer_plugin = xfce4-timer-plugin;
|
||||
xfce4_verve_plugin = xfce4-verve-plugin;
|
||||
xfce4_xkb_plugin = xfce4-xkb-plugin;
|
||||
xfce4_weather_plugin = xfce4-weather-plugin;
|
||||
xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin;
|
||||
xfce4_windowck_plugin = xfce4-windowck-plugin;
|
||||
xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin;
|
||||
})
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
let
|
||||
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
||||
self = stdenv.mkDerivation {
|
||||
self = stdenv.mkDerivation ({
|
||||
name = "clang-${version}";
|
||||
|
||||
unpackPhase = ''
|
||||
@ -37,9 +37,8 @@ let
|
||||
|
||||
patches = [ ./purity.patch ];
|
||||
|
||||
postBuild = stdenv.lib.optionalString enableManpages ''
|
||||
cmake --build . --target docs-clang-man
|
||||
'';
|
||||
# XXX: TODO: This should be removed on next rebuild
|
||||
postBuild = "";
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
|
||||
@ -49,8 +48,7 @@ let
|
||||
sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
|
||||
'';
|
||||
|
||||
outputs = [ "out" "lib" "python" ]
|
||||
++ stdenv.lib.optional enableManpages "man";
|
||||
outputs = [ "out" "lib" "python" ];
|
||||
|
||||
# Clang expects to find LLVMgold in its own prefix
|
||||
# Clang expects to find sanitizer libraries in its own prefix
|
||||
@ -71,13 +69,6 @@ let
|
||||
fi
|
||||
mv $out/share/clang/*.py $python/share/clang
|
||||
rm $out/bin/c-index-test
|
||||
''
|
||||
+ stdenv.lib.optionalString enableManpages ''
|
||||
# Manually install clang manpage
|
||||
cp docs/man/*.1 $out/share/man/man1/
|
||||
|
||||
# Move it and other man pages to 'man' output
|
||||
moveToOutput "share/man" "$man"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -95,5 +86,23 @@ let
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
};
|
||||
} // stdenv.lib.optionalAttrs enableManpages {
|
||||
name = "clang-manpages-${version}";
|
||||
|
||||
buildPhase = ''
|
||||
make docs-clang-man
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/man/man1
|
||||
# Manually install clang manpage
|
||||
cp docs/man/*.1 $out/share/man/man1/
|
||||
'';
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta.description = "man page for Clang ${version}";
|
||||
});
|
||||
in self
|
||||
|
||||
@ -20,7 +20,7 @@ let
|
||||
# Add man output without introducing extra dependencies.
|
||||
overrideManOutput = drv:
|
||||
let drv-manpages = drv.override { enableManpages = true; }; in
|
||||
drv // { man = drv-manpages.man; /*outputs = drv.outputs ++ ["man"];*/ };
|
||||
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
|
||||
|
||||
llvm = callPackage ./llvm.nix {
|
||||
inherit compiler-rt_src stdenv;
|
||||
|
||||
@ -27,7 +27,7 @@ let
|
||||
# Used when creating a version-suffixed symlink of libLLVM.dylib
|
||||
shortVersion = with stdenv.lib;
|
||||
concatStringsSep "." (take 2 (splitString "." release_version));
|
||||
in stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation (rec {
|
||||
name = "llvm-${version}";
|
||||
|
||||
unpackPhase = ''
|
||||
@ -39,8 +39,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
outputs = [ "out" ]
|
||||
++ stdenv.lib.optional enableSharedLibraries "lib"
|
||||
++ stdenv.lib.optional enableManpages "man";
|
||||
++ stdenv.lib.optional enableSharedLibraries "lib";
|
||||
|
||||
nativeBuildInputs = [ perl groff cmake python ]
|
||||
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
|
||||
@ -129,10 +128,7 @@ in stdenv.mkDerivation rec {
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
|
||||
'';
|
||||
|
||||
postInstall = stdenv.lib.optionalString enableManpages ''
|
||||
moveToOutput "share/man" "$man"
|
||||
''
|
||||
+ stdenv.lib.optionalString enableSharedLibraries ''
|
||||
postInstall = stdenv.lib.optionalString enableSharedLibraries ''
|
||||
moveToOutput "lib/libLLVM-*" "$lib"
|
||||
moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
|
||||
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
|
||||
@ -160,4 +156,22 @@ in stdenv.mkDerivation rec {
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
} // stdenv.lib.optionalAttrs enableManpages {
|
||||
name = "llvm-manpages-${version}";
|
||||
|
||||
buildPhase = ''
|
||||
make docs-llvm-man
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ ];
|
||||
|
||||
installPhase = ''
|
||||
make -C docs install
|
||||
'';
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta.description = "man pages for LLVM ${version}";
|
||||
})
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
let
|
||||
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
||||
self = stdenv.mkDerivation {
|
||||
self = stdenv.mkDerivation ({
|
||||
name = "clang-${version}";
|
||||
|
||||
unpackPhase = ''
|
||||
@ -37,9 +37,8 @@ let
|
||||
|
||||
patches = [ ./purity.patch ];
|
||||
|
||||
postBuild = stdenv.lib.optionalString enableManpages ''
|
||||
cmake --build . --target docs-clang-man
|
||||
'';
|
||||
# XXX: TODO: This should be removed on next rebuild
|
||||
postBuild = "";
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
|
||||
@ -50,8 +49,7 @@ let
|
||||
sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
|
||||
'';
|
||||
|
||||
outputs = [ "out" "lib" "python" ]
|
||||
++ stdenv.lib.optional enableManpages "man";
|
||||
outputs = [ "out" "lib" "python" ];
|
||||
|
||||
# Clang expects to find LLVMgold in its own prefix
|
||||
# Clang expects to find sanitizer libraries in its own prefix
|
||||
@ -72,13 +70,6 @@ let
|
||||
fi
|
||||
mv $out/share/clang/*.py $python/share/clang
|
||||
rm $out/bin/c-index-test
|
||||
''
|
||||
+ stdenv.lib.optionalString enableManpages ''
|
||||
# Manually install clang manpage
|
||||
cp docs/man/*.1 $out/share/man/man1/
|
||||
|
||||
# Move it and other man pages to 'man' output
|
||||
moveToOutput "share/man" "$man"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -96,5 +87,23 @@ let
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
};
|
||||
} // stdenv.lib.optionalAttrs enableManpages {
|
||||
name = "clang-manpages-${version}";
|
||||
|
||||
buildPhase = ''
|
||||
make docs-clang-man
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/man/man1
|
||||
# Manually install clang manpage
|
||||
cp docs/man/*.1 $out/share/man/man1/
|
||||
'';
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta.description = "man page for Clang ${version}";
|
||||
});
|
||||
in self
|
||||
|
||||
@ -20,7 +20,7 @@ let
|
||||
# Add man output without introducing extra dependencies.
|
||||
overrideManOutput = drv:
|
||||
let drv-manpages = drv.override { enableManpages = true; }; in
|
||||
drv // { man = drv-manpages.man; /*outputs = drv.outputs ++ ["man"];*/ };
|
||||
drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
|
||||
|
||||
llvm = callPackage ./llvm.nix {
|
||||
inherit compiler-rt_src stdenv;
|
||||
|
||||
@ -27,7 +27,7 @@ let
|
||||
# Used when creating a version-suffixed symlink of libLLVM.dylib
|
||||
shortVersion = with stdenv.lib;
|
||||
concatStringsSep "." (take 2 (splitString "." release_version));
|
||||
in stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation (rec {
|
||||
name = "llvm-${version}";
|
||||
|
||||
unpackPhase = ''
|
||||
@ -39,8 +39,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
outputs = [ "out" ]
|
||||
++ stdenv.lib.optional enableSharedLibraries "lib"
|
||||
++ stdenv.lib.optional enableManpages "man";
|
||||
++ stdenv.lib.optional enableSharedLibraries "lib";
|
||||
|
||||
nativeBuildInputs = [ perl groff cmake python ]
|
||||
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
|
||||
@ -123,10 +122,7 @@ in stdenv.mkDerivation rec {
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
|
||||
'';
|
||||
|
||||
postInstall = stdenv.lib.optionalString enableManpages ''
|
||||
moveToOutput "share/man" "$man"
|
||||
''
|
||||
+ stdenv.lib.optionalString enableSharedLibraries ''
|
||||
postInstall = stdenv.lib.optionalString enableSharedLibraries ''
|
||||
moveToOutput "lib/libLLVM-*" "$lib"
|
||||
moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
|
||||
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
|
||||
@ -154,4 +150,22 @@ in stdenv.mkDerivation rec {
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
} // stdenv.lib.optionalAttrs enableManpages {
|
||||
name = "llvm-manpages-${version}";
|
||||
|
||||
buildPhase = ''
|
||||
make docs-llvm-man
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [];
|
||||
|
||||
installPhase = ''
|
||||
make -C docs install
|
||||
'';
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta.description = "man pages for LLVM ${version}";
|
||||
})
|
||||
|
||||
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://mono-project.com/;
|
||||
description = "Cross platform, open source .NET development framework";
|
||||
platforms = with stdenv.lib.platforms; darwin ++ linux;
|
||||
platforms = with stdenv.lib.platforms; allBut [ "aarch64-linux" ];
|
||||
maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ];
|
||||
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
|
||||
};
|
||||
|
||||
@ -605,6 +605,9 @@ self: super: {
|
||||
haskell-src-exts = self.haskell-src-exts_1_20_1;
|
||||
};
|
||||
|
||||
# Needs newer version of its dependencies than we have in LTS-10.x.
|
||||
hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; });
|
||||
|
||||
# https://github.com/bos/configurator/issues/22
|
||||
configurator = dontCheck super.configurator;
|
||||
|
||||
|
||||
@ -1123,7 +1123,6 @@ default-package-overrides:
|
||||
- hjsonschema ==1.7.1
|
||||
- hlibgit2 ==0.18.0.16
|
||||
- hlibsass ==0.1.6.1
|
||||
- hlint ==2.0.11
|
||||
- hmatrix ==0.18.1.0
|
||||
- hmatrix-gsl ==0.18.0.1
|
||||
- hmatrix-gsl-stats ==0.4.1.7
|
||||
@ -2759,12 +2758,9 @@ package-maintainers:
|
||||
- shakespeare
|
||||
abbradar:
|
||||
- Agda
|
||||
- lambdabot
|
||||
alunduil:
|
||||
- collection-json
|
||||
- network-arbitrary
|
||||
- network-uri-json
|
||||
- siren-json
|
||||
|
||||
dont-distribute-packages:
|
||||
# hard restrictions that really belong into meta.platforms
|
||||
@ -3230,6 +3226,7 @@ dont-distribute-packages:
|
||||
battleships: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
bdcs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
beam: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
beamable: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -3498,6 +3495,7 @@ dont-distribute-packages:
|
||||
cao: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cap: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Capabilities: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
capataz: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
capri: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -3690,6 +3688,7 @@ dont-distribute-packages:
|
||||
cmv: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -3705,6 +3704,7 @@ dont-distribute-packages:
|
||||
collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
collapse-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
collection-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
collections: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4417,6 +4417,7 @@ dont-distribute-packages:
|
||||
explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
explore: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
extcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
extemp: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4440,6 +4441,8 @@ dont-distribute-packages:
|
||||
falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fast-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fast-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fast-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4688,6 +4691,7 @@ dont-distribute-packages:
|
||||
geek: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gegl: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gemstone: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gen-imports: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gen-passwd: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gencheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gender: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4779,6 +4783,7 @@ dont-distribute-packages:
|
||||
gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4797,6 +4802,7 @@ dont-distribute-packages:
|
||||
gi-secret: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-soup: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-xlib: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
giak: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ginsu: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5036,6 +5042,7 @@ dont-distribute-packages:
|
||||
haddock-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
haddock: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
haddocset: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hadolint: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hadoop-formats: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hadoop-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hadoop-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5350,6 +5357,7 @@ dont-distribute-packages:
|
||||
heap: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hecc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
heckle: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hedgehog-gen-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hedis-config: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hedis-pile: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5847,6 +5855,7 @@ dont-distribute-packages:
|
||||
hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hwhile: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hworker: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hws: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6014,6 +6023,7 @@ dont-distribute-packages:
|
||||
irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Irc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
iri: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
iridium: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6212,7 +6222,9 @@ dont-distribute-packages:
|
||||
lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lambdabot: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6475,9 +6487,11 @@ dont-distribute-packages:
|
||||
lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ltk: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lua-bc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
luautils: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lucid-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lucid-svg: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6508,6 +6522,7 @@ dont-distribute-packages:
|
||||
macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
madlang: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mage: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
magic-wormhole: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
magicbane: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
magico: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6666,6 +6681,7 @@ dont-distribute-packages:
|
||||
mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mlist: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mmark-cli: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6972,6 +6988,7 @@ dont-distribute-packages:
|
||||
notzero: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
nptools: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ntha: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6985,6 +7002,7 @@ dont-distribute-packages:
|
||||
numeric-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numhask-array: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numhask-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
numhask: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6993,6 +7011,7 @@ dont-distribute-packages:
|
||||
NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
nylas: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
o-clock: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
oanda-rest-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
obd: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7132,6 +7151,7 @@ dont-distribute-packages:
|
||||
paprika: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
paragon: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Parallel-Arrows-Eden: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7480,6 +7500,7 @@ dont-distribute-packages:
|
||||
pyffi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
pyfi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
q4c12-twofinger: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
qc-oi-testgenerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
qd: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7752,6 +7773,7 @@ dont-distribute-packages:
|
||||
ridley: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
riemann: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
riff: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
rio: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
riot: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ripple-federation: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ripple: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -8085,6 +8107,7 @@ dont-distribute-packages:
|
||||
singnal: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
sink: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
siphon: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
siren-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
sitepipe: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -9067,6 +9090,7 @@ dont-distribute-packages:
|
||||
why3: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wild-bind-task-x11: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
windns: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
winerror: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -9083,6 +9107,7 @@ dont-distribute-packages:
|
||||
wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
woffex: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wolf: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
word2vec-model: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -9295,6 +9320,7 @@ dont-distribute-packages:
|
||||
yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
z3-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
z3: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
zabt: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -156,7 +156,7 @@ rec {
|
||||
enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}";
|
||||
disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
|
||||
|
||||
markBroken = drv: overrideCabal drv (drv: { broken = true; });
|
||||
markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; });
|
||||
markBrokenVersion = version: drv: assert drv.version == version; markBroken drv;
|
||||
|
||||
enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; });
|
||||
|
||||
@ -3,40 +3,21 @@
|
||||
# args: Additional arguments to pass to mkDerivation. Generally should include at least
|
||||
# name and src.
|
||||
{ stdenv, idris, gmp }: args: stdenv.mkDerivation ({
|
||||
preHook = ''
|
||||
# Library import path
|
||||
export IDRIS_LIBRARY_PATH=$PWD/idris-libs
|
||||
mkdir -p $IDRIS_LIBRARY_PATH
|
||||
|
||||
# Library install path
|
||||
export IBCSUBDIR=$out/lib/${idris.name}
|
||||
mkdir -p $IBCSUBDIR
|
||||
|
||||
addIdrisLibs () {
|
||||
if [ -d $1/lib/${idris.name} ]; then
|
||||
ln -sv $1/lib/${idris.name}/* $IDRIS_LIBRARY_PATH
|
||||
fi
|
||||
}
|
||||
|
||||
# All run-time deps
|
||||
addEnvHooks 0 addIdrisLibs
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
${idris}/bin/idris --build *.ipkg
|
||||
idris --build *.ipkg
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
if grep -q test *.ipkg; then
|
||||
${idris}/bin/idris --testpkg *.ipkg
|
||||
idris --testpkg *.ipkg
|
||||
fi
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR
|
||||
idris --install *.ipkg --ibcsubdir $IBCSUBDIR
|
||||
'';
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
buildInputs = [ gmp idris ];
|
||||
} // args)
|
||||
|
||||
@ -9,6 +9,9 @@ symlinkJoin {
|
||||
wrapProgram $out/bin/idris \
|
||||
--suffix PATH : ${ stdenv.lib.makeBinPath path } \
|
||||
--suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib}
|
||||
|
||||
mkdir -p $out/nix-support
|
||||
substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
|
||||
'';
|
||||
}
|
||||
|
||||
|
||||
16
pkgs/development/idris-modules/setup-hook.sh
Normal file
16
pkgs/development/idris-modules/setup-hook.sh
Normal file
@ -0,0 +1,16 @@
|
||||
# Library import path
|
||||
export IDRIS_LIBRARY_PATH=$PWD/idris-libs
|
||||
mkdir -p $IDRIS_LIBRARY_PATH
|
||||
|
||||
# Library install path
|
||||
export IBCSUBDIR=$out/lib/@name@
|
||||
mkdir -p $IBCSUBDIR
|
||||
|
||||
addIdrisLibs () {
|
||||
if [ -d $1/lib/@name@ ]; then
|
||||
ln -sv $1/lib/@name@/* $IDRIS_LIBRARY_PATH
|
||||
fi
|
||||
}
|
||||
|
||||
# All run-time deps
|
||||
addEnvHooks 1 addIdrisLibs
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, SDL2 }:
|
||||
{ stdenv, darwin, fetchurl, SDL2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "SDL2_gfx-${version}";
|
||||
@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL2 ];
|
||||
buildInputs = [ SDL2 ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
||||
|
||||
configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx";
|
||||
|
||||
@ -38,6 +39,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.zlib;
|
||||
|
||||
maintainers = with maintainers; [ bjg ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which
|
||||
, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug
|
||||
, CoreServices, AudioUnit, AudioToolbox
|
||||
, enableNativeMidi ? false, fluidsynth ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -17,6 +18,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig which ];
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
|
||||
|
||||
propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];
|
||||
|
||||
configureFlags = [ "--disable-music-ogg-shared" ]
|
||||
@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SDL multi-channel audio mixer library";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
homepage = https://www.libsdl.org/projects/SDL_mixer/;
|
||||
maintainers = with maintainers; [ MP2E ];
|
||||
license = licenses.zlib;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, SDL2 }:
|
||||
{ stdenv, darwin, fetchurl, SDL2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "SDL2_net-${version}";
|
||||
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
||||
|
||||
propagatedBuildInputs = [ SDL2 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
@ -16,6 +18,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://www.libsdl.org/projects/SDL_net;
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ MP2E ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, SDL2, freetype, mesa_noglu }:
|
||||
{ stdenv, darwin, fetchurl, SDL2, freetype, mesa_noglu }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "SDL2_ttf-${version}";
|
||||
@ -9,11 +9,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL2 freetype mesa_noglu ];
|
||||
buildInputs = [ SDL2 freetype mesa_noglu ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SDL TrueType library";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.zlib;
|
||||
homepage = https://www.libsdl.org/projects/SDL_ttf/;
|
||||
};
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libsigsegv-2.11";
|
||||
name = "libsigsegv-2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libsigsegv/${name}.tar.gz";
|
||||
sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x";
|
||||
sha256 = "1dlhqf4igzpqayms25lkhycjq1ccavisx8cnb3y4zapbkqsszq9s";
|
||||
};
|
||||
|
||||
patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }:
|
||||
{ stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "smpeg2-svn${version}";
|
||||
@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
|
||||
|
||||
buildInputs = [ SDL2 ];
|
||||
buildInputs = [ SDL2 ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
||||
|
||||
preConfigure = ''
|
||||
sh autogen.sh
|
||||
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://icculus.org/smpeg/;
|
||||
description = "SDL2 MPEG Player Library";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -499,13 +499,13 @@ let
|
||||
sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
|
||||
};
|
||||
};
|
||||
"class-utils-0.3.5" = {
|
||||
"class-utils-0.3.6" = {
|
||||
name = "class-utils";
|
||||
packageName = "class-utils";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz";
|
||||
sha1 = "17e793103750f9627b2176ea34cfd1b565903c80";
|
||||
url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz";
|
||||
sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58";
|
||||
};
|
||||
};
|
||||
"cliui-3.2.0" = {
|
||||
@ -814,6 +814,15 @@ let
|
||||
sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359";
|
||||
};
|
||||
};
|
||||
"depd-1.1.2" = {
|
||||
name = "depd";
|
||||
packageName = "depd";
|
||||
version = "1.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz";
|
||||
sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
|
||||
};
|
||||
};
|
||||
"deprecated-0.0.1" = {
|
||||
name = "deprecated";
|
||||
packageName = "deprecated";
|
||||
@ -985,13 +994,13 @@ let
|
||||
sha1 = "26a71aaf073b39fb2127172746131c2704028db8";
|
||||
};
|
||||
};
|
||||
"extglob-2.0.3" = {
|
||||
"extglob-2.0.4" = {
|
||||
name = "extglob";
|
||||
packageName = "extglob";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/extglob/-/extglob-2.0.3.tgz";
|
||||
sha512 = "31zb5fc59ps76hnxlnrcmm3lkv4pjd3cw55h5h7r9pn1q259bs15hw0bn4gp8kn91qwabgbj0cwkx9pxp8fgsj3ljlvmfv0xijnsah3";
|
||||
url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz";
|
||||
sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin";
|
||||
};
|
||||
};
|
||||
"extsprintf-1.3.0" = {
|
||||
@ -2956,13 +2965,13 @@ let
|
||||
sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
|
||||
};
|
||||
};
|
||||
"rc-1.2.3" = {
|
||||
"rc-1.2.4" = {
|
||||
name = "rc";
|
||||
packageName = "rc";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz";
|
||||
sha1 = "51575a900f8dd68381c710b4712c2154c3e2035b";
|
||||
url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz";
|
||||
sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3";
|
||||
};
|
||||
};
|
||||
"read-pkg-1.1.0" = {
|
||||
@ -3172,13 +3181,13 @@ let
|
||||
sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
|
||||
};
|
||||
};
|
||||
"semver-5.4.1" = {
|
||||
"semver-5.5.0" = {
|
||||
name = "semver";
|
||||
packageName = "semver";
|
||||
version = "5.4.1";
|
||||
version = "5.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
|
||||
sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
|
||||
url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
|
||||
sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1";
|
||||
};
|
||||
};
|
||||
"send-0.16.1" = {
|
||||
@ -3802,13 +3811,13 @@ let
|
||||
sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
|
||||
};
|
||||
};
|
||||
"uuid-3.1.0" = {
|
||||
"uuid-3.2.1" = {
|
||||
name = "uuid";
|
||||
packageName = "uuid";
|
||||
version = "3.1.0";
|
||||
version = "3.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
|
||||
sha512 = "3x5mi85l1559nkb35pfksjjgiyfyqrcvmcf0nly1xjl1kb0d37jnxd6sk0b8d331waadnqbf60nfssb563x9pvnjcw87lrh976sv18c";
|
||||
url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz";
|
||||
sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd";
|
||||
};
|
||||
};
|
||||
"v8-debug-1.0.1" = {
|
||||
@ -4296,7 +4305,7 @@ in
|
||||
sources."is-extendable-0.1.1"
|
||||
];
|
||||
})
|
||||
(sources."extglob-2.0.3" // {
|
||||
(sources."extglob-2.0.4" // {
|
||||
dependencies = [
|
||||
(sources."expand-brackets-2.1.4" // {
|
||||
dependencies = [
|
||||
@ -4449,7 +4458,7 @@ in
|
||||
})
|
||||
];
|
||||
})
|
||||
(sources."class-utils-0.3.5" // {
|
||||
(sources."class-utils-0.3.6" // {
|
||||
dependencies = [
|
||||
sources."arr-union-3.1.0"
|
||||
(sources."define-property-0.2.5" // {
|
||||
@ -4479,23 +4488,6 @@ in
|
||||
})
|
||||
];
|
||||
})
|
||||
(sources."lazy-cache-2.0.2" // {
|
||||
dependencies = [
|
||||
(sources."set-getter-0.1.0" // {
|
||||
dependencies = [
|
||||
(sources."to-object-path-0.3.0" // {
|
||||
dependencies = [
|
||||
(sources."kind-of-3.2.2" // {
|
||||
dependencies = [
|
||||
sources."is-buffer-1.1.6"
|
||||
];
|
||||
})
|
||||
];
|
||||
})
|
||||
];
|
||||
})
|
||||
];
|
||||
})
|
||||
(sources."static-extend-0.1.2" // {
|
||||
dependencies = [
|
||||
(sources."object-copy-0.1.0" // {
|
||||
@ -5089,7 +5081,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."tunnel-agent-0.6.0"
|
||||
sources."uuid-3.1.0"
|
||||
sources."uuid-3.2.1"
|
||||
];
|
||||
})
|
||||
sources."rimraf-2.6.2"
|
||||
@ -5328,6 +5320,7 @@ in
|
||||
sources."bytes-3.0.0"
|
||||
(sources."http-errors-1.6.2" // {
|
||||
dependencies = [
|
||||
sources."depd-1.1.1"
|
||||
sources."inherits-2.0.3"
|
||||
sources."setprototypeof-1.0.3"
|
||||
];
|
||||
@ -5344,7 +5337,7 @@ in
|
||||
sources."content-type-1.0.4"
|
||||
sources."cookie-0.3.1"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."depd-1.1.1"
|
||||
sources."depd-1.1.2"
|
||||
sources."encodeurl-1.0.1"
|
||||
sources."escape-html-1.0.3"
|
||||
sources."etag-1.8.1"
|
||||
@ -5377,6 +5370,7 @@ in
|
||||
sources."destroy-1.0.4"
|
||||
(sources."http-errors-1.6.2" // {
|
||||
dependencies = [
|
||||
sources."depd-1.1.1"
|
||||
sources."inherits-2.0.3"
|
||||
sources."setprototypeof-1.0.3"
|
||||
];
|
||||
@ -5428,7 +5422,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."path-is-absolute-1.0.1"
|
||||
(sources."rc-1.2.3" // {
|
||||
(sources."rc-1.2.4" // {
|
||||
dependencies = [
|
||||
sources."deep-extend-0.4.2"
|
||||
sources."ini-1.3.5"
|
||||
@ -5607,7 +5601,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."tunnel-agent-0.6.0"
|
||||
sources."uuid-3.1.0"
|
||||
sources."uuid-3.2.1"
|
||||
];
|
||||
})
|
||||
(sources."rimraf-2.6.2" // {
|
||||
@ -5640,7 +5634,7 @@ in
|
||||
})
|
||||
];
|
||||
})
|
||||
sources."semver-5.4.1"
|
||||
sources."semver-5.5.0"
|
||||
(sources."tar-2.2.1" // {
|
||||
dependencies = [
|
||||
sources."block-stream-0.0.9"
|
||||
@ -5854,7 +5848,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."tunnel-agent-0.6.0"
|
||||
sources."uuid-3.1.0"
|
||||
sources."uuid-3.2.1"
|
||||
];
|
||||
})
|
||||
(sources."rimraf-2.6.2" // {
|
||||
@ -5887,7 +5881,7 @@ in
|
||||
})
|
||||
];
|
||||
})
|
||||
sources."semver-5.4.1"
|
||||
sources."semver-5.5.0"
|
||||
(sources."tar-2.2.1" // {
|
||||
dependencies = [
|
||||
sources."block-stream-0.0.9"
|
||||
@ -6087,7 +6081,7 @@ in
|
||||
sources."set-blocking-2.0.0"
|
||||
];
|
||||
})
|
||||
(sources."rc-1.2.3" // {
|
||||
(sources."rc-1.2.4" // {
|
||||
dependencies = [
|
||||
sources."deep-extend-0.4.2"
|
||||
sources."ini-1.3.5"
|
||||
@ -6175,7 +6169,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."tunnel-agent-0.6.0"
|
||||
sources."uuid-3.1.0"
|
||||
sources."uuid-3.2.1"
|
||||
];
|
||||
})
|
||||
(sources."rimraf-2.6.2" // {
|
||||
@ -6209,7 +6203,7 @@ in
|
||||
})
|
||||
];
|
||||
})
|
||||
sources."semver-5.4.1"
|
||||
sources."semver-5.5.0"
|
||||
(sources."tar-2.2.1" // {
|
||||
dependencies = [
|
||||
sources."block-stream-0.0.9"
|
||||
|
||||
@ -80,6 +80,7 @@
|
||||
, "pulp"
|
||||
, "quassel-webserver"
|
||||
, "react-tools"
|
||||
, "react-native-cli"
|
||||
, "s3http"
|
||||
, "semver"
|
||||
, "serve"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -2155,6 +2155,18 @@ rec {
|
||||
|
||||
};
|
||||
|
||||
gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "gitv-2017-11-26";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/gregsexton/gitv";
|
||||
rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35";
|
||||
sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w";
|
||||
};
|
||||
dependencies = ["fugitive"];
|
||||
|
||||
};
|
||||
|
||||
|
||||
matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "matchit-zip";
|
||||
src = fetchurl {
|
||||
|
||||
@ -67,6 +67,7 @@
|
||||
"github:google/vim-codefmt"
|
||||
"github:google/vim-jsonnet"
|
||||
"github:google/vim-maktaba"
|
||||
"github:gregsexton/gitv"
|
||||
"github:heavenshell/vim-jsdoc"
|
||||
"github:hecal3/vim-leader-guide"
|
||||
"github:idris-hackers/idris-vim"
|
||||
|
||||
@ -0,0 +1,255 @@
|
||||
From bfb560d4184c5371f0628c2473eacfb9b4ee8519 Mon Sep 17 00:00:00 2001
|
||||
From: Jiada Wang <jiada_wang@mentor.com>
|
||||
Date: Sun, 9 Apr 2017 20:02:37 -0700
|
||||
Subject: [PATCH] perf tools: Fix build with ARCH=x86_64
|
||||
|
||||
With commit: 0a943cb10ce78 (tools build: Add HOSTARCH Makefile variable)
|
||||
when building for ARCH=x86_64, ARCH=x86_64 is passed to perf instead of
|
||||
ARCH=x86, so the perf build process searchs header files from
|
||||
tools/arch/x86_64/include, which doesn't exist.
|
||||
|
||||
The following build failure is seen:
|
||||
|
||||
In file included from util/event.c:2:0:
|
||||
tools/include/uapi/linux/mman.h:4:27: fatal error: uapi/asm/mman.h: No such file or directory
|
||||
compilation terminated.
|
||||
|
||||
Fix this issue by using SRCARCH instead of ARCH in perf, just like the
|
||||
main kernel Makefile and tools/objtool's.
|
||||
|
||||
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
|
||||
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||
Acked-by: Jiri Olsa <jolsa@kernel.org>
|
||||
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
||||
Cc: Andi Kleen <ak@linux.intel.com>
|
||||
Cc: Eugeniu Rosca <erosca@de.adit-jv.com>
|
||||
Cc: Jan Stancek <jstancek@redhat.com>
|
||||
Cc: Masami Hiramatsu <mhiramat@kernel.org>
|
||||
Cc: Peter Zijlstra <peterz@infradead.org>
|
||||
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
|
||||
Cc: Rui Teng <rui.teng@linux.vnet.ibm.com>
|
||||
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
|
||||
Cc: Wang Nan <wangnan0@huawei.com>
|
||||
Fixes: 0a943cb10ce7 ("tools build: Add HOSTARCH Makefile variable")
|
||||
Link: http://lkml.kernel.org/r/1491793357-14977-2-git-send-email-jiada_wang@mentor.com
|
||||
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||
---
|
||||
tools/perf/Makefile.config | 38 +++++++++++++++++++-------------------
|
||||
tools/perf/Makefile.perf | 2 +-
|
||||
tools/perf/arch/Build | 2 +-
|
||||
tools/perf/pmu-events/Build | 4 ++--
|
||||
tools/perf/tests/Build | 2 +-
|
||||
tools/perf/util/header.c | 2 +-
|
||||
6 files changed, 25 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
|
||||
index cffdd9cf3ebf..ff375310efe4 100644
|
||||
--- a/tools/perf/Makefile.config
|
||||
+++ b/tools/perf/Makefile.config
|
||||
@@ -19,18 +19,18 @@ CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS)
|
||||
|
||||
include $(srctree)/tools/scripts/Makefile.arch
|
||||
|
||||
-$(call detected_var,ARCH)
|
||||
+$(call detected_var,SRCARCH)
|
||||
|
||||
NO_PERF_REGS := 1
|
||||
|
||||
# Additional ARCH settings for ppc
|
||||
-ifeq ($(ARCH),powerpc)
|
||||
+ifeq ($(SRCARCH),powerpc)
|
||||
NO_PERF_REGS := 0
|
||||
LIBUNWIND_LIBS := -lunwind -lunwind-ppc64
|
||||
endif
|
||||
|
||||
# Additional ARCH settings for x86
|
||||
-ifeq ($(ARCH),x86)
|
||||
+ifeq ($(SRCARCH),x86)
|
||||
$(call detected,CONFIG_X86)
|
||||
ifeq (${IS_64_BIT}, 1)
|
||||
CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -DHAVE_SYSCALL_TABLE -I$(OUTPUT)arch/x86/include/generated
|
||||
@@ -43,12 +43,12 @@ ifeq ($(ARCH),x86)
|
||||
NO_PERF_REGS := 0
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH),arm)
|
||||
+ifeq ($(SRCARCH),arm)
|
||||
NO_PERF_REGS := 0
|
||||
LIBUNWIND_LIBS = -lunwind -lunwind-arm
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH),arm64)
|
||||
+ifeq ($(SRCARCH),arm64)
|
||||
NO_PERF_REGS := 0
|
||||
LIBUNWIND_LIBS = -lunwind -lunwind-aarch64
|
||||
endif
|
||||
@@ -61,7 +61,7 @@ endif
|
||||
# Disable it on all other architectures in case libdw unwind
|
||||
# support is detected in system. Add supported architectures
|
||||
# to the check.
|
||||
-ifneq ($(ARCH),$(filter $(ARCH),x86 arm))
|
||||
+ifneq ($(SRCARCH),$(filter $(SRCARCH),x86 arm))
|
||||
NO_LIBDW_DWARF_UNWIND := 1
|
||||
endif
|
||||
|
||||
@@ -115,9 +115,9 @@ endif
|
||||
FEATURE_CHECK_CFLAGS-libbabeltrace := $(LIBBABELTRACE_CFLAGS)
|
||||
FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf
|
||||
|
||||
-FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi
|
||||
+FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi
|
||||
# include ARCH specific config
|
||||
--include $(src-perf)/arch/$(ARCH)/Makefile
|
||||
+-include $(src-perf)/arch/$(SRCARCH)/Makefile
|
||||
|
||||
ifdef PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET
|
||||
CFLAGS += -DHAVE_ARCH_REGS_QUERY_REGISTER_OFFSET
|
||||
@@ -205,12 +205,12 @@ ifeq ($(DEBUG),0)
|
||||
endif
|
||||
|
||||
CFLAGS += -I$(src-perf)/util/include
|
||||
-CFLAGS += -I$(src-perf)/arch/$(ARCH)/include
|
||||
+CFLAGS += -I$(src-perf)/arch/$(SRCARCH)/include
|
||||
CFLAGS += -I$(srctree)/tools/include/uapi
|
||||
CFLAGS += -I$(srctree)/tools/include/
|
||||
-CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/uapi
|
||||
-CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/
|
||||
-CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/
|
||||
+CFLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi
|
||||
+CFLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/
|
||||
+CFLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/
|
||||
|
||||
# $(obj-perf) for generated common-cmds.h
|
||||
# $(obj-perf)/util for generated bison/flex headers
|
||||
@@ -321,7 +321,7 @@ ifndef NO_LIBELF
|
||||
|
||||
ifndef NO_DWARF
|
||||
ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)
|
||||
- msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);
|
||||
+ msg := $(warning DWARF register mappings have not been defined for architecture $(SRCARCH), DWARF support disabled);
|
||||
NO_DWARF := 1
|
||||
else
|
||||
CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)
|
||||
@@ -346,7 +346,7 @@ ifndef NO_LIBELF
|
||||
CFLAGS += -DHAVE_BPF_PROLOGUE
|
||||
$(call detected,CONFIG_BPF_PROLOGUE)
|
||||
else
|
||||
- msg := $(warning BPF prologue is not supported by architecture $(ARCH), missing regs_query_register_offset());
|
||||
+ msg := $(warning BPF prologue is not supported by architecture $(SRCARCH), missing regs_query_register_offset());
|
||||
endif
|
||||
else
|
||||
msg := $(warning DWARF support is off, BPF prologue is disabled);
|
||||
@@ -372,7 +372,7 @@ ifdef PERF_HAVE_JITDUMP
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH),powerpc)
|
||||
+ifeq ($(SRCARCH),powerpc)
|
||||
ifndef NO_DWARF
|
||||
CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
|
||||
endif
|
||||
@@ -453,7 +453,7 @@ else
|
||||
endif
|
||||
|
||||
ifndef NO_LOCAL_LIBUNWIND
|
||||
- ifeq ($(ARCH),$(filter $(ARCH),arm arm64))
|
||||
+ ifeq ($(SRCARCH),$(filter $(SRCARCH),arm arm64))
|
||||
$(call feature_check,libunwind-debug-frame)
|
||||
ifneq ($(feature-libunwind-debug-frame), 1)
|
||||
msg := $(warning No debug_frame support found in libunwind);
|
||||
@@ -717,7 +717,7 @@ ifeq (${IS_64_BIT}, 1)
|
||||
NO_PERF_READ_VDSO32 := 1
|
||||
endif
|
||||
endif
|
||||
- ifneq ($(ARCH), x86)
|
||||
+ ifneq ($(SRCARCH), x86)
|
||||
NO_PERF_READ_VDSOX32 := 1
|
||||
endif
|
||||
ifndef NO_PERF_READ_VDSOX32
|
||||
@@ -746,7 +746,7 @@ ifdef LIBBABELTRACE
|
||||
endif
|
||||
|
||||
ifndef NO_AUXTRACE
|
||||
- ifeq ($(ARCH),x86)
|
||||
+ ifeq ($(SRCARCH),x86)
|
||||
ifeq ($(feature-get_cpuid), 0)
|
||||
msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
|
||||
NO_AUXTRACE := 1
|
||||
@@ -793,7 +793,7 @@ sysconfdir = $(prefix)/etc
|
||||
ETC_PERFCONFIG = etc/perfconfig
|
||||
endif
|
||||
ifndef lib
|
||||
-ifeq ($(ARCH)$(IS_64_BIT), x861)
|
||||
+ifeq ($(SRCARCH)$(IS_64_BIT), x861)
|
||||
lib = lib64
|
||||
else
|
||||
lib = lib
|
||||
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
|
||||
index ef52d1e3d431..2b92ffef554b 100644
|
||||
--- a/tools/perf/Makefile.perf
|
||||
+++ b/tools/perf/Makefile.perf
|
||||
@@ -192,7 +192,7 @@ endif
|
||||
|
||||
ifeq ($(config),0)
|
||||
include $(srctree)/tools/scripts/Makefile.arch
|
||||
--include arch/$(ARCH)/Makefile
|
||||
+-include arch/$(SRCARCH)/Makefile
|
||||
endif
|
||||
|
||||
# The FEATURE_DUMP_EXPORT holds location of the actual
|
||||
diff --git a/tools/perf/arch/Build b/tools/perf/arch/Build
|
||||
index 109eb75cf7de..d9b6af837c7d 100644
|
||||
--- a/tools/perf/arch/Build
|
||||
+++ b/tools/perf/arch/Build
|
||||
@@ -1,2 +1,2 @@
|
||||
libperf-y += common.o
|
||||
-libperf-y += $(ARCH)/
|
||||
+libperf-y += $(SRCARCH)/
|
||||
diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build
|
||||
index 9213a1273697..999a4e878162 100644
|
||||
--- a/tools/perf/pmu-events/Build
|
||||
+++ b/tools/perf/pmu-events/Build
|
||||
@@ -2,7 +2,7 @@ hostprogs := jevents
|
||||
|
||||
jevents-y += json.o jsmn.o jevents.o
|
||||
pmu-events-y += pmu-events.o
|
||||
-JDIR = pmu-events/arch/$(ARCH)
|
||||
+JDIR = pmu-events/arch/$(SRCARCH)
|
||||
JSON = $(shell [ -d $(JDIR) ] && \
|
||||
find $(JDIR) -name '*.json' -o -name 'mapfile.csv')
|
||||
#
|
||||
@@ -10,4 +10,4 @@ JSON = $(shell [ -d $(JDIR) ] && \
|
||||
# directory and create tables in pmu-events.c.
|
||||
#
|
||||
$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JEVENTS)
|
||||
- $(Q)$(call echo-cmd,gen)$(JEVENTS) $(ARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V)
|
||||
+ $(Q)$(call echo-cmd,gen)$(JEVENTS) $(SRCARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V)
|
||||
diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
|
||||
index 8a4ce492f7b2..546250a273e7 100644
|
||||
--- a/tools/perf/tests/Build
|
||||
+++ b/tools/perf/tests/Build
|
||||
@@ -71,7 +71,7 @@ $(OUTPUT)tests/llvm-src-relocation.c: tests/bpf-script-test-relocation.c tests/B
|
||||
$(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
|
||||
$(Q)echo ';' >> $@
|
||||
|
||||
-ifeq ($(ARCH),$(filter $(ARCH),x86 arm arm64 powerpc))
|
||||
+ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc))
|
||||
perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
|
||||
endif
|
||||
|
||||
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
|
||||
index 5337f49db361..28bdb48357f0 100644
|
||||
--- a/tools/perf/util/header.c
|
||||
+++ b/tools/perf/util/header.c
|
||||
@@ -826,7 +826,7 @@ static int write_group_desc(int fd, struct perf_header *h __maybe_unused,
|
||||
|
||||
/*
|
||||
* default get_cpuid(): nothing gets recorded
|
||||
- * actual implementation must be in arch/$(ARCH)/util/header.c
|
||||
+ * actual implementation must be in arch/$(SRCARCH)/util/header.c
|
||||
*/
|
||||
int __weak get_cpuid(char *buffer __maybe_unused, size_t sz __maybe_unused)
|
||||
{
|
||||
--
|
||||
2.15.1
|
||||
|
||||
@ -11,7 +11,7 @@ assert versionAtLeast kernel.version "3.12";
|
||||
stdenv.mkDerivation {
|
||||
name = "perf-linux-${kernel.version}";
|
||||
|
||||
inherit (kernel) src;
|
||||
inherit (kernel) src makeFlags;
|
||||
|
||||
preConfigure = ''
|
||||
cd tools/perf
|
||||
@ -39,10 +39,6 @@ stdenv.mkDerivation {
|
||||
"-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
|
||||
];
|
||||
|
||||
makeFlags = if stdenv.hostPlatform == stdenv.buildPlatform
|
||||
then null
|
||||
else "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
|
||||
|
||||
installFlags = "install install-man ASCIIDOC8=1";
|
||||
|
||||
preFixup = ''
|
||||
@ -50,6 +46,9 @@ stdenv.mkDerivation {
|
||||
--prefix PATH : "${binutils}/bin"
|
||||
'';
|
||||
|
||||
|
||||
patches = optional (hasPrefix "4.9" kernel.version) [ ./perf-tools-fix-build-with-arch-x86_64.patch ];
|
||||
|
||||
meta = {
|
||||
homepage = https://perf.wiki.kernel.org/;
|
||||
description = "Linux tools to profile with performance counters";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, thin-provisioning-tools, enable_dmeventd ? false }:
|
||||
|
||||
let
|
||||
version = "2.02.176";
|
||||
version = "2.02.177";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
|
||||
sha256 = "0wx4rvy4frdmb66znh2xms2j2n06sm361ki6l5ks4y1ciii87kny";
|
||||
sha256 = "1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -3527,6 +3527,8 @@ with pkgs;
|
||||
|
||||
modsecurity_standalone = callPackage ../tools/security/modsecurity { };
|
||||
|
||||
molden = callPackage ../applications/science/chemistry/molden { };
|
||||
|
||||
molly-guard = callPackage ../os-specific/linux/molly-guard { };
|
||||
|
||||
moneyplex = callPackage ../applications/office/moneyplex { };
|
||||
@ -10963,7 +10965,9 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
};
|
||||
|
||||
SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { };
|
||||
SDL2_mixer = callPackage ../development/libraries/SDL2_mixer {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
|
||||
};
|
||||
|
||||
SDL2_net = callPackage ../development/libraries/SDL2_net { };
|
||||
|
||||
@ -15756,7 +15760,7 @@ with pkgs;
|
||||
|
||||
inherit (kdeApplications)
|
||||
akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b
|
||||
kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf keditbookmarks
|
||||
kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks
|
||||
kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
|
||||
kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user