ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 06:14:26 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Frederik Rietdijk 2017-10-27 21:35:58 +02:00
commit 8634a2e2c5
294 changed files with 3049 additions and 2090 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/maintainers.nix
View File

@ -177,6 +177,7 @@
dupgit = "Olivier Delhomme <olivier.delhomme@free.fr>";
dywedir = "Vladyslav M. <dywedir@protonmail.ch>";
e-user = "Alexander Kahl <nixos@sodosopa.io>";
earldouglas = "James Earl Douglas <james@earldouglas.com>";
ebzzry = "Rommel Martinez <ebzzry@ebzzry.io>";
edanaher = "Evan Danaher <nixos@edanaher.net>";
edef = "edef <edef@edef.eu>";
@ -330,6 +331,7 @@
kragniz = "Louis Taylor <louis@kragniz.eu>";
kristoff3r = "Kristoffer Søholm <k.soeholm@gmail.com>";
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
kuznero = "Roman Kuznetsov <roman@kuznero.com>";
lassulus = "Lassulus <lassulus@gmail.com>";
layus = "Guillaume Maudoux <layus.on@gmail.com>";
ldesgoui = "Lucas Desgouilles <ldesgoui@gmail.com>";
@ -385,6 +387,7 @@
mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
mdaiter = "Matthew S. Daiter <mdaiter8121@gmail.com>";
meditans = "Carlo Nucera <meditans@gmail.com>";
mehandes = "Matt Deming <niewskici@gmail.com>";
meisternu = "Matt Miemiec <meister@krutt.org>";
metabar = "Celine Mercier <softs@metabarcoding.org>";
mgdelacroix = "Miguel de la Cruz <mgdelacroix@gmail.com>";
@ -607,6 +610,7 @@
teh = "Tom Hunger <tehunger@gmail.com>";
telotortium = "Robert Irelan <rirelan@gmail.com>";
teto = "Matthieu Coudron <mcoudron@hotmail.com>";
tex = "Milan Svoboda <milan.svoboda@centrum.cz>";
thall = "Niclas Thall <niclas.thall@gmail.com>";
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
@ -672,6 +676,7 @@
xnwdd = "Guillermo NWDD <nwdd+nixos@no.team>";
xvapx = "Marti Serra <marti.serra.coscollano@gmail.com>";
xwvvvvwx = "David Terry <davidterry@posteo.de>";
xzfc = "Albert Safin <xzfcpw@gmail.com>";
yarr = "Dmitry V. <savraz@gmail.com>";
yegortimoshenko = "Yegor Timoshenko <yegortimoshenko@gmail.com>";
ylwghst = "Burim Augustin Berisa <ylwghst@onionmail.info>";

10
nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
View File

@ -10,6 +10,7 @@ let
in
{
imports = [
../../profiles/base.nix
../../profiles/installation-device.nix
./sd-image.nix
];
@ -27,9 +28,12 @@ in
boot.loader.generic-extlinux-compatible.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
# Increase the amount of CMA to ensure the virtual console on the RPi3 works.
boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=tty0"];
boot.consoleLogLevel = 7;
# The serial ports listed here are:
# - ttyS0: for Tegra (Jetson TX1)
# - ttyAMA0: for QEMU's -machine virt
# Also increase the amount of CMA to ensure the virtual console on the RPi3 works.
boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
# FIXME: this probably should be in installation-device.nix
users.extraUsers.root.initialHashedPassword = "";

7
nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
View File

@ -10,6 +10,7 @@ let
in
{
imports = [
../../profiles/base.nix
../../profiles/installation-device.nix
./sd-image.nix
];
@ -27,6 +28,12 @@ in
boot.loader.generic-extlinux-compatible.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
# The serial ports listed here are:
# - ttyS0: for Tegra (Jetson TK1)
# - ttymxc0: for i.MX6 (Wandboard)
# - ttyAMA0: for Allwinner (pcDuino3 Nano) and QEMU's -machine virt
# - ttyO0: for OMAP (BeagleBone Black)
# - ttySAC2: for Exynos (ODROID-XU3)
boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"];
# FIXME: this probably should be in installation-device.nix

1
nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
View File

@ -10,6 +10,7 @@ let
in
{
imports = [
../../profiles/base.nix
../../profiles/installation-device.nix
./sd-image.nix
];

39
nixos/modules/misc/crashdump.nix
View File

@ -18,26 +18,23 @@ in
default = false;
description = ''
If enabled, NixOS will set up a kernel that will
boot on crash, and leave the user to a stage1 debug1devices
interactive shell to be able to save the crashed kernel dump.
boot on crash, and leave the user in systemd rescue
to be able to save the crashed kernel dump at
/proc/vmcore.
It also activates the NMI watchdog.
'';
};
kernelPackages = mkOption {
type = types.package;
default = pkgs.linuxPackages;
# We don't want to evaluate all of linuxPackages for the manual
# - some of it might not even evaluate correctly.
defaultText = "pkgs.linuxPackages";
example = literalExample "pkgs.linuxPackages_2_6_25";
reservedMemory = mkOption {
default = "128M";
description = ''
This will override the boot.kernelPackages, and will add some
kernel configuration parameters for the crash dump to work.
The amount of memory reserved for the crashdump kernel.
If you choose a too high value, dmesg will mention
"crashkernel reservation failed".
'';
};
kernelParams = mkOption {
type = types.listOf types.str;
default = [ "debug1devices" ];
default = [ "1" "boot.shell_on_fail" ];
description = ''
Parameters that will be passed to the kernel kexec-ed on crash.
'';
@ -51,29 +48,29 @@ in
config = mkIf crashdump.enable {
boot = {
postBootCommands = ''
echo "loading crashdump kernel...";
${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \
--initrd=/run/current-system/initrd \
--append="init=$(readlink -f /run/current-system/init) system=$(readlink -f /run/current-system) irqpoll maxcpus=1 reset_devices ${kernelParams}" --reset-vga --console-vga
--reset-vga --console-vga \
--command-line="systemConfig=$(readlink -f /run/current-system) init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"
'';
kernelParams = [
"crashkernel=64M"
"crashkernel=${crashdump.reservedMemory}"
"nmi_watchdog=panic"
"softlockup_panic=1"
"idle=poll"
];
kernelPackages = mkOverride 50 (crashdump.kernelPackages // {
kernel = crashdump.kernelPackages.kernel.override
(attrs: {
extraConfig = (optionalString (attrs ? extraConfig) attrs.extraConfig) +
''
kernelPatches = [ {
name = "crashdump-config";
patch = null;
extraConfig = ''
CRASH_DUMP y
DEBUG_INFO y
PROC_VMCORE y
LOCKUP_DETECTOR y
HARDLOCKUP_DETECTOR y
'';
});
});
} ];
};
};
}

59
nixos/modules/programs/sway.nix
View File

@ -1,13 +1,59 @@
{ config, pkgs, lib, ... }:
with lib;
{
options.programs.sway.enable = mkEnableOption "sway";
config = mkIf config.programs.sway.enable {
environment.systemPackages = [ pkgs.sway pkgs.xwayland ];
let
cfg = config.programs.sway;
sway = pkgs.sway;
swayWrapped = pkgs.writeScriptBin "sway" ''
#! ${pkgs.stdenv.shell}
${cfg.extraSessionCommands}
PATH="${sway}/bin:$PATH"
exec ${pkgs.dbus.dbus-launch} --exit-with-session "${sway}/bin/sway"
'';
swayJoined = pkgs.symlinkJoin {
name = "sway-wrapped";
paths = [ swayWrapped sway ];
};
in
{
options.programs.sway = {
enable = mkEnableOption "sway";
extraSessionCommands = mkOption {
default = "";
type = types.lines;
example = ''
export XKB_DEFAULT_LAYOUT=us,de
export XKB_DEFAULT_VARIANT=,nodeadkeys
export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,
'';
description = ''
Shell commands executed just before sway is started.
'';
};
extraPackages = mkOption {
type = with types; listOf package;
default = with pkgs; [
i3status xwayland rxvt_unicode dmenu
];
example = literalExample ''
with pkgs; [
i3status xwayland rxvt_unicode dmenu
]
'';
description = ''
Extra packages to be installed system wide.
'';
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
security.wrappers.sway = {
source = "${pkgs.sway}/bin/sway";
source = "${swayJoined}/bin/sway";
capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip";
owner = "root";
group = "sway";
@ -15,5 +61,8 @@ with lib;
};
users.extraGroups.sway = {};
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
};
}

4
nixos/modules/services/continuous-integration/buildkite-agent.nix
View File

@ -33,8 +33,8 @@ in
};
runtimePackages = mkOption {
default = [ pkgs.nix ];
defaultText = "[ pkgs.nix ]";
default = [ pkgs.bash pkgs.nix ];
defaultText = "[ pkgs.bash pkgs.nix ]";
description = "Add programs to the buildkite-agent environment";
type = types.listOf types.package;
};

15
nixos/modules/services/mail/postfix.nix
View File

@ -62,7 +62,9 @@ let
shlib_directory = false;
relayhost = if cfg.lookupMX || cfg.relayHost == ""
then cfg.relayHost
else "[${cfg.relayHost}]";
else
"[${cfg.relayHost}]"
+ optionalString (cfg.relayPort != null) ":${toString cfg.relayPort}";
mail_spool_directory = "/var/spool/mail/";
setgid_group = setgidGroup;
}
@ -458,6 +460,17 @@ in
";
};
relayPort = mkOption {
type = types.nullOr types.int;
default = null;
example = 587;
description = "
Specify an optional port for outbound mail relay. (Note:
only used if an explicit <option>relayHost</option> is
defined.)
";
};
lookupMX = mkOption {
type = types.bool;
default = false;

19
nixos/modules/services/monitoring/prometheus/node-exporter.nix
View File

@ -4,9 +4,6 @@ with lib;
let
cfg = config.services.prometheus.nodeExporter;
cmdlineArgs = cfg.extraFlags ++ [
"-web.listen-address=${cfg.listenAddress}"
];
in {
options = {
services.prometheus.nodeExporter = {
@ -37,6 +34,15 @@ in {
'';
};
disabledCollectors = mkOption {
type = types.listOf types.str;
default = [];
example = ''[ "timex" ]'';
description = ''
Collectors to disable which are enabled by default.
'';
};
extraFlags = mkOption {
type = types.listOf types.str;
default = [];
@ -64,13 +70,14 @@ in {
wantedBy = [ "multi-user.target" ];
script = ''
exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \
${concatMapStrings (x: "--collector." + x + " ") cfg.enabledCollectors} \
${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \
${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
serviceConfig = {
DynamicUser = true;
Restart = "always";
User = "nobody";
Restart = "always";
PrivateTmp = true;
WorkingDirectory = /tmp;
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

14
nixos/modules/services/networking/dnsmasq.nix
View File

@ -55,6 +55,14 @@ in
'';
};
alwaysKeepRunning = mkOption {
type = types.bool;
default = false;
description = ''
If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
@ -101,10 +109,12 @@ in
BusName = "uk.org.thekelleys.dnsmasq";
ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
PrivateTmp = true;
ProtectSystem = true;
ProtectHome = true;
Restart = if cfg.alwaysKeepRunning then "always" else "on-failure";
};
restartTriggers = [ config.environment.etc.hosts.source ];
};
};
}

12
nixos/modules/services/search/elasticsearch.nix
View File

@ -174,11 +174,13 @@ in {
LimitNOFILE = "1024000";
};
preStart = ''
# Only set vm.max_map_count if lower than ES required minimum
# This avoids conflict if configured via boot.kernel.sysctl
if [ `${pkgs.procps}/bin/sysctl -n vm.max_map_count` -lt 262144 ]; then
${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144
fi
${optionalString (!config.boot.isContainer) ''
# Only set vm.max_map_count if lower than ES required minimum
# This avoids conflict if configured via boot.kernel.sysctl
if [ `${pkgs.procps}/bin/sysctl -n vm.max_map_count` -lt 262144 ]; then
${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144
fi
''}
mkdir -m 0700 -p ${cfg.dataDir}

2
nixos/modules/system/boot/plymouth.nix
View File

@ -72,7 +72,7 @@ in
environment.systemPackages = [ plymouth ];
environment.etc."plymouth/plymouthd.conf".source = configFile;
environment.etc."plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouth.defaults";
environment.etc."plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults";
environment.etc."plymouth/logo.png".source = cfg.logo;
environment.etc."plymouth/themes".source = "${themesEnv}/share/plymouth/themes";
# XXX: Needed because we supply a different set of plugins in initrd.

15
nixos/modules/tasks/filesystems.nix
View File

@ -115,11 +115,18 @@ let
};
config = {
config = let
defaultFormatOptions =
# -F needed to allow bare block device without partitions
if (builtins.substring 0 3 config.fsType) == "ext" then "-F"
# -q needed for non-interactive operations
else if config.fsType == "jfs" then "-q"
# (same here)
else if config.fsType == "reiserfs" then "-q"
else null;
in {
options = mkIf config.autoResize [ "x-nixos.autoresize" ];
# -F needed to allow bare block device without partitions
formatOptions = mkIf ((builtins.substring 0 3 config.fsType) == "ext") (mkDefault "-F");
formatOptions = mkIf (defaultFormatOptions != null) (mkDefault defaultFormatOptions);
};
};

12
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -92,7 +92,7 @@ let
-drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \
-kernel ${config.system.build.toplevel}/kernel \
-initrd ${config.system.build.toplevel}/initrd \
-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \
''} \
$extraDisks \
${qemuGraphics} \
@ -102,15 +102,7 @@ let
'';
regInfo = pkgs.runCommand "reginfo"
{ exportReferencesGraph =
map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB;
buildInputs = [ pkgs.perl ];
preferLocalBuild = true;
}
''
printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
'';
regInfo = pkgs.closureInfo { rootPaths = config.virtualisation.pathsInNixDB; };
# Generate a hard disk image containing a /boot partition and GRUB

7
pkgs/applications/audio/gpodder/default.nix
View File

@ -51,6 +51,13 @@ python2Packages.buildPythonApplication rec {
feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib
] ++ stdenv.lib.optional ipodSupport libgpod;
preBuild = ''
make PREFIX="$out" \
share/applications/gpodder-url-handler.desktop \
share/applications/gpodder.desktop \
share/dbus-1/services/org.gpodder.service
'';
checkPhase = ''
LC_ALL=C python -m gpodder.unittests
'';

26
pkgs/applications/audio/greg/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
with pythonPackages; buildPythonApplication rec {
pname = "greg";
version = "0.4.7";
name = pname + "-" + version;
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "manolomartinez";
repo = pname;
rev = "v" + version;
sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v";
};
buildInputs = with pythonPackages; [ feedparser ];
propagatedBuildInputs = buildInputs;
meta = with stdenv.lib; {
homepage = "https://github.com/manolomartinez/greg";
description = "A command-line podcast aggregator";
license = licenses.gpl3;
maintainers = with maintainers; [ edwtjo ];
};
}

13
pkgs/applications/audio/mpg321/default.nix
View File

@ -1,4 +1,8 @@
{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib}:
{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib
# Specify default libao output plugin to use (e.g. "alsa", "pulse" …).
# If null, it will use the libao system default.
, defaultAudio ? null
}:
stdenv.mkDerivation rec {
name = "mpg321-${version}";
@ -11,9 +15,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
configureFlags = [
("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no"))
];
configureFlags =
[ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ]
++ (stdenv.lib.optional (defaultAudio != null)
"--with-default-audio=${defaultAudio}");
buildInputs = [libao libid3tag libmad zlib]
++ stdenv.lib.optional stdenv.isLinux alsaLib;

8
pkgs/applications/audio/ncmpcpp/default.nix
View File

@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "ncmpcpp-${version}";
version = "0.8";
version = "0.8.1";
src = fetchurl {
url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
sha256 = "0nj6ky805a55acj0w57sbn3vfmmkbqp97rhbi0q9848n10f2l3rg";
url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
sha256 = "1zw8d07b2bkssbsybg6jnmpq001w525viajrnz4jvfml3l55gyad";
};
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A featureful ncurses based MPD client inspired by ncmpc";
homepage = http://ncmpcpp.rybczak.net/;
homepage = https://ncmpcpp.rybczak.net/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ];
platforms = platforms.all;

6
pkgs/applications/audio/zam-plugins/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "zam-plugins-${version}";
version = "3.8";
version = "3.9";
src = fetchgit {
url = "https://github.com/zamaudio/zam-plugins.git";
deepClone = true;
rev = "830ab2e9dd1db8cf56d12c71057157e5d8e9fd74";
sha256 = "1hyly5inis59cvh0r7lyi203h8v5jh84ca9jpaljm53cvw6d93px";
rev = "4976cf204074c1dfaf344821e83e8d896b35107d";
sha256 = "1xgwl51sf2hgc5ikcnycyxaw9vy82lrcswn07b6av6i67qclm8f8";
};
nativeBuildInputs = [ pkgconfig ];

20
pkgs/applications/editors/android-studio/packages.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, fetchurl, makeFontsConf }:
{ stdenv, callPackage, fetchurl, makeFontsConf }:
let
mkStudio = opts: callPackage (import ./common.nix opts) {
fontsConf = makeFontsConf {
@ -6,11 +6,11 @@ let
};
};
in rec {
stable = mkStudio rec {
stable = mkStudio {
pname = "android-studio";
version = "2.3.3.0";
build = "162.4069837";
sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
version = "3.0.0.18"; # "Android Studio 3.0"
build = "171.4408382";
sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br";
meta = with stdenv.lib; {
description = "The Official IDE for Android (stable version)";
@ -25,16 +25,16 @@ in rec {
};
};
preview = mkStudio rec {
preview = mkStudio {
pname = "android-studio-preview";
version = "3.0.0.17"; # "Android Studio 3.0 RC 2"
build = "171.4402976";
sha256Hash = "18f5cq1dcmyjxaq520kqjac332bpp35pis02yplh6gzp65i4bvvf";
version = "3.1.0.0"; # "Android Studio 3.1 Canary 1"
build = "171.4415322";
sha256Hash = "08xgwv6mg2zxys9dqjfz66h60g640ni3snyb89ij0fkmd28rbxgj";
meta = stable.meta // {
description = "The Official IDE for Android (preview version)";
homepage = https://developer.android.com/studio/preview/index.html;
maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
maintainers = with stdenv.lib.maintainers; [ primeos ];
};
};
}

2
pkgs/applications/editors/kdevelop5/kdevelop.nix
View File

@ -39,7 +39,7 @@ mkDerivation rec {
postInstall = ''
# The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin"
wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}"
# Fix the (now wrapped) kdevelop! to find things in right places:
# - Make KDEV_BASEDIR point to bin directory of kdevplatform.

63
pkgs/applications/graphics/astah-community/default.nix Normal file
View File

@ -0,0 +1,63 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem, unzip, jre }:
let
name = "astah-community";
version = "7.2.0";
postfix = "1ff236";
desktopIcon = fetchurl {
name = "${name}.png";
url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.png?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87";
sha256 = "0knlknwfqqnhg63sxxpia5ykn397id31gzr956wnn6yjj58k3ckm";
};
mimeXml = fetchurl {
name = "${name}.xml";
url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.xml?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87";
sha256 = "096n2r14ddm97r32i4sbp7v4qdmwn9sxy7lwphcx1nydppb0m97b";
};
desktopItem = makeDesktopItem {
name = name;
exec = "astah %U";
icon = "${desktopIcon}";
comment = "Lightweight, easy-to-use, and free UML2.x modeler";
desktopName = "Astah* Community";
genericName = "Astah* Community";
mimeType = "application/x-astah";
categories = "Application;Development;";
extraEntries = "NoDisplay=false";
};
in
stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchurl {
url = "http://cdn.change-vision.com/files/${name}-${stdenv.lib.replaceStrings ["."] ["_"] version}-${postfix}.zip";
sha256 = "1lkl30jdjiarvh2ap9rjabvrq9qhrlmfrasv3vvkag22y9w4l499";
};
nativeBuildInputs = [ unzip makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share}
cp -r . $out/share/astah
cp -r ${desktopItem}/share/applications $out/share/applications
install -D ${desktopIcon} $out/share/pixmaps/${name}.png
install -D ${mimeXml} $out/share/mime/packages/${name}.xml
makeWrapper ${jre}/bin/java $out/bin/astah \
--add-flags "-jar $out/share/astah/astah-community.jar"
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Lightweight, easy-to-use, and free UML2.x modeler";
homepage = http://astah.net/editions/community;
license = licenses.unfree;
};
}

1
pkgs/applications/kde/default.nix
View File

@ -101,6 +101,7 @@ let
kdepim-runtime = callPackage ./kdepim-runtime.nix {};
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
keditbookmarks = callPackage ./keditbookmarks.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kholidays = callPackage ./kholidays.nix {};

17
pkgs/applications/kde/keditbookmarks.nix Normal file
View File

@ -0,0 +1,17 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kio, kparts, kwindowsystem
}:
mkDerivation {
name = "keditbookmarks";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kio kparts kwindowsystem ];
meta = with lib; {
homepage = http://www.kde.org;
license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
};
}

28
pkgs/applications/misc/alacritty/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv,
fetchFromGitHub,
fetchgit,
rustPlatform,
cmake,
makeWrapper,
@ -29,16 +29,19 @@ let
in
buildRustPackage rec {
name = "alacritty-unstable-2017-10-17";
name = "alacritty-unstable-${version}";
version = "2017-10-22";
src = fetchFromGitHub {
owner = "jwilm";
repo = "alacritty";
rev = "5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6";
sha256 = "0h37x12r33xwz9vf1n8y24c0ph5w17lhkpfi5q6lbpgidvbs6fyx";
# At the moment we cannot handle git dependencies in buildRustPackage.
# This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
src = fetchgit {
url = https://github.com/Mic92/alacritty.git;
rev = "rev-${version}";
sha256 = "02wvwi72hnqmy12n0b248wzhajni9ipyayz6vnn3ryhnrccrrp7j";
fetchSubmodules = true;
};
cargoSha256 = "0w3j92kd27pny37pfvlv6qsnbb1lgphmfbhvvng0z96r2b1wjviz";
cargoSha256 = "14bmm1f7hqh8i4mpb6ljh7szrm4g6mplzpq9zbgjrgxnc01w3s0i";
buildInputs = [
cmake
@ -54,14 +57,10 @@ buildRustPackage rec {
installPhase = ''
runHook preInstall
mkdir -p $out/bin
for f in $(find target/release -maxdepth 1 -type f); do
cp $f $out/bin
done;
install -D target/release/alacritty $out/bin/alacritty
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
mkdir -p $out/share/applications
cp Alacritty.desktop $out/share/applications/alacritty.desktop
install -D Alacritty.desktop $out/share/applications/alacritty.desktop
runHook postInstall
'';
@ -69,7 +68,6 @@ buildRustPackage rec {
dontPatchELF = true;
meta = with stdenv.lib; {
broken = true;
description = "GPU-accelerated terminal emulator";
homepage = https://github.com/jwilm/alacritty;
license = with licenses; [ asl20 ];

38
pkgs/applications/misc/kitty/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, glew, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper }:
with python3Packages;
buildPythonApplication rec {
version = "0.4.2";
name = "kitty-${version}";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "058676r2b83mjggbfc701v3vlviaslf7qciz8sm8lcda82k01wfp";
};
buildInputs = [ glew fontconfig glfw ncurses libunistring ];
nativeBuildInputs = [ pkgconfig ];
buildPhase = ''
python3 setup.py linux-package
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r linux-package/{bin,share,lib} $out
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick ]}"
runHook postInstall
'';
meta = with stdenv.lib; {
homepage = https://github.com/kovidgoyal/kitty;
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
license = licenses.gpl3;
maintainers = with maintainers; [ tex ];
};
}

24
pkgs/applications/misc/mupdf/default.nix
View File

@ -32,6 +32,30 @@ stdenv.mkDerivation rec {
url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch";
sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j";
})
(fetchurl {
name = "mupdf-1.11-CVE-2017-14685.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=ab1a420613dec93c686acbee2c165274e922f82a";
sha256 = "120xapwj0af333n3a32ypxk0jmjv2ia476jg8pzsfqk9a5qqkx46";
})
(fetchurl {
name = "mupdf-1.11-CVE-2017-14686.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1";
sha256 = "0pkn7mfqhmnsyia4rh4mw4q435bzvlc22crqa1bxpaa0gcyky51c";
})
(fetchurl {
name = "mupdf-1.11-CVE-2017-14687.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28";
sha256 = "01v41cwrdnz3k32fcadk2gk4knqrm3mavzp6pxhn19nwgmqkshjd";
})
(fetchurl {
name = "mupdf-1.11-CVE-2017-15587.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8";
sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9";
})
];
makeFlags = [ "prefix=$(out)" ];

8
pkgs/applications/misc/nnn/default.nix
View File

@ -4,17 +4,17 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "nnn-${version}";
version = "1.3";
version = "1.5";
src = fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v${version}";
sha256 = "0w9i9vwyqgsi64b5mk4rhmr5gvnnb24c98321r0j5hb0ghdcp96s";
sha256 = "10gcbklh0cp12293lzlwcplj0in90p95x4fyvg1smg4cxamkibvn";
};
configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses readline ];

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

@ -2,14 +2,14 @@
with pythonPackages;
buildPythonApplication rec {
version = "1.18.0";
version = "1.19.0";
name = "rtv-${version}";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
sha256 = "00d2s29sp68hw8ljjmzn5dc5ly2s3c7qf0azwizgd3b40zlfgzcg";
sha256 = "19rnw9cac06ns10vqn2cj0v61ycrj9g1ysa3hncamwxxibmkycp7";
};
# Tests try to access network

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

@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec {
name = "udiskie-${version}";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "coldfix";
repo = "udiskie";
rev = version;
sha256 = "12d0fc88wlbh5vvsijvy3cwk37wagmg8193n9zcipr1ivmcmhx15";
sha256 = "1p732gi6lhwcqxvsa0pknb6jmhy3kgv3yzz7xzmdzhy47m312965";
};
buildInputs = [

6
pkgs/applications/misc/xca/default.nix
View File

@ -20,12 +20,6 @@ mkDerivation rec {
configureFlags = [ "CXXFLAGS=-std=c++11" ];
preBuild = ''
substituteInPlace Local.mak \
--replace ${qtbase}/bin/moc ${qtbase.dev}/bin/moc \
--replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic
'';
meta = with lib; {
description = "Interface for managing asymetric keys like RSA or DSA";
homepage = http://xca.sourceforge.net/;

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -94,12 +94,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "27.0.0.170";
version = "27.0.0.183";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "191gqgpsl5dl39m04mm5bkkbv5m5npg91anbwsvzb29cs2yqq95m";
sha256 = "012fhsjfp71vaarjhi3dd4qpb41n4510zmid38hl2hsjz7qrj5aj";
stripRoot = false;
};

762
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

762
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

762
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

8
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -6,10 +6,10 @@ rec {
firefox = common rec {
pname = "firefox";
version = "56.0.1";
version = "56.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "6a07de6bfb71ccdef04b0f2ced720e309d037dd89fe983178ac59ea972147360552e2b8e33d8caa476008cabf53a99003807b0e817150b7a39e0bc143d82b88f";
sha512 = "35f81e8163a254b7e134fc073acbcff63aa1025b9c6392377650a8f2d0a5f0c77211adb0ae3d8ac85f036bb387246934b8847f14a03fceb7fcbc5b3cf94c9392";
};
patches =
@ -32,10 +32,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
version = "52.4.0esr";
version = "52.4.1esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "be3be7f9dbf4bd0344d5d76f26d1a5090bb012154d25833d5cd58e5e707c080515b42ed751e1f7e58b15b96939d7da634cafb6e8aa9bb1627ff420836b802183";
sha512 = "d80c7219548391d8a47b6e404662ea41e6acfa264a67d69365e76dd8943077e388ab24b030850919f8fc6681c11486bdbaaf170d441c861f4a12cedbe08955ab";
};
meta = firefox.meta // {

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "27.0.0.170";
version = "27.0.0.183";
src = fetchurl {
url =
@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"018dx7vpl8ha5c7wlcvh422ll5f0zb9cb77cmylbai84dwb9wrvg"
"1qn9hm9c303jihksfc8sb5yjpcasj711s66lhqlqmj5hd0r8bzya"
else
"09qd15khv914xcr9c4vy770mm33bl6szfy334ddb5gv6dh6h2gd8"
"19d0d4fn2p2wvh27gshybgc4xpjp0ibgm2gg8g0jzrvbc3cqdz0j"
else
if arch == "x86_64" then
"0hyc25ygxrp8k0w1xmg5wx1d2l959glc23bjswf30agwlpyn2rwn"
"0df8lbbvr226k9z6p2jwxandjb6yy0bqz5kaz79hpj0dwkiqwax1"
else
"1jsq8lgs4jvplwkkb2pngnr7vq9xv9knajk2247qpraq51fq2vd0";
"0vs63rlra5ccm24j908zrcxhffjlmvjr6pb2bb7a4fmnfjrk4idf";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -55,7 +55,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "27.0.0.170";
version = "27.0.0.183";
src = fetchurl {
url =
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"1mz1sxg9wvkgpcwmvbgn1s8x01lx9vkm7wbldfn66j230yrx2mlh"
"0vf28qdhb1ly5w3hhy3n20r4nyvwsxj5csb969s0r328nf1xaflj"
else
"1ysdl7j7d9fqy509wz0gq2sray08j1v3bv9zwd6nzplgd60qdrva";
"0jqbnbpdrmxh2jnai0bv4c8jzsvqmcnhsp1hzaygsvp0ri4vncs8";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -98,7 +98,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "7.0.7";
version = "7.0.8";
lang = "en-US";
@ -108,7 +108,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "1848j28majbb61r080g6dw0lmh7hbp515iidyjdrpgcwhazzg06j";
sha256 = "0bi4l4ma40ifsajvjpwv6ixphijqvb7yrci2jcyykh3j41ndfjf2";
};
"i686-linux" = fetchurl {
@ -116,7 +116,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "08wvpymmyg16ifz23awnjy0pbva8xh1fdx2i8c1n18x3k12d5r7h";
sha256 = "182q1gb8jnk92wxr7m977yxcksa8d3zg90qbsja1raym2vhqaf73";
};
};
in

8
pkgs/applications/networking/cluster/minikube/default.nix
View File

@ -15,15 +15,15 @@ let
# instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
# currently https://storage.googleapis.com/minikube/k8s_releases.json
localkube-version = "1.7.5";
localkube-version = "1.8.0";
localkube-binary = fetchurl {
url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
sha256 = "1kn4lwnn961r19hqnkgr13np80zqk2fhp8xkhrvxzq6v6shk7gfz";
sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc";
};
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
version = "0.22.3";
version = "0.23.0";
goPackagePath = "k8s.io/minikube";
@ -31,7 +31,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "0jcfw0yrd4vqyiyhg15cy2knn2fjw91das8id4famz5gl6dnlm28";
sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h";
};
# kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly

34
pkgs/applications/networking/instant-messengers/profanity/default.nix
View File

@ -1,14 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode
, ncurses, libotr, curl, readline, libuuid
, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
, traySupport ? false, gnome2 ? null
, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
, traySupport ? false, gnome2 ? null
, pgpSupport ? true, gpgme ? null
, pythonPluginSupport ? true, python ? null
}:
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk_pixbuf != null;
assert traySupport -> gnome2 != null;
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk_pixbuf != null;
assert traySupport -> gnome2 != null;
assert pgpSupport -> gpgme != null;
assert pythonPluginSupport -> python != null;
with stdenv.lib;
@ -21,13 +25,25 @@ stdenv.mkDerivation rec {
sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
readline libuuid libmesode
glib openssl expat ncurses libotr curl
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk_pixbuf ]
++ optionals traySupport [ gnome2.gtk ];
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk_pixbuf ]
++ optionals traySupport [ gnome2.gtk ]
++ optionals pgpSupport [ gpgme ]
++ optionals pythonPluginSupport [ python ];
# Enable feature flags, so that build fail if libs are missing
configureFlags = [ "--enable-c-plugins" "--enable-otr" ]
++ optionals notifySupport [ "--enable-notifications" ]
++ optionals traySupport [ "--enable-icons" ]
++ optionals pgpSupport [ "--enable-pgp" ]
++ optionals pythonPluginSupport [ "--enable-python-plugins" ];
meta = {
description = "A console based XMPP client";

35
pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, xmpppy }:
stdenv.mkDerivation {
name = "weechat-jabber-2017-08-30";
src = fetchFromGitHub {
repo = "weechat-xmpp";
owner = "sleduc";
sha256 = "0s02xs0ynld9cxxzj07al364sfglyc5ir1i82133mq0s8cpphnxv";
rev = "8f6c21f5a160c9318c7a2d8fd5dcac7ab2e0d843";
};
installPhase = ''
mkdir -p $out/share
cp jabber.py $out/share/jabber.py
'';
buildInputs = [ xmpppy ];
postPatch = ''
substituteInPlace jabber.py \
--replace "__NIX_OUTPUT__" "${xmpppy}/lib/python2.7/site-packages"
'';
patches = [
./libpath.patch
];
meta = with stdenv.lib; {
description = "A fork of the jabber plugin for weechat";
homepage = "https://github.com/sleduc/weechat-xmpp";
maintainers = with maintainers; [ ma27 ];
license = licenses.gpl3Plus;
};
}

16
pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/jabber.py b/jabber.py
index 27006a3..e53c2c0 100644
--- a/jabber.py
+++ b/jabber.py
@@ -95,6 +95,11 @@ SCRIPT_COMMAND = SCRIPT_NAME
import re
import warnings
+import sys
+
+sys.path.append('__NIX_OUTPUT__')
+
+
import_ok = True
try:

45
pkgs/applications/networking/mailreaders/neomutt/default.nix
View File

@ -1,7 +1,19 @@
{ stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl
{ stdenv, fetchFromGitHub, which, autoreconfHook, writeScript, ncurses, perl
, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
stdenv.mkDerivation rec {
let
muttWrapper = writeScript "mutt" ''
#!${stdenv.shell} -eu
echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.'
echo ""
echo 'This wrapper is provided for compatibility purposes only. You should start calling `neomutt` instead.'
echo ""
read -p 'Press any key to launch NeoMutt...' -n1 -s
exec neomutt "$@"
'';
in stdenv.mkDerivation rec {
version = "20171013";
name = "neomutt-${version}";
@ -12,24 +24,35 @@ stdenv.mkDerivation rec {
sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1";
};
nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ];
buildInputs = [
cyrus_sasl gss gpgme kerberos libidn ncurses
notmuch openssl perl lmdb
];
nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ];
enableParallelBuilding = true;
postPatch = ''
for f in doc/*.{xml,xsl}* ; do
substituteInPlace $f \
--replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl \
--replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd
done
'';
configureFlags = [
"--enable-debug"
"--enable-gpgme"
"--enable-notmuch"
"--with-homespool=mailbox"
"--with-gss"
"--with-mailpath="
"--with-ssl"
"--with-sasl"
"--with-curses"
"--with-gss"
"--with-homespool=mailbox"
"--with-idn"
"--with-lmdb"
"--with-mailpath="
"--with-sasl"
"--with-ssl"
# Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
"ac_cv_path_SENDMAIL=sendmail"
@ -40,9 +63,9 @@ stdenv.mkDerivation rec {
# like pgpring, pgpewrap, ...
NIX_LDFLAGS = "-lidn";
configureScript = "./prepare";
enableParallelBuilding = true;
postInstall = ''
cp ${muttWrapper} $out/bin/mutt
'';
meta = with stdenv.lib; {
description = "A small but very powerful text-based mail client";

7
pkgs/applications/networking/p2p/tribler/default.nix
View File

@ -4,12 +4,11 @@
stdenv.mkDerivation rec {
pname = "tribler";
name = "${pname}-${version}";
version = "7.0.0-rc2";
revision = "1d3ddb8";
version = "7.0.0-rc3";
src = fetchurl {
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
sha256 = "0wlv32cw52c5khnrm218dccgn2l177933p4dhp7m50hipqfb0ly2";
sha256 = "0f1f8mzbk1ygkh8lv9y1s9mvslv12d94mxvmp3b4s2vm8w4syza7";
};
buildInputs = [
@ -40,6 +39,8 @@ stdenv.mkDerivation rec {
pythonPackages.decorator
pythonPackages.feedparser
pythonPackages.service-identity
pythonPackages.psutil
pythonPackages.meliae
];
postPatch = ''

29
pkgs/applications/networking/p2p/vuze/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchsvn, jdk, jre, ant, swt, makeWrapper }:
stdenv.mkDerivation rec {
name = "vuze-${version}";
version = "5750";
src = fetchsvn {
url = "http://svn.vuze.com/public/client/tags/RELEASE_${version}";
sha256 = "07w6ipyiy8hi88d6yxbbf3vkv26mj7dcz9yr8141hb2ig03v0h0p";
};
buildInputs = [ makeWrapper jdk ant ];
buildPhase = "ant";
installPhase = ''
install -D dist/Vuze_0000-00.jar $out/share/java/Vuze_${version}-00.jar
makeWrapper ${jre}/bin/java $out/bin/vuze \
--add-flags "-Xmx256m -Djava.library.path=${swt}/lib -cp $out/share/java/Vuze_${version}-00.jar:${swt}/jars/swt.jar org.gudy.azureus2.ui.swt.Main"
'';
meta = with stdenv.lib; {
description = "Torrent client";
homepage = http://www.vuze.com;
license = licenses.unfree;
platforms = platforms.all;
maintainers = with maintainers; [ volth ];
};
}

6
pkgs/applications/office/jabref/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }:
{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings_desktop_schemas }:
stdenv.mkDerivation rec {
version = "3.8.1";
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
exec = "jabref";
};
buildInputs = [ makeWrapper jdk ];
buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings_desktop_schemas ];
phases = [ "installPhase" ];
unpackPhase = "#";
installPhase = ''
mkdir -p $out/bin $out/share/java $out/share/icons

4
pkgs/applications/office/marp/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marp-${version}";
version = "0.0.10";
version = "0.0.11";
src = fetchurl {
url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
sha256 = "0x4qldbyvq88cs12znxv33bb0nxr3wxcwhyr97pkjrjc2cn7nphx";
sha256 = "06kka6kxrj35w23n34in6ks3vax9arl756jg720jhfy14vavyk0f";
};
sourceRoot = ".";

6
pkgs/applications/office/zanshin/default.nix
View File

@ -1,5 +1,5 @@
{
stdenv,
mkDerivation, lib,
fetchurl, fetchpatch,
extra-cmake-modules,
qtbase, boost,
@ -7,7 +7,7 @@
krunner, kwallet
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "zanshin";
version = "0.4.1";
name = "${pname}-${version}";
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
krunner kwallet
];
meta = with stdenv.lib; {
meta = with lib; {
description = "A powerful yet simple application to manage your day to day actions, getting your mind like water";
homepage = https://zanshin.kde.org/;
maintainers = with maintainers; [ zraexy ];

13
pkgs/applications/version-management/git-and-tools/git-hub/default.nix
View File

@ -1,18 +1,21 @@
{ stdenv, fetchFromGitHub, docutils, python2Packages }:
{ stdenv, fetchFromGitHub, docutils, gitMinimal, python2Packages }:
stdenv.mkDerivation rec {
name = "git-hub-${version}";
version = "0.11.1";
version = "1.0.0";
src = fetchFromGitHub {
sha256 = "15449bqk7nyvbpin5j2hg862cqa7hb4zxkmr8mkqm5hz2jxmxspa";
sha256 = "07756pidrm4cph3nm90z16imvnylvz3fw4369wrglbdr27filf3x";
rev = "v${version}";
repo = "git-hub";
owner = "sociomantic-tsunami";
};
buildInputs = [ python2Packages.python ];
nativeBuildInputs = [ python2Packages.docutils ];
nativeBuildInputs = [
gitMinimal # Used during build to generate Bash completion.
python2Packages.docutils
];
postPatch = ''
substituteInPlace Makefile --replace rst2man rst2man.py
@ -21,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
installFlags = [ "prefix=$(out)" ];
installFlags = [ "prefix=$(out)" "sysconfdir=$(out)/etc" ];
postInstall = ''
# Remove inert ftdetect vim plugin and a README that's a man page subset:

7
pkgs/applications/video/kmplayer/default.nix
View File

@ -1,6 +1,7 @@
{
mkDerivation, lib, fetchurl,
extra-cmake-modules, makeWrapper,
libpthreadstubs, libXdmcp,
qtsvg, qtx11extras, ki18n, kdelibs4support, kio, kmediaplayer, kwidgetsaddons,
phonon, cairo, mplayer
}:
@ -21,9 +22,15 @@ mkDerivation rec {
./no-docs.patch # Don't build docs due to errors (kdelibs4support propagates kdoctools)
];
postPatch = ''
sed -i src/kmplayer.desktop \
-e "s,^Exec.*,Exec=$out/bin/kmplayer -qwindowtitle %c %i %U,"
'';
nativeBuildInputs = [ extra-cmake-modules makeWrapper ];
buildInputs = [
libpthreadstubs libXdmcp
qtsvg qtx11extras ki18n kdelibs4support kio kmediaplayer kwidgetsaddons
phonon cairo
];

10
pkgs/applications/video/obs-studio/default.nix
View File

@ -4,17 +4,20 @@
, fdk_aac
, ffmpeg
, jansson
, libjack2
, libxkbcommon
, libpthreadstubs
, libXdmcp
, qtbase
, qtx11extras
, speex
, libv4l
, x264
, curl
, xorg
, makeWrapper
, pkgconfig
, vlc
, alsaSupport ? false
, alsaLib
@ -26,13 +29,13 @@ let
optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "obs-studio-${version}";
version = "20.0.1";
version = "20.1.0";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = "${version}";
sha256 = "1f701rh4w88ba48b50y16fvmzzsyv4y5nv30mrx3pb2ni7wyanld";
sha256 = "1366nl301rhz8cfbq89ixiq1hdxdn8iimz9xyln274anghz02sbr";
};
patches = [ ./find-xcb.patch ];
@ -45,13 +48,16 @@ in stdenv.mkDerivation rec {
fdk_aac
ffmpeg
jansson
libjack2
libv4l
libxkbcommon
libpthreadstubs
libXdmcp
qtbase
qtx11extras
speex
x264
vlc
makeWrapper
]
++ optional alsaSupport alsaLib

5
pkgs/applications/virtualization/qemu/default.nix
View File

@ -18,7 +18,8 @@
with stdenv.lib;
let
version = "2.9.1";
version = "2.10.1";
sha256 = "1a3bjr0ygx4r2qd4nx5jf77jhh4xis3zga27lfryn0b4ap3hn14f";
audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+ optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,";
@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "1340hh4jvhvi97yqck408wi8aagnhzq1311ih0fq9bp4ddlk03sd";
inherit sha256;
};
buildInputs =

28
pkgs/applications/window-managers/sway/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, fetchFromGitHub
, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs
, pango, cairo, libinput, libcap, xwayland, pam, gdk_pixbuf, libpthreadstubs
, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
, wayland, wlc, libxkbcommon, pcre, json_c, dbus_libs
, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs
, libXdmcp
, buildDocs ? true
}:
stdenv.mkDerivation rec {
@ -17,28 +18,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
makeWrapper cmake pkgconfig
asciidoc libxslt docbook_xsl
];
cmake pkgconfig
] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ];
buildInputs = [
wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs
pango cairo libinput libcap xwayland pam gdk_pixbuf libpthreadstubs
wayland wlc libxkbcommon pcre json_c dbus_libs
pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs
libXdmcp
];
patchPhase = ''
sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
'';
enableParallelBuilding = true;
makeFlags = "PREFIX=$(out)";
cmakeFlags = "-DVERSION=${version}";
installPhase = "PREFIX=$out make install";
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];
preFixup = ''
wrapProgram $out/bin/sway \
--prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
'';
meta = with stdenv.lib; {
description = "i3-compatible window manager for Wayland";

55
pkgs/build-support/closure-info.nix Normal file
View File

@ -0,0 +1,55 @@
# This derivation builds two files containing information about the
# closure of 'rootPaths': $out/store-paths contains the paths in the
# closure, and $out/registration contains a file suitable for use with
# "nix-store --load-db" and "nix-store --register-validity
# --hash-given".
{ stdenv, coreutils, jq, perl, pathsFromGraph }:
{ rootPaths }:
if builtins.langVersion >= 5 then
# Nix >= 1.12: Include NAR hash / size info.
stdenv.mkDerivation {
name = "closure-info";
__structuredAttrs = true;
exportReferencesGraph.closure = rootPaths;
PATH = "${coreutils}/bin:${jq}/bin";
builder = builtins.toFile "builder"
''
if [ -e .attrs.sh ]; then . .attrs.sh; fi
out=''${outputs[out]}
mkdir $out
jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration
jq -r .closure[].path < .attrs.json > $out/store-paths
'';
}
else
# Nix < 1.12
stdenv.mkDerivation {
name = "closure-info";
exportReferencesGraph =
map (x: [("closure-" + baseNameOf x) x]) rootPaths;
buildInputs = [ perl ];
buildCommand =
''
mkdir $out
printRegistration=1 perl ${pathsFromGraph} closure-* > $out/registration
perl ${pathsFromGraph} closure-* > $out/store-paths
'';
}

23
pkgs/build-support/kernel/paths-from-graph.pl
View File

@ -1,8 +1,6 @@
# Parses a /nix/store/*-closure file and prints
# various information.
# By default, the nodes in the graph are printed to stdout.
# If the environment variable printManifest is set,
# then the graph is written as a manifest.
# If printRegistration is set, then the graph is written
# as a registration file for a manifest is written
# in the `nix-store --load-db' format.
@ -46,26 +44,7 @@ foreach my $graph (@ARGV) {
}
if ($ENV{"printManifest"} eq "1") {
print "version {\n";
print " ManifestVersion: 3\n";
print "}\n";
foreach my $storePath (sort (keys %storePaths)) {
my $base = basename $storePath;
print "localPath {\n";
print " StorePath: $storePath\n";
print " CopyFrom: /tmp/inst-store/$base\n";
print " References: ";
foreach my $ref (@{$refs{$storePath}}) {
print "$ref ";
}
print "\n";
print "}\n";
}
}
elsif ($ENV{"printRegistration"} eq "1") {
if ($ENV{"printRegistration"} eq "1") {
# This is the format used by `nix-store --register-validity
# --hash-given' / `nix-store --load-db'.
foreach my $storePath (sort (keys %storePaths)) {

2
pkgs/build-support/rust/default.nix
View File

@ -80,5 +80,5 @@ in stdenv.mkDerivation (args // {
runHook postInstall
'';
passthru = { inherit cargoDeps; };
passthru = { inherit cargoDeps; } // (args.passthru or {});
})

4
pkgs/data/icons/elementary-icon-theme/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "4.3.0";
version = "4.3.1";
package-name = "elementary-icon-theme";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz";
sha256 = "1gg7znfgyj4zxsa741psc67nyixi27q9ghjklz0337r4cwmcwn1g";
sha256 = "1rp22igvnx71l94j5a6px142329djhk2psm1wfgbhdxbj23hw9kb";
};
dontBuild = true;

12
pkgs/data/misc/geolite-legacy/default.nix
View File

@ -12,22 +12,22 @@ stdenv.mkDerivation rec {
srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz"
"04akk0jczvki8rdvz6z6v5s26ds0m27953lzvp3v0fsg7rl08q5n";
"1xqxlnxxk8grqr0nr9vaf5r6z5bcdbadh83qhzr6jvhs20s37lsl";
srcGeoIPv6 = fetchDB
"GeoIPv6.dat.gz"
"0i0885vvj0s5sysyafvk8pc8gr3znh7gmiy8rp4iiai7qnbylb7y";
"0g3am25jmhm3r51hvz9lknkrnzj98hxdxav2cvrhz6b7wndgyspk";
srcGeoLiteCity = fetchDB
"GeoLiteCity.dat.gz"
"1yqxqfndnsvqc3hrs0nm6nvs0wp8jh9phs0yzrn48rlb9agcb8gj";
"1syw19gx2mpqz9ypkaq2gh712bv60a7rf56afzd3qzkmgf6rw1qr";
srcGeoLiteCityv6 = fetchDB
"GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
"05grm006r723l9zm7pdmwwycc658ni858hcrcf5mysv0hmc3wqb2";
"0ihbqm1f5b9qb68i73ghmk30b6i2n53fmmhv2wadja5zcdpkhdvk";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz"
"1gpvsqvq9z9pg9zfn86i50fb481llfyn79r1jwddwfflp1qqfrrv";
"0adddsk0g9a3xaa0f8qx12s07n31wvirymjzrhnsg66i2qlm0h34";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz"
"0nmhz82dn9clm5w2y6z861ifj7i761spy1p1zcam93046cdpqqaa";
"1qar0vdlpk3razq83l5fzb54zihs2sma8xgngpql8njfgby0w825";
meta = with stdenv.lib; {
description = "GeoLite Legacy IP geolocation databases";

4
pkgs/desktops/enlightenment/efl.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
version = "1.20.4";
version = "1.20.5";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
sha256 = "1jxha61gsil6hs9zb72zsyh3gmdipvfnlc9v3palb2bm0b23aq9i";
sha256 = "07624c71l9d1jx1zvdhwkr1bgb1n7i0i5hyg6579zdwl3jw6jpns";
};
nativeBuildInputs = [ pkgconfig ];

2
pkgs/desktops/plasma-5/breeze-qt5.nix
View File

@ -15,6 +15,6 @@ mkDerivation {
kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
qtx11extras
];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
cmakeFlags = [ "-DUSE_Qt4=OFF" ];
}

2
pkgs/desktops/plasma-5/khotkeys.nix
View File

@ -12,6 +12,6 @@ mkDerivation {
kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
plasma-framework plasma-workspace qtx11extras
];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
enableParallelBuilding = false;
}

2
pkgs/desktops/plasma-5/kwin/default.nix
View File

@ -28,7 +28,7 @@ mkDerivation {
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''

2
pkgs/desktops/plasma-5/libksysguard/default.nix
View File

@ -17,5 +17,5 @@ mkDerivation {
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
qtwebkit
];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
}

2
pkgs/desktops/plasma-5/oxygen.nix
View File

@ -14,5 +14,5 @@ mkDerivation {
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
qtx11extras
];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
}

2
pkgs/desktops/plasma-5/plasma-workspace/default.nix
View File

@ -33,7 +33,7 @@ mkDerivation {
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
cmakeFlags = [
"-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage"

2
pkgs/desktops/plasma-5/systemsettings.nix
View File

@ -13,5 +13,5 @@ mkDerivation {
kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
kactivities kactivities-stats kirigami2
];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
}

1
pkgs/development/compilers/avian/default.nix
View File

@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
homepage = https://readytalk.github.io/avian/;
license = stdenv.lib.licenses.isc;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.earldouglas ];
};
}

66
pkgs/development/compilers/coreclr/default.nix
View File

@ -12,19 +12,19 @@
, lttng-ust
, liburcu
, libuuid
, ed
, libkrb5
, debug ? false
}:
stdenv.mkDerivation rec {
name = "coreclr-${version}";
version = "1.0.4";
version = "2.0.0";
src = fetchFromGitHub {
owner = "dotnet";
repo = "coreclr";
rev = "v${version}";
sha256 = "1wpig71q0kh2yrq162d32x00zlwrrs1wymkgijh49cqkn4cwkh91";
sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw";
};
buildInputs = [
@ -41,67 +41,43 @@ stdenv.mkDerivation rec {
lttng-ust
liburcu
libuuid
ed
libkrb5
];
configurePhase = ''
# Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's
# not wrapped
# substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$"
patchShebangs build.sh
patchShebangs src/pal/tools/gen-buildsys-clang.sh
# See https://github.com/dotnet/coreclr/issues/7573#issuecomment-253081323
ed -v ./src/pal/src/include/pal/palinternal.h << EOF
/^#undef memcpy
-1
d
+1
d
w
EOF
# override to avoid cmake running
patchShebangs .
'';
BuildArch = if stdenv.is64bit then "x64" else "x86";
BuildType = if debug then "Debug" else "Release";
hardeningDisable = [ "strictoverflow" "format" ];
NIX_CFLAGS_COMPILE = [
"-Wno-error=unused-result" "-Wno-error=delete-non-virtual-dtor"
"-Wno-error=null-dereference"
hardeningDisable = [
"strictoverflow"
"format"
];
buildPhase = ''
runHook preBuild
./build.sh $BuildArch $BuildType
# Try to make some sensible hierarchy out of the output
pushd bin/Product/Linux.$BuildArch.$BuildType
mkdir lib2
mv *.so *.so.dbg lib2
mv bin lib3
mkdir lib4
mv Loader lib4
mv inc include
mv gcinfo include
mkdir bin
mkdir -p share/doc
mv sosdocsunix.txt share/doc
for f in * ; do test -f $f && mv -v $f bin; done
popd
runHook postBuild
'';
installPhase = ''
mkdir -p $out
cp -rv bin/Product/Linux.$BuildArch.$BuildType/* $out
runHook preInstall
mkdir -p $out/share/dotnet $out/bin
cp -r bin/Product/Linux.$BuildArch.$BuildType/* $out/share/dotnet
for cmd in coreconsole corerun createdump crossgen ilasm ildasm mcs superpmi; do
ln -s $out/share/dotnet/$cmd $out/bin/$cmd
done
runHook postInstall
'';
meta = {
meta = with stdenv.lib; {
homepage = http://dotnet.github.io/core/;
description = ".NET is a general purpose development platform";
platforms = [ "x86_64-linux" ];
maintainers = with stdenv.lib.maintainers; [ obadz ];
license = stdenv.lib.licenses.mit;
broken = true; # CoreCLR has proven to be very difficult to package. PRs welcome if someone wants to shave that yak.
maintainers = with maintainers; [ kuznero ];
license = licenses.mit;
};
}

53
pkgs/development/compilers/dotnet/sdk/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ stdenv
, fetchurl
, libunwind
, openssl
, icu
, libuuid
, zlib
, curl
, patchelf
}:
let
rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
in
stdenv.mkDerivation rec {
version = "2.0.3";
name = "dotnet-sdk-${version}";
src = fetchurl {
url = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.3-servicing-007037/dotnet-sdk-2.0.3-servicing-007037-linux-x64.tar.gz";
sha256 = "0kqk1f0vfdfyb9mp7d4y83airkxyixmxb7lrx0h0hym2a9661ch8";
};
unpackPhase = "tar xvzf $src";
buildPhase = ''
runHook preBuild
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./dotnet
patchelf --set-rpath "${rpath}" ./dotnet
find -type f -name "*.so" -exec patchelf --set-rpath "${rpath}" {} \;
echo -n "dotnet-sdk version: "
./dotnet --version
runHook postBuild
'';
dontPatchELF = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r ./ $out
ln -s $out/dotnet $out/bin/dotnet
runHook postInstall
'';
meta = with stdenv.lib; {
homepage = https://dotnet.github.io/;
description = ".NET Core SDK 2.0.2 with .NET Core 2.0.0";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ kuznero ];
license = licenses.mit;
};
}

4
pkgs/development/compilers/go/1.8.nix
View File

@ -25,13 +25,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.8.4";
version = "1.8.5";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "0p0m63y39pja3fkj43sdq0qv8kqljkz7d58bf9jbw0rjw2c9ml4a";
sha256 = "1ab021l3v29ciaxp738cjpbkh1chlsl6928672q3i82anmdzn5m5";
};
# perl is used for testing go vet

8
pkgs/development/compilers/go/1.9.nix
View File

@ -25,13 +25,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "1p226lgsmiwgcvmiakac9i08304cq5ick23vmsk1vjcsh6dvz9i3";
sha256 = "07p4ld07r2nml2bsbfb8h51hqilbqyhhdlia99y1gk7ibvhybv8i";
};
# perl is used for testing go vet
@ -123,10 +123,6 @@ stdenv.mkDerivation rec {
url = "https://github.com/golang/go/commit/29415eb2b92e78481897c4161ba99f5b09fa6102.patch";
sha256 = "01jkm4b2dazzjnfla7rdd0w2clzplga3zza6ybpmkjkk3i4bp73d";
})
(fetchpatch {
url = "https://github.com/golang/go/commit/27e80f7c4d8001598367e15a1617fa524bd0fb11.patch";
sha256 = "1250nrc79jwcagkjqffn5srn78isykvjhvmqhwipwyqb99q85wcz";
})
];
postPatch = optionalString stdenv.isDarwin ''

1
pkgs/development/compilers/picat/default.nix
View File

@ -33,5 +33,6 @@ stdenv.mkDerivation {
homepage = http://picat-lang.org/;
license = stdenv.lib.licenses.mpl20;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.earldouglas ];
};
}

44
pkgs/development/compilers/reason/default.nix
View File

@ -1,41 +1,20 @@
{ stdenv, makeWrapper, buildOcaml, fetchFromGitHub,
ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }:
let
version = "2.0.0";
buildOcaml rec {
name = "reason";
version = "3.0.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
rev = version;
sha256 = "0l3lwfvppplah707rq5nqjav2354lq6d7xfflfigkzhn74hlx6iy";
};
meta = with stdenv.lib; {
homepage = https://facebook.github.io/reason/;
description = "Facebook's friendly syntax to OCaml";
license = licenses.bsd3;
maintainers = [ maintainers.volth ];
sha256 = "0vj3y9vlm9gqvj9grmb9n487avbrj4q5611m7wv1bsdpndvv96jr";
};
reason-parser = buildOcaml {
name = "reason-parser";
inherit version src meta;
sourceRoot = "reason-${version}-src/reason-parser";
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
minimumSupportedOcamlVersion = "4.02";
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
buildInputs = [ opam topkg ];
createFindlibDestdir = true;
inherit (topkg) installPhase;
};
in
buildOcaml {
name = "reason";
inherit version src meta;
buildInputs = [ makeWrapper opam topkg reason-parser utop ];
buildInputs = [ makeWrapper opam topkg utop menhir opam topkg ];
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
@ -48,10 +27,15 @@ buildOcaml {
installPhase = ''
${topkg.installPhase}
wrapProgram $out/bin/reup \
--prefix PATH : "${opam}/bin"
wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \
--set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
'';
meta = with stdenv.lib; {
homepage = https://facebook.github.io/reason/;
description = "Facebook's friendly syntax to OCaml";
license = licenses.bsd3;
maintainers = [ maintainers.volth ];
};
}

5
pkgs/development/coq-modules/QuickChick/default.nix
View File

@ -20,11 +20,6 @@ let param =
sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9";
};
"8.7" = {
version = "20170616";
rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a";
sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9";
};
}."${coq.coq-version}"
; in

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

@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
name = "SDL2-${version}";
version = "2.0.5";
version = "2.0.7";
src = fetchurl {
url = "http://www.libsdl.org/release/${name}.tar.gz";
sha256 = "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824";
sha256 = "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf";
};
outputs = [ "out" "dev" ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "SDL2_image-${version}";
version = "2.0.1";
version = "2.0.2";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
sha256 = "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis";
sha256 = "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj";
};
buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ];

10
pkgs/development/libraries/SDL2_mixer/default.nix
View File

@ -4,19 +4,21 @@
stdenv.mkDerivation rec {
name = "SDL2_mixer-${version}";
version = "2.0.1";
version = "2.0.2";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s";
sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf";
};
preAutoreconf = ''
aclocal
'';
nativeBuildInputs = [ autoreconfHook pkgconfig which ];
propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];
patches = [ ./libmodplug.patch ];
configureFlags = [ "--disable-music-ogg-shared" ]
++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";

13
pkgs/development/libraries/SDL2_mixer/libmodplug.patch
View File

@ -1,13 +0,0 @@
diff --git a/configure.in b/configure.in
index d511646..77dc3fe 100644
--- a/configure.in
+++ b/configure.in
@@ -258,7 +258,7 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then
have_libmodplug_lib=yes
], [dnl
AC_CHECK_HEADER([libmodplug/modplug.h], [have_libmodplug_hdr=yes])
- AC_CHECK_LIB([modplug], [have_libmodplug_lib=yes])
+ AC_CHECK_LIB([modplug], [ModPlug_Load], [have_libmodplug_lib=yes])
])
if test x$have_libmodplug_hdr = xyes -a x$have_libmodplug_lib = xyes; then

13
pkgs/development/libraries/freeimage/default.nix
View File

@ -8,6 +8,19 @@ stdenv.mkDerivation {
sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v";
};
patches = let
patchURL = https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches;
in [
(fetchurl {
url = patchURL + "/Fix-CVE-2015-0852.patch";
sha256 = "1vxdck4i5qi5j6i3cjja0gfy79mmbf0lq2qdrnqdsl4kclbvw2c8";
})
(fetchurl {
url = patchURL + "/Fix-CVE-2016-5684.patch";
sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3";
})
];
buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
prePatch = if stdenv.isDarwin

2
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -78,7 +78,7 @@ let
inherit (args) name;
inherit (srcs."${name}") src version;
outputs = args.outputs or [ "out" "dev" "bin" ];
outputs = args.outputs or [ "bin" "dev" "out" ];
hasBin = lib.elem "bin" outputs;
hasDev = lib.elem "dev" outputs;

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

@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
passthru.swig = swig2;
outputs = ["out" "dev" "bin" "py"];
outputs = ["bin" "dev" "out" "py"];
postFixup = ''
moveToOutput "lib/${python.libPrefix}" "$py"

2
pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
View File

@ -76,7 +76,7 @@ stdenv.mkDerivation {
[ bison flex gperf lndir perl pkgconfig python2 which ]
++ lib.optional (!stdenv.isDarwin) patchelf;
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
patches =
copyPathsToStore (lib.readPathsFromFile ./. ./series)

2
pkgs/development/libraries/qt-5/5.9/qtcharts.nix
View File

@ -3,7 +3,7 @@
qtSubmodule {
name = "qtcharts";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';

2
pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix
View File

@ -3,7 +3,7 @@
qtSubmodule {
name = "qtconnectivity";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';

2
pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix
View File

@ -7,7 +7,7 @@ qtSubmodule {
patches = copyPathsToStore (readPathsFromFile ./. ./series);
qtInputs = [ qtbase qtsvg qtxmlpatterns ];
nativeBuildInputs = [ python2 ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""

2
pkgs/development/libraries/qt-5/5.9/qtlocation.nix
View File

@ -3,7 +3,7 @@
qtSubmodule {
name = "qtlocation";
qtInputs = [ qtbase qtmultimedia ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtPluginPrefix" "$bin"
moveToOutput "$qtQmlPrefix" "$bin"

2
pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix
View File

@ -11,7 +11,7 @@ qtSubmodule {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gstreamer gst-plugins-base libpulseaudio]
++ optional (stdenv.isLinux) alsaLib;
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
qmakeFlags = [ "GST_VERSION=1.0" ];
NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc";
postInstall = ''

2
pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix
View File

@ -3,7 +3,7 @@
qtSubmodule {
name = "qtquickcontrols2";
qtInputs = [ qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';

2
pkgs/development/libraries/qt-5/5.9/qtsensors.nix
View File

@ -5,7 +5,7 @@ with stdenv.lib;
qtSubmodule {
name = "qtsensors";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtPluginPrefix" "$bin"
moveToOutput "$qtQmlPrefix" "$bin"

2
pkgs/development/libraries/qt-5/5.9/qtsvg.nix
View File

@ -3,7 +3,7 @@
qtSubmodule {
name = "qtsvg";
qtInputs = [ qtbase ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtPluginPrefix" "$bin"
'';

2
pkgs/development/libraries/qt-5/5.9/qttools/default.nix
View File

@ -5,7 +5,7 @@ with stdenv.lib;
qtSubmodule {
name = "qttools";
qtInputs = [ qtbase ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
patches = copyPathsToStore (readPathsFromFile ./. ./series);
# qmake moves all binaries to $dev in preFixup
postFixup = ''

2
pkgs/development/libraries/qt-5/5.9/qtwayland.nix
View File

@ -5,7 +5,7 @@ qtSubmodule {
qtInputs = [ qtbase qtquickcontrols ];
buildInputs = [ wayland ];
nativeBuildInputs = [ pkgconfig ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtPluginPrefix" "$bin"
moveToOutput "$qtQmlPrefix" "$bin"

2
pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix
View File

@ -3,7 +3,7 @@
qtSubmodule {
name = "qtwebchannel";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';

2
pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
View File

@ -25,7 +25,7 @@ qtSubmodule {
bison coreutils flex git gperf ninja pkgconfig python2 which
];
doCheck = true;
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
enableParallelBuilding = true;

2
pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix
View File

@ -3,7 +3,7 @@
qtSubmodule {
name = "qtwebsockets";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
outputs = [ "bin" "dev" "out" ];
postInstall = ''
moveToOutput "$qtQmlPrefix" "$bin"
'';

6
pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, unzip, tcl }:
stdenv.mkDerivation {
name = "sqlite3_analyzer-3.20.0";
name = "sqlite3_analyzer-3.20.1";
src = fetchurl {
url = "https://www.sqlite.org/2017/sqlite-src-3200000.zip";
sha256 = "1vjbc5i95wildrdfzalrsgai1ziz4m4gbah4wm8qc4jxm1vqwdab";
url = "https://www.sqlite.org/2017/sqlite-src-3200100.zip";
sha256 = "0aicmapa99141hjncyxwg66ndhr16nwpbqy27x79fg1ikzhwlnv6";
};
nativeBuildInputs = [ unzip ];

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

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "Library for multiprecision complex arithmetic with exact rounding";
homepage = https://github.com/VcDevel/Vc;
license = licenses.bsd3;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};
}

27
pkgs/development/libraries/wlc/default.nix
View File

@ -1,11 +1,17 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa
, libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols
, libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig
, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, mesa_noglu
, libX11, dbus_libs, wayland-protocols
, libpthreadstubs, libXdmcp, libXext
, withOptionalPackages ? true, zlib, valgrind, doxygen
}:
stdenv.mkDerivation rec {
let
# for 0.0.10
xwaylandPatch = fetchpatch {
url = "https://github.com/Cloudef/wlc/commit/a130f6006560fb8ac02fb59a90ced1659563f9ca.diff";
sha256 = "0kzcbqklcyg8bganm65di8cif6dpc8bkrsvkjia09kr92lymxm2c";
};
in stdenv.mkDerivation rec {
name = "wlc-${version}";
version = "0.0.10";
@ -17,16 +23,21 @@ stdenv.mkDerivation rec {
sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k";
};
patches = [
xwaylandPatch
];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa
libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols
libpthreadstubs libXau libXdmcp libXext libXxf86vm ]
wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage mesa_noglu
libX11 dbus_libs wayland-protocols
libpthreadstubs libXdmcp libXext ]
++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ];
doCheck = true;
checkTarget = "test";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A library for making a simple Wayland compositor";

4
pkgs/development/ocaml-modules/javalib/default.nix
View File

@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
version = "2.3.4";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/37153/javalib-2.3.4.tar.bz2";
sha256 = "081ga3qzx0lkz0wy92qyj6k75k3s79518bvqii2q778hh5wif36f";
url = "https://gforge.inria.fr/frs/download.php/file/37154/javalib-2.3.4.tar.bz2";
sha256 = "1ajzbyli5a3y9s8f46913drpxdzlby3i4g3c2fqacmnbyvhpaqb6";
};
buildInputs = [ which ocaml findlib camlp4 ];

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