ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +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 2018-03-30 08:14:35 +02:00
commit 9d2ff98571
101 changed files with 1732 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
doc/functions.xml
View File

@ -221,16 +221,69 @@
<para>
All generators follow a similar call interface: <code>generatorName
configFunctions data</code>, where <literal>configFunctions</literal> is a
set of user-defined functions that format variable parts of the content.
configFunctions data</code>, where <literal>configFunctions</literal> is
an attrset of user-defined functions that format nested parts of the
content.
They each have common defaults, so often they do not need to be set
manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]"
] name)</code> from the <literal>INI</literal> generator. It gets the name
of a section and returns a sanitized name. The default
] name)</code> from the <literal>INI</literal> generator. It receives the
name of a section and sanitizes it. The default
<literal>mkSectionName</literal> escapes <literal>[</literal> and
<literal>]</literal> with a backslash.
</para>
<para>
Generators can be fine-tuned to produce exactly the file format required
by your application/service. One example is an INI-file format which uses
<literal>: </literal> as separator, the strings
<literal>"yes"</literal>/<literal>"no"</literal> as boolean values
and requires all string values to be quoted:
</para>
<programlisting>
with lib;
let
customToINI = generators.toINI {
# specifies how to format a key/value pair
mkKeyValue = generators.mkKeyValueDefault {
# specifies the generated string for a subset of nix values
mkValueString = v:
if v == true then ''"yes"''
else if v == false then ''"no"''
else if isString v then ''"${v}"''
# and delegats all other values to the default generator
else generators.mkValueStringDefault {} v;
} ":";
};
# the INI file can now be given as plain old nix values
in customToINI {
main = {
pushinfo = true;
autopush = false;
host = "localhost";
port = 42;
};
mergetool = {
merge = "diff3";
};
}
</programlisting>
<para>This will produce the following INI file as nix string:</para>
<programlisting>
[main]
autopush:"no"
host:"localhost"
port:42
pushinfo:"yes"
str\:ange:"very::strange"
[mergetool]
merge:"diff3"
</programlisting>
<note><para>Nix store paths can be converted to strings by enclosing a
derivation attribute like so: <code>"${drv}"</code>.</para></note>

45
lib/generators.nix
View File

@ -4,6 +4,12 @@
* They all follow a similar interface:
* generator { config-attrs } data
*
* `config-attrs` are “holes” in the generators
* with sensible default implementations that
* can be overwritten. The default implementations
* are mostly generators themselves, called with
* their respective default values; they can be reused.
*
* Tests can be found in ./tests.nix
* Documentation in the manual, #sec-generators
*/
@ -20,6 +26,32 @@ in
rec {
## -- HELPER FUNCTIONS & DEFAULTS --
/* Convert a value to a sensible default string representation.
* The builtin `toString` function has some strange defaults,
* suitable for bash scripts but not much else.
*/
mkValueStringDefault = {}: v: with builtins;
let err = t: v: abort
("generators.mkValueStringDefault: " +
"${t} not supported: ${toPretty {} v}");
in if isInt v then toString v
# we default to not quoting strings
else if isString v then v
# isString returns "1", which is not a good default
else if true == v then "true"
# here it returns to "", which is even less of a good default
else if false == v then "false"
else if null == v then "null"
# if you have lists you probably want to replace this
else if isList v then err "lists" v
# same as for lists, might want to replace
else if isAttrs v then err "attrsets" v
else if isFunction v then err "functions" v
else err "this value is" (toString v);
/* Generate a line of key k and value v, separated by
* character sep. If sep appears in k, it is escaped.
* Helper for synaxes with different separators.
@ -30,11 +62,14 @@ rec {
* > "f\:oo:bar"
*/
mkKeyValueDefault = {
mkValueString ? toString
mkValueString ? mkValueStringDefault {}
}: sep: k: v:
"${libStr.escape [sep] k}${sep}${mkValueString v}";
## -- FILE FORMAT GENERATORS --
/* Generate a key-value-style config file from an attrset.
*
* mkKeyValue is the same as in toINI.
@ -98,6 +133,7 @@ rec {
*/
toYAML = {}@args: toJSON args;
/* Pretty print a value, akin to `builtins.trace`.
* Should probably be a builtin as well.
*/
@ -108,8 +144,9 @@ rec {
allowPrettyValues ? false
}@args: v: with builtins;
if isInt v then toString v
else if isBool v then (if v == true then "true" else "false")
else if isString v then "\"" + v + "\""
else if isString v then ''"${libStr.escape [''"''] v}"''
else if true == v then "true"
else if false == v then "false"
else if null == v then "null"
else if isFunction v then
let fna = lib.functionArgs v;
@ -132,6 +169,6 @@ rec {
(name: value:
"${toPretty args name} = ${toPretty args value};") v)
+ " }"
else abort "toPretty: should never happen (v = ${v})";
else abort "generators.toPretty: should never happen (v = ${v})";
}

26
lib/tests/misc.nix
View File

@ -207,6 +207,29 @@ runTests {
expected = ''f\:oo:bar'';
};
testMkValueString = {
expr = let
vals = {
int = 42;
string = ''fo"o'';
bool = true;
bool2 = false;
null = null;
# float = 42.23; # floats are strange
};
in mapAttrs
(const (generators.mkValueStringDefault {}))
vals;
expected = {
int = "42";
string = ''fo"o'';
bool = "true";
bool2 = "false";
null = "null";
# float = "42.23" true false [ "bar" ] ]'';
};
};
testToKeyValue = {
expr = generators.toKeyValue {} {
key = "value";
@ -249,6 +272,8 @@ runTests {
"section 1" = {
attribute1 = 5;
x = "Me-se JarJar Binx";
# booleans are converted verbatim by default
boolean = false;
};
"foo[]" = {
"he\\h=he" = "this is okay";
@ -260,6 +285,7 @@ runTests {
[section 1]
attribute1=5
boolean=false
x=Me-se JarJar Binx
'';
};

5
maintainers/maintainer-list.nix
View File

@ -3586,6 +3586,11 @@
github = "tnias";
name = "Philipp Bartsch";
};
tobim = {
email = "nix@tobim.fastmail.fm";
github = "tobimpub";
name = "Tobias Mayer";
};
tohl = {
email = "tom@logand.com";
github = "tohl";

9
nixos/doc/manual/release-notes/rl-1803.xml
View File

@ -418,15 +418,6 @@ following incompatible changes:</para>
have been added to set up static routing.
</para>
</listitem>
<listitem>
<para>
The option <option>services.xserver.desktopManager.default</option> is now
<literal>none</literal> by default. An assertion failure is thrown if WM's
and DM's default are <literal>none</literal>.
To explicitly run a plain X session without and DM or WM, the newly
introduced option <option>services.xserver.plainX</option> must be set to true.
</para>
</listitem>
<listitem>
<para>
The option <option>services.logstash.listenAddress</option> is now <literal>127.0.0.1</literal> by default.

15
nixos/modules/misc/version.nix
View File

@ -16,6 +16,21 @@ in
options.system = {
# XXX: Reintroduce old options to make nixops before 1.6 able to evaluate configurations
# XXX: Remove after nixops has been bumped to a compatible version
nixosVersion = mkOption {
readOnly = true;
internal = true;
type = types.str;
default = config.system.nixos.version;
};
nixosVersionSuffix = mkOption {
readOnly = true;
internal = true;
type = types.str;
default = config.system.nixos.versionSuffix;
};
nixos.version = mkOption {
internal = true;
type = types.str;

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

@ -323,8 +323,9 @@
./services/misc/geoip-updater.nix
./services/misc/gitea.nix
#./services/misc/gitit.nix
./services/misc/gitlab.nix
#./services/misc/gitlab.nix
./services/misc/gitolite.nix
./services/misc/gitweb.nix
./services/misc/gogs.nix
./services/misc/gollum.nix
./services/misc/gpsd.nix
@ -650,6 +651,7 @@
./services/web-servers/mighttpd2.nix
./services/web-servers/minio.nix
./services/web-servers/nginx/default.nix
./services/web-servers/nginx/gitweb.nix
./services/web-servers/phpfpm/default.nix
./services/web-servers/shellinabox.nix
./services/web-servers/tomcat.nix

4
nixos/modules/rename.nix
View File

@ -196,9 +196,9 @@ with lib;
(mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
# misc/version.nix
(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
#(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
(mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ])
(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
#(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
(mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ])
(mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ])
(mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ])

1
nixos/modules/services/mail/dovecot.nix
View File

@ -30,6 +30,7 @@ let
''
default_internal_user = ${cfg.user}
default_internal_group = ${cfg.group}
${optionalString (cfg.mailUser != null) "mail_uid = ${cfg.mailUser}"}
${optionalString (cfg.mailGroup != null) "mail_gid = ${cfg.mailGroup}"}

50
nixos/modules/services/misc/gitweb.nix Normal file
View File

@ -0,0 +1,50 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.gitweb;
in
{
options.services.gitweb = {
projectroot = mkOption {
default = "/srv/git";
type = types.path;
description = ''
Path to git projects (bare repositories) that should be served by
gitweb. Must not end with a slash.
'';
};
extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
Verbatim configuration text appended to the generated gitweb.conf file.
'';
example = ''
$feature{'highlight'}{'default'} = [1];
$feature{'ctags'}{'default'} = [1];
'';
};
gitwebConfigFile = mkOption {
default = pkgs.writeText "gitweb.conf" ''
# path to git projects (<project>.git)
$projectroot = "${cfg.projectroot}";
$highlight_bin = "${pkgs.highlight}/bin/highlight";
${cfg.extraConfig}
'';
type = types.path;
readOnly = true;
internal = true;
};
};
meta.maintainers = with maintainers; [ gnidorah ];
}

16
nixos/modules/services/monitoring/monit.nix
View File

@ -26,16 +26,10 @@ in
environment.systemPackages = [ pkgs.monit ];
environment.etc = [
{
source = pkgs.writeTextFile {
name = "monitrc";
text = config.services.monit.config;
};
target = "monitrc";
mode = "0400";
}
];
environment.etc."monitrc" = {
text = config.services.monit.config;
mode = "0400";
};
systemd.services.monit = {
description = "Pro-active monitoring utility for unix systems";
@ -48,6 +42,8 @@ in
KillMode = "process";
Restart = "always";
};
restartTriggers = [ config.environment.etc."monitrc".source ];
};
};
}

22
nixos/modules/services/networking/zerotierone.nix
View File

@ -7,6 +7,16 @@ let
in
{
options.services.zerotierone.enable = mkEnableOption "ZeroTierOne";
options.services.zerotierone.joinNetworks = mkOption {
default = [];
example = [ "a8a2c3c10c1a68de" ];
type = types.listOf types.str;
description = ''
List of ZeroTier Network IDs to join on startup
'';
};
options.services.zerotierone.package = mkOption {
default = pkgs.zerotierone;
defaultText = "pkgs.zerotierone";
@ -22,12 +32,13 @@ in
path = [ cfg.package ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart =
''
mkdir -p /var/lib/zerotier-one
preStart = ''
mkdir -p /var/lib/zerotier-one/networks.d
chmod 700 /var/lib/zerotier-one
chown -R root:root /var/lib/zerotier-one
'';
'' + (concatMapStrings (netId: ''
touch "/var/lib/zerotier-one/networks.d/${netId}.conf"
'') cfg.joinNetworks);
serviceConfig = {
ExecStart = "${cfg.package}/bin/zerotier-one";
Restart = "always";
@ -38,6 +49,9 @@ in
# ZeroTier does not issue DHCP leases, but some strangers might...
networking.dhcpcd.denyInterfaces = [ "zt0" ];
# ZeroTier receives UDP transmissions on port 9993 by default
networking.firewall.allowedUDPPorts = [ 9993 ];
environment.systemPackages = [ cfg.package ];
};
}

28
nixos/modules/services/web-servers/lighttpd/gitweb.nix
View File

@ -3,12 +3,7 @@
with lib;
let
cfg = config.services.lighttpd.gitweb;
gitwebConfigFile = pkgs.writeText "gitweb.conf" ''
# path to git projects (<project>.git)
$projectroot = "${cfg.projectroot}";
${cfg.extraConfig}
'';
cfg = config.services.gitweb;
in
{
@ -23,26 +18,9 @@ in
'';
};
projectroot = mkOption {
default = "/srv/git";
type = types.path;
description = ''
Path to git projects (bare repositories) that should be served by
gitweb. Must not end with a slash.
'';
};
extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
Verbatim configuration text appended to the generated gitweb.conf file.
'';
};
};
config = mkIf cfg.enable {
config = mkIf config.services.lighttpd.gitweb.enable {
# declare module dependencies
services.lighttpd.enableModules = [ "mod_cgi" "mod_redirect" "mod_alias" "mod_setenv" ];
@ -60,7 +38,7 @@ in
"/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi"
)
setenv.add-environment = (
"GITWEB_CONFIG" => "${gitwebConfigFile}",
"GITWEB_CONFIG" => "${cfg.gitwebConfigFile}",
"HOME" => "${cfg.projectroot}"
)
}

64
nixos/modules/services/web-servers/nginx/gitweb.nix Normal file
View File

@ -0,0 +1,64 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.gitweb;
in
{
options.services.nginx.gitweb = {
enable = mkOption {
default = false;
type = types.bool;
description = ''
If true, enable gitweb in nginx. Access it at http://yourserver/gitweb
'';
};
};
config = mkIf config.services.nginx.gitweb.enable {
systemd.sockets.gitweb = {
description = "GitWeb Listen Socket";
listenStreams = [ "/run/gitweb.sock" ];
socketConfig = {
Accept = "false";
SocketUser = "nginx";
SocketGroup = "nginx";
SocketMode = "0600";
};
wantedBy = [ "sockets.target" ];
};
systemd.services.gitweb = {
description = "GitWeb service";
script = "${git}/share/gitweb/gitweb.cgi --fcgi";
serviceConfig = {
Type = "simple";
StandardInput = "socket";
User = "nginx";
Group = "nginx";
};
};
services.nginx = {
virtualHosts.default = {
locations."/gitweb" = {
root = "${pkgs.git}/share/gitweb";
extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile};
fastcgi_pass unix:/run/gitweb.sock;
'';
};
};
};
};
meta.maintainers = with maintainers; [ gnidorah ];
}

6
nixos/modules/services/x11/desktop-managers/default.nix
View File

@ -87,11 +87,11 @@ in
default = mkOption {
type = types.str;
default = "none";
example = "plasma5";
default = "";
example = "none";
description = "Default desktop manager loaded if none have been chosen.";
apply = defaultDM:
if defaultDM == "none" && cfg.session.list != [] then
if defaultDM == "" && cfg.session.list != [] then
(head cfg.session.list).name
else if any (w: w.name == defaultDM) cfg.session.list then
defaultDM

4
nixos/modules/services/x11/window-managers/default.nix
View File

@ -62,9 +62,7 @@ in
example = "wmii";
description = "Default window manager loaded if none have been chosen.";
apply = defaultWM:
if defaultWM == "none" && cfg.session != [] then
(head cfg.session).name
else if any (w: w.name == defaultWM) cfg.session then
if any (w: w.name == defaultWM) cfg.session then
defaultWM
else
throw "Default window manager (${defaultWM}) not found.";

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

@ -161,15 +161,6 @@ in
'';
};
plainX = mkOption {
type = types.bool;
default = false;
description = ''
Whether the X11 session can be plain (without DM/WM) and
the Xsession script will be used as fallback or not.
'';
};
autorun = mkOption {
type = types.bool;
default = true;
@ -561,11 +552,6 @@ in
+ "${toString (length primaryHeads)} heads set to primary: "
+ concatMapStringsSep ", " (x: x.output) primaryHeads;
})
{ assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX;
message = "Either the desktop manager or the window manager shouldn't be `none`! "
+ "To explicitly allow this, you can also set `services.xserver.plainX` to `true`. "
+ "The `default` value looks for enabled WMs/DMs and select the first one.";
}
];
environment.etc =

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

@ -21,9 +21,9 @@ in rec {
stable = mkStudio {
pname = "android-studio";
#pname = "android-studio-stable"; # TODO: Rename and provide symlink
version = "3.0.1.0"; # "Android Studio 3.0.1"
build = "171.4443003";
sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd";
version = "3.1.0.16"; # "Android Studio 3.1"
build = "173.4670197";
sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy";
meta = with stdenv.lib; {
description = "The Official IDE for Android (stable channel)";
@ -41,9 +41,9 @@ in rec {
beta = mkStudio {
pname = "android-studio-preview";
#pname = "android-studio-beta"; # TODO: Rename and provide symlink
version = "3.1.0.15"; # "Android Studio 3.1 RC 3"
build = "173.4658569";
sha256Hash = "0jvq7k5vhrli41bj2imnsp3z70c7yws3fvs8m873qrjvfgmi5qrq";
version = "3.1.0.16"; # "Android Studio 3.1"
build = "173.4670197";
sha256Hash = "1i0ldyadrcyy5pl9vjpm2k755mf08xi9x5qz8655qsbiajzqf9fy";
meta = stable.meta // {
description = "The Official IDE for Android (beta channel)";

4
pkgs/applications/graphics/shotwell/default.nix
View File

@ -7,13 +7,13 @@
let
pname = "shotwell";
version = "0.28.0";
version = "0.28.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1d797nmlz9gs6ri0h65b76s40ss6ma6h6405xqx03lhg5xni3kmg";
sha256 = "1ywikm5kdsr7q8hklh146x28rzvqkqfjs8kdpw7zcc15ri0dkzya";
};
nativeBuildInputs = [

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

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "2.2.3";
version = "2.3.0";
name = "lyx-${version}";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz";
sha256 = "0mrbr24xbdg25gd7w8g76gpmy0a10nrnz0mz47mdjwi441yfpjjg";
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${name}.tar.xz";
sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri";
};
# LaTeX is used from $PATH, as people often want to have it with extra pkgs

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

@ -10,7 +10,7 @@
with lib;
let
pname = "orca";
version = "3.27.91";
version = "3.28.0";
in buildPythonApplication rec {
name = "${pname}-${version}";
@ -18,7 +18,7 @@ in buildPythonApplication rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0phlkn6ffqncvsg7ph3l4xw388baddav9s4pbkvqqa8myca9g4wg";
sha256 = "1jy2zxs50ah1rg4zgiaj2l2sm1zyyvs37phws0hwmy3xd90ljfc2";
};
patches = [

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

@ -20,12 +20,12 @@
mkDerivation rec {
pname = "yakuake";
version = "3.0.4";
version = "3.0.5";
name = "${pname}-${version}";
src = fetchurl {
url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "1q31p1cqhz8b2bikqjrr7fww86kaq723ib4ys2zwablfa1ybbqhh";
sha256 = "021a9mnghffv2mrdl987mn7wbg8bk6bnf6xz8kn2nwsqxp9kpqh8";
};
buildInputs = [

52
pkgs/applications/networking/compactor/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, gcc, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }:
stdenv.mkDerivation rec {
name = "compactor-${version}";
version = "0.11.0";
src = fetchFromGitHub {
owner = "dns-stats";
repo = "compactor";
rev = "${version}";
sha256 = "1zn6w99xqq5igaz0n89429i78a5pj4nnfn1mm5yv1yfbn1lm0y3l";
};
# cbor-diag, cddl and wireshark-cli are only used for tests.
nativeBuildInputs = [ autoconf automake libtool pkgconfig cbor-diag cddl wireshark-cli ];
buildInputs = [
boost
libpcap
openssl
libtins
lzma
];
patchPhase = ''
patchShebangs test-scripts/
'';
preConfigure = ''
sh autogen.sh
substituteInPlace configure \
--replace "/usr/bin/file" "${file}/bin/file"
'';
CXXFLAGS = "-std=c++11";
configureFlags = [
"--with-boost-libdir=${boost.out}/lib"
"--with-boost=${boost.dev}"
];
doCheck = true;
preCheck = ''
substituteInPlace test-scripts/check-live-pcap.sh \
--replace "/usr/sbin/tcpdump" "${tcpdump}/bin/tcpdump"
'';
meta = with stdenv.lib; {
description = "Tools to capture DNS traffic and record it in C-DNS files";
homepage = http://dns-stats.org/;
license = [ licenses.boost licenses.mpl20 licenses.openssl ];
maintainers = with maintainers; [ fdns ];
platforms = stdenv.lib.platforms.unix;
};
}

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

@ -6,7 +6,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.17.0.2";
version = "8.18.0.6";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@ -57,7 +57,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
sha256 = "0lv8sb49ws8yjh4kkppzqy7sap2b1fw0y13lsc9s45w8mw3l16rp";
sha256 = "193icz1s385d25qzm5vx58h66m4hfwwmkavn0p3w6631gj617hig";
}
else
throw "Skype for linux is not supported on ${stdenv.system}";

21
pkgs/applications/office/abiword/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi
{ stdenv, fetchurl, pkgconfig, gtk3, fribidi
, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
, boost, libxslt, goffice, makeWrapper, iconTheme
, boost, libxslt, goffice, wrapGAppsHook, iconTheme
}:
stdenv.mkDerivation rec {
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "3.0.2";
src = fetchurl {
url = "http://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
url = "https://www.abisource.com/downloads/abiword/${version}/source/${name}.tar.gz";
sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
};
@ -22,19 +22,16 @@ stdenv.mkDerivation rec {
})
];
buildInputs =
[ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme
];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
postFixup = ''
wrapProgram "$out/bin/abiword" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
buildInputs = [
gtk3 librsvg bzip2 fribidi libpng popt
libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme
];
meta = with stdenv.lib; {
description = "Word processing program, similar to Microsoft Word";
homepage = http://www.abisource.com/;
homepage = https://www.abisource.com/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ylwghst ];

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

@ -15,7 +15,7 @@ let
perlPackages.MIMEBase64 perlPackages.AuthenSASL
perlPackages.DigestHMAC
];
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser ];
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
};
in

4
pkgs/applications/video/peek/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "peek-${version}";
version = "1.2.2";
version = "1.3.0";
src = fetchFromGitHub {
owner = "phw";
repo = "peek";
rev = version;
sha256 = "1ihmq914g2h5iw86bigkkblzqimr50yq6z883lzq656xkcayd8gh";
sha256 = "0yizf55rzkm88bfjzwr8yyhm33yqp1mbih2ifwhvnjd1911db0x9";
};
nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ];

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6272b092cf23aa30154cd90ab0f5786c69bceb17.tar.gz";
sha256 = "11qs8whpqkj1l3mhx9ibpwh5pwgwj0xb6r9r8c7wk414vdmaa5mw";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f7d88041d19d251bca6330e9008175875c0ed4a.tar.gz";
sha256 = "18aymxbm7zhmh8jciq2p1hjdfwq5g31s5mmw3lqwaviigcisq22a";
}

2
pkgs/desktops/gnome-3/apps/gnome-music/default.nix
View File

@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
gdk_pixbuf gnome3.defaultIconTheme python3
grilo grilo-plugins libnotify
gnome3.gsettings-desktop-schemas tracker
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
];
propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python requests pygobject3 ];

4
pkgs/desktops/gnome-3/core/evince/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, intltool, libxml2
, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
, poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook
, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
, librsvg, gobjectIntrospection, yelp-tools
, recentListSize ? null # 5 is not enough, allow passing a different number
, supportXPS ? false # Open XML Paper Specification via libgxps
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib gtk3 pango atk gdk_pixbuf libxml2
gnome3.gsettings-desktop-schemas
poppler ghostscriptX djvulibre libspectre
poppler ghostscriptX djvulibre libspectre libarchive
libsecret librsvg gnome3.adwaita-icon-theme
] ++ stdenv.lib.optional supportXPS gnome3.libgxps;

3
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
];
postPatch = ''
cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags"
'';
preFixup = ''
for f in $(find $out/libexec/ -type f -executable); do

4
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-keyring-${version}";
version = "3.28.0.1";
version = "3.28.0.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0qxxc3wx4abb07vmbhqy4gipdzilx3v8yba9hsfzpn8p15prjz6i";
sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8";
};
passthru = {

4
pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
View File

@ -3,13 +3,13 @@
let
pname = "gnome-themes-extra";
version = "3.27.92";
version = "3.28";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "04jwsg9f29vzhcmf146d3rr27c8ldra378m465ahsal9vaaiywcm";
sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw";
};
passthru = {

4
pkgs/desktops/gnome-3/core/libgweather/default.nix
View File

@ -3,7 +3,7 @@
let
pname = "libgweather";
version = "3.28.0";
version = "3.28.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "13z12ra5fhn7xhsrskd7q8dnc2qnd1kylhndg6zlhk0brj6yfjsr";
sha256 = "1qqbfgmlfs0g0v92rdl96v2b44yr3sqj9x7zpqv1nx9aaf486yhm";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ];

4
pkgs/desktops/gnome-3/misc/gpaste/default.nix
View File

@ -2,12 +2,12 @@
, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }:
stdenv.mkDerivation rec {
version = "3.28.0";
version = "3.28.1";
name = "gpaste-${version}";
src = fetchurl {
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
sha256 = "15zigqmhd2x58ml0rl6srgvpx8ms7a3dapphcr75563pacv46mir";
sha256 = "19rdi2syshrk32hqnjh63fm0wargw546j5wlsnsg1axml0x1xww9";
};
nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];

4
pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
View File

@ -2,13 +2,13 @@
let
pname = "libgnome-games-support";
version = "1.4.0";
version = "1.4.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0mhly6yhdc4kvg8ff09a0syabd6igvcmcm577ypfsjkxv92v328x";
sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1";
};
nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty;

4
pkgs/desktops/mate/caja/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "caja-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "05shyqqapqbz4w0gbhx0i3kj6xg7rcj80hkaq7wf5pyj91wmkxqg";
sha256 = "1qqqq3fi1aqjqg36y3v73z4d0bqkx7d5f79i6h9lxyh3s0876v9c";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/libmatekbd/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libmatekbd-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "1n2zphb3g6ai54nfr0r9s06vn3bmm361xpjga88hmq947fvbpx19";
sha256 = "1d80xnbb8w51cv9cziybdxca037lksqkc5bd8wqlyb2p79z77426";
};
nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/desktops/mate/marco/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marco-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "07asf8i15ih6ajkp5yapk720qyssi2cinxwg2z5q5j9m6mxax6lr";
sha256 = "1qnx47aibvl00qaf1jik457cwncxb71pf5pd1m3gdg7ky61ljkm4";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-applets/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mate-applets-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "1jmhswfcbawp9ax5p5h2dj8pyajadjdyxa0ac7ldvh7viv8qy52s";
sha256 = "1a119g49sr7jrd8i32bw7sn2qlsg3sdiwqdb2v36bm2999j261wc";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-calc/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mate-calc-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "03cma6b00chd4026pbnh5i0ckpl8b1l7i1ppvcmbfbx0s3vpbc73";
sha256 = "00k063ia4dclvcpg1q733lbi56533s6mj8bgb1nrgna6y7zw4q87";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-control-center/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mate-control-center-${version}";
version = "1.20.0";
version = "1.20.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "0qq3ln40w7lxa7qvbvbsgdq1c5ybzqw3bw2x4z6y6brl4c77sbh7";
sha256 = "1x40gxrz1hrzbdfl8vbag231g08h45vaky5z827k44qwl6pjd6nl";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-desktop/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mate-desktop-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "0y5172sbj6f4dvimf4pmz74b9cfidbpmnwwb9f6vlc6fa0kp5l1n";
sha256 = "0jxhhf9w6mz8ha6ymgj2alzmiydylg4ngqslkjxx37vvpvms2dyx";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-panel/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mate-panel-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "0cz1pfwvsmrjcd0wa83cid9yjcygla6rhigyr7f75d75kiknlcm7";
sha256 = "1vmvn93apvq6r9m823zyrncbxgsjr4nmigw9k4s4n05z8zd8wy8k";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-power-manager/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mate-power-manager-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "038c2q5kqvqmkp1i93p4pp9x8p6a9i7lyn3nv522mq06qsbynbww";
sha256 = "1s46jvjcrai6xb2k0dy7i121b9ihfl5h3y5809fg9fzrbvw6bafn";
};
buildInputs = [

4
pkgs/desktops/mate/mate-settings-daemon/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "mate-settings-daemon-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "0p4fr2sgkjcjsrmkdy579xmk20dl0sa6az40rzvm6fb2w6693sf5";
sha256 = "1hmc5qfr9yrvrlc1d2mmsqbhv0lhikbadaac18bxjynw9ff857iq";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/pluma/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pluma-${version}";
version = "1.20.0";
version = "1.20.1";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "0w2x270n11rfa321cdlycfhcgncwxqpikjyl3lwmn4vkx8nhgq5f";
sha256 = "09arzypdz6q1zpxd1qqnsn1ykvhmzlf7nylkz2vpwlvnnd3x8ip3";
};
nativeBuildInputs = [

2
pkgs/development/compilers/ghcjs/head.nix
View File

@ -47,4 +47,6 @@ bootPkgs.callPackage ./base.nix {
stage2 = import ./head_stage2.nix;
patches = [ ./ghcjs-head.patch ];
broken = true; # https://hydra.nixos.org/build/71923242
}

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

@ -32,9 +32,13 @@ self: super: {
# compiled on Linux. We provide the name to avoid evaluation errors.
unbuildable = throw "package depends on meta package 'unbuildable'";
# hackage-security's test suite does not compile with Cabal 2.x.
# See https://github.com/haskell/hackage-security/issues/188.
hackage-security = dontCheck super.hackage-security;
# Use the latest version of the Cabal library.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
# Use the latest version, which supports Cabal 2.2.x. Unfortunately, the test
# suite depends on old versions of tasty and QuickCheck.
hackage-security = self.hackage-security_0_5_3_0;
hackage-security_0_5_3_0 = dontCheck super.hackage-security_0_5_3_0;
# Link statically to avoid runtime dependency on GHC.
jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
@ -1008,4 +1012,7 @@ self: super: {
# https://github.com/strake/lenz-template.hs/issues/1
lenz-template = doJailbreak super.lenz-template;
# https://github.com/haskell-hvr/resolv/issues/1
resolv = dontCheck super.resolv;
}

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

@ -173,10 +173,6 @@ self: super: {
# https://github.com/thoughtpolice/hs-ed25519/issues/13
ed25519 = dontCheck super.ed25519;
# https://github.com/well-typed/hackage-security/issues/157
# https://github.com/well-typed/hackage-security/issues/158
hackage-security = dontHaddock (dontCheck super.hackage-security);
# Breaks a dependency cycle between QuickCheck and semigroups
hashable = dontCheck super.hashable;
unordered-containers = dontCheck super.unordered-containers;

13
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View File

@ -41,9 +41,6 @@ self: super: {
prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
});
# cabal-install can use the native Cabal library.
cabal-install = super.cabal-install.override { Cabal = null; };
# jailbreak-cabal doesn't seem to work right with the native Cabal version.
jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
@ -87,12 +84,12 @@ self: super: {
purescript = doJailbreak (super.purescript);
# These packages need Cabal 2.2.x, which is not the default.
distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_0; });
distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: {
Cabal = self.Cabal_2_2_0_0;
Cabal = self.Cabal_2_2_0_1;
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
}));

62
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -8,9 +8,6 @@ self: super: {
inherit (pkgs) llvmPackages;
# Disable GHC 8.4.x core libraries.
#
# Verify against:
# ls /nix/store/wnh3kxra586h9wvxrn62g4lmsri2akds-ghc-8.4.20180115/lib/ghc-8.4.20180115/ -1 | sort | grep -e '-' | grep -Ev '(txt|h|targets)$'
array = null;
base = null;
binary = null;
@ -20,12 +17,11 @@ self: super: {
deepseq = null;
directory = null;
filepath = null;
bin-package-db = null;
ghc-boot = null;
ghc-boot-th = null;
ghc-compact = null;
ghci = null;
ghc-prim = null;
ghci = null;
haskeline = null;
hpc = null;
integer-gmp = null;
@ -33,6 +29,7 @@ self: super: {
parsec = null;
pretty = null;
process = null;
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
@ -121,41 +118,6 @@ self: super: {
## On Hackage:
## Upstreamed, awaiting a Hackage release
cabal-install = overrideCabal super.cabal-install (drv: {
## Setup: Encountered missing dependencies:
## Cabal >=2.0.1.0 && <2.1, base >=4.5 && <4.11
src = pkgs.fetchFromGitHub {
owner = "haskell";
repo = "cabal";
rev = "728ad1a1e066da453ae13ee479629c00d8c2f32d";
sha256 = "0943xpva0fjlx8fanqvb6bg7myim2pki7q8hz3q0ijnf73bgzf7p";
};
prePatch = "cd cabal-install; ";
## Setup: Encountered missing dependencies:
## network >=2.4 && <2.6, resolv >=0.1.1 && <0.2
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ network resolv ]);
});
## Upstreamed, awaiting a Hackage release
hackage-security = overrideCabal super.hackage-security (drv: {
## Setup: Encountered missing dependencies:
## Cabal >=1.14 && <1.26,
## directory >=1.1.0.2 && <1.3,
## time >=1.2 && <1.7
src = pkgs.fetchFromGitHub {
owner = "haskell";
repo = "hackage-security";
rev = "21519f4f572b9547485285ebe44c152e1230fd76";
sha256 = "1ijwmps4pzyhsxfhc8mrnc3ldjvpisnmr457vvhgymwhdrr95k0z";
};
prePatch = "cd hackage-security; ";
## https://github.com/haskell/hackage-security/issues/211
jailbreak = true;
## error: while evaluating ‘overrideCabal’ at nixpkgs://pkgs/development/haskell-modules/lib.nix:37:24, called from /home/deepfire/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix:217:22:
editedCabalFile = null;
});
## Upstreamed, awaiting a Hackage release
haskell-gi = overrideCabal super.haskell-gi (drv: {
## Setup: Encountered missing dependencies:
@ -620,14 +582,12 @@ self: super: {
jailbreak = true;
});
# Fix missing semigroup instance.
data-inttrie = appendPatch super.data-inttrie (pkgs.fetchpatch
{ url = https://github.com/luqui/data-inttrie/pull/5.patch;
sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a";
});
# https://github.com/luqui/data-inttrie/pull/5#issuecomment-377169026
data-inttrie_0_1_3 = doJailbreak super.data-inttrie_0_1_3;
# Older versions don't compile.
brick = self.brick_0_35_1;
data-inttrie = self.data-inttrie_0_1_3;
HaTeX = self.HaTeX_3_19_0_0;
matrix = self.matrix_0_3_6_1;
pandoc = self.pandoc_2_1_3;
@ -642,4 +602,16 @@ self: super: {
# https://github.com/xmonad/xmonad-contrib/issues/235
xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch);
# Contributed by Bertram Felgenhauer <int-e@gmx.de>.
arrows = appendPatch super.arrows (pkgs.fetchpatch {
url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/arrows-0.4.4.1.patch;
sha256 = "0j859vclcfnz8n2mw466mv00kjsa9gdbrppjc1m3b68jbypdmfvr";
});
# Contributed by Bertram Felgenhauer <int-e@gmx.de>.
flexible-defaults = appendPatch super.flexible-defaults (pkgs.fetchpatch {
url = https://raw.githubusercontent.com/lambdabot/lambdabot/ghc-8.4.1/patches/flexible-defaults-0.0.1.2.patch;
sha256 = "1bpsqq80h6nxm04wddgcgyzn0fjfsmhccmqb211jqswv5209znx8";
});
}

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

@ -3043,6 +3043,7 @@ dont-distribute-packages:
aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-ses-easy: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3966,8 +3967,10 @@ dont-distribute-packages:
dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ]
dgim: [ i686-linux, x86_64-linux, x86_64-darwin ]
dgs: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-bash: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-nix: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-to-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-braille: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4745,6 +4748,7 @@ dont-distribute-packages:
github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ]
github-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
githud: [ i686-linux, x86_64-linux, x86_64-darwin ]
gitignore: [ i686-linux, x86_64-linux, x86_64-darwin ]
gitit: [ i686-linux, x86_64-linux, x86_64-darwin ]
gitlib-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4916,6 +4920,7 @@ dont-distribute-packages:
google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-mail-filters: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-maps-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-oauth2-easy: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-search: [ i686-linux, x86_64-linux, x86_64-darwin ]
google-server-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5926,6 +5931,8 @@ dont-distribute-packages:
huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ]
huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ]
hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-kafka-avro: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ]
hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6390,6 +6397,7 @@ dont-distribute-packages:
lens-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-toml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
lenses: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6561,6 +6569,7 @@ dont-distribute-packages:
lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ]
lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ]
ltext: [ i686-linux, x86_64-linux, x86_64-darwin ]
ltk: [ i686-linux, x86_64-linux, x86_64-darwin ]
lua-bc: [ i686-linux, x86_64-linux, x86_64-darwin ]
luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7497,9 +7506,11 @@ dont-distribute-packages:
potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ]
potoki-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ]
potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
potoki-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ]
potoki: [ i686-linux, x86_64-linux, x86_64-darwin ]
potrace-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
powerqueue-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ]
powerqueue-levelmem: [ i686-linux, x86_64-linux, x86_64-darwin ]
powerqueue-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ]
PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7937,6 +7948,7 @@ dont-distribute-packages:
roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ]
roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ]
roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ]
roku-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
roller: [ i686-linux, x86_64-linux, x86_64-darwin ]
RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ]
rope: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8179,6 +8191,7 @@ dont-distribute-packages:
shady-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ]
shake-ats: [ i686-linux, x86_64-linux, x86_64-darwin ]
shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ]
shake-ext: [ i686-linux, x86_64-linux, x86_64-darwin ]
shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ]
shake-pack: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8877,6 +8890,7 @@ dont-distribute-packages:
tracy: [ i686-linux, x86_64-linux, x86_64-darwin ]
traildb: [ i686-linux, x86_64-linux, x86_64-darwin ]
trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ]
transaction: [ i686-linux, x86_64-linux, x86_64-darwin ]
transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ]
transf: [ i686-linux, x86_64-linux, x86_64-darwin ]
transfer-db: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9235,6 +9249,7 @@ dont-distribute-packages:
WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ]
webfinger-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
webkit2gtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ]
webserver: [ i686-linux, x86_64-linux, x86_64-darwin ]
webwire: [ i686-linux, x86_64-linux, x86_64-darwin ]

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -138,7 +138,7 @@ let
(optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
(enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
(enableFeature enableLibraryProfiling "library-profiling")
(optionalString (enableExecutableProfiling || enableLibraryProfiling) "--profiling-detail=${profilingDetail}")
(optionalString ((enableExecutableProfiling || enableLibraryProfiling) && versionOlder "8" ghc.version) "--profiling-detail=${profilingDetail}")
(enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
(enableFeature enableSharedLibraries "shared")
(optionalString (versionAtLeast ghc.version "7.10") (enableFeature doCoverage "coverage"))

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

File diff suppressed because it is too large Load Diff

3
pkgs/development/haskell-modules/lib.nix
View File

@ -162,6 +162,9 @@ rec {
enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; });
disableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = false; });
enableExecutableProfiling = drv: overrideCabal drv (drv: { enableExecutableProfiling = true; });
disableExecutableProfiling = drv: overrideCabal drv (drv: { enableExecutableProfiling = false; });
enableSharedExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = true; });
disableSharedExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = false; });

1
pkgs/development/libraries/dbus/make-system-conf.xsl
View File

@ -27,6 +27,7 @@
<xsl:for-each select="str:tokenize($serviceDirectories)">
<servicedir><xsl:value-of select="." />/share/dbus-1/system-services</servicedir>
<includedir><xsl:value-of select="." />/etc/dbus-1/system.d</includedir>
<includedir><xsl:value-of select="." />/share/dbus-1/system.d</includedir>
</xsl:for-each>
</busconfig>
</xsl:template>

6
pkgs/development/libraries/getdns/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "getdns";
name = "${pname}-${version}";
version = "1.3.0";
version = "1.4.1";
src = fetchurl {
url = "https://getdnsapi.net/releases/${pname}-1-3-0/${pname}-${version}.tar.gz";
sha256 = "920fa2e07c72fd0e5854db1820fa777108009fc5cb702f9aa5155ef58b12adb1";
url = "https://getdnsapi.net/releases/${pname}-1-4-1/${pname}-${version}.tar.gz";
sha256 = "07n5n5m4dnnh2xkh7wrnlx8s8myrvjf2nbs7n5m5nq8gg3f36li4";
};
nativeBuildInputs = [ libtool m4 autoreconfHook automake file ];

6
pkgs/development/libraries/libgringotts/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libgringotts-${version}";
version = "1.1.2";
version = "1.2.1";
src = fetchurl {
url = "http://libgringotts.sourceforge.net/current/${name}.tar.bz2";
sha256 = "1bzfnpf2gwc2bisbrw06s63g9z9v4mh1n9ksqr6pbgj2prz7bvlk";
url = "https://sourceforge.net/projects/gringotts.berlios/files/${name}.tar.bz2";
sha256 = "1ldz1lyl1aml5ci1mpnys8dg6n7khpcs4zpycak3spcpgdsnypm7";
};
nativeBuildInputs = [ pkgconfig ];

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

@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
"-Denable_gstreamer=true"
];
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user";
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file

7
pkgs/development/python-modules/celery/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect,
pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
}:
}:
buildPythonPackage rec {
pname = "celery";
version = "4.1.0";
@ -11,11 +12,11 @@ buildPythonPackage rec {
};
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
preCheck = ''
preCheck = stdenv.lib.optionalString stdenv.isLinux ''
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
LD_PRELOAD=${libredirect}/lib/libredirect.so
'';
postCheck = ''
postCheck = stdenv.lib.optionalString stdenv.isLinux ''
unset NIX_REDIRECTS LD_PRELOAD
'';

20
pkgs/development/python-modules/linode-api/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
isPy3k,
pythonOlder,
lib,
requests,
future,
enum34 }:
enum34,
mock }:
buildPythonPackage rec {
pname = "linode-api";
version = "4.1.2b0"; # NOTE: this is a beta, and the API may change in future versions.
name = "${pname}-${version}";
version = "4.1.8b1"; # NOTE: this is a beta, and the API may change in future versions.
disabled = (pythonOlder "2.7");
@ -22,11 +22,15 @@ buildPythonPackage rec {
sed -i -e '/"enum34",/d' setup.py
'');
doCheck = false; # This library does not have any tests at this point.
doCheck = true;
checkInputs = [ mock ];
src = fetchPypi {
inherit pname version;
sha256 = "19yzyb4sbxib8yxmrqm6d8i0fm8cims56q7kiq2ana26nbcm0gr4";
# Sources from Pypi exclude test fixtures
src = fetchFromGitHub {
rev = "v${version}";
owner = "linode";
repo = "python-linode-api";
sha256 = "0qfqn92fr876dncwbkf2vhm90hnf7lwpg80hzwyzyzwz1hcngvjg";
};
meta = {

2
pkgs/development/tools/cbor-diag/Gemfile Normal file
View File

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'cbor-diag'

19
pkgs/development/tools/cbor-diag/Gemfile.lock Normal file
View File

@ -0,0 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
cbor-diag (0.5.2)
json
treetop (~> 1)
json (2.1.0)
polyglot (0.3.5)
treetop (1.6.10)
polyglot (~> 0.3)
PLATFORMS
ruby
DEPENDENCIES
cbor-diag
BUNDLED WITH
1.14.6

30
pkgs/development/tools/cbor-diag/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib, bundlerApp, ruby }:
bundlerApp {
pname = "cbor-diag";
inherit ruby;
gemdir = ./.;
exes = [
"cbor2diag.rb"
"cbor2json.rb"
"cbor2pretty.rb"
"cbor2yaml.rb"
"diag2cbor.rb"
"diag2pretty.rb"
"json2cbor.rb"
"json2pretty.rb"
"pretty2cbor.rb"
"pretty2diag.rb"
"yaml2cbor.rb"
];
meta = with lib; {
description = "CBOR diagnostic utilities";
homepage = https://github.com/cabo/cbor-diag;
license = with licenses; asl20;
maintainers = with maintainers; [ fdns ];
platforms = platforms.unix;
};
}

36
pkgs/development/tools/cbor-diag/gemset.nix Normal file
View File

@ -0,0 +1,36 @@
{
cbor-diag = {
dependencies = ["json" "treetop"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1";
type = "gem";
};
version = "0.5.2";
};
json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
type = "gem";
};
version = "2.1.0";
};
polyglot = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
type = "gem";
};
version = "0.3.5";
};
treetop = {
dependencies = ["polyglot"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
type = "gem";
};
version = "1.6.10";
};
}

2
pkgs/development/tools/cddl/Gemfile Normal file
View File

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'cddl'

28
pkgs/development/tools/cddl/Gemfile.lock Normal file
View File

@ -0,0 +1,28 @@
GEM
remote: https://rubygems.org/
specs:
abnc (0.1.0)
cbor-diag (0.5.2)
json
treetop (~> 1)
cddl (0.8.5)
abnc
cbor-diag
colorize
json
regexp-examples
colorize (0.8.1)
json (2.1.0)
polyglot (0.3.5)
regexp-examples (1.4.2)
treetop (1.6.10)
polyglot (~> 0.3)
PLATFORMS
ruby
DEPENDENCIES
cddl
BUNDLED WITH
1.14.6

17
pkgs/development/tools/cddl/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ lib, bundlerApp, ruby }:
bundlerApp {
pname = "cddl";
inherit ruby;
gemdir = ./.;
exes = [ "cddl" ];
meta = with lib; {
description = "A parser, generator, and validator for CDDL";
homepage = https://rubygems.org/gems/cddl;
license = with licenses; mit;
maintainers = with maintainers; [ fdns ];
platforms = platforms.unix;
};
}

69
pkgs/development/tools/cddl/gemset.nix Normal file
View File

@ -0,0 +1,69 @@
{
abnc = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "13nvzrk72nj130fs8bq8q3cfm48939rdzh7l31ncj5c4969hrbig";
type = "gem";
};
version = "0.1.0";
};
cbor-diag = {
dependencies = ["json" "treetop"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1";
type = "gem";
};
version = "0.5.2";
};
cddl = {
dependencies = ["abnc" "cbor-diag" "colorize" "json" "regexp-examples"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pg91wrby0qgrdnf089ddy5yy2jalxd3bb9dljj16cpwv4gjx047";
type = "gem";
};
version = "0.8.5";
};
colorize = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
type = "gem";
};
version = "0.8.1";
};
json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
type = "gem";
};
version = "2.1.0";
};
polyglot = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
type = "gem";
};
version = "0.3.5";
};
regexp-examples = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "104f0j0h2x5ijly7kyaj7zz0md65r2c03cpbi5cngm0hs2sr1qkz";
type = "gem";
};
version = "1.4.2";
};
treetop = {
dependencies = ["polyglot"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
type = "gem";
};
version = "1.6.10";
};
}

4
pkgs/development/tools/jbake/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchzip, jre }:
stdenv.mkDerivation rec {
version = "2.5.1";
version = "2.6.0";
name = "jbake-${version}";
src = fetchzip {
url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
sha256 = "1ib5gvz6sl7k0ywx22anhz69i40wc6jj5lxjxj2aa14qf4lrw912";
sha256 = "1k71rz82fwyi51xhyghg8laz794xyz06d5apmxa9psy7yz184ylk";
};
buildInputs = [ jre ];

4
pkgs/development/tools/misc/babeltrace/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:
stdenv.mkDerivation rec {
name = "babeltrace-1.5.4";
name = "babeltrace-1.5.5";
src = fetchurl {
url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
sha256 = "1h8zi7afilbfx4jvdlhhgysj6x01w3799mdk4mdcgax04fch6hwn";
sha256 = "1b78fam1gbsalga5pppn8ka461q35a9svz3mlbv82ssakdw4d4a0";
};
nativeBuildInputs = [ pkgconfig ];

61
pkgs/development/tools/misc/cquery/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ stdenv, fetchFromGitHub, makeWrapper
, cmake, llvmPackages, ncurses }:
let
src = fetchFromGitHub {
owner = "cquery-project";
repo = "cquery";
rev = "e45a9ebbb6d8bfaf8bf1a3135b6faa910afea37e";
sha256 = "049gkqbamq4r2nz9yjcwq369zrmwrikzbhfza2x2vndqzaavq5yg";
fetchSubmodules = true;
};
stdenv = llvmPackages.stdenv;
in
stdenv.mkDerivation rec {
name = "cquery-${version}";
version = "2018-03-25";
inherit src;
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = with llvmPackages; [ clang clang-unwrapped llvm ncurses ];
cmakeFlags = [
"-DSYSTEM_CLANG=ON"
"-DCLANG_CXX=ON"
];
shell = stdenv.shell;
postFixup = ''
# We need to tell cquery where to find the standard library headers.
standard_library_includes="\\\"-isystem\\\", \\\"${if (stdenv.hostPlatform.libc == "glibc") then stdenv.cc.libc.dev else stdenv.cc.libc}/include\\\""
standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\""
export standard_library_includes
wrapped=".cquery-wrapped"
export wrapped
mv $out/bin/cquery $out/bin/$wrapped
substituteAll ${./wrapper} $out/bin/cquery
chmod --reference=$out/bin/$wrapped $out/bin/cquery
'';
doInstallCheck = true;
installCheckPhase = ''
pushd ${src}
$out/bin/cquery --ci --clang-sanity-check && \
$out/bin/cquery --ci --test-unit
'';
meta = with stdenv.lib; {
description = "A c/c++ language server powered by libclang";
homepage = https://github.com/cquery-project/cquery;
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.tobim ];
priority = 3;
};
}

12
pkgs/development/tools/misc/cquery/wrapper Normal file
View File

@ -0,0 +1,12 @@
#! @shell@ -e
initString="--init={\"extraClangArguments\": [@standard_library_includes@"
if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then
read -a cflags_array <<< ${NIX_CFLAGS_COMPILE}
initString+=$(printf ', \"%s\"' "${cflags_array[@]}")
fi
initString+="]}"
exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@"

18
pkgs/development/tools/misc/d-feet/default.nix
View File

@ -2,14 +2,14 @@
, python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }:
let
version = "${major}.13";
major = "0.3";
pname = "d-feet";
version = "0.3.13";
in python3Packages.buildPythonApplication rec {
name = "d-feet-${version}";
name = "${pname}-${version}";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1md3lzs55sg04ds69dbginpxqvgg3qnf1lfx3vmsxph6bbd2y6ll";
};
@ -18,6 +18,14 @@ in python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "dfeet";
versionPolicy = "none";
};
};
meta = {
description = "D-Feet is an easy to use D-Bus debugger";
@ -26,7 +34,7 @@ in python3Packages.buildPythonApplication rec {
and invoke methods on those interfaces.
'';
homepage = https://wiki.gnome.org/action/show/Apps/DFeet;
homepage = https://wiki.gnome.org/Apps/DFeet;
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ ktosiek ];

25
pkgs/development/tools/skopeo/default.nix
View File

@ -1,29 +1,33 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux }:
, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux
, go-md2man }:
with stdenv.lib;
let
version = "0.1.28";
version = "0.1.29";
src = fetchFromGitHub {
rev = "v${version}";
owner = "projectatomic";
repo = "skopeo";
sha256 = "068nwrr3nr27alravcq1sxyhdd5jjr24213vdgn1dqva3885gbi0";
sha256 = "1lhzbyj2mm25x12s7g2jx4v8w19izjwlgx4lml13r5yy1spn65k2";
};
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
goPackagePath = "github.com/projectatomic/skopeo";
in
buildGoPackage rec {
name = "skopeo-${version}";
inherit src;
inherit src goPackagePath;
outputs = [ "bin" "man" "out" ];
goPackagePath = "github.com/projectatomic/skopeo";
excludedPackages = "integration";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ];
buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}";
@ -33,10 +37,17 @@ buildGoPackage rec {
export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib"
'';
postBuild = ''
# depends on buildGoPackage not changing …
pushd ./go/src/${goPackagePath}
make install-docs MANINSTALLDIR="$man"
popd
'';
meta = {
description = "A command line utility for various operations on container images and image repositories";
homepage = https://github.com/projectatomic/skopeo;
maintainers = with stdenv.lib.maintainers; [ vdemeester ];
maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ];
license = stdenv.lib.licenses.asl20;
};
}

1
pkgs/misc/drivers/hplip/default.nix
View File

@ -70,6 +70,7 @@ pythonPackages.buildPythonApplication {
pygobject2
reportlab
usbutils
sip
] ++ stdenv.lib.optionals withQt5 [
pyqt5
];

4
pkgs/os-specific/linux/fatrace/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "fatrace-${version}";
version = "0.12";
version = "0.13";
src = fetchurl {
url = "http://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
sha256 = "0szn86rbbvmjcw192vjhhgc3v99s5lm2kg93gk1yzm6ay831grsh";
sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx";
};
buildInputs = [ python3 which ];

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,13 +3,13 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.30";
version = "4.14.31";
# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0ib6zqn1psffgffmvqmh9x3wdh15yd8z0gwwkamvgwa8xcpv0nvw";
sha256 = "0h30z1dlrr9zdxvqlk5lq5m9db3k6n9ci39mlsjkd5kx4ia8lnyd";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.15.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.15.13";
version = "4.15.14";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1iam2adh6ghzv0lgh60c03pzrhv4axxw6k78xh209v889xdfjbhx";
sha256 = "188nnzcclccka37rnx792b4p41smv9sll9h4glzfg4vwz7y54x2a";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.124";
version = "4.4.125";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0a91phmdpa82s3mqnyw2an3j4v18cksvy1akdyxf5w2byq51qd2r";
sha256 = "0rrq9hwpsz0xjl10rf2c3brlkxq074cq3cr1gqp98na6zazl9xrx";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.90";
version = "4.9.91";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0mbl0d6z8yx7bn5m804kv17bh64pd0w0nc8lls4pw335jx7hkc0v";
sha256 = "0clqndkj24a9752bc8x7cwdrdl38yarpvwx2yqkc98czxi9agjk0";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
View File

@ -3,9 +3,9 @@
with stdenv.lib;
let
version = "4.15.13";
version = "4.15.14";
revision = "a";
sha256 = "0zmamaf600jja3m2i41rysxq0rqixiz1vvd1nf5bd8piqkd8dbvf";
sha256 = "1y5w02gr108098p26l6gq8igrk435ljlqiazxwha6lgajk1rgpv2";
# modVersion needs to be x.y.z, will automatically add .0 if needed
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

6
pkgs/os-specific/linux/phc-intel/default.nix
View File

@ -6,14 +6,14 @@ assert stdenv.lib.versionAtLeast kernel.version "4.10";
let
release = "0.4.0";
revbump = "rev24"; # don't forget to change forum download id...
revbump = "rev25"; # don't forget to change forum download id...
in stdenv.mkDerivation rec {
name = "linux-phc-intel-${version}-${kernel.version}";
version = "${release}-${revbump}";
src = fetchurl {
sha256 = "02b4j8ap1fy09z36pmpplbw4vpwqdi16jyzw5kl0a60ydgxkmrpz";
url = "http://www.linux-phc.org/forum/download/file.php?id=178";
sha256 = "1w91hpphd8i0br7g5qra26jdydqar45zqwq6jq8yyz6l0vb10zlz";
url = "http://www.linux-phc.org/forum/download/file.php?id=194";
name = "phc-intel-pack-${revbump}.tar.bz2";
};

6
pkgs/os-specific/linux/radeontop/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "radeontop-${version}";
version = "2016-10-28";
version = "2018-03-25";
src = fetchFromGitHub {
sha256 = "0y4rl8pm7p22s1ipyb75mlsk9qb6j4rd6nlqb3digmimnyxda1q3";
rev = "v1.0";
sha256 = "0s41xy9nrzxmimkdg23fr86rqcfiw6iqh99zpph0j990l8yzmv9b";
rev = "v1.1";
repo = "radeontop";
owner = "clbr";
};

2
pkgs/os-specific/linux/selinux-sandbox/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "-m 4755" "-m 755"
substituteInPlace sandboxX.sh \
--replace "#!/bin/sh" "#!${bash}/bin/sh" \
--replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \
--replace "/usr/share/sandbox/start" "$out/share/sandbox/start" \
--replace "/usr/bin/cut" "${coreutils}/bin/cut" \
--replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
--replace "secon" "${policycoreutils}/bin/secon"

12
pkgs/os-specific/linux/v4l2loopback/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, fetchurl, kernel, kmod }:
{ stdenv, fetchFromGitHub, kernel, kmod }:
stdenv.mkDerivation rec {
name = "v4l2loopback-${version}-${kernel.version}";
version = "0.9.1";
version = "0.11.0";
src = fetchurl {
url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz";
sha256 = "1crkhxlnskqrfj3f7jmiiyi5m75zmj7n0s26xz07wcwdzdf2p568";
src = fetchFromGitHub {
owner = "umlaeute";
repo = "v4l2loopback";
rev = "v${version}";
sha256 = "1wb5qmy13w8rl4279bwp69s4sb1x5hk5d2n563p1yk8yi567p2az";
};
hardeningDisable = [ "format" "pic" ];

4
pkgs/servers/mail/dovecot/default.nix
View File

@ -8,7 +8,7 @@
}:
stdenv.mkDerivation rec {
name = "dovecot-2.3.0.1";
name = "dovecot-2.3.1";
nativeBuildInputs = [ perl pkgconfig ];
buildInputs =
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://dovecot.org/releases/2.3/${name}.tar.gz";
sha256 = "0lzisrdgrj5qqwjb7bv99mf2aljm568r6g108yisp0s644z2nxxb";
sha256 = "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8";
};
preConfigure = ''

4
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "dovecot-pigeonhole-${version}";
version = "0.5.0.1";
version = "0.5.1";
src = fetchurl {
url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
sha256 = "1lpsdqh9pwqx917z5v23bahhhbrcb3y5ps3l413sli8cn4a6sdan";
sha256 = "0ivmaxic6cygfphvlrvy0xgggydm7j7kjv1ssfqbr08q4rcsmc73";
};
buildInputs = [ dovecot openssl ];

6
pkgs/servers/monitoring/grafana/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
version = "5.0.3";
version = "5.0.4";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";
@ -9,12 +9,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "0508dvkanrfrvdnddjsaz8qm3qbgavznia5hqr8zx3qvq4789hj2";
sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90";
};
srcStatic = fetchurl {
url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
sha256 = "0dzb93vx72sm6iri6c96k3a15zn8mp26pd2r78m6k3nhg8rsrqmm";
sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc";
};
preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

2
pkgs/servers/sql/mysql/5.7.x.nix
View File

@ -60,7 +60,7 @@ self = stdenv.mkDerivation rec {
install -vD $out/lib/*.a -t $static/lib
rm -r $out/mysql-test
rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a
ln -s libmysqlclient.so $out/lib/libmysqlclient_r.so
ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary}
'';
passthru = {

7
pkgs/stdenv/generic/check-meta.nix
View File

@ -174,9 +174,10 @@ let
else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]";
checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else [];
checkPlatform = attrs:
(!(attrs ? meta.platforms) || lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.platforms) &&
(!(attrs ? meta.badPlatforms && lib.any (lib.meta.platformMatch hostPlatform) attrs.meta.badPlatforms));
checkPlatform = attrs: let
anyMatch = lib.any (lib.meta.platformMatch hostPlatform);
in anyMatch (attrs.meta.platforms or lib.platforms.all) &&
! anyMatch (attrs.meta.badPlatforms or []);
# Check if a derivation is valid, that is whether it passes checks for
# e.g brokenness or license.

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "convmv-2.04";
name = "convmv-2.05";
src = fetchurl {
url = "http://www.j3e.de/linux/convmv/${name}.tar.gz";
sha256 = "075xn1ill26hbhg4nl54sp75b55db3ikl7lvhqb9ijvkpi67j6yy";
sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk";
};
preBuild=''

26
pkgs/tools/misc/gsmartcontrol/default.nix
View File

@ -1,18 +1,28 @@
{ fetchurl, stdenv, smartmontools, gtkmm2, libglademm, pkgconfig, pcre }:
{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }:
stdenv.mkDerivation rec {
version="0.8.7";
version="1.1.3";
name = "gsmartcontrol-${version}";
src = fetchurl {
url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh";
url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ smartmontools gtkmm2 libglademm pcre ];
patches = [
./fix-paths.patch
];
#installTargets = "install datainstall";
nativeBuildInputs = [ autoreconfHook gettext pkgconfig wrapGAppsHook ];
buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ];
enableParallelBuilding = true;
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}"
)
'';
meta = {
description = "Hard disk drive health inspection tool";
@ -25,7 +35,7 @@ stdenv.mkDerivation rec {
It allows you to inspect the drive's SMART data to determine its health,
as well as run various tests on it.
'';
homepage = http://gsmartcontrol.sourceforge.net/;
homepage = https://gsmartcontrol.sourceforge.io/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [qknight];
platforms = with stdenv.lib.platforms; linux;

58
pkgs/tools/misc/gsmartcontrol/fix-paths.patch Normal file
View File

@ -0,0 +1,58 @@
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -475,6 +475,7 @@
AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \
+ data/org.gsmartcontrol.policy \
data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \
debian.dist/changelog \
src/gsc_winres.rc src/gsmartcontrol.exe.manifest \
diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in
--- a/data/gsmartcontrol-root.in
+++ b/data/gsmartcontrol-root.in
@@ -8,7 +8,7 @@
# Run gsmartcontrol with root, asking for root password first.
# export GSMARTCONTROL_SU to override a su command (e.g. "kdesu -c").
-EXEC_BIN="@prefix@/sbin/gsmartcontrol";
+EXEC_BIN="@prefix@/bin/gsmartcontrol";
prog_name="gsmartcontrol"
@@ -118,7 +118,7 @@
# Add @prefix@/sbin as well (freebsd seems to require it).
# Note that beesu won't show a GUI login box if /usr/sbin is before /usr/bin,
# so add it first as well.
-EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/sbin";
+EXTRA_PATHS="/usr/bin:/usr/sbin:/usr/local/sbin:@prefix@/bin";
export PATH="$EXTRA_PATHS:$PATH"
diff --git a/data/org.gsmartcontrol.policy b/data/org.gsmartcontrol.policy.in
rename from data/org.gsmartcontrol.policy
rename to data/org.gsmartcontrol.policy.in
--- a/data/org.gsmartcontrol.policy
+++ b/data/org.gsmartcontrol.policy.in
@@ -12,7 +12,7 @@
<allow_inactive>auth_admin</allow_inactive>
<allow_active>auth_admin</allow_active>
</defaults>
- <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gsmartcontrol</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">@prefix@/bin/gsmartcontrol</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@
# endif
-sbin_PROGRAMS = gsmartcontrol
+bin_PROGRAMS = gsmartcontrol
gsmartcontrol_LDADD = $(top_builddir)/src/applib/libapplib.a \
$(top_builddir)/src/libdebug/libdebug.a \

7
pkgs/tools/misc/txt2man/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, coreutils, gawk }:
stdenv.mkDerivation rec {
name = "txt2man-1.5.6";
name = "txt2man-${version}";
version = "1.6.0";
src = fetchurl {
url = "http://mvertes.free.fr/download/${name}.tar.gz";
sha256 = "0ammlb4pwc4ya1kc9791vjl830074zrpfcmzc18lkcqczp2jaj4q";
url = "https://github.com/mvertes/txt2man/archive/${name}.tar.gz";
sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn";
};
preConfigure = ''

4
pkgs/tools/security/spectre-meltdown-checker/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "spectre-meltdown-checker-${version}";
version = "0.35";
version = "0.36";
src = fetchFromGitHub {
owner = "speed47";
repo = "spectre-meltdown-checker";
rev = "v${version}";
sha256 = "0pzs6iznrar5zkg92gsh6d0zhdi715zwqcb8hh1aaykx9igjb1xw";
sha256 = "0pcw300hizzm130d0ip7j0ivf53sjlv6qzsdk9l68bj2lpx9n3kd";
};
prePatch = ''

4
pkgs/tools/system/facter/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "facter-${version}";
version = "3.10.0";
version = "3.11.0";
src = fetchFromGitHub {
sha256 = "0qj23n5h98iirwhnjpcqzmirqf92sjd8mws5dky0pap359j6w792";
sha256 = "15cqn09ng23k6a70xvxbpjjqlxw46838k7qr9216lcvxwl2banih";
rev = version;
repo = "facter";
owner = "puppetlabs";

6
pkgs/tools/text/untex/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "untex-${version}";
version = "1.2";
version = "1.3";
src = fetchurl {
url = "https://www.ctan.org/tex-archive/support/untex/${name}.tar.gz";
sha256 = "07p836jydd5yjy905m5ylnnac1h4cc4jsr41panqb808mlsiwmmy";
url = "ftp://ftp.thp.uni-duisburg.de/pub/source/${name}.tar.gz";
sha256 = "1jww43pl9qvg6kwh4h8imp966fzd62dk99pb4s93786lmp3kgdjv";
};
hardeningDisable = [ "format" ];

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

@ -975,8 +975,12 @@ with pkgs;
image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { };
cbor-diag = callPackage ../development/tools/cbor-diag { };
ccnet = callPackage ../tools/networking/ccnet { };
cddl = callPackage ../development/tools/cddl { };
cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
ckbcomp = callPackage ../tools/X11/ckbcomp { };
@ -1003,6 +1007,8 @@ with pkgs;
colpack = callPackage ../applications/science/math/colpack { };
compactor = callPackage ../applications/networking/compactor { };
consul = callPackage ../servers/consul { };
consul-ui = callPackage ../servers/consul/ui.nix { };
@ -2694,9 +2700,7 @@ with pkgs;
sbsigntool = callPackage ../tools/security/sbsigntool { };
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
inherit (gnome2) libglademm;
};
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
gssdp = callPackage ../development/libraries/gssdp {
inherit (gnome2) libsoup;
@ -7656,6 +7660,10 @@ with pkgs;
cppcheck = callPackage ../development/tools/analysis/cppcheck { };
cquery = callPackage ../development/tools/misc/cquery {
llvmPackages = llvmPackages_6;
};
creduce = callPackage ../development/tools/misc/creduce {
inherit (perlPackages) perl
ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey;
@ -14583,7 +14591,6 @@ with pkgs;
};
abiword = callPackage ../applications/office/abiword {
inherit (gnome2) libglade libgnomecanvas;
iconTheme = gnome3.defaultIconTheme;
};

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