JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Some more larger rebuilds from master.
This commit is contained in:
Vladimír Čunát 2017-05-12 11:29:41 +02:00
commit 51e0f8f759
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
85 changed files with 3472 additions and 1063 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,7 @@
./security/wrappers/default.nix
./security/sudo.nix
./services/admin/salt/master.nix
./services/admin/salt/minion.nix
./services/amqp/activemq/default.nix
./services/amqp/rabbitmq.nix
./services/audio/alsa.nix

81
nixos/modules/programs/fish.nix
View File

@ -28,6 +28,30 @@ in
type = types.bool;
};
vendor.config.enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether fish should source configuration snippets provided by other packages.
'';
};
vendor.completions.enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether fish should use completion files provided by other packages.
'';
};
vendor.functions.enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether fish should autoload fish functions provided by other packages.
'';
};
shellAliases = mkOption {
default = config.environment.shellAliases;
description = ''
@ -79,30 +103,71 @@ in
environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;
environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit;
environment.etc."fish/nixos-env-preinit.fish".text = ''
# avoid clobbering the environment if it's been set by a parent shell
# This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
# unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
# source the NixOS environment config
fenv source ${config.system.build.setEnvironment}
# clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
set -e fish_function_path
'';
environment.etc."fish/config.fish".text = ''
# /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically.
set fish_function_path $fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions
fenv source ${config.system.build.setEnvironment} > /dev/null ^&1
# if our parent shell didn't source the general config, do it
if not set -q __fish_nixos_general_config_sourced
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/shellInit > /dev/null
set -e fish_function_path[1]
${cfg.shellInit}
if status --is-login
fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
${cfg.loginShellInit}
# and leave a note to our children to spare them the same work
set -gx __fish_nixos_general_config_sourced 1
end
if status --is-interactive
# if our parent shell didn't source the login config, do it
status --is-login; and not set -q __fish_nixos_login_config_sourced
and begin
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
set -e fish_function_path[1]
${cfg.loginShellInit}
# and leave a note to our children to spare them the same work
set -gx __fish_nixos_login_config_sourced 1
end
# if our parent shell didn't source the interactive config, do it
status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
and begin
${fishAliases}
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
set -e fish_function_path[1]
${cfg.promptInit}
${cfg.interactiveShellInit}
# and leave a note to our children to spare them the same work
set -gx __fish_nixos_interactive_config_sourced 1
end
'';
# include programs that bring their own completions
environment.pathsToLink = [ "/share/fish/vendor_completions.d" ];
environment.pathsToLink = []
++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
environment.systemPackages = [ pkgs.fish ];

5
nixos/modules/security/acme.nix
View File

@ -185,12 +185,15 @@ in
path = [ pkgs.simp_le ];
preStart = ''
mkdir -p '${cfg.directory}'
chown -R '${data.user}:${data.group}' '${cfg.directory}'
chown 'root:root' '${cfg.directory}'
chmod 755 '${cfg.directory}'
if [ ! -d '${cpath}' ]; then
mkdir '${cpath}'
fi
chmod ${rights} '${cpath}'
chown -R '${data.user}:${data.group}' '${cpath}'
mkdir -p '${data.webroot}/.well-known/acme-challenge'
chown -R '${data.user}:${data.group}' '${data.webroot}/.well-known/acme-challenge'
'';
script = ''
cd '${cpath}'

56
nixos/modules/services/admin/salt/minion.nix Normal file
View File

@ -0,0 +1,56 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.services.salt.minion;
fullConfig = lib.recursiveUpdate {
# Provide defaults for some directories to allow an immutable config dir
# NOTE: the config dir being immutable prevents `minion_id` caching
# Default is equivalent to /etc/salt/minion.d/*.conf
default_include = "/var/lib/salt/minion.d/*.conf";
# Default is in /etc/salt/pki/minion
pki_dir = "/var/lib/salt/pki/minion";
} cfg.configuration;
configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig);
in
{
options = {
services.salt.minion = {
enable = mkEnableOption "Salt minion service";
configuration = mkOption {
type = types.attrs;
default = {};
description = ''
Salt minion configuration as Nix attribute set.
See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/>
for details.
'';
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ salt ];
systemd.services.salt-minion = {
description = "Salt Minion";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = with pkgs; [
utillinux
];
serviceConfig = {
ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}";
LimitNOFILE = 8192;
Type = "notify";
NotifyAccess = "all";
};
};
};
}

18
nixos/modules/services/network-filesystems/ipfs.nix
View File

@ -3,12 +3,19 @@
with lib;
let
inherit (pkgs) ipfs;
inherit (pkgs) ipfs runCommand makeWrapper;
cfg = config.services.ipfs;
ipfsFlags = ''${if cfg.autoMigrate then "--migrate" else ""} ${if cfg.enableGC then "--enable-gc" else ""} ${toString cfg.extraFlags}'';
pathEnv = { IPFS_PATH = cfg.dataDir; };
# Wrapping the ipfs binary with the environment variable IPFS_PATH set to dataDir because we can't set it in the user environment
wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; } ''
mkdir -p "$out/bin"
makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" --set IPFS_PATH ${cfg.dataDir}
'';
in
{
@ -86,7 +93,7 @@ in
###### implementation
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.ipfs ];
environment.systemPackages = [ wrapped ];
users.extraUsers = mkIf (cfg.user == "ipfs") {
ipfs = {
@ -116,9 +123,10 @@ in
install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
'';
environment = pathEnv;
script = ''
if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then
cd ${cfg.dataDir}
${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"}
fi
${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress}
@ -145,6 +153,8 @@ in
path = [ pkgs.ipfs ];
environment = pathEnv;
serviceConfig = {
ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}";
User = cfg.user;
@ -164,6 +174,8 @@ in
path = [ pkgs.ipfs ];
environment = pathEnv;
serviceConfig = {
ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --offline";
User = cfg.user;

17
nixos/modules/services/x11/window-managers/i3.nix
View File

@ -36,6 +36,21 @@ in
i3 package to use.
'';
};
extraPackages = mkOption {
type = with types; listOf package;
default = with pkgs; [ dmenu i3status i3lock ];
example = literalExample ''
with pkgs; [
dmenu
i3status
i3lock
]
'';
description = ''
Extra packages to be installed system wide.
'';
};
};
config = mkIf cfg.enable {
@ -50,7 +65,7 @@ in
waitPID=$!
'';
}];
environment.systemPackages = [ cfg.package ];
environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
};
imports = [

11
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@ -2,12 +2,15 @@
import argparse
import shutil
import os
import sys
import errno
import subprocess
import glob
import tempfile
import errno
import warnings
import ctypes
libc = ctypes.CDLL("libc.so.6")
def copy_if_not_exists(source, dest):
if not os.path.exists(dest):
@ -145,5 +148,13 @@ def main():
if os.readlink(system_dir(gen)) == args.default_config:
write_loader_conf(gen)
# Since fat32 provides little recovery facilities after a crash,
# it can leave the system in an unbootable state, when a crash/outage
# happens shortly after an update. To decrease the likelihood of this
# event sync the efi filesystem after each update.
rc = libc.syncfs(os.open("@efiSysMountPoint@", os.O_RDONLY))
if rc != 0:
print("could not sync @efiSysMountPoint@: {}".format(os.strerror(rc)), file=sys.stderr)
if __name__ == '__main__':
main()

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

@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "ncmpcpp-${version}";
version = "0.7.5";
version = "0.7.7";
src = fetchurl {
url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
sha256 = "0zg084m06y7dd8ccy6aq9hx8q7qi2s5kl0br5139hrmk40q68kvy";
sha256 = "1vq19m36608pvw1g8nbcaqqb89wsw05v35pi45xwr20z7g4bxg5p";
};
configureFlags = [ "BOOST_LIB_SUFFIX=" ]

23
pkgs/applications/editors/eclipse/plugins.nix
View File

@ -127,6 +127,29 @@ rec {
};
};
autodetect-encoding = buildEclipsePlugin rec {
name = "autodetect-encoding-${version}";
version = "1.8.3.201610171338";
srcFeature = fetchurl {
url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar";
sha256 = "09xfn5j6vr9r7n0riqs5ja5ms98ax9pyi3f7irnv80flhzagdv7f";
};
srcPlugin = fetchurl {
url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar";
sha256 = "0l2zw4whx1a7j0jl7i6n6igr2ki6jh6nwggx53n3ipzg7cgdcg0y";
};
meta = with stdenv.lib; {
homepage = https://github.com/cypher256/eclipse-encoding-plugin;
description = "Show file encoding and line ending for the active editor in the eclipse status bar";
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
bytecode-outline = buildEclipsePlugin rec {
name = "bytecode-outline-${version}";
version = "2.4.3";

629
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

File diff suppressed because it is too large Load Diff

65
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

@ -1154,27 +1154,48 @@
license = lib.licenses.free;
};
}) {};
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
melpaBuild {
pname = "all-the-icons";
version = "2.5.2";
version = "2.6.2";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
rev = "0ed04c0cdf10ce43a01323ac97f129520de09a7e";
sha256 = "0h7h0rbd34g5yrm4f1bpdwkw3yrj2w75jzgh2blrdhbs29sxdv1s";
rev = "f21e1004e0e115a73e503b92e8a4faf656fa413a";
sha256 = "022pk57dszg253bk7q5p0sp91ihc7dnyvky49b73gwcm77jgrjzd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
name = "all-the-icons";
};
packageRequires = [ emacs font-lock-plus ];
packageRequires = [ emacs font-lock-plus memoize ];
meta = {
homepage = "https://melpa.org/#/all-the-icons";
license = lib.licenses.free;
};
}) {};
all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons-ivy";
version = "0.1.2";
src = fetchFromGitHub {
owner = "asok";
repo = "all-the-icons-ivy";
rev = "aa791d6b0055bce3ac68970a8ef6abf0726edf0f";
sha256 = "0mmimibzn5ncy4rpyq6vkk2m2qlki54nf8yirphabh4m2zf9marg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy";
sha256 = "1xv67gxd2sqj6zld4i3qcid0x5qsbd7baz55m93y1ivdqi7x7gr2";
name = "all-the-icons-ivy";
};
packageRequires = [ all-the-icons emacs ivy ];
meta = {
homepage = "https://melpa.org/#/all-the-icons-ivy";
license = lib.licenses.free;
};
}) {};
amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }:
melpaBuild {
pname = "amd-mode";
@ -7070,22 +7091,22 @@
license = lib.licenses.free;
};
}) {};
doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
version = "1.1.5";
version = "1.2.5";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-theme";
rev = "f07088c1a6c177cdb5e2ff674489c17a8a7a8426";
sha256 = "1c6id6d42p38viwd0x6cic0v08g117gj7im1m15k9j52rkvgvvn8";
rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728";
sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik";
name = "doom-themes";
};
packageRequires = [ all-the-icons dash emacs font-lock-plus ];
packageRequires = [ all-the-icons cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/doom-themes";
license = lib.licenses.free;
@ -24047,15 +24068,15 @@
license = lib.licenses.free;
};
}) {};
omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s, shut-up }:
omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
melpaBuild {
pname = "omnisharp";
version = "3.9";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
rev = "93c188938305533ea34ceca51dd53c7841598ada";
sha256 = "0ynjxf0r9i5yb98pnhrcm55shhv4gqfr0wigfkz83yqzpsjzq6fn";
rev = "59aa5ac1957b4875e13f52885255293608a960f4";
sha256 = "1jjhksrp3ljl4pqkclyvdwbj0dzn1alnxdz42f4xmlx4kn93w8bs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@ -24067,8 +24088,8 @@
cl-lib
csharp-mode
dash
emacs
flycheck
json
popup
s
shut-up
@ -24267,22 +24288,22 @@
license = lib.licenses.free;
};
}) {};
org-babel-eval-in-repl = callPackage ({ emacs, eval-in-repl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }:
melpaBuild {
pname = "org-babel-eval-in-repl";
version = "1.0";
version = "1.4";
src = fetchFromGitHub {
owner = "diadochos";
repo = "org-babel-eval-in-repl";
rev = "1e3189e2da14c1c2a2b793c6563597c1aa7d1122";
sha256 = "0vf77wc1pq9dfqkrnagkxfg7klwyaichms492jsp0dh5warnw7hm";
rev = "38d02b8e2412381f6498c29511d1981a88b7d7f4";
sha256 = "0fwmcignkglx73spk3cv7acap15yrn0c0npr4ikfc9prs6svaah6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl";
sha256 = "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx";
name = "org-babel-eval-in-repl";
};
packageRequires = [ emacs eval-in-repl ];
packageRequires = [ emacs ess eval-in-repl matlab-mode ];
meta = {
homepage = "https://melpa.org/#/org-babel-eval-in-repl";
license = lib.licenses.free;
@ -29059,12 +29080,12 @@
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "rg";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
rev = "44eca47f049b25bd45e8cbc7e6579911e552b88a";
sha256 = "0riv5cr5sy37pcwvg0yjwi3qkvqr081503j487mcc7dcyvwlcrzy";
rev = "261ed756377285f0f8941b7a33866ef538465d74";
sha256 = "1fs367w5695v8kvwka1w9kykgpq3qp1209cxkxs096rlkxhbdvv5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";

13
pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
stdenv.mkDerivation (rec {
name = "ProofGeneral-unstable-${version}";
version = "2017-03-13";
version = "2017-05-06";
src = fetchgit {
url = "https://github.com/ProofGeneral/PG.git";
rev = "62ec846fcaaef8f3ae94302cbef2972f88a0804f";
sha256 = "0vln1bc884qynbl5yci0dkr6ckz3p46q4jrhxgylcx4w0jkhizhm";
src = fetchFromGitHub {
owner = "ProofGeneral";
repo = "PG";
rev = "574b0992e3cb4b7a4ad88400b9a5ab0198a96ca5";
sha256 = "1c1pgdmy58h78s53g0ga9b5ilbsibz0dr2lk52xgbs3q5m22v5fh";
};
buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;

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

@ -59,6 +59,7 @@ let
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};
gwenview = callPackage ./gwenview.nix {};
k3b = callPackage ./k3b.nix {};
kate = callPackage ./kate.nix {};
kdenlive = callPackage ./kdenlive.nix {};
kcalc = callPackage ./kcalc.nix {};
@ -80,6 +81,7 @@ let
konsole = callPackage ./konsole.nix {};
krfb = callPackage ./krfb.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
libkcddb = callPackage ./libkcddb.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
libkipi = callPackage ./libkipi.nix {};

41
pkgs/applications/kde/k3b.nix Normal file
View File

@ -0,0 +1,41 @@
{ kdeApp, lib, kdeWrapper, extra-cmake-modules
, qtwebkit
, libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
, flac, lame, libmad, libmpcdec, libvorbis
, libsamplerate, libsndfile, taglib
, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
, ffmpeg, libmusicbrainz2, normalize, sox, transcode
}:
let
unwrapped =
kdeApp {
name = "k3b";
meta = with lib; {
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ sander phreedom ];
platforms = platforms.linux;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
# qt
qtwebkit
# kde
libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
# formats
flac lame libmad libmpcdec libvorbis
# sound utilities
libsamplerate libsndfile taglib
# cd/dvd
cdparanoia libdvdcss libdvdread
# others
ffmpeg libmusicbrainz2
];
enableParallelBuilding = true;
};
in kdeWrapper {
inherit unwrapped;
targets = [ "bin/k3b" ];
paths = [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode vcdimager ];
}

18
pkgs/applications/kde/libkcddb.nix Normal file
View File

@ -0,0 +1,18 @@
{ kdeApp, lib, extra-cmake-modules, qtbase, kdoctools
, kcodecs, ki18n, kio, kwidgetsaddons
, libmusicbrainz5 }:
kdeApp {
name = "libkcddb";
meta = with lib; {
license = with licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = with maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase kdoctools ];
propagatedBuildInputs = [
kcodecs ki18n kio kwidgetsaddons
libmusicbrainz5
];
enableParallelBuilding = true;
}

47
pkgs/applications/misc/k3b/default.nix
View File

@ -1,47 +0,0 @@
{ stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
, shared_mime_info, libvorbis, taglib, flac, libsamplerate
, libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
, dvdplusrwtools, vcdimager, cdparanoia, kdelibs4, libdvdcss, ffmpeg
, libkcddb, phonon
}:
let
# at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
# eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
# vcdxminfo, and vcdxrip
binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager ];
in stdenv.mkDerivation rec {
name = "k3b-${version}";
version = "2.0.3a";
src = fetchurl {
url = "http://download.kde.org/stable/k3b/${name}.tar.xz";
sha256 = "10f07465g9860chfnvrp9w3m686g6j9f446xgnnx7h82d1sb42rd";
};
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
buildInputs = [
shared_mime_info libvorbis taglib flac libsamplerate libdvdread
lame libsndfile libmad stdenv.cc.libc kdelibs4
phonon libkcddb makeWrapper cdparanoia
libdvdcss ffmpeg
];
enableParallelBuilding = true;
NIX_CFLAGS_LINK = [ "-lcdda_interface" "-lcdda_paranoia" "-ldvdcss" ];
postInstall = ''
wrapProgram $out/bin/k3b \
--prefix PATH ":" "${binPath}"
'';
meta = with stdenv.lib; {
description = "CD/DVD Burning Application for KDE";
license = licenses.gpl2Plus;
maintainers = [ maintainers.sander maintainers.phreedom ];
platforms = with stdenv.lib.platforms; linux;
};
}

38
pkgs/applications/misc/krusader/default.nix
View File

@ -1,21 +1,33 @@
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs4, kde_baseapps
{
kdeDerivation, kdeWrapper, fetchurl, lib,
extra-cmake-modules, kdoctools,
kconfig, kinit, kparts
}:
stdenv.mkDerivation rec {
name = "krusader-2.4.0-beta1";
let
pname = "krusader";
version = "2.6.0";
unwrapped = kdeDerivation rec {
name = "krusader-${version}";
src = fetchurl {
url = "mirror://sourceforge/krusader/${name}.tar.bz2";
sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
};
buildInputs = [ kdelibs4 kde_baseapps ];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
meta = {
meta = with lib; {
description = "Norton/Total Commander clone for KDE";
license = "GPL";
license = licenses.gpl2;
homepage = http://www.krusader.org;
maintainers = with stdenv.lib.maintainers; [ sander ];
inherit (kdelibs4.meta) platforms;
maintainers = with maintainers; [ sander ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kconfig kinit kparts ];
enableParallelBuilding = true;
};
in kdeWrapper {
inherit unwrapped;
targets = [ "bin/krusader" ];
}

4
pkgs/applications/misc/mediainfo-gui/default.nix
View File

@ -2,11 +2,11 @@
, desktop_file_utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
version = "0.7.91";
version = "0.7.95";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm";
sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
version = "0.7.91";
version = "0.7.95";
name = "mediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm";
sha256 = "0bil5hsjas585s83j0srxwlplzpw2wny2wklp8az8iayvxmmi20m";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "phwmon-${version}";
version = "2016-03-13";
version = "2017-04-10";
src = fetchFromGitLab {
owner = "o9000";
repo = "phwmon";
rev = "90247ceaff915ad1040352c5cc9195e4153472d4";
sha256 = "1gkjfmd8rai7bl1j7jz9drmzlw72n7mczl0akv39ya4l6k8plzvv";
rev = "b162e53dccc4adf8f11f49408d05fd85d9c6c909";
sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq";
};
nativeBuildInputs = [ pythonPackages.wrapPython ];

16
pkgs/applications/misc/pmenu/default.nix
View File

@ -1,29 +1,25 @@
{ stdenv, fetchFromGitLab, python2Packages, gnome2 }:
{ stdenv, fetchFromGitLab, python2Packages, gnome3 }:
stdenv.mkDerivation rec {
name = "pmenu-${version}";
version = "2016-05-13";
version = "2017-04-10";
src = fetchFromGitLab {
owner = "o9000";
repo = "pmenu";
rev = "90b722de345cff56f8ec0908a0e8a7d733c0c671";
sha256 = "15bkvadr7ab44mc8gkdqs3w14cm498mwf72w5rjm2rdh55357jjh";
rev = "87fec9ddf594f1046d03348de2bafcfa6e94cfd1";
sha256 = "0ynhml46bi5k52v7fw2pjpcac9dswkmlvh6gynvnyqjp4p153fl4";
};
nativeBuildInputs = [ python2Packages.wrapPython ];
buildInputs = [ python2Packages.pygtk gnome2.gnome_menus ];
buildInputs = [ python2Packages.pygtk gnome3.gnome-menus ];
pythonPath = [ python2Packages.pygtk ];
patchPhase = ''
substituteInPlace install.sh --replace "/usr/local" "$out"
'';
installPhase = ''
mkdir -p $out/bin $out/share/applications
./install.sh
./install.sh $out
'';
postFixup = ''

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

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
license = licenses.lgpl3;
maintainers = with maintainers; [ zraexy peterhoeg ];
platforms = platforms.all;
# 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
# 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
};
}

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "tint2-${version}";
version = "0.14.1";
version = "0.14.4";
src = fetchFromGitLab {
owner = "o9000";
repo = "tint2";
rev = version;
sha256 = "1wxz8sbv4cx3d3s5mbrzffidi3nayh1g6bd8m1ndz61jhv01ypam";
sha256 = "0bwz8fdh4imp1gdg8slzjq28s7mh942i09x9zl20f4frfdliyx47";
};
enableParallelBuilding = true;

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, lib, autoreconfHook }:
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
version = "1.4.14";
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "verdammelt";
repo = "tnef";
rev = "${version}";
rev = version;
sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2";
};
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
meta = with stdenv.lib; {
description = "Unpacks MIME attachments of type application/ms-tnef";
longDescription = ''
TNEF is a program for unpacking MIME attachments of type "application/ms-tnef". This is a Microsoft only attachment.
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/verdammelt/tnef;
license = licenses.gpl2;
maintainers = [ ];
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
}

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

@ -22,7 +22,7 @@ let
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
version = "0.18.0";
version = "0.19.0";
goPackagePath = "k8s.io/minikube";
@ -30,7 +30,7 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "0r8184xfsw7vvvmzhc18si582q41cnzka4ry151hwy56gmp2jyiw";
sha256 = "060zl5wx9karl0j1w3b1jnr6wkr56p3wgs75r6d5aiz36i8fkg8m";
};
# kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly

2
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "terragrunt-${version}";
version = "0.12.15";
version = "0.12.16";
goPackagePath = "github.com/gruntwork-io/terragrunt";

29
pkgs/applications/networking/cluster/terragrunt/deps.nix
View File

@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "c790b8046767d9c773ad83c327ab988312f85a94";
sha256 = "0bhk7j088r8hhf05l70gpfnprxk7vzgb1fql9brk065hw2xnplsr";
rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5";
sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj";
};
}
{
@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-getter";
rev = "e48f67b534e614bf7fbd978fd0020f61a17b7527";
sha256 = "0dlmirfi0pfbwylcjf2mggzav5r7bzdy19m3by6dgarn6izx6g7i";
rev = "90b6568eac830f62a08e8f1f46375daa63e57015";
sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism";
};
}
{
@ -50,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "630949a3c5fa3c613328e1b8256052cbc2327c9b";
sha256 = "00lalg0gz7218gnw6zgn28gfizpcl8zw8jpkghn681vj7lfah5dh";
rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
};
}
{
@ -72,13 +72,22 @@
sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
};
}
{
goPackagePath = "github.com/mitchellh/go-testing-interface";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-testing-interface";
rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8";
sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "53818660ed4955e899c0bcafa97299a388bd7c8e";
sha256 = "10gdkk8gcjv0lg15ajy68dwgvfkjhawk08ccs9x9ym1adp6l2ycs";
rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096";
sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86";
};
}
{
@ -95,8 +104,8 @@
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "8ba6f23b6e36d03666a14bd9421f5e3efcb59aca";
sha256 = "01s53ny3p0fdx64rnwcnmjj4xpc5adihnh6islsfq5z1ph2phhnj";
rev = "d70f47eeca3afd795160003bc6e28b001d60c67c";
sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif";
};
}
]

5
pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit
, qtbase, qtmultimedia, qtquick1, qtquickcontrols
, qtimageformats, qtgraphicaleffects
, qtimageformats, qtgraphicaleffects, qtwebkit
, telegram-qml, libqtelegram-aseman-edition
, gst_all_1
, makeQtWrapper, qmakeHook }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ qtbase qtmultimedia qtquick1 qtquickcontrols
qtimageformats qtgraphicaleffects
qtimageformats qtgraphicaleffects qtwebkit
telegram-qml libqtelegram-aseman-edition
] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]);
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ profpatsch AndersonTorres ];
platforms = platforms.linux;
broken = true;
};
}
#TODO: appindicator, for system tray plugin (by @profpatsch)

13
pkgs/applications/office/osmo/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, gettext, libical, libnotify
, libarchive, gtkspell2, webkitgtk2, libgringotts }:
{ stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify
, libarchive, gtkspell3, webkitgtk, libgringotts, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "osmo-${version}";
version = "0.2.14";
version = "0.4.0-1";
src = fetchurl {
url = "mirror://sourceforge/osmo-pim/${name}.tar.gz";
sha256 = "0vaayrmyiqn010gr11drmhkkg8fkxdmla3gwj9v3zvp5x44kab05";
sha256 = "fb454718e071c44bd360ce3e56cb29926cbf44a0d06ec738fa9b40fe3cbf8a33";
};
buildInputs = [ pkgconfig gtk2 libxml2 gettext libical libnotify libarchive
gtkspell2 webkitgtk2 libgringotts ];
nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ];
buildInputs = [ gtk3 libxml2 libical libnotify libarchive
gtkspell3 webkitgtk libgringotts ];
meta = with stdenv.lib; {
description = "A handy personal organizer";

11
pkgs/applications/science/biology/bcftools/default.nix
View File

@ -1,16 +1,17 @@
{ stdenv, fetchurl, zlib, htslib }:
{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, perl }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "bcftools";
version = "1.3.1";
major = "1.4";
version = "${major}.0";
src = fetchurl {
url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2";
sha256 = "095ry68vmz9q5s1scjsa698dhgyvgw5aicz24c19iwfbai07mhqj";
url = "https://github.com/samtools/bcftools/releases/download/${major}/bcftools-${major}.tar.bz2";
sha256 = "0k93mq3lf73dch81p4zxi0bdll567acxfa81qzbzkqflgsjb1ccg";
};
buildInputs = [ zlib ];
buildInputs = [ zlib bzip2 lzma perl ];
makeFlags = [
"HSTDIR=${htslib}"

9
pkgs/applications/science/biology/samtools/default.nix
View File

@ -3,14 +3,15 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "samtools";
version = "1.3.1";
major = "1.4";
version = "${major}.0";
src = fetchurl {
url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2";
sha256 = "0znnnxc467jbf1as2dpskrjhfh8mbll760j6w6rdkwlwbqsp8gbc";
url = "https://github.com/samtools/samtools/releases/download/${major}/samtools-${major}.tar.bz2";
sha256 = "1x73c0lxvd58ghrmaqqyp56z7bkmp28a71fk4ap82j976pw5pbls";
};
buildInputs = [ zlib ncurses htslib ];
buildInputs = [ zlib ncurses ];
configureFlags = [ "--with-htslib=${htslib}" ]
++ stdenv.lib.optional (ncurses == null) "--without-curses";

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

@ -11,7 +11,7 @@
}:
let
version = "2.12.2";
version = "2.13.0";
svn = subversionClient.override { perlBindings = true; };
in
@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0jlccxx7l4c76h830y8lhrxr4kqksrxqlnmj3xb8sqbfa0irw6nj";
sha256 = "0n0j36rapw31zb0sabap88ffncv8jg3nwc4miyim64ilyav2mgsb";
};
hardeningDisable = [ "format" ];

10
pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
View File

@ -2,20 +2,20 @@ diff --git a/connect.c b/connect.c
index fd7ffe1..20cd992 100644
--- a/connect.c
+++ b/connect.c
@@ -768,7 +768,7 @@ struct child_process *git_connect(int fd[2], const char *url,
@@ -768,7 +768,7 @@
ssh = getenv("GIT_SSH");
if (!ssh)
- ssh = "ssh";
+ ssh = "@ssh@";
ssh_dup = xstrdup(ssh);
base = basename(ssh_dup);
else
handle_ssh_variant(ssh, 0,
&port_option,
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
index 50029d0..17b9594 100644
--- a/git-gui/lib/remote_add.tcl
+++ b/git-gui/lib/remote_add.tcl
@@ -139,7 +139,7 @@ method _add {} {
@@ -139,7 +139,7 @@
# Parse the location
if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
|| [regexp {([^:][^:]+):(.+)} $location xx host path]} {

12
pkgs/applications/virtualization/docker/default.nix
View File

@ -157,14 +157,14 @@ rec {
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
docker_17_04 = dockerGen rec {
version = "17.04.0-ce";
rev = "4845c56"; # git commit
sha256 = "04farary19ws7xzsyack0sbrxjzp5xwjh26frxbpdd0a88pxnbj7";
docker_17_05 = dockerGen rec {
version = "17.05.0-ce";
rev = "90d35abf7b3535c1c319c872900fbd76374e521c"; # git commit
sha256 = "1m4fcawjj14qws57813wjxjwgnrfxgxnnzlj61csklp0s9dhg7df";
runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228";
runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl";
containerdRev = "422e31ce907fd9c3833a38d7b8fdd023e5a76e73";
containerdSha256 = "1g0k82f1mk3vn57k130q776wp5c226d06qbiq1q148pqxxhym2r2";
containerdRev = "9048e5e50717ea4497b757314bad98ea3763c145";
containerdSha256 = "1r9xhvzzh7md08nqb0rbp5d1rdr7jylb3da954d0267i0kh2iksa";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};

4
pkgs/applications/virtualization/docker/proxy.nix
View File

@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
name = "docker-proxy-${rev}";
rev = "0f534354b813003a754606689722fe253101bc4e";
rev = "7b2b1feb1de4817d522cc372af149ff48d25028e";
src = fetchFromGitHub {
inherit rev;
owner = "docker";
repo = "libnetwork";
sha256 = "1ah7h417llcq0xzdbp497pchb9m9qvjhrwajcjb0ybrs8v889m31";
sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935";
};
buildInputs = [ go ];

9
pkgs/applications/window-managers/i3/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb_run, dmenu, i3status }:
, xorgserver, xvfb_run }:
stdenv.mkDerivation rec {
name = "i3-${version}";
@ -30,13 +30,6 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
postFixup = ''
substituteInPlace $out/etc/i3/config --replace dmenu_run ${dmenu}/bin/dmenu_run
substituteInPlace $out/etc/i3/config --replace "status_command i3status" "status_command ${i3status}/bin/i3status"
substituteInPlace $out/etc/i3/config.keycodes --replace dmenu_run ${dmenu}/bin/dmenu_run
substituteInPlace $out/etc/i3/config.keycodes --replace "status_command i3status" "status_command ${i3status}/bin/i3status"
'';
# Tests have been failing (at least for some people in some cases)
# and have been disabled until someone wants to fix them. Some
# initial digging uncovers that the tests call out to `git`, which

2
pkgs/data/fonts/emojione/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Open source emoji set";
homepage = "http://emojione.com/";
licenses = licenses.cc-by-40;
license = licenses.cc-by-40;
platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
};

21
pkgs/development/compilers/fstar/default.nix
View File

@ -1,26 +1,37 @@
{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper }:
{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper, pkgconfig, file }:
stdenv.mkDerivation rec {
name = "fstar-${version}";
version = "0.9.2.0";
version = "0.9.4.0";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "FStar";
rev = "v${version}";
sha256 = "0vrxmxfaslngvbvkzpm1gfl1s34hdsprv8msasxf9sjqc3hlir3l";
sha256 = "130779p5plsgvz0dkcqycns3vwrvyfl138nq2xdhd3rkdsbyyvb7";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = with ocamlPackages; [
mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl
mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries
zarith camlp4 yojson pprint openssl pkgconfig file
];
preBuild = ''
substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true"
substituteInPlace src/VS/.nuget/NuGet.targets --replace "mono" "true"
source setenv.sh
# Fails with bad interpreter otherwise
patchShebangs src/tools
patchShebangs bin
export FSharpTargetsPath="$(dirname $(pkg-config FSharp.Core --variable=Libraries))/Microsoft.FSharp.Targets"
# remove hardcoded windows paths
sed -i '/<FSharpTargetsPath/d' src/*/*.fsproj
mkdir -p src/VS/packages/FsLexYacc.6.1.0
ln -s ${dotnetPackages.FsLexYacc}/lib/dotnet/FsLexYacc src/VS/packages/FsLexYacc.6.1.0/build
'';
makeFlags = [

2
pkgs/development/compilers/llvm/4/default.nix
View File

@ -24,6 +24,8 @@ let
clang = wrapCC self.clang-unwrapped;
openmp = callPackage ./openmp.nix {};
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;

25
pkgs/development/compilers/llvm/4/openmp.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv
, fetch
, cmake
, zlib
, llvm
, perl
, version
}:
stdenv.mkDerivation {
name = "openmp-${version}";
src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv";
buildInputs = [ cmake llvm perl ];
enableParallelBuilding = true;
meta = {
description = "Components required to build an executable OpenMP program";
homepage = http://openmp.llvm.org/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.all;
};
}

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

@ -454,4 +454,8 @@ self: super: builtins.intersectAttrs super {
export PATH="$PWD/dist/build/intero:$PATH"
'';
});
# loc and loc-test depend on each other for testing. Break that infinite cycle:
loc-test = super.loc-test.override { loc = dontCheck self.loc; };
}

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

File diff suppressed because it is too large Load Diff

2
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -101,7 +101,7 @@ self: let
'';
};
hackage2nix = name: version: haskellSrc2nix {
hackage2nix = name: version: self.haskellSrc2nix {
name = "${name}-${version}";
sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")'';
src = "${all-cabal-hashes}/${name}/${version}/${name}.cabal";

25
pkgs/development/libraries/cmark/default.nix
View File

@ -1,20 +1,27 @@
{ stdenv, fetchurl, cmake }:
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
version = "0.23.0";
version = "0.27.1";
name = "cmark-${version}";
src = fetchurl {
url = "https://github.com/jgm/cmark/archive/${version}.tar.gz";
sha256 = "87d289965066fce7be247d44c0304af1b20817dcc1b563702302ae33f2be0596";
src = fetchFromGitHub {
owner = "jgm";
repo = "cmark";
rev = version;
sha256 = "06miwq3rl2bighkn6iq7bdwzmvcqa53qwpa0pqjqa8yn44j8ijj8";
};
buildInputs = [ cmake ];
nativeBuildInputs = [ cmake ];
doCheck = true;
checkPhase = ''
export LD_LIBRARY_PATH=$(readlink -f ./src)
CTEST_OUTPUT_ON_FAILURE=1 make test
'';
meta = {
meta = with stdenv.lib; {
description = "CommonMark parsing and rendering library and program in C";
homepage = https://github.com/jgm/cmark;
maintainers = [ stdenv.lib.maintainers.michelk ];
platforms = stdenv.lib.platforms.unix;
maintainers = [ maintainers.michelk ];
platforms = platforms.unix;
};
}

31
pkgs/development/libraries/kpmcore/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig
, qtbase, kdeFrameworks
, eject, libatasmart, parted }:
let
pname = "kpmcore";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.0.3";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "17lqrp39w31fm7haigwq23cp92zwk3czjzqa2fhn3wafx3vafwd2";
};
buildInputs = [
qtbase
eject # this is to get libblkid
libatasmart
parted # we only need the library
kdeFrameworks.kio
];
nativeBuildInputs = [ extra-cmake-modules ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
maintainers = with lib.maintainers; [ peterhoeg ];
};
}

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
version = "0.7.91";
version = "0.7.95";
name = "libmediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "1h39cwd85rgidr0hbwab9dwbjv25xhvjv8y2nv35p3fwrs48p098";
sha256 = "0snrcashc5c5gcwvfh7sl7z4h523d8vxbfin3gb6g81zv43d2b23";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

2
pkgs/development/libraries/opencv/3.x.nix
View File

@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = http://opencv.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [viric flosse mdaiter];
maintainers = with stdenv.lib.maintainers; [viric mdaiter];
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}

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

@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = http://opencv.org/;
license = licenses.bsd3;
maintainers = with maintainers; [ viric flosse ];
maintainers = with maintainers; [ viric ];
platforms = platforms.linux ++ platforms.darwin;
};
}

15
pkgs/development/libraries/science/biology/htslib/default.nix
View File

@ -1,16 +1,21 @@
{ stdenv, fetchurl, zlib }:
{ stdenv, fetchurl, zlib, bzip2, lzma, curl }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "${major}.0";
pname = "htslib";
version = "1.3.2";
major = "1.4";
src = fetchurl {
url = "https://github.com/samtools/${pname}/releases/download/${version}/${name}.tar.bz2";
sha256 = "0iq3blw23s55vkr1z88p9y2dqrb2dybzhl6hz2nlk53ncihrxcdr";
url = "https://github.com/samtools/htslib/releases/download/${major}/htslib-${major}.tar.bz2";
sha256 = "0l1ki3sqfhawfn7fx9v7i2pm725jki4c5zij9j96xka5zwc8iz2w";
};
buildInputs = [ zlib ];
buildInputs = [ zlib bzip2 lzma curl ];
configureFlags = "--enable-libcurl"; # optional but strongly recommended
installFlags = "prefix=$(out)";
meta = with stdenv.lib; {
description = "A C library for reading/writing high-throughput sequencing data";

26
pkgs/development/ocaml-modules/octavius/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam }:
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "octavius is not available for OCaml ${ocaml.version}" else
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-octavius-0.2.0";
src = fetchurl {
url = http://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz;
sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
};
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
inherit (topkg) buildPhase installPhase;
meta = {
description = "Ocamldoc comment syntax parser";
homepage = https://github.com/ocaml-doc/octavius;
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
};
}

4
pkgs/development/python-modules/django/1_11.nix
View File

@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
name = "Django-${version}";
version = "1.11";
version = "1.11.1";
disabled = pythonOlder "2.7";
src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
sha256 = "0c1c2n05wv1br651hfbvnxw8ymcn4q8m56893pyv8xj2jijbiwxn";
sha256 = "131swdygapgrnkicvksqf904gkrfvljcrsqq8z82rvzf4bwgvkmv";
};
patches = [

6
pkgs/development/python-modules/dogpile.cache/default.nix
View File

@ -12,6 +12,12 @@ buildPythonPackage rec {
sha256 = "73793471af07af6dc5b3ee015abfaca4220caaa34c615537f5ab007ed150726d";
};
# Disable concurrency tests that often fail,
# probably some kind of timing issue.
prePatch = ''
rm tests/test_lock.py
'';
propagatedBuildInputs = [ dogpile_core ];
buildInputs = [ pytest pytestcov mock Mako ];

32
pkgs/development/tools/activator/default.nix
View File

@ -1,32 +0,0 @@
{ stdenv, fetchurl, unzip, jre }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "activator";
version = "1.3.12";
src = fetchurl {
url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip";
sha256 = "0c7mxznfgvywnyvr8l5jh4cp67ila5cdq14p6jwrkh6lwif3ah1p";
};
buildInputs = [ unzip jre ];
installPhase = ''
mkdir -p $out/{bin,lib,libexec}
mv repository $out/lib
sed -i -e "s,declare.*activator_home.*=.*,declare -r activator_home=$out/lib/,g" bin/activator
mv bin/activator $out/bin
mv libexec/activator-launch-${version}.jar $out/libexec
'';
meta = with stdenv.lib; {
description = "A scafollding tool for setting up reactive projects";
homepage = "http://typesafe.com/activator";
license = licenses.asl20;
maintainers = with maintainers; [ edwtjo cko ];
platforms = with platforms; unix;
};
}

6
pkgs/development/tools/flamegraph/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation {
name = "FlameGraph-2015-10-10";
name = "FlameGraph-2017-05-11";
src = fetchFromGitHub {
owner = "brendangregg";
repo = "FlameGraph";
rev = "182b24fb635345d48c91ed1de58a08b620312f3d";
sha256 = "1djz0wl8202a6j87ka9j3d8iw3bli056lrn73gv2i65p16rwk9kc";
rev = "6b2a446dfb5d8027a0adf14adf71748aa502c247";
sha256 = "11j1776zsvhn9digqay1cbfhhxz01nv2hm44i4gnpqcxkada44l2";
};
buildInputs = [ perl ];

5
pkgs/development/tools/misc/usb-modeswitch/data.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libusb1, tcl, usb-modeswitch }:
{ stdenv, fetchurl, tcl, usb-modeswitch }:
stdenv.mkDerivation rec {
name = "usb-modeswitch-data-${version}";
@ -15,10 +15,9 @@ stdenv.mkDerivation rec {
sed -i 's@usb_modeswitch@${usb-modeswitch}/bin/usb_modeswitch@g' 40-usb_modeswitch.rules
'';
buildInputs = [ libusb1 usb-modeswitch ];
# we add tcl here so we can patch in support for new devices by dropping config into
# the usb_modeswitch.d directory
nativeBuildInputs = [ pkgconfig tcl ];
nativeBuildInputs = [ tcl ];
meta = with stdenv.lib; {
description = "Device database and the rules file for 'multi-mode' USB devices";

7
pkgs/development/tools/vndr/default.nix
View File

@ -2,16 +2,17 @@
buildGoPackage rec {
name = "vndr-${version}";
version = "20161110-${lib.strings.substring 0 7 rev}";
rev = "cf8678fba5591fbacc4dafab1a22d64f6c603c20";
version = "20170511-${lib.strings.substring 0 7 rev}";
rev = "0cb33a0eb64c8ca73b8e2939a3430b22fbb8d3e3";
goPackagePath = "github.com/LK4D4/vndr";
excludedPackages = "test";
src = fetchFromGitHub {
inherit rev;
owner = "LK4D4";
repo = "vndr";
sha256 = "1fbrpdpfir05hqj1dr8rxw8hnjkhl0xbzncxkva56508vyyzbxcs";
sha256 = "02vdr59xn79hffayfcxg29nf62rdc33a60i104fgj746kcswgy5n";
};
meta = {

32
pkgs/games/sgt-puzzles/default.nix
View File

@ -1,22 +1,25 @@
{stdenv, gtk3, pkgconfig, libX11, perl, fetchurl, automake115x, autoconf}:
let
{ stdenv, fetchurl
, gtk3, libX11
, makeWrapper, pkgconfig, perl, autoreconfHook, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "sgt-puzzles-r${version}";
version = "20170228.1f613ba";
buildInputs = [
gtk3 pkgconfig libX11 perl automake115x autoconf
];
in
stdenv.mkDerivation {
src = fetchurl {
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
sha256 = "02nqc18fhvxr545wgk55ly61fi0a06q61ljzwadprqxa1n0g0fz5";
};
name = "sgt-puzzles-r" + version;
inherit buildInputs;
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ];
buildInputs = [ gtk3 libX11 ];
makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"];
preInstall = ''
mkdir -p "$out"/{bin,share/doc/sgtpuzzles}
cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles"
cp LICENCE "$out/share/doc/sgtpuzzles/LICENSE"
'';
# SGT Puzzles use generic names like net, map, etc.
# Create symlinks with sgt-puzzle- prefix for possibility of
@ -33,12 +36,11 @@ stdenv.mkDerivation {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
cp Makefile.gtk Makefile
'';
meta = {
inherit version;
meta = with stdenv.lib; {
description = "Simon Tatham's portable puzzle collection";
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = licenses.mit;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
homepage = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/";
};
}

8
pkgs/misc/emulators/pcsxr/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook, intltool, pkgconfig, gtk3, SDL2, xorg
, gsettings_desktop_schemas, makeWrapper, libcdio, nasm, ffmpeg, file
, wrapGAppsHook, libcdio, nasm, ffmpeg, file
, fetchpatch }:
stdenv.mkDerivation rec {
@ -49,9 +49,9 @@ stdenv.mkDerivation rec {
./uncompress2.patch
];
nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ];
buildInputs = [
autoreconfHook intltool pkgconfig gtk3 SDL2 xorg.libXv xorg.libXtst
makeWrapper libcdio nasm ffmpeg file
gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file
];
dynarecTarget =
@ -67,8 +67,6 @@ stdenv.mkDerivation rec {
];
postInstall = ''
wrapProgram "$out/bin/pcsxr" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
mkdir -p "$out/share/doc/${name}"
cp README \
AUTHORS \

10
pkgs/misc/emulators/wine/sources.nix
View File

@ -32,23 +32,23 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "2.6";
version = "2.7";
url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
sha256 = "1h5ajw50fax2pg9p4wch6824zxdd85g2gh9nkbllfxj3ixsn9zz6";
sha256 = "0k711vdn1h2x6ar20hpvb5b6zh21niy2n9s9mgvlag1iiq446np5";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
inherit (unstable) version;
sha256 = "1j1fsq7pb7rxi7ppagrk93gmg5wk3anr9js0civxiqd3h8d4lsz2";
sha256 = "0ipz160mpg9di47xin9whcq986nrbadmcvpdbwgrpwlxf63x4k63";
owner = "wine-compholio";
repo = "wine-staging";
rev = "v${version}";
};
winetricks = fetchFromGitHub rec {
version = "20170316";
sha256 = "193g3b6rfbxkxmq1y0rawrkrzb225ly71hprif3lv09gmi2bf95a";
version = "20170327";
sha256 = "1iplk8nl37k94bhhy3q3jxkif0mnpc09xhwxn2xic16nvfavrmhy";
owner = "Winetricks";
repo = "winetricks";
rev = version;

6
pkgs/misc/vim-plugins/default.nix
View File

@ -646,11 +646,11 @@ rec {
};
vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-elixir-2017-04-12";
name = "vim-elixir-2017-04-26";
src = fetchgit {
url = "https://github.com/elixir-lang/vim-elixir";
rev = "8781ff7c675d0cbfb4859f91698365c2eecf3205";
sha256 = "0990qbzs2cn3k07xrn4xcczl7kpapygpa0ypkwpgxamyk0lgjlr8";
rev = "e130adfd82f65be838a9c8d9eab1dff797527033";
sha256 = "1pxix3vr4ry1r2l7bqmq5hn1iqal970312qvfp40h8bnq792v9d1";
};
dependencies = [];

20
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -6,19 +6,19 @@ in
{
# Policy: use the highest stable version as the default (on our master).
stable = generic {
version = "375.39";
sha256_32bit = "0mlly5n84640xa2mcdqqg44s42ck6g3lj5skf7gmfp2w5ibzccvz";
sha256_64bit = "19w5v81f770rqjrvdwz11k015zli2y8f4x10ydqxcy0nhhh5mgli";
settingsSha256 = "0f881q4jzliqzqi1p5lzwz86h829m5g74zdj7nlfi1cc6s45g5p5";
persistencedSha256 = "0zj6wdcgg2ljhvsssfsqz9wk28ykmsh4gwmis31q3rsrkq668x33";
version = "375.66";
sha256_32bit = "0k7ib5ah3c2apzgzxlq75l48zm8901mbwj7slv18k3rhk8j0w8i9";
sha256_64bit = "1h01s8brpz42jwc24dsflm4psd3zsy26ds98h0adgwx51dbpzqsr";
settingsSha256 = "0bpdayyqw4cpgl7bgddfz6w5j8y3wsgr89p5vxnzgk9g0vgqxh5h";
persistencedSha256 = "113rllf9l26z546jjfijpxllp17qcpawblzxvsqc6rbzbkmvcdwi";
};
beta = generic {
version = "378.13";
sha256_32bit = "1ca6kbk20kki5f698x1ga9b1v1is4mr10f7f70s3gixak1h2mrh5";
sha256_64bit = "1vj2vyy6vim0qis7iqq4la6k6bnby65p3qjbl888qnpjkqj7kqrx";
settingsSha256 = "08q04cd769l1i6737ylvanaxrqg8fym05kjp7kvpz28764g96gxj";
persistencedSha256 = "0hmxp5fbxwl9f7c9fspg65my6lwynpqhz02zw7100dgwqb2vn1qj";
version = "381.22";
sha256_32bit = "024x3c6hrivg2bkbzv1xd0585hvpa2kbn1y2gwvca7c73kpdczbv";
sha256_64bit = "13fj9ndy5rmh410d0vi2b0crfl7rbsm6rn7cwms0frdzkyhshghs";
settingsSha256 = "1gls187zfd201b29qfvwvqvl5gvp5wl9lq966vd28crwqh174jrh";
persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963";
};
legacy_340 = generic {

13
pkgs/os-specific/linux/nvidia-x11/generic.nix
View File

@ -8,7 +8,7 @@
, preferGtk2 ? false
}:
{ stdenv, callPackage, callPackage_i686, fetchurl
{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch
, kernel ? null, xorg, zlib, perl, nukeReferences
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
@ -49,17 +49,16 @@ let
then null
else if versionOlder version "375"
then [
(fetchurl {
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/4.10.0_kernel.patch?h=packages/nvidia-340xx;
sha256 = "08k2phr9kawg6a3v88d4zkj7gdlih29gm5a1gmhpgmvd926k0z5l";
(fetchpatch {
name = "kernel-4.10.patch";
url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
})
# from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
# with datestamps removed
./fs52243.patch
]
else [ (fetchurl {
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
}) ];
else null;
inherit version useGLVND useProfiles;
inherit (stdenv) system;

4
pkgs/os-specific/linux/nvidia-x11/settings.nix
View File

@ -1,6 +1,6 @@
nvidia_x11: sha256:
{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau
{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau
, librsvg, wrapGAppsHook
, withGtk2 ? false, withGtk3 ? true
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 ]
buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus ]
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ];

4
pkgs/servers/emby/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "emby-${version}";
version = "3.2.13.0";
version = "3.2.15.0";
src = fetchurl {
url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
sha256 = "180prfbc1lv35cqwamzzgl30c0j89nh18jr1nwjancq0s0wkiksp";
sha256 = "0xfjj899l7xmmiwwbfj4j9dwgrq10911nls06viz793bflmxw082";
};
buildInputs = with pkgs; [

6
pkgs/servers/x11/xorg/default.nix
View File

@ -1813,11 +1813,11 @@ let
}) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videointel = (mkDerivation "xf86videointel" {
name = "xf86-video-intel-2017-02-05";
name = "xf86-video-intel-2017-04-18";
builder = ./builder.sh;
src = fetchurl {
url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/e4fe79cf0d9a05ee3f3a027148ef0aeb2b1b34e1.tar.gz;
sha256 = "1hzfz5m9iclxk55531nqmyn25a50ggibl1qb80l6742k25k211cr";
url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz;
sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8";
};
buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
meta.platforms = stdenv.lib.platforms.unix;

6
pkgs/shells/fish-foreign-env/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "fish-foreign-env-${version}";
version = "git-20151223";
version = "git-20170324";
src = fetchFromGitHub {
owner = "oh-my-fish";
repo = "plugin-foreign-env";
rev = "2dfe5b73fd2101702c83d1d7b566e2b9332c5ddc";
sha256 = "17jxlbljp7k2azcl1miz5h5xfyazlf9z9lrddcrnm6r7c1w1zdh5";
rev = "baefbd690f0b52cb8746f3e64b326d82834d07c5";
sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl";
};
buildCommand = ''

89
pkgs/shells/fish/default.nix
View File

@ -2,15 +2,91 @@
nettools, kbd, bc, which, gnused, gnugrep,
groff, man-db, glibc, libiconv, pcre2,
gettext, ncurses, python
, writeText
, useOperatingSystemEtc ? true
}:
with stdenv.lib;
let
etcConfigAppendixText = ''
############### ↓ Nix hook for sourcing /etc/fish/config.fish ↓ ###############
# #
# Origin:
# This fish package was called with the attribute
# "useOperatingSystemEtc = true;".
#
# Purpose:
# Fish ordinarily sources /etc/fish/config.fish as
# $__fish_sysconfdir/config.fish,
# and $__fish_sysconfdir is defined at compile-time, baked into the C++
# component of fish. By default, it is set to "/etc/fish". When building
# through Nix, $__fish_sysconfdir gets set to $out/etc/fish. Here we may
# have included a custom $out/etc/config.fish in the fish package,
# as specified, but according to the value of useOperatingSystemEtc, we
# may want to further source the real "/etc/fish/config.fish" file.
#
# When this option is enabled, this segment should appear the very end of
# "$out/etc/config.fish". This is to emulate the behavior of fish itself
# with respect to /etc/fish/config.fish and ~/.config/fish/config.fish:
# source both, but source the more global configuration files earlier
# than the more local ones, so that more local configurations inherit
# from but override the more global locations.
if test -f /etc/fish/config.fish
source /etc/fish/config.fish
end
# #
############### ↑ Nix hook for sourcing /etc/fish/config.fish ↑ ###############
'';
fishPreInitHooks = ''
# source nixos environment if we're a login shell
builtin status --is-login
and test -f /etc/fish/nixos-env-preinit.fish
and source /etc/fish/nixos-env-preinit.fish
test -n "$NIX_PROFILES"
and begin
# We ensure that __extra_* variables are read in $__fish_datadir/config.fish
# with a preference for user-configured data by making sure the package-specific
# data comes last. Files are loaded/sourced in encounter order, duplicate
# basenames get skipped, so we assure this by prepending Nix profile paths
# (ordered in reverse of the $NIX_PROFILE variable)
#
# Note that at this point in evaluation, there is nothing whatsoever on the
# fish_function_path. That means we don't have most fish builtins, e.g., `eval`.
# additional profiles are expected in order of precedence, which means the reverse of the
# NIX_PROFILES variable (same as config.environment.profiles)
set -l __nix_profile_paths (echo $NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')[-1..1]
set __extra_completionsdir \
$__nix_profile_paths"/etc/fish/completions" \
$__nix_profile_paths"/share/fish/vendor_completions.d" \
$__extra_completionsdir
set __extra_functionsdir \
$__nix_profile_paths"/etc/fish/functions" \
$__nix_profile_paths"/share/fish/vendor_functions.d" \
$__extra_functionsdir
set __extra_confdir \
$__nix_profile_paths"/etc/fish/conf.d" \
$__nix_profile_paths"/share/fish/vendor_conf.d" \
$__extra_confdir
end
'';
in
stdenv.mkDerivation rec {
name = "fish-${version}";
version = "2.5.0";
patches = [ ./etc_config.patch ];
etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
src = fetchurl {
url = "http://fishshell.com/files/${version}/${name}.tar.gz";
@ -69,15 +145,10 @@ stdenv.mkDerivation rec {
"$out/share/fish/tools/create_manpage_completions.py"
sed -i "s|command manpath|command ${man-db}/bin/manpath|" \
"$out/share/fish/functions/man.fish"
'' + optionalString useOperatingSystemEtc ''
tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)}
'' + ''
tee -a $out/share/fish/config.fish << EOF
# make fish pick up completions from nix profile
if status --is-interactive
set -l profiles (echo \$NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')
set fish_complete_path \$profiles"/share/fish/vendor_completions.d" \$fish_complete_path
end
EOF
tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)}
'';
meta = with stdenv.lib; {

12
pkgs/shells/fish/etc_config.patch
View File

@ -1,12 +0,0 @@
diff --git a/etc/config.fish b/etc/config.fish
index 9be6f07..61c9ae2 100644
--- a/etc/config.fish
+++ b/etc/config.fish
@@ -12,3 +12,7 @@
# if status --is-interactiv
# ...
# end
+
+if test -f /etc/fish/config.fish
+ source /etc/fish/config.fish
+end

7
pkgs/tools/bluetooth/blueman/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
, obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp
, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
, hicolor_icon_theme, librsvg, wrapGAppsHook
, withPulseAudio ? true, libpulseaudio }:
@ -17,8 +17,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ];
buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg
gsettings_desktop_schemas hicolor_icon_theme ]
buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ]
++ pythonPath
++ lib.optional withPulseAudio libpulseaudio;
@ -28,7 +27,7 @@ in stdenv.mkDerivation rec {
pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ];
propagatedUserEnvPkgs = [ obex_data_server dconf ];
propagatedUserEnvPkgs = [ obex_data_server ];
configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];

4
pkgs/tools/compression/lzip/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "lzip-${version}";
version = "1.18";
version = "1.19";
buildInputs = [ texinfo ];
src = fetchurl {
url = "mirror://savannah/lzip/${name}.tar.gz";
sha256 = "1p8lvc22sv3damld9ng8y6i8z2dvvpsbi9v7yhr5bc2a20m8iya7";
sha256 = "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz";
};
configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";

17
pkgs/tools/compression/zstd/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub
{ stdenv, fetchFromGitHub, gnugrep
, legacySupport ? false }:
stdenv.mkDerivation rec {
name = "zstd-${version}";
version = "1.1.3";
version = "1.2.0";
src = fetchFromGitHub {
sha256 = "1d46hs6pyq55izcmnk7hzvbl8iyxh7bp7qchc7rl8ay396ax2sd5";
sha256 = "01b5w4yrwa8lgnjyi42zxjhw8cfyh8yfhdsjr04y5qsblz0hv0zl";
rev = "v${version}";
repo = "zstd";
owner = "facebook";
@ -24,6 +24,15 @@ stdenv.mkDerivation rec {
"PREFIX=$(out)"
];
preInstall = ''
substituteInPlace programs/zstdgrep \
--replace "=grep" "=${gnugrep}/bin/grep" \
--replace "=zstdcat" "=$out/bin/zstdcat"
substituteInPlace programs/zstdless \
--replace "zstdcat" "$out/bin/zstdcat"
'';
meta = with stdenv.lib; {
description = "Zstandard real-time compression algorithm";
longDescription = ''
@ -40,6 +49,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ gpl2Plus bsd2 ];
platforms = platforms.unix;
maintainers = with maintainers; [ nckx ];
maintainers = with maintainers; [ nckx orivej ];
};
}

27
pkgs/tools/graphics/wkhtmltopdf/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg
{ stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg
, openssl, libX11, libXext, libXrender, overrideDerivation }:
stdenv.mkDerivation rec {
version = "0.12.3.2";
version = "0.12.4";
name = "wkhtmltopdf-${version}";
src = fetchFromGitHub {
owner = "wkhtmltopdf";
repo = "wkhtmltopdf";
rev = "${version}";
sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s";
rev = version;
sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2";
};
wkQt = overrideDerivation qt4 (deriv: {
@ -105,13 +105,26 @@ stdenv.mkDerivation rec {
'';
});
buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl
buildInputs = [
wkQt fontconfig freetype libpng zlib libjpeg openssl
libX11 libXext libXrender
];
configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
prePatch = ''
for f in src/image/image.pro src/pdf/pdf.pro ; do
substituteInPlace $f --replace '$(INSTALL_ROOT)' ""
done
'';
patches = [ ./makefix.patch ];
patches = [
(fetchpatch {
name = "make-0.12.4-compile.patch";
url = "https://github.com/efx/aports/raw/eb9f8e6bb9a488460929db747b15b8fceddd7abd/testing/wkhtmltopdf/10-patch1.patch";
sha256 = "1c136jz0klr2rmhmy13gdbgsgkpjfdp2sif8bnw8d23mr9pym3s1";
})
];
configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
enableParallelBuilding = true;

2
pkgs/tools/misc/clac/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "Interactive stack-based calculator";
license = stdenv.lib.licenses.bsd2;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
homepage = "https://github.com/soveran/clac";
};
}

4
pkgs/tools/misc/direnv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, go, bash }:
{ stdenv, fetchFromGitHub, go, bash, writeText}:
stdenv.mkDerivation rec {
name = "direnv-${version}";
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
installPhase = ''
make install DESTDIR=$out
mkdir -p $out/share/fish/vendor_conf.d
echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish
'';
meta = with stdenv.lib; {

10
pkgs/tools/misc/fzf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub }:
{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, writeText }:
buildGoPackage rec {
name = "fzf-${version}";
@ -16,6 +16,8 @@ buildGoPackage rec {
outputs = [ "bin" "out" "man" ];
fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings";
buildInputs = [ ncurses ];
goDeps = ./deps.nix;
@ -25,6 +27,12 @@ buildGoPackage rec {
sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
'';
preInstall = ''
mkdir -p $bin/share/fish/vendor_functions.d $bin/share/fish/vendor_conf.d
cp $src/shell/key-bindings.fish $bin/share/fish/vendor_functions.d/fzf_key_bindings.fish
cp ${fishHook} $bin/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
'';
postInstall = ''
cp $src/bin/fzf-tmux $bin/bin
mkdir -p $man/share/man

9
pkgs/tools/misc/lnav/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses,
readline, zlib, bzip2, autoconf, automake }:
{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses
, readline, zlib, bzip2, autoconf, automake, curl }:
stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "tstack";
repo = "lnav";
rev = "v${meta.version}";
sha256 = "0pag2rl7b6s2xfl80c629vhwsdvvlhcdy6732yvpgfv94w0zyjp9";
sha256 = "1jdjn64cxgbhhyg73cisrfrk7vjg1hr9nvkmfdk8gxc4g82y3xxc";
inherit name;
};
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
pcre-cpp
readline
sqlite
curl
];
preConfigure = ''
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
'';
downloadPage = "https://github.com/tstack/lnav/releases";
license = licenses.bsd2;
version = "0.8.1";
version = "0.8.2";
maintainers = [ maintainers.dochang ];
};

32
pkgs/tools/misc/partition-manager/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ kdeDerivation, kdeWrapper, fetchurl, lib
, ecm, kdoctools
, kconfig, kinit, kpmcore
, eject, libatasmart }:
let
pname = "partitionmanager";
unwrapped = kdeDerivation rec {
name = "${pname}-${version}";
version = "3.0.1";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410";
};
meta = with lib; {
description = "KDE Partition Manager";
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ ecm kdoctools ];
# refer to kpmcore for the use of eject
buildInputs = [ eject libatasmart ];
propagatedBuildInputs = [ kconfig kinit kpmcore ];
enableParallelBuilding = true;
};
in kdeWrapper {
inherit unwrapped;
targets = [ "bin/partitionmanager" ];
}

4
pkgs/tools/misc/svtplay-dl/default.nix
View File

@ -5,13 +5,13 @@ let
inherit (pythonPackages) python nose pycrypto requests mock;
in stdenv.mkDerivation rec {
name = "svtplay-dl-${version}";
version = "1.9.3";
version = "1.9.4";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
sha256 = "14qksi1svi89niffykxg47kay013byls6bnhkrkzkanq04075lmw";
sha256 = "15vjaia1qbs49gplpfi8sj5scl9mb4qg8n2z4zyzjs5461lx5qqv";
};
pythonPaths = [ pycrypto requests ];

16
pkgs/tools/networking/megatools/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking, gsettings_desktop_schemas
, asciidoc, makeWrapper }:
{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking
, asciidoc, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "megatools-${version}";
@ -10,16 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv";
};
buildInputs = [ pkgconfig glib fuse curl makeWrapper
gsettings_desktop_schemas asciidoc ];
postInstall = ''
for i in $(find $out/bin/ -type f); do
wrapProgram "$i" \
--prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
done
'';
nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ];
buildInputs = [ glib glib_networking fuse curl ];
meta = with stdenv.lib; {
description = "Command line client for Mega.co.nz";

22
pkgs/tools/networking/mu/default.nix
View File

@ -1,15 +1,17 @@
{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook, pmccabe
{ stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe
, xapian, glib, gmime, texinfo , emacs, guile
, gtk3, webkitgtk24x, libsoup, icu
, withMug ? false }:
stdenv.mkDerivation rec {
version = "0.9.18";
name = "mu-${version}";
version = "0.9.18";
src = fetchurl {
url = "https://github.com/djcb/mu/archive/${version}.tar.gz";
sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y";
};
# as of 0.9.18 2 tests are failing but previously we had no tests
@ -19,9 +21,10 @@ stdenv.mkDerivation rec {
# pmccabe should be a checkInput instead, but configure looks for it
buildInputs = [
sqlite xapian glib gmime texinfo emacs guile libsoup icu pmccabe
sqlite xapian glib gmime texinfo emacs guile libsoup icu
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
checkInputs = [ pmccabe ];
doCheck = true;
@ -37,8 +40,9 @@ stdenv.mkDerivation rec {
# Install mug and msg2pdf
postInstall = stdenv.lib.optionalString withMug ''
cp -v toys/msg2pdf/msg2pdf $out/bin/
cp -v toys/mug/mug $out/bin/
for f in msg2pdf mug ; do
install -m755 toys/$f/$f $out/bin/$f
done
'';
meta = with stdenv.lib; {
@ -46,6 +50,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
homepage = "http://www.djcbsoftware.nl/code/mu/";
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ antono the-kenny ];
maintainers = with maintainers; [ antono the-kenny peterhoeg ];
};
}

11
pkgs/tools/text/kdiff3/default.nix
View File

@ -4,16 +4,15 @@
}:
let
rev = "468652ce70b1214842cef0a021c81d056ec6aa01";
unwrapped = kdeDerivation rec {
name = "kdiff3-${version}";
version = "1.7.0-${lib.strings.substring 0 7 rev}";
version = "1.7.0-2017-02-19";
src = fetchgit {
url = "https://gitlab.com/tfischer/kdiff3";
sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m";
inherit rev;
# gitlab is outdated
url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git;
sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8";
rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f";
};
setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';

4
pkgs/tools/text/languagetool/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "LanguageTool";
version = "3.5";
version = "3.7";
name = pname + "-" + version;
src = fetchurl {
url = "https://www.languagetool.org/download/${name}.zip";
sha256 = "1axw8fqg2wlkmv45s71q5pg44sg1s06szpkjhyscy704i7d2jc34";
sha256 = "04i49z022k3nyyr8hnlxima9k5id8qvh2nr3dv8zgcqm5sin6xx9";
};
buildInputs = [ unzip jdk ];
installPhase =

32
pkgs/top-level/all-packages.nix
View File

@ -1138,7 +1138,6 @@ with pkgs;
};
blueman = callPackage ../tools/bluetooth/blueman {
inherit (gnome3) dconf gsettings_desktop_schemas;
withPulseAudio = config.pulseaudio or true;
};
@ -1850,7 +1849,10 @@ with pkgs;
fdk_aac = callPackage ../development/libraries/fdk-aac { };
flameGraph = callPackage ../development/tools/flamegraph { };
flamegraph = callPackage ../development/tools/flamegraph { };
# Awkward historical capitalization for flamegraph. Remove eventually
flameGraph = flamegraph;
flvtool2 = callPackage ../tools/video/flvtool2 { };
@ -2574,6 +2576,8 @@ with pkgs;
knockknock = callPackage ../tools/security/knockknock { };
partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { };
kpcli = callPackage ../tools/security/kpcli { };
krename = libsForQt5.callPackage ../applications/misc/krename { };
@ -6324,7 +6328,13 @@ with pkgs;
### DEVELOPMENT / TOOLS
activator = callPackage ../development/tools/activator { };
activator = throw ''
Typesafe Activator was removed in 2017-05-08 as the actual package reaches end of life.
See https://github.com/NixOS/nixpkgs/pull/25616
and http://www.lightbend.com/community/core-tools/activator-and-sbt
for more information.
'';
alloy = callPackage ../development/tools/alloy { };
@ -9691,6 +9701,8 @@ with pkgs;
libva = libva-full; # also wants libva-x11
};
kpmcore = callPackage ../development/libraries/kpmcore { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix {
ffmpeg = ffmpeg_2;
};
@ -13414,10 +13426,10 @@ with pkgs;
inherit (callPackage ../applications/virtualization/docker { })
docker_17_03
docker_17_04;
docker_17_05;
docker = docker_17_03;
docker-edge = docker_17_04;
docker-edge = docker_17_05;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
@ -14457,9 +14469,7 @@ with pkgs;
boost = boost155;
};
k3b-original = lowPrio (kde4.callPackage ../applications/misc/k3b { });
k3b = kde4.callPackage ../applications/misc/k3b/wrapper.nix { };
k3b = kdeApplications.k3b;
k9copy = libsForQt5.callPackage ../applications/video/k9copy {};
@ -14544,7 +14554,7 @@ with pkgs;
openjpeg = openjpeg_1;
};
krusader = kde4.callPackage ../applications/misc/krusader { };
krusader = libsForQt5.callPackage ../applications/misc/krusader { };
ksuperkey = callPackage ../tools/X11/ksuperkey { };
@ -15385,8 +15395,8 @@ with pkgs;
qt = qt4;
};
# 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
# 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { };
qsynth = callPackage ../applications/audio/qsynth { };

2
pkgs/top-level/ocaml-packages.nix
View File

@ -395,6 +395,8 @@ let
ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };
octavius = callPackage ../development/ocaml-modules/octavius { };
ojquery = callPackage ../development/ocaml-modules/ojquery { };
omd = callPackage ../development/ocaml-modules/omd { };

4
pkgs/top-level/python-packages.nix
View File

@ -73,7 +73,7 @@ let
in {
inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication;
inherit fetchPypi;
inherit fetchPypi callPackage;
inherit sharedLibraryExtension;
# helpers
@ -5252,8 +5252,8 @@ in {
sha256 = "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k";
};
buildInputs = with self; [ pytest pytest_xdist virtualenv process-tests ];
propagatedBuildInputs = with self; [ coverage ];
buildInputs = with self; [ pytest covCore virtualenv process-tests helper ];
# xdist related tests fail with the following error
# OSError: [Errno 13] Permission denied: 'py/_code'