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

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

Conflicts:
	pkgs/os-specific/linux/cpupower/default.nix
This commit is contained in:
Tuomas Tynkkynen 2018-02-06 04:11:23 +02:00
parent c08e4b9102 da82aff2b0
commit 9548028a22
78 changed files with 6199 additions and 3149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -258,6 +258,7 @@
gavin = "Gavin Rogers <gavin@praxeology.co.uk>"; gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
gebner = "Gabriel Ebner <gebner@gebner.org>"; gebner = "Gabriel Ebner <gebner@gebner.org>";
geistesk = "Alvar Penning <post@0x21.biz>"; geistesk = "Alvar Penning <post@0x21.biz>";
genesis = "Ronan Bignaux <ronan@aimao.org>";
georgewhewell = "George Whewell <georgerw@gmail.com>"; georgewhewell = "George Whewell <georgerw@gmail.com>";
gilligan = "Tobias Pflug <tobias.pflug@gmail.com>"; gilligan = "Tobias Pflug <tobias.pflug@gmail.com>";
giogadi = "Luis G. Torres <lgtorres42@gmail.com>"; giogadi = "Luis G. Torres <lgtorres42@gmail.com>";

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

@ -182,6 +182,20 @@ following incompatible changes:</para>
<literal>lib.mkOverride</literal> can be used. <literal>lib.mkOverride</literal> can be used.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The following changes apply if the <literal>stateVersion</literal> is changed to 18.03 or higher.
For <literal>stateVersion = "17.09"</literal> or lower the old behavior is preserved.
</para>
<itemizedlist>
<listitem>
<para>
<literal>matrix-synapse</literal> uses postgresql by default instead of sqlite.
Migration instructions can be found <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite"> here </link>.
</para>
</listitem>
</itemizedlist>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

10
nixos/modules/programs/shadow.nix
View File

@ -26,8 +26,9 @@ let
# Ensure privacy for newly created home directories. # Ensure privacy for newly created home directories.
UMASK 077 UMASK 077
# Uncomment this to allow non-root users to change their account # Uncomment this and install chfn SUID to allow non-root
#information. This should be made configurable. # users to change their account GECOS information.
# This should be made configurable.
#CHFN_RESTRICT frwh #CHFN_RESTRICT frwh
''; '';
@ -103,13 +104,12 @@ in
security.wrappers = { security.wrappers = {
su.source = "${pkgs.shadow.su}/bin/su"; su.source = "${pkgs.shadow.su}/bin/su";
chfn.source = "${pkgs.shadow.out}/bin/chfn"; sg.source = "${pkgs.shadow.out}/bin/sg";
newgrp.source = "${pkgs.shadow.out}/bin/newgrp";
newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap"; newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";
newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap"; newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";
} // (if config.users.mutableUsers then { } // (if config.users.mutableUsers then {
passwd.source = "${pkgs.shadow.out}/bin/passwd"; passwd.source = "${pkgs.shadow.out}/bin/passwd";
sg.source = "${pkgs.shadow.out}/bin/sg";
newgrp.source = "${pkgs.shadow.out}/bin/newgrp";
} else {}); } else {});
}; };
} }

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

@ -104,7 +104,7 @@ let
}; };
mailboxConfig = mailbox: '' mailboxConfig = mailbox: ''
mailbox ${mailbox.name} { mailbox "${mailbox.name}" {
auto = ${toString mailbox.auto} auto = ${toString mailbox.auto}
'' + optionalString (mailbox.specialUse != null) '' '' + optionalString (mailbox.specialUse != null) ''
special_use = \${toString mailbox.specialUse} special_use = \${toString mailbox.specialUse}

61
nixos/modules/services/misc/matrix-synapse.nix
View File

@ -4,6 +4,8 @@ with lib;
let let
cfg = config.services.matrix-synapse; cfg = config.services.matrix-synapse;
pg = config.services.postgresql;
usePostgresql = cfg.database_type == "psycopg2";
logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig;
mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}''; mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}'';
mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}'';
@ -38,7 +40,7 @@ database: {
name: "${cfg.database_type}", name: "${cfg.database_type}",
args: { args: {
${concatStringsSep ",\n " ( ${concatStringsSep ",\n " (
mapAttrsToList (n: v: "\"${n}\": ${v}") cfg.database_args mapAttrsToList (n: v: "\"${n}\": ${builtins.toJSON v}") cfg.database_args
)} )}
} }
} }
@ -155,7 +157,7 @@ in {
tls_certificate_path = mkOption { tls_certificate_path = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
example = "/var/lib/matrix-synapse/homeserver.tls.crt"; example = "${cfg.dataDir}/homeserver.tls.crt";
description = '' description = ''
PEM encoded X509 certificate for TLS. PEM encoded X509 certificate for TLS.
You can replace the self-signed certificate that synapse You can replace the self-signed certificate that synapse
@ -167,7 +169,7 @@ in {
tls_private_key_path = mkOption { tls_private_key_path = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
example = "/var/lib/matrix-synapse/homeserver.tls.key"; example = "${cfg.dataDir}/homeserver.tls.key";
description = '' description = ''
PEM encoded private key for TLS. Specify null if synapse is not PEM encoded private key for TLS. Specify null if synapse is not
speaking TLS directly. speaking TLS directly.
@ -176,7 +178,7 @@ in {
tls_dh_params_path = mkOption { tls_dh_params_path = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
example = "/var/lib/matrix-synapse/homeserver.tls.dh"; example = "${cfg.dataDir}/homeserver.tls.dh";
description = '' description = ''
PEM dh parameters for ephemeral keys PEM dh parameters for ephemeral keys
''; '';
@ -184,6 +186,7 @@ in {
server_name = mkOption { server_name = mkOption {
type = types.str; type = types.str;
example = "example.com"; example = "example.com";
default = config.networking.hostName;
description = '' description = ''
The domain name of the server, with optional explicit port. The domain name of the server, with optional explicit port.
This is used by remote servers to connect to this server, This is used by remote servers to connect to this server,
@ -339,16 +342,39 @@ in {
}; };
database_type = mkOption { database_type = mkOption {
type = types.enum [ "sqlite3" "psycopg2" ]; type = types.enum [ "sqlite3" "psycopg2" ];
default = "sqlite3"; default = if versionAtLeast config.system.stateVersion "18.03"
then "psycopg2"
else "sqlite3";
description = '' description = ''
The database engine name. Can be sqlite or psycopg2. The database engine name. Can be sqlite or psycopg2.
''; '';
}; };
create_local_database = mkOption {
type = types.bool;
default = true;
description = ''
Whether to create a local database automatically.
'';
};
database_name = mkOption {
type = types.str;
default = "matrix-synapse";
description = "Database name.";
};
database_user = mkOption {
type = types.str;
default = "matrix-synapse";
description = "Database user name.";
};
database_args = mkOption { database_args = mkOption {
type = types.attrs; type = types.attrs;
default = { default = {
database = "${cfg.dataDir}/homeserver.db"; sqlite3 = { database = "${cfg.dataDir}/homeserver.db"; };
psycopg2 = {
user = cfg.database_user;
database = cfg.database_name;
}; };
}."${cfg.database_type}";
description = '' description = ''
Arguments to pass to the engine. Arguments to pass to the engine.
''; '';
@ -623,15 +649,36 @@ in {
gid = config.ids.gids.matrix-synapse; gid = config.ids.gids.matrix-synapse;
} ]; } ];
services.postgresql.enable = mkIf usePostgresql (mkDefault true);
systemd.services.matrix-synapse = { systemd.services.matrix-synapse = {
description = "Synapse Matrix homeserver"; description = "Synapse Matrix homeserver";
after = [ "network.target" ]; after = [ "network.target" "postgresql.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = '' preStart = ''
${cfg.package}/bin/homeserver \ ${cfg.package}/bin/homeserver \
--config-path ${configFile} \ --config-path ${configFile} \
--keys-directory ${cfg.dataDir} \ --keys-directory ${cfg.dataDir} \
--generate-keys --generate-keys
'' + optionalString (usePostgresql && cfg.create_local_database) ''
if ! test -e "${cfg.dataDir}/db-created"; then
${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
${pg.package}/bin/createuser \
--login \
--no-createdb \
--no-createrole \
--encrypted \
${cfg.database_user}
${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
${pg.package}/bin/createdb \
--owner=${cfg.database_user} \
--encoding=UTF8 \
--lc-collate=C \
--lc-ctype=C \
--template=template0 \
${cfg.database_name}
touch "${cfg.dataDir}/db-created"
fi
''; '';
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";

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

@ -47,6 +47,18 @@ in
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''} ''}
if [ -f "$HOME/.config/kdeglobals" ]
then
# Remove extraneous font style names.
# See also: https://phabricator.kde.org/D9070
${getBin pkgs.gnused}/bin/sed -i "$HOME/.config/kdeglobals" \
-e '/^fixed=/ s/,Regular$//' \
-e '/^font=/ s/,Regular$//' \
-e '/^menuFont=/ s/,Regular$//' \
-e '/^smallestReadableFont=/ s/,Regular$//' \
-e '/^toolBarFont=/ s/,Regular$//'
fi
exec "${getBin plasma5.plasma-workspace}/bin/startkde" exec "${getBin plasma5.plasma-workspace}/bin/startkde"
''; '';
}; };

1
nixos/release.nix
View File

@ -292,6 +292,7 @@ in rec {
tests.login = callTest tests/login.nix {}; tests.login = callTest tests/login.nix {};
#tests.logstash = callTest tests/logstash.nix {}; #tests.logstash = callTest tests/logstash.nix {};
tests.mathics = callTest tests/mathics.nix {}; tests.mathics = callTest tests/mathics.nix {};
tests.matrix-synapse = callTest tests/matrix-synapse.nix {};
tests.mesos = callTest tests/mesos.nix {}; tests.mesos = callTest tests/mesos.nix {};
tests.misc = callTest tests/misc.nix {}; tests.misc = callTest tests/misc.nix {};
tests.mongodb = callTest tests/mongodb.nix {}; tests.mongodb = callTest tests/mongodb.nix {};

30
nixos/tests/matrix-synapse.nix Normal file
View File

@ -0,0 +1,30 @@
import ./make-test.nix ({ pkgs, ... } : {
name = "matrix-synapse";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ corngood ];
};
nodes = {
server_postgres = args: {
services.matrix-synapse.enable = true;
services.matrix-synapse.database_type = "psycopg2";
};
server_sqlite = args: {
services.matrix-synapse.enable = true;
services.matrix-synapse.database_type = "sqlite3";
};
};
testScript = ''
startAll;
$server_postgres->waitForUnit("matrix-synapse.service");
$server_postgres->waitUntilSucceeds("curl -Lk https://localhost:8448/");
$server_postgres->requireActiveUnit("postgresql.service");
$server_sqlite->waitForUnit("matrix-synapse.service");
$server_sqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/");
$server_sqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]");
'';
})

6
pkgs/applications/audio/normalize/default.nix
View File

@ -1,14 +1,16 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, libmad }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "normalize-${version}"; name = "normalize-${version}";
version = "0.7.7"; version = "0.7.7";
src = fetchurl { src = fetchurl {
url = "mirror://savannah/normalize/normalize-0.7.7.tar.gz"; url = "mirror://savannah/normalize/${name}.tar.gz";
sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"; sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0";
}; };
buildInputs = [ libmad ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://normalize.nongnu.org/; homepage = http://normalize.nongnu.org/;
description = "Audio file normalizer"; description = "Audio file normalizer";

20
pkgs/applications/editors/jetbrains/default.nix
View File

@ -234,12 +234,12 @@ in
clion = buildClion rec { clion = buildClion rec {
name = "clion-${version}"; name = "clion-${version}";
version = "2017.3.2"; /* updated by script */ version = "2017.3.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform"; description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "0lv0nwfgm6h67mxhh0a2154ym7wcbm1qp3k1k1i00lg0lwig1rcw"; /* updated by script */ sha256 = "0j090863y68ppw34qkldm8h4lpbhalhqn70gb0ifj9bglf17503d"; /* updated by script */
}; };
wmClass = "jetbrains-clion"; wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@ -273,12 +273,12 @@ in
idea-community = buildIdea rec { idea-community = buildIdea rec {
name = "idea-community-${version}"; name = "idea-community-${version}";
version = "2017.3.3"; /* updated by script */ version = "2017.3.4"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "1wxaz25609wri2d91s9wy00gngplyjg7gzix3mzdhgysm00qizf1"; /* updated by script */ sha256 = "15qsfirzmmjhwzkhx36zr4n0z5lhs021n2n3wim01g309ymr4gl9"; /* updated by script */
}; };
wmClass = "jetbrains-idea-ce"; wmClass = "jetbrains-idea-ce";
update-channel = "IDEA_Release"; update-channel = "IDEA_Release";
@ -286,12 +286,12 @@ in
idea-ultimate = buildIdea rec { idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}"; name = "idea-ultimate-${version}";
version = "2017.3.3"; /* updated by script */ version = "2017.3.4"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
sha256 = "01d5a6m927q9bnjlpz8va8bfjnj52k8q6i3im5ygj6lwadbzawyf"; /* updated by script */ sha256 = "0f937s6zc1sv0gdlxf9kkc8l8rg78a5mxsfr2laab0g37rfy8c99"; /* updated by script */
}; };
wmClass = "jetbrains-idea"; wmClass = "jetbrains-idea";
update-channel = "IDEA_Release"; update-channel = "IDEA_Release";
@ -299,12 +299,12 @@ in
phpstorm = buildPhpStorm rec { phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}"; name = "phpstorm-${version}";
version = "2017.3.3"; /* updated by script */ version = "2017.3.4"; /* updated by script */
description = "Professional IDE for Web and PHP developers"; description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "0mk4d2c41qvfz7sqxqw7adak86pm95wvhzxrfg32y01r5i5q0av7"; /* updated by script */ sha256 = "1hxkn0p0lp021bbysypwn8s69iggb76iwq38jv5a1ql7v5r1nwvd"; /* updated by script */
}; };
wmClass = "jetbrains-phpstorm"; wmClass = "jetbrains-phpstorm";
update-channel = "PS2017.3"; update-channel = "PS2017.3";
@ -364,12 +364,12 @@ in
webstorm = buildWebStorm rec { webstorm = buildWebStorm rec {
name = "webstorm-${version}"; name = "webstorm-${version}";
version = "2017.3.3"; /* updated by script */ version = "2017.3.4"; /* updated by script */
description = "Professional IDE for Web and JavaScript development"; description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "1fhs13944928rqcqbv8d29qm1y0zzry4drr9gqqmj814y2vkbpnl"; /* updated by script */ sha256 = "0d5whqa6c76l6g5yj0yq8a3k1x6d9kxwnac1dwsiy5dbr5jk0cyj"; /* updated by script */
}; };
wmClass = "jetbrains-webstorm"; wmClass = "jetbrains-webstorm";
update-channel = "WS_Release"; update-channel = "WS_Release";

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

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.15.0"; version = "3.16.0";
name = "calibre-${version}"; name = "calibre-${version}";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
sha256 = "1zvk499g3ddl82f6655ddqzl7r62hj1fq3qjsxpn07an2lizail7"; sha256 = "0dsnn974lfd6xbnyjhgxl2hd07kjhm1w9plqi28mx8nqa8bwqira";
}; };
patches = [ patches = [

11
pkgs/applications/misc/gnuradio/wrapper.nix
View File

@ -1,7 +1,6 @@
{ stdenv, gnuradio, makeWrapper, python { stdenv, gnuradio, makeWrapper, python, extraPackages ? [] }:
, extraPackages ? [] }:
with stdenv.lib; with { inherit (stdenv.lib) appendToName makeSearchPath; };
stdenv.mkDerivation { stdenv.mkDerivation {
name = (appendToName "with-packages" gnuradio).name; name = (appendToName "with-packages" gnuradio).name;
@ -11,13 +10,15 @@ stdenv.mkDerivation {
mkdir -p $out/bin mkdir -p $out/bin
ln -s "${gnuradio}"/bin/* $out/bin/ ln -s "${gnuradio}"/bin/* $out/bin/
for file in $(find $out/bin -type f -executable); do for file in $(find -L $out/bin -type f); do
if test -x "$(readlink -f "$file")"; then
wrapProgram "$file" \ wrapProgram "$file" \
--prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
(map (path: "$(toPythonPath ${path})") extraPackages)} \ (map (path: "$(toPythonPath ${path})") extraPackages)} \
--prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
fi
done done
''; '';
inherit (gnuradio) meta; inherit (gnuradio) meta;
} }

10
pkgs/applications/misc/synapse/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme, gobjectIntrospection , keybinder3, json_glib, zeitgeist, vala_0_38, hicolor_icon_theme, gobjectIntrospection
}: }:
let let
version = "0.2.99.2"; version = "0.2.99.3";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "synapse-${version}"; name = "synapse-${version}";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz";
sha256 = "04cnsmwf9xa52dh7rpb4ia715c0ls8jg1p7llc9yf3lbg1m0bvzv"; sha256 = "0rwd42164xqfi40r13yr29cx6zy3bckgxk00y53b376nl5yqacvy";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig intltool vala_0_34 pkgconfig gettext vala_0_38
# For setup hook # For setup hook
gobjectIntrospection gobjectIntrospection
]; ];

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
beta = { beta = {
sha256 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; sha256 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl";
sha256bin64 = "18833sqqfssjvcmf6v7wj9h9gsc07wr09cms5c0k7f8v9dqysc7r"; sha256bin64 = "0i1g0hv2vji8jx9c973x8nr1ynzsvqjaqcncxj77x6vj9wp0v41p";
version = "64.0.3282.119"; version = "64.0.3282.140";
}; };
dev = { dev = {
sha256 = "04vrcsvlanjljah3pbgfz49ygwr9i6zymr1a09kldrnykv770c5l"; sha256 = "1b3gyj55xyqsb439szisfn8c4mnpws3pfzrndrl5kgdd239qrfqz";
sha256bin64 = "016s8lh94i0m3zyld32vzqfw1c0s97sa143dyww7x26b2mp93lcc"; sha256bin64 = "1hmkinzn4gpikjfd8c9j30px3i0x6y8dddn9pyvjzsk6dzfcvknz";
version = "65.0.3322.3"; version = "65.0.3325.31";
}; };
stable = { stable = {
sha256 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; sha256 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl";
sha256bin64 = "18a61myi3wlrk9zr7jjad1zi8k0ls9cnl2nyhjibjlwiz3npwbm5"; sha256bin64 = "1zsgcnilip9rxbs51xvnchp87gh4fmgxzrcf9dhfrnldhji17ikj";
version = "64.0.3282.119"; version = "64.0.3282.140";
}; };
} }

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

@ -40,13 +40,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "signal-desktop-${version}"; name = "signal-desktop-${version}";
version = "1.1.0"; version = "1.3.0";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1v0ydfdgcnkh6rk7gmqbjrzpz56mw2gjmakz58gpn167ln7l1vkl"; sha256 = "047l3yyqvzyi5969r0n9cwdarsxfbssj415ysh57w7vkdp01axsr";
} }
else else
throw "Signal for Desktop is not currently supported on ${stdenv.system}"; throw "Signal for Desktop is not currently supported on ${stdenv.system}";

8
pkgs/applications/science/logic/symbiyosys/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "symbiyosys-${version}"; name = "symbiyosys-${version}";
version = "2018.01.10"; version = "2018.02.04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cliffordwolf"; owner = "yosyshq";
repo = "symbiyosys"; repo = "symbiyosys";
rev = "25936009bbc2cffd289c607ddf42a578527aa59c"; rev = "236f6412c1c1afe95d752eaf907f66f19c343134";
sha256 = "06idd8vbn4s2k6bja4f6lxjc4qwgbak2fhfxj8f18ki1xb3yqfh6"; sha256 = "06bsvvkn9yhz9jvgf7a6pf407ab9m5qrr42niww666z967xdw4p0";
}; };
buildInputs = [ python3 yosys ]; buildInputs = [ python3 yosys ];

17
pkgs/applications/science/math/sage/spkg-giac.patch
View File

@ -1,10 +1,19 @@
--- old/build/pkgs/giac/spkg-install 2017-07-21 14:10:00.000000000 -0500 diff --git a/build/pkgs/giac/spkg-install b/build/pkgs/giac/spkg-install
+++ new/build/pkgs/giac/spkg-install 2017-10-15 15:55:55.321237645 -0500 index bdd8df6cb8..3fd7a3ef8a 100644
@@ -4,6 +4,8 @@ --- a/build/pkgs/giac/spkg-install
+++ b/build/pkgs/giac/spkg-install
@@ -2,6 +2,15 @@
## Giac ## Giac
########################################### ###########################################
+find . -type f -exec sed -e 's@/bin/cp@cp@g' -i '{}' ';' && echo "Patching input parser" && find . -iname 'input_parser.cc' +# Fix hardcoded paths, while making sure to only update timestamps of actually
+# changed files (otherwise confuses make)
+grep -rlF '/bin/cp' . | while read file
+do
+ sed -e 's@/bin/cp@cp@g' -i "$file"
+done
+
+# Fix input parser syntax
+sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc' +sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc'
if [ "$SAGE_LOCAL" = "" ]; then if [ "$SAGE_LOCAL" = "" ]; then

11
pkgs/applications/science/math/sage/spkg-git.patch
View File

@ -1,12 +1,17 @@
diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install
index 8469cb58c2..d0dc9a1db9 100755 index 87874de3d8..b0906245fa 100644
--- a/build/pkgs/git/spkg-install --- a/build/pkgs/git/spkg-install
+++ b/build/pkgs/git/spkg-install +++ b/build/pkgs/git/spkg-install
@@ -35,6 +35,8 @@ fi @@ -33,6 +33,13 @@ fi
cd src cd src
+find . -type f -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' +# Fix hardcoded paths, while making sure to only update timestamps of actually
+# changed files (otherwise confuses make)
+grep -rlF '/usr/bin/perl' . | while read file
+do
+ sed -e 's@/usr/bin/perl@perl@g' -i "$file"
+done
+ +
# We don't want to think about Fink or Macports # We don't want to think about Fink or Macports
export NO_FINK=1 export NO_FINK=1

16
pkgs/applications/science/math/sage/spkg-singular.patch
View File

@ -1,11 +1,17 @@
--- old/build/pkgs/singular/spkg-install 2017-10-15 10:35:41.826540964 -0500 diff --git a/build/pkgs/singular/spkg-install b/build/pkgs/singular/spkg-install
+++ new/build/pkgs/singular/spkg-install 2017-10-15 10:36:40.613743443 -0500 index 8caafb1699..3c34e6608a 100644
@@ -4,6 +4,9 @@ --- a/build/pkgs/singular/spkg-install
+++ b/build/pkgs/singular/spkg-install
@@ -2,6 +2,13 @@
## Singular ## Singular
########################################### ###########################################
+find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' +# Fix hardcoded paths, while making sure to only update timestamps of actually
+#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing +# changed files (otherwise confuses make)
+grep -rlF '/bin/rm' . | while read file
+do
+ sed -e 's@/bin/rm@rm@g' -i "$file"
+done
+ +
if [ -z "$SAGE_LOCAL" ]; then if [ -z "$SAGE_LOCAL" ]; then
echo >&2 "Error: SAGE_LOCAL undefined -- exiting..." echo >&2 "Error: SAGE_LOCAL undefined -- exiting..."

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

@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }: { stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }:
let let
version = "0.1.0"; version = "0.1.1";
in in
buildGoPackage { buildGoPackage {
name = "grv-${version}"; name = "grv-${version}";
@ -16,7 +16,7 @@ buildGoPackage {
owner = "rgburke"; owner = "rgburke";
repo = "grv"; repo = "grv";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qd9kq8l29v3gwwls98933bk0rdw44mrbnqgb1r6hm9m6vzjfcn3"; sha256 = "0q9gvxfw48d4kjpb2jx7lg577vazjg0n961y6ija5saja5n16mk2";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "src-${version}"; name = "src-${version}";
version = "1.13"; version = "1.17";
src = fetchurl { src = fetchurl {
url = "http://www.catb.org/~esr/src/${name}.tar.gz"; url = "http://www.catb.org/~esr/src/${name}.tar.gz";
sha256 = "0l13ld8nxm1c720ns22lyx3q1bq2c2zn78vi5w92b7nl6p2nncy8"; sha256 = "17885hpq8nxhqzwl50nrgdk1q9dq4cxjxldgkk8shdf08s5hcqhk";
}; };
buildInputs = [ python rcs git makeWrapper ]; buildInputs = [ python rcs git makeWrapper ];

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

@ -29,13 +29,13 @@ let
optional = stdenv.lib.optional; optional = stdenv.lib.optional;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "obs-studio-${version}"; name = "obs-studio-${version}";
version = "20.1.3"; version = "21.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jp9000"; owner = "jp9000";
repo = "obs-studio"; repo = "obs-studio";
rev = "${version}"; rev = "${version}";
sha256 = "0qdpa2xxiiw53ksvlrf80jm8gz6kxsn56sffv2v2ijxvy7kw5zcg"; sha256 = "1yyvxqzxy9dz6rmjcrdn90nfaff4f38mfz2gsq535cr59sg3f8jc";
}; };
patches = [ ./find-xcb.patch ]; patches = [ ./find-xcb.patch ];

59
pkgs/applications/window-managers/way-cooler/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides { stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
, wayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon, pam, python3Packages, lemonbar , wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf
}: }:
let let
@ -9,13 +9,10 @@ let
fakegit = writeShellScriptBin "git" '' fakegit = writeShellScriptBin "git" ''
echo "" echo ""
''; '';
way-cooler = ((callPackage ./way-cooler.nix {}).way_cooler_0_6_2.override { way-cooler = (((callPackage ./way-cooler.nix {}).way_cooler { builtin-lua = true; }).override {
crateOverrides = defaultCrateOverrides // { crateOverrides = defaultCrateOverrides // {
way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit ]; }; way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; };
dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; };
gobject-sys = attrs: { buildInputs = [ dbus_glib ]; };
cairo-rs = attrs: { buildInputs = [ cairo ]; };
};}).overrideAttrs (oldAttrs: rec { };}).overrideAttrs (oldAttrs: rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -23,51 +20,35 @@ let
mkdir -p $out/etc mkdir -p $out/etc
cp -r config $out/etc/way-cooler cp -r config $out/etc/way-cooler
''; '';
# prior v0.7 https://github.com/way-cooler/way-cooler/issues/395
postFixup = '' postFixup = ''
makeWrapper $out/bin/way_cooler $out/bin/way-cooler \ cd $out/bin
mv way_cooler way-cooler
'';
});
wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec {
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
makeWrapper $out/bin/wc_bg $out/bin/wc-bg \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}"
''; '';
}); });
wc-bg = ((callPackage ./wc-bg.nix {}).way_cooler_bg_0_2_1.override { wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec {
crateOverrides = defaultCrateOverrides // {
dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; };
};}).overrideAttrs (oldAttrs: rec {
postFixup = ''
cd $out/bin
mv way_cooler_bg way-cooler-bg
'';
});
wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab_0_2_0.override {
crateOverrides = defaultCrateOverrides // {
wc-grab = attrs: {
src = fetchFromGitHub {
owner = "way-cooler";
repo = "way-cooler-grab";
rev = "v0.2.0";
sha256 = "1pc8rhvzdi6bi8g5w03i0ygbcpks9051c3d3yc290rgmmmmkmnwq";
};
};
dbus = attrs: { buildInputs = [ pkgconfig dbus_libs ]; };
};}).overrideAttrs (oldAttrs: rec {
postFixup = '' postFixup = ''
cd $out/bin cd $out/bin
mv wc_grab wc-grab mv wc_grab wc-grab
''; '';
}); });
wc-lock = ((callPackage ./wc-lock.nix {}).wc_lock_0_1_0.override { wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override {
crateOverrides = defaultCrateOverrides // { wc-lock = attrs: { crateOverrides = defaultCrateOverrides // {
buildInputs = [ pam ]; wc-lock = attrs: { buildInputs = [ pam ]; };
};};}).overrideAttrs (oldAttrs: rec { };}).overrideAttrs (oldAttrs: rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
postFixup = '' postFixup = ''
makeWrapper $out/bin/wc_lock $out/bin/wc-lock \ makeWrapper $out/bin/wc_lock $out/bin/wc-lock \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}"
''; '';
}); });
# https://github.com/way-cooler/way-cooler/issues/446 # https://github.com/way-cooler/way-cooler/issues/446
@ -102,7 +83,7 @@ let
${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d ${wc-bar-bare}/bin/bar.py $SELECTED $BACKGROUND $SELECTED_OTHER_WORKSPACE 2> /tmp/bar_debug.txt | ${lemonbar}/bin/lemonbar -B $BACKGROUND -F "#FFF" -n "lemonbar" -p -d
''; '';
in symlinkJoin rec { in symlinkJoin rec {
version = "0.6.2"; version = "0.8.0";
name = "way-cooler-with-extensions-${version}"; name = "way-cooler-with-extensions-${version}";
paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ]; paths = [ way-cooler wc-bg wc-grab wc-lock wc-bar ];

1918
pkgs/applications/window-managers/way-cooler/way-cooler.nix
View File

File diff suppressed because it is too large Load Diff

1591
pkgs/applications/window-managers/way-cooler/wc-bg.nix
View File

File diff suppressed because it is too large Load Diff

707
pkgs/applications/window-managers/way-cooler/wc-grab.nix
View File

@ -1,23 +1,24 @@
# Generated by carnix 0.5.0: carnix -o wc-grab.nix Cargo.lock # Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock
{ lib, buildPlatform, buildRustCrate, fetchgit }: { lib, buildPlatform, buildRustCrate, fetchgit }:
let kernel = buildPlatform.parsed.kernel.name; let kernel = buildPlatform.parsed.kernel.name;
abi = buildPlatform.parsed.abi.name; abi = buildPlatform.parsed.abi.name;
hasFeature = feature: include = includedFiles: src: builtins.filterSource (path: type:
lib.lists.any lib.lists.any (f:
(originName: feature.${originName}) let p = toString (src + ("/" + f)); in
(builtins.attrNames feature); (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
) includedFiles
hasDefault = feature: ) src;
let defaultFeatures = builtins.attrNames (feature."default" or {}); in updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
(defaultFeatures == []) mapFeatures = features: map (fun: fun { features = features; });
|| (lib.lists.any (originName: feature."default".${originName}) defaultFeatures);
mkFeatures = feat: lib.lists.foldl (features: featureName: mkFeatures = feat: lib.lists.foldl (features: featureName:
if featureName != "" && hasFeature feat.${featureName} then if feat.${featureName} or false then
[ featureName ] ++ features [ featureName ] ++ features
else else
features features
) (if hasDefault feat then [ "default" ] else []) (builtins.attrNames feat); ) [] (builtins.attrNames feat);
in
rec {
wc_grab = f: wc_grab_0_3_0 { features = wc_grab_0_3_0_features { wc_grab_0_3_0 = f; }; };
adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "adler32"; crateName = "adler32";
version = "1.0.0"; version = "1.0.0";
@ -288,11 +289,11 @@ let kernel = buildPlatform.parsed.kernel.name;
sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1"; sha256 = "0jawvi83b1nm101nam0w71kdyh7cy3fr0l9qj1hfcjvzvihfk2l1";
inherit dependencies buildDependencies features; inherit dependencies buildDependencies features;
}; };
wc_grab_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { wc_grab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "wc-grab"; crateName = "wc-grab";
version = "0.2.0"; version = "0.3.0";
authors = [ "Timidger <APragmaticPlace@gmail.com>" ]; authors = [ "Timidger <APragmaticPlace@gmail.com>" ];
src = ./.; sha256 = "02dkjxffzh38h3hiwfypkjv0g8dsfkp9wk20j04x4qydg4dr8a8h";
inherit dependencies buildDependencies features; inherit dependencies buildDependencies features;
}; };
winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@ -310,253 +311,491 @@ let kernel = buildPlatform.parsed.kernel.name;
libName = "build"; libName = "build";
inherit dependencies buildDependencies features; inherit dependencies buildDependencies features;
}; };
adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {};
in adler32_1_0_0_features = f: updateFeatures f (rec {
rec { adler32_1_0_0.default = (f.adler32_1_0_0.default or true);
adler32_1_0_0 = adler32_1_0_0_ rec {}; }) [];
ansi_term_0_9_0 = ansi_term_0_9_0_ rec {}; ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
atty_0_2_2 = atty_0_2_2_ rec { ansi_term_0_9_0_features = f: updateFeatures f (rec {
dependencies = (if !(kernel == "windows") then [ libc_0_2_21 ] else []) ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); }) [];
atty_0_2_2 = { features?(atty_0_2_2_features {}) }: atty_0_2_2_ {
dependencies = (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
}; };
libc_0_2_21_features."default".from_atty_0_2_2__default = true; atty_0_2_2_features = f: updateFeatures f (rec {
kernel32_sys_0_2_2_features."default".from_atty_0_2_2__default = true; atty_0_2_2.default = (f.atty_0_2_2.default or true);
winapi_0_2_8_features."default".from_atty_0_2_2__default = true; kernel32_sys_0_2_2.default = true;
bitflags_0_7_0 = bitflags_0_7_0_ rec {}; libc_0_2_21.default = true;
bitflags_0_8_0 = bitflags_0_8_0_ rec { winapi_0_2_8.default = true;
features = mkFeatures bitflags_0_8_0_features; }) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
bitflags_0_7_0 = { features?(bitflags_0_7_0_features {}) }: bitflags_0_7_0_ {};
bitflags_0_7_0_features = f: updateFeatures f (rec {
bitflags_0_7_0.default = (f.bitflags_0_7_0.default or true);
}) [];
bitflags_0_8_0 = { features?(bitflags_0_8_0_features {}) }: bitflags_0_8_0_ {
features = mkFeatures (features.bitflags_0_8_0 or {});
}; };
bitflags_0_8_0_features."i128".self_unstable = hasFeature (bitflags_0_8_0_features."unstable" or {}); bitflags_0_8_0_features = f: updateFeatures f (rec {
byteorder_1_0_0 = byteorder_1_0_0_ rec { bitflags_0_8_0.default = (f.bitflags_0_8_0.default or true);
features = mkFeatures byteorder_1_0_0_features; bitflags_0_8_0.i128 =
(f.bitflags_0_8_0.i128 or false) ||
(f.bitflags_0_8_0.unstable or false) ||
(bitflags_0_8_0.unstable or false);
}) [];
byteorder_1_0_0 = { features?(byteorder_1_0_0_features {}) }: byteorder_1_0_0_ {
features = mkFeatures (features.byteorder_1_0_0 or {});
}; };
byteorder_1_0_0_features."std".self_default = hasDefault byteorder_1_0_0_features; byteorder_1_0_0_features = f: updateFeatures f (rec {
clap_2_22_0 = clap_2_22_0_ rec { byteorder_1_0_0.default = (f.byteorder_1_0_0.default or true);
dependencies = [ ansi_term_0_9_0 atty_0_2_2 bitflags_0_8_0 strsim_0_6_0 term_size_0_2_3 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ] byteorder_1_0_0.std =
++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_9_0] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_2] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "term_size") features then [term_size_0_2_3] else []); (f.byteorder_1_0_0.std or false) ||
features = mkFeatures clap_2_22_0_features; (f.byteorder_1_0_0.default or false) ||
(byteorder_1_0_0.default or false);
}) [];
clap_2_22_0 = { features?(clap_2_22_0_features {}) }: clap_2_22_0_ {
dependencies = mapFeatures features ([ bitflags_0_8_0 unicode_segmentation_1_1_0 unicode_width_0_1_4 vec_map_0_7_0 ]
++ (if features.clap_2_22_0.ansi_term or false then [ ansi_term_0_9_0 ] else [])
++ (if features.clap_2_22_0.atty or false then [ atty_0_2_2 ] else [])
++ (if features.clap_2_22_0.strsim or false then [ strsim_0_6_0 ] else [])
++ (if features.clap_2_22_0.term_size or false then [ term_size_0_2_3 ] else []));
features = mkFeatures (features.clap_2_22_0 or {});
}; };
clap_2_22_0_features."".self = true; clap_2_22_0_features = f: updateFeatures f (rec {
clap_2_22_0_features."ansi_term".self_color = hasFeature (clap_2_22_0_features."color" or {}); ansi_term_0_9_0.default = true;
clap_2_22_0_features."atty".self_color = hasFeature (clap_2_22_0_features."color" or {}); atty_0_2_2.default = true;
clap_2_22_0_features."suggestions".self_default = hasDefault clap_2_22_0_features; bitflags_0_8_0.default = true;
clap_2_22_0_features."color".self_default = hasDefault clap_2_22_0_features; clap_2_22_0.ansi_term =
clap_2_22_0_features."wrap_help".self_default = hasDefault clap_2_22_0_features; (f.clap_2_22_0.ansi_term or false) ||
clap_2_22_0_features."clippy".self_lints = hasFeature (clap_2_22_0_features."lints" or {}); (f.clap_2_22_0.color or false) ||
clap_2_22_0_features."strsim".self_suggestions = hasFeature (clap_2_22_0_features."suggestions" or {}); (clap_2_22_0.color or false);
clap_2_22_0_features."term_size".self_wrap_help = hasFeature (clap_2_22_0_features."wrap_help" or {}); clap_2_22_0.atty =
clap_2_22_0_features."yaml-rust".self_yaml = hasFeature (clap_2_22_0_features."yaml" or {}); (f.clap_2_22_0.atty or false) ||
ansi_term_0_9_0_features."default".from_clap_2_22_0__default = true; (f.clap_2_22_0.color or false) ||
atty_0_2_2_features."default".from_clap_2_22_0__default = true; (clap_2_22_0.color or false);
bitflags_0_8_0_features."default".from_clap_2_22_0__default = true; clap_2_22_0.clippy =
clippy_0_0_0_features."default".from_clap_2_22_0__default = true; (f.clap_2_22_0.clippy or false) ||
strsim_0_6_0_features."default".from_clap_2_22_0__default = true; (f.clap_2_22_0.lints or false) ||
term_size_0_2_3_features."default".from_clap_2_22_0__default = true; (clap_2_22_0.lints or false);
unicode_segmentation_1_1_0_features."default".from_clap_2_22_0__default = true; clap_2_22_0.color =
unicode_width_0_1_4_features."default".from_clap_2_22_0__default = true; (f.clap_2_22_0.color or false) ||
vec_map_0_7_0_features."default".from_clap_2_22_0__default = true; (f.clap_2_22_0.default or false) ||
yaml_rust_0_0_0_features."default".from_clap_2_22_0__default = true; (clap_2_22_0.default or false);
color_quant_1_0_0 = color_quant_1_0_0_ rec {}; clap_2_22_0.default = (f.clap_2_22_0.default or true);
dbus_0_5_2 = dbus_0_5_2_ rec { clap_2_22_0.strsim =
dependencies = [ libc_0_2_21 ]; (f.clap_2_22_0.strsim or false) ||
buildDependencies = [ metadeps_1_1_1 ]; (f.clap_2_22_0.suggestions or false) ||
features = mkFeatures dbus_0_5_2_features; (clap_2_22_0.suggestions or false);
clap_2_22_0.suggestions =
(f.clap_2_22_0.suggestions or false) ||
(f.clap_2_22_0.default or false) ||
(clap_2_22_0.default or false);
clap_2_22_0.term_size =
(f.clap_2_22_0.term_size or false) ||
(f.clap_2_22_0.wrap_help or false) ||
(clap_2_22_0.wrap_help or false);
clap_2_22_0.wrap_help =
(f.clap_2_22_0.wrap_help or false) ||
(f.clap_2_22_0.default or false) ||
(clap_2_22_0.default or false);
clap_2_22_0.yaml-rust =
(f.clap_2_22_0.yaml-rust or false) ||
(f.clap_2_22_0.yaml or false) ||
(clap_2_22_0.yaml or false);
strsim_0_6_0.default = true;
term_size_0_2_3.default = true;
unicode_segmentation_1_1_0.default = true;
unicode_width_0_1_4.default = true;
vec_map_0_7_0.default = true;
}) [ ansi_term_0_9_0_features atty_0_2_2_features bitflags_0_8_0_features strsim_0_6_0_features term_size_0_2_3_features unicode_segmentation_1_1_0_features unicode_width_0_1_4_features vec_map_0_7_0_features ];
color_quant_1_0_0 = { features?(color_quant_1_0_0_features {}) }: color_quant_1_0_0_ {};
color_quant_1_0_0_features = f: updateFeatures f (rec {
color_quant_1_0_0.default = (f.color_quant_1_0_0.default or true);
}) [];
dbus_0_5_2 = { features?(dbus_0_5_2_features {}) }: dbus_0_5_2_ {
dependencies = mapFeatures features ([ libc_0_2_21 ]);
buildDependencies = mapFeatures features ([ metadeps_1_1_1 ]);
features = mkFeatures (features.dbus_0_5_2 or {});
}; };
dbus_0_5_2_features."".self = true; dbus_0_5_2_features = f: updateFeatures f (rec {
libc_0_2_21_features."default".from_dbus_0_5_2__default = true; dbus_0_5_2.default = (f.dbus_0_5_2.default or true);
deflate_0_7_5 = deflate_0_7_5_ rec { libc_0_2_21.default = true;
dependencies = [ adler32_1_0_0 byteorder_1_0_0 ]; metadeps_1_1_1.default = true;
}) [ libc_0_2_21_features metadeps_1_1_1_features ];
deflate_0_7_5 = { features?(deflate_0_7_5_features {}) }: deflate_0_7_5_ {
dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_0_0 ]);
}; };
adler32_1_0_0_features."default".from_deflate_0_7_5__default = true; deflate_0_7_5_features = f: updateFeatures f (rec {
byteorder_1_0_0_features."default".from_deflate_0_7_5__default = true; adler32_1_0_0.default = true;
deque_0_3_1 = deque_0_3_1_ rec { byteorder_1_0_0.default = true;
dependencies = [ rand_0_3_15 ]; deflate_0_7_5.default = (f.deflate_0_7_5.default or true);
}) [ adler32_1_0_0_features byteorder_1_0_0_features ];
deque_0_3_1 = { features?(deque_0_3_1_features {}) }: deque_0_3_1_ {
dependencies = mapFeatures features ([ rand_0_3_15 ]);
}; };
rand_0_3_15_features."default".from_deque_0_3_1__default = true; deque_0_3_1_features = f: updateFeatures f (rec {
enum_primitive_0_1_1 = enum_primitive_0_1_1_ rec { deque_0_3_1.default = (f.deque_0_3_1.default or true);
dependencies = [ num_traits_0_1_37 ]; rand_0_3_15.default = true;
}) [ rand_0_3_15_features ];
enum_primitive_0_1_1 = { features?(enum_primitive_0_1_1_features {}) }: enum_primitive_0_1_1_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
}; };
num_traits_0_1_37_features."default".from_enum_primitive_0_1_1__default = false; enum_primitive_0_1_1_features = f: updateFeatures f (rec {
error_chain_0_7_2 = error_chain_0_7_2_ rec { enum_primitive_0_1_1.default = (f.enum_primitive_0_1_1.default or true);
dependencies = []; num_traits_0_1_37.default = (f.num_traits_0_1_37.default or false);
features = mkFeatures error_chain_0_7_2_features; }) [ num_traits_0_1_37_features ];
error_chain_0_7_2 = { features?(error_chain_0_7_2_features {}) }: error_chain_0_7_2_ {
dependencies = mapFeatures features ([]);
features = mkFeatures (features.error_chain_0_7_2 or {});
}; };
error_chain_0_7_2_features."backtrace".self_default = hasDefault error_chain_0_7_2_features; error_chain_0_7_2_features = f: updateFeatures f (rec {
error_chain_0_7_2_features."example_generated".self_default = hasDefault error_chain_0_7_2_features; error_chain_0_7_2.backtrace =
backtrace_0_0_0_features."default".from_error_chain_0_7_2__default = true; (f.error_chain_0_7_2.backtrace or false) ||
gif_0_9_1 = gif_0_9_1_ rec { (f.error_chain_0_7_2.default or false) ||
dependencies = [ color_quant_1_0_0 lzw_0_10_0 ]; (error_chain_0_7_2.default or false);
features = mkFeatures gif_0_9_1_features; error_chain_0_7_2.default = (f.error_chain_0_7_2.default or true);
error_chain_0_7_2.example_generated =
(f.error_chain_0_7_2.example_generated or false) ||
(f.error_chain_0_7_2.default or false) ||
(error_chain_0_7_2.default or false);
}) [];
gif_0_9_1 = { features?(gif_0_9_1_features {}) }: gif_0_9_1_ {
dependencies = mapFeatures features ([ color_quant_1_0_0 lzw_0_10_0 ]);
features = mkFeatures (features.gif_0_9_1 or {});
}; };
gif_0_9_1_features."libc".self_c_api = hasFeature (gif_0_9_1_features."c_api" or {}); gif_0_9_1_features = f: updateFeatures f (rec {
gif_0_9_1_features."raii_no_panic".self_default = hasDefault gif_0_9_1_features; color_quant_1_0_0.default = true;
color_quant_1_0_0_features."default".from_gif_0_9_1__default = true; gif_0_9_1.default = (f.gif_0_9_1.default or true);
libc_0_0_0_features."default".from_gif_0_9_1__default = true; gif_0_9_1.libc =
lzw_0_10_0_features."default".from_gif_0_9_1__default = true; (f.gif_0_9_1.libc or false) ||
glob_0_2_11 = glob_0_2_11_ rec {}; (f.gif_0_9_1.c_api or false) ||
image_0_12_3 = image_0_12_3_ rec { (gif_0_9_1.c_api or false);
dependencies = [ byteorder_1_0_0 enum_primitive_0_1_1 gif_0_9_1 glob_0_2_11 jpeg_decoder_0_1_11 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 png_0_6_2 scoped_threadpool_0_1_7 ] gif_0_9_1.raii_no_panic =
++ (if lib.lists.any (x: x == "gif") features then [gif_0_9_1] else []) ++ (if lib.lists.any (x: x == "jpeg-decoder") features then [jpeg_decoder_0_1_11] else []) ++ (if lib.lists.any (x: x == "png") features then [png_0_6_2] else []) ++ (if lib.lists.any (x: x == "scoped_threadpool") features then [scoped_threadpool_0_1_7] else []); (f.gif_0_9_1.raii_no_panic or false) ||
features = mkFeatures image_0_12_3_features; (f.gif_0_9_1.default or false) ||
(gif_0_9_1.default or false);
lzw_0_10_0.default = true;
}) [ color_quant_1_0_0_features lzw_0_10_0_features ];
glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {};
glob_0_2_11_features = f: updateFeatures f (rec {
glob_0_2_11.default = (f.glob_0_2_11.default or true);
}) [];
image_0_12_3 = { features?(image_0_12_3_features {}) }: image_0_12_3_ {
dependencies = mapFeatures features ([ byteorder_1_0_0 enum_primitive_0_1_1 glob_0_2_11 num_iter_0_1_33 num_rational_0_1_36 num_traits_0_1_37 ]
++ (if features.image_0_12_3.gif or false then [ gif_0_9_1 ] else [])
++ (if features.image_0_12_3.jpeg-decoder or false then [ jpeg_decoder_0_1_11 ] else [])
++ (if features.image_0_12_3.png or false then [ png_0_6_2 ] else [])
++ (if features.image_0_12_3.scoped_threadpool or false then [ scoped_threadpool_0_1_7 ] else []));
features = mkFeatures (features.image_0_12_3 or {});
}; };
image_0_12_3_features."".self = true; image_0_12_3_features = f: updateFeatures f (rec {
image_0_12_3_features."gif_codec".self_default = hasDefault image_0_12_3_features; byteorder_1_0_0.default = true;
image_0_12_3_features."jpeg".self_default = hasDefault image_0_12_3_features; enum_primitive_0_1_1.default = true;
image_0_12_3_features."ico".self_default = hasDefault image_0_12_3_features; gif_0_9_1.default = true;
image_0_12_3_features."png_codec".self_default = hasDefault image_0_12_3_features; glob_0_2_11.default = true;
image_0_12_3_features."ppm".self_default = hasDefault image_0_12_3_features; image_0_12_3.bmp =
image_0_12_3_features."tga".self_default = hasDefault image_0_12_3_features; (f.image_0_12_3.bmp or false) ||
image_0_12_3_features."tiff".self_default = hasDefault image_0_12_3_features; (f.image_0_12_3.default or false) ||
image_0_12_3_features."webp".self_default = hasDefault image_0_12_3_features; (image_0_12_3.default or false) ||
image_0_12_3_features."bmp".self_default = hasDefault image_0_12_3_features; (f.image_0_12_3.ico or false) ||
image_0_12_3_features."hdr".self_default = hasDefault image_0_12_3_features; (image_0_12_3.ico or false);
image_0_12_3_features."gif".self_gif_codec = hasFeature (image_0_12_3_features."gif_codec" or {}); image_0_12_3.default = (f.image_0_12_3.default or true);
image_0_12_3_features."scoped_threadpool".self_hdr = hasFeature (image_0_12_3_features."hdr" or {}); image_0_12_3.gif =
image_0_12_3_features."bmp".self_ico = hasFeature (image_0_12_3_features."ico" or {}); (f.image_0_12_3.gif or false) ||
image_0_12_3_features."png_codec".self_ico = hasFeature (image_0_12_3_features."ico" or {}); (f.image_0_12_3.gif_codec or false) ||
image_0_12_3_features."jpeg-decoder".self_jpeg = hasFeature (image_0_12_3_features."jpeg" or {}); (image_0_12_3.gif_codec or false);
image_0_12_3_features."png".self_png_codec = hasFeature (image_0_12_3_features."png_codec" or {}); image_0_12_3.gif_codec =
byteorder_1_0_0_features."default".from_image_0_12_3__default = true; (f.image_0_12_3.gif_codec or false) ||
enum_primitive_0_1_1_features."default".from_image_0_12_3__default = true; (f.image_0_12_3.default or false) ||
gif_0_9_1_features."default".from_image_0_12_3__default = true; (image_0_12_3.default or false);
glob_0_2_11_features."default".from_image_0_12_3__default = true; image_0_12_3.hdr =
jpeg_decoder_0_1_11_features."default".from_image_0_12_3__default = true; (f.image_0_12_3.hdr or false) ||
num_iter_0_1_33_features."default".from_image_0_12_3__default = true; (f.image_0_12_3.default or false) ||
num_rational_0_1_36_features."default".from_image_0_12_3__default = false; (image_0_12_3.default or false);
num_traits_0_1_37_features."default".from_image_0_12_3__default = true; image_0_12_3.ico =
png_0_6_2_features."default".from_image_0_12_3__default = true; (f.image_0_12_3.ico or false) ||
scoped_threadpool_0_1_7_features."default".from_image_0_12_3__default = true; (f.image_0_12_3.default or false) ||
inflate_0_1_1 = inflate_0_1_1_ rec { (image_0_12_3.default or false);
features = mkFeatures inflate_0_1_1_features; image_0_12_3.jpeg =
(f.image_0_12_3.jpeg or false) ||
(f.image_0_12_3.default or false) ||
(image_0_12_3.default or false);
image_0_12_3.jpeg-decoder =
(f.image_0_12_3.jpeg-decoder or false) ||
(f.image_0_12_3.jpeg or false) ||
(image_0_12_3.jpeg or false);
image_0_12_3.png =
(f.image_0_12_3.png or false) ||
(f.image_0_12_3.png_codec or false) ||
(image_0_12_3.png_codec or false);
image_0_12_3.png_codec =
(f.image_0_12_3.png_codec or false) ||
(f.image_0_12_3.default or false) ||
(image_0_12_3.default or false) ||
(f.image_0_12_3.ico or false) ||
(image_0_12_3.ico or false);
image_0_12_3.ppm =
(f.image_0_12_3.ppm or false) ||
(f.image_0_12_3.default or false) ||
(image_0_12_3.default or false);
image_0_12_3.scoped_threadpool =
(f.image_0_12_3.scoped_threadpool or false) ||
(f.image_0_12_3.hdr or false) ||
(image_0_12_3.hdr or false);
image_0_12_3.tga =
(f.image_0_12_3.tga or false) ||
(f.image_0_12_3.default or false) ||
(image_0_12_3.default or false);
image_0_12_3.tiff =
(f.image_0_12_3.tiff or false) ||
(f.image_0_12_3.default or false) ||
(image_0_12_3.default or false);
image_0_12_3.webp =
(f.image_0_12_3.webp or false) ||
(f.image_0_12_3.default or false) ||
(image_0_12_3.default or false);
jpeg_decoder_0_1_11.default = true;
num_iter_0_1_33.default = true;
num_rational_0_1_36.default = (f.num_rational_0_1_36.default or false);
num_traits_0_1_37.default = true;
png_0_6_2.default = true;
scoped_threadpool_0_1_7.default = true;
}) [ byteorder_1_0_0_features enum_primitive_0_1_1_features gif_0_9_1_features glob_0_2_11_features jpeg_decoder_0_1_11_features num_iter_0_1_33_features num_rational_0_1_36_features num_traits_0_1_37_features png_0_6_2_features scoped_threadpool_0_1_7_features ];
inflate_0_1_1 = { features?(inflate_0_1_1_features {}) }: inflate_0_1_1_ {
features = mkFeatures (features.inflate_0_1_1 or {});
}; };
inflate_0_1_1_features."".self = true; inflate_0_1_1_features = f: updateFeatures f (rec {
jpeg_decoder_0_1_11 = jpeg_decoder_0_1_11_ rec { inflate_0_1_1.default = (f.inflate_0_1_1.default or true);
dependencies = [ byteorder_1_0_0 rayon_0_6_0 ] }) [];
++ (if lib.lists.any (x: x == "rayon") features then [rayon_0_6_0] else []); jpeg_decoder_0_1_11 = { features?(jpeg_decoder_0_1_11_features {}) }: jpeg_decoder_0_1_11_ {
features = mkFeatures jpeg_decoder_0_1_11_features; dependencies = mapFeatures features ([ byteorder_1_0_0 ]
++ (if features.jpeg_decoder_0_1_11.rayon or false then [ rayon_0_6_0 ] else []));
features = mkFeatures (features.jpeg_decoder_0_1_11 or {});
}; };
jpeg_decoder_0_1_11_features."".self = true; jpeg_decoder_0_1_11_features = f: updateFeatures f (rec {
jpeg_decoder_0_1_11_features."rayon".self_default = hasDefault jpeg_decoder_0_1_11_features; byteorder_1_0_0.default = true;
byteorder_1_0_0_features."default".from_jpeg_decoder_0_1_11__default = true; jpeg_decoder_0_1_11.default = (f.jpeg_decoder_0_1_11.default or true);
rayon_0_6_0_features."default".from_jpeg_decoder_0_1_11__default = true; jpeg_decoder_0_1_11.rayon =
kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { (f.jpeg_decoder_0_1_11.rayon or false) ||
dependencies = [ winapi_0_2_8 ]; (f.jpeg_decoder_0_1_11.default or false) ||
buildDependencies = [ winapi_build_0_1_1 ]; (jpeg_decoder_0_1_11.default or false);
rayon_0_6_0.default = true;
}) [ byteorder_1_0_0_features rayon_0_6_0_features ];
kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
dependencies = mapFeatures features ([ winapi_0_2_8 ]);
buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
}; };
winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
libc_0_2_21 = libc_0_2_21_ rec { kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
features = mkFeatures libc_0_2_21_features; winapi_0_2_8.default = true;
winapi_build_0_1_1.default = true;
}) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
libc_0_2_21 = { features?(libc_0_2_21_features {}) }: libc_0_2_21_ {
features = mkFeatures (features.libc_0_2_21 or {});
}; };
libc_0_2_21_features."use_std".self_default = hasDefault libc_0_2_21_features; libc_0_2_21_features = f: updateFeatures f (rec {
lzw_0_10_0 = lzw_0_10_0_ rec { libc_0_2_21.default = (f.libc_0_2_21.default or true);
features = mkFeatures lzw_0_10_0_features; libc_0_2_21.use_std =
(f.libc_0_2_21.use_std or false) ||
(f.libc_0_2_21.default or false) ||
(libc_0_2_21.default or false);
}) [];
lzw_0_10_0 = { features?(lzw_0_10_0_features {}) }: lzw_0_10_0_ {
features = mkFeatures (features.lzw_0_10_0 or {});
}; };
lzw_0_10_0_features."raii_no_panic".self_default = hasDefault lzw_0_10_0_features; lzw_0_10_0_features = f: updateFeatures f (rec {
metadeps_1_1_1 = metadeps_1_1_1_ rec { lzw_0_10_0.default = (f.lzw_0_10_0.default or true);
dependencies = [ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]; lzw_0_10_0.raii_no_panic =
(f.lzw_0_10_0.raii_no_panic or false) ||
(f.lzw_0_10_0.default or false) ||
(lzw_0_10_0.default or false);
}) [];
metadeps_1_1_1 = { features?(metadeps_1_1_1_features {}) }: metadeps_1_1_1_ {
dependencies = mapFeatures features ([ error_chain_0_7_2 pkg_config_0_3_9 toml_0_2_1 ]);
}; };
error_chain_0_7_2_features."default".from_metadeps_1_1_1__default = false; metadeps_1_1_1_features = f: updateFeatures f (rec {
pkg_config_0_3_9_features."default".from_metadeps_1_1_1__default = true; error_chain_0_7_2.default = (f.error_chain_0_7_2.default or false);
toml_0_2_1_features."default".from_metadeps_1_1_1__default = false; metadeps_1_1_1.default = (f.metadeps_1_1_1.default or true);
num_integer_0_1_33 = num_integer_0_1_33_ rec { pkg_config_0_3_9.default = true;
dependencies = [ num_traits_0_1_37 ]; toml_0_2_1.default = (f.toml_0_2_1.default or false);
}) [ error_chain_0_7_2_features pkg_config_0_3_9_features toml_0_2_1_features ];
num_integer_0_1_33 = { features?(num_integer_0_1_33_features {}) }: num_integer_0_1_33_ {
dependencies = mapFeatures features ([ num_traits_0_1_37 ]);
}; };
num_traits_0_1_37_features."default".from_num_integer_0_1_33__default = true; num_integer_0_1_33_features = f: updateFeatures f (rec {
num_iter_0_1_33 = num_iter_0_1_33_ rec { num_integer_0_1_33.default = (f.num_integer_0_1_33.default or true);
dependencies = [ num_integer_0_1_33 num_traits_0_1_37 ]; num_traits_0_1_37.default = true;
}) [ num_traits_0_1_37_features ];
num_iter_0_1_33 = { features?(num_iter_0_1_33_features {}) }: num_iter_0_1_33_ {
dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]);
}; };
num_integer_0_1_33_features."default".from_num_iter_0_1_33__default = true; num_iter_0_1_33_features = f: updateFeatures f (rec {
num_traits_0_1_37_features."default".from_num_iter_0_1_33__default = true; num_integer_0_1_33.default = true;
num_rational_0_1_36 = num_rational_0_1_36_ rec { num_iter_0_1_33.default = (f.num_iter_0_1_33.default or true);
dependencies = [ num_integer_0_1_33 num_traits_0_1_37 ]; num_traits_0_1_37.default = true;
features = mkFeatures num_rational_0_1_36_features; }) [ num_integer_0_1_33_features num_traits_0_1_37_features ];
num_rational_0_1_36 = { features?(num_rational_0_1_36_features {}) }: num_rational_0_1_36_ {
dependencies = mapFeatures features ([ num_integer_0_1_33 num_traits_0_1_37 ]);
features = mkFeatures (features.num_rational_0_1_36 or {});
}; };
num_rational_0_1_36_features."num-bigint".self_bigint = hasFeature (num_rational_0_1_36_features."bigint" or {}); num_rational_0_1_36_features = f: updateFeatures f (rec {
num_rational_0_1_36_features."bigint".self_default = hasDefault num_rational_0_1_36_features; num_integer_0_1_33.default = true;
num_rational_0_1_36_features."rustc-serialize".self_default = hasDefault num_rational_0_1_36_features; num_rational_0_1_36.bigint =
num_bigint_0_0_0_features."default".from_num_rational_0_1_36__default = true; (f.num_rational_0_1_36.bigint or false) ||
num_integer_0_1_33_features."default".from_num_rational_0_1_36__default = true; (f.num_rational_0_1_36.default or false) ||
num_traits_0_1_37_features."default".from_num_rational_0_1_36__default = true; (num_rational_0_1_36.default or false);
rustc_serialize_0_0_0_features."default".from_num_rational_0_1_36__default = true; num_rational_0_1_36.default = (f.num_rational_0_1_36.default or true);
serde_0_0_0_features."default".from_num_rational_0_1_36__default = true; num_rational_0_1_36.num-bigint =
num_traits_0_1_37 = num_traits_0_1_37_ rec {}; (f.num_rational_0_1_36.num-bigint or false) ||
num_cpus_1_3_0 = num_cpus_1_3_0_ rec { (f.num_rational_0_1_36.bigint or false) ||
dependencies = [ libc_0_2_21 ]; (num_rational_0_1_36.bigint or false);
num_rational_0_1_36.rustc-serialize =
(f.num_rational_0_1_36.rustc-serialize or false) ||
(f.num_rational_0_1_36.default or false) ||
(num_rational_0_1_36.default or false);
num_traits_0_1_37.default = true;
}) [ num_integer_0_1_33_features num_traits_0_1_37_features ];
num_traits_0_1_37 = { features?(num_traits_0_1_37_features {}) }: num_traits_0_1_37_ {};
num_traits_0_1_37_features = f: updateFeatures f (rec {
num_traits_0_1_37.default = (f.num_traits_0_1_37.default or true);
}) [];
num_cpus_1_3_0 = { features?(num_cpus_1_3_0_features {}) }: num_cpus_1_3_0_ {
dependencies = mapFeatures features ([ libc_0_2_21 ]);
}; };
libc_0_2_21_features."default".from_num_cpus_1_3_0__default = true; num_cpus_1_3_0_features = f: updateFeatures f (rec {
pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; libc_0_2_21.default = true;
png_0_6_2 = png_0_6_2_ rec { num_cpus_1_3_0.default = (f.num_cpus_1_3_0.default or true);
dependencies = [ bitflags_0_7_0 deflate_0_7_5 inflate_0_1_1 num_iter_0_1_33 ] }) [ libc_0_2_21_features ];
++ (if lib.lists.any (x: x == "deflate") features then [deflate_0_7_5] else []); pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
features = mkFeatures png_0_6_2_features; pkg_config_0_3_9_features = f: updateFeatures f (rec {
pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
}) [];
png_0_6_2 = { features?(png_0_6_2_features {}) }: png_0_6_2_ {
dependencies = mapFeatures features ([ bitflags_0_7_0 inflate_0_1_1 num_iter_0_1_33 ]
++ (if features.png_0_6_2.deflate or false then [ deflate_0_7_5 ] else []));
features = mkFeatures (features.png_0_6_2 or {});
}; };
png_0_6_2_features."".self = true; png_0_6_2_features = f: updateFeatures f (rec {
png_0_6_2_features."png-encoding".self_default = hasDefault png_0_6_2_features; bitflags_0_7_0.default = true;
png_0_6_2_features."deflate".self_png-encoding = hasFeature (png_0_6_2_features."png-encoding" or {}); deflate_0_7_5.default = true;
bitflags_0_7_0_features."default".from_png_0_6_2__default = true; inflate_0_1_1.default = true;
deflate_0_7_5_features."default".from_png_0_6_2__default = true; num_iter_0_1_33.default = true;
inflate_0_1_1_features."default".from_png_0_6_2__default = true; png_0_6_2.default = (f.png_0_6_2.default or true);
num_iter_0_1_33_features."default".from_png_0_6_2__default = true; png_0_6_2.deflate =
rand_0_3_15 = rand_0_3_15_ rec { (f.png_0_6_2.deflate or false) ||
dependencies = [ libc_0_2_21 ]; (f.png_0_6_2.png-encoding or false) ||
(png_0_6_2.png-encoding or false);
png_0_6_2.png-encoding =
(f.png_0_6_2.png-encoding or false) ||
(f.png_0_6_2.default or false) ||
(png_0_6_2.default or false);
}) [ bitflags_0_7_0_features deflate_0_7_5_features inflate_0_1_1_features num_iter_0_1_33_features ];
rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ {
dependencies = mapFeatures features ([ libc_0_2_21 ]);
}; };
libc_0_2_21_features."default".from_rand_0_3_15__default = true; rand_0_3_15_features = f: updateFeatures f (rec {
rayon_0_6_0 = rayon_0_6_0_ rec { libc_0_2_21.default = true;
dependencies = [ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]; rand_0_3_15.default = (f.rand_0_3_15.default or true);
features = mkFeatures rayon_0_6_0_features; }) [ libc_0_2_21_features ];
rayon_0_6_0 = { features?(rayon_0_6_0_features {}) }: rayon_0_6_0_ {
dependencies = mapFeatures features ([ deque_0_3_1 libc_0_2_21 num_cpus_1_3_0 rand_0_3_15 ]);
features = mkFeatures (features.rayon_0_6_0 or {});
}; };
rayon_0_6_0_features."".self = true; rayon_0_6_0_features = f: updateFeatures f (rec {
deque_0_3_1_features."default".from_rayon_0_6_0__default = true; deque_0_3_1.default = true;
libc_0_2_21_features."default".from_rayon_0_6_0__default = true; libc_0_2_21.default = true;
num_cpus_1_3_0_features."default".from_rayon_0_6_0__default = true; num_cpus_1_3_0.default = true;
rand_0_3_15_features."default".from_rayon_0_6_0__default = true; rand_0_3_15.default = true;
scoped_threadpool_0_1_7 = scoped_threadpool_0_1_7_ rec { rayon_0_6_0.default = (f.rayon_0_6_0.default or true);
features = mkFeatures scoped_threadpool_0_1_7_features; }) [ deque_0_3_1_features libc_0_2_21_features num_cpus_1_3_0_features rand_0_3_15_features ];
scoped_threadpool_0_1_7 = { features?(scoped_threadpool_0_1_7_features {}) }: scoped_threadpool_0_1_7_ {
features = mkFeatures (features.scoped_threadpool_0_1_7 or {});
}; };
scoped_threadpool_0_1_7_features."".self = true; scoped_threadpool_0_1_7_features = f: updateFeatures f (rec {
strsim_0_6_0 = strsim_0_6_0_ rec {}; scoped_threadpool_0_1_7.default = (f.scoped_threadpool_0_1_7.default or true);
term_size_0_2_3 = term_size_0_2_3_ rec { }) [];
dependencies = [] strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
++ (if !(kernel == "windows") then [ libc_0_2_21 ] else []) strsim_0_6_0_features = f: updateFeatures f (rec {
++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
features = mkFeatures term_size_0_2_3_features; }) [];
term_size_0_2_3 = { features?(term_size_0_2_3_features {}) }: term_size_0_2_3_ {
dependencies = mapFeatures features ([])
++ (if !(kernel == "windows") then mapFeatures features ([ libc_0_2_21 ]) else [])
++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
features = mkFeatures (features.term_size_0_2_3 or {});
}; };
term_size_0_2_3_features."clippy".self_lints = hasFeature (term_size_0_2_3_features."lints" or {}); term_size_0_2_3_features = f: updateFeatures f (rec {
term_size_0_2_3_features."nightly".self_lints = hasFeature (term_size_0_2_3_features."lints" or {}); kernel32_sys_0_2_2.default = true;
term_size_0_2_3_features."lints".self_travis = hasFeature (term_size_0_2_3_features."travis" or {}); libc_0_2_21.default = true;
term_size_0_2_3_features."nightly".self_travis = hasFeature (term_size_0_2_3_features."travis" or {}); term_size_0_2_3.clippy =
clippy_0_0_0_features."default".from_term_size_0_2_3__default = true; (f.term_size_0_2_3.clippy or false) ||
libc_0_2_21_features."default".from_term_size_0_2_3__default = true; (f.term_size_0_2_3.lints or false) ||
kernel32_sys_0_2_2_features."default".from_term_size_0_2_3__default = true; (term_size_0_2_3.lints or false);
winapi_0_2_8_features."default".from_term_size_0_2_3__default = true; term_size_0_2_3.default = (f.term_size_0_2_3.default or true);
toml_0_2_1 = toml_0_2_1_ rec { term_size_0_2_3.lints =
dependencies = []; (f.term_size_0_2_3.lints or false) ||
(f.term_size_0_2_3.travis or false) ||
(term_size_0_2_3.travis or false);
term_size_0_2_3.nightly =
(f.term_size_0_2_3.nightly or false) ||
(f.term_size_0_2_3.lints or false) ||
(term_size_0_2_3.lints or false) ||
(f.term_size_0_2_3.travis or false) ||
(term_size_0_2_3.travis or false);
winapi_0_2_8.default = true;
}) [ libc_0_2_21_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
toml_0_2_1 = { features?(toml_0_2_1_features {}) }: toml_0_2_1_ {
dependencies = mapFeatures features ([]);
}; };
toml_0_2_1_features."rustc-serialize".self_default = hasDefault toml_0_2_1_features; toml_0_2_1_features = f: updateFeatures f (rec {
rustc_serialize_0_0_0_features."default".from_toml_0_2_1__default = true; toml_0_2_1.default = (f.toml_0_2_1.default or true);
serde_0_0_0_features."default".from_toml_0_2_1__default = true; toml_0_2_1.rustc-serialize =
unicode_segmentation_1_1_0 = unicode_segmentation_1_1_0_ rec { (f.toml_0_2_1.rustc-serialize or false) ||
features = mkFeatures unicode_segmentation_1_1_0_features; (f.toml_0_2_1.default or false) ||
(toml_0_2_1.default or false);
}) [];
unicode_segmentation_1_1_0 = { features?(unicode_segmentation_1_1_0_features {}) }: unicode_segmentation_1_1_0_ {
features = mkFeatures (features.unicode_segmentation_1_1_0 or {});
}; };
unicode_segmentation_1_1_0_features."".self = true; unicode_segmentation_1_1_0_features = f: updateFeatures f (rec {
unicode_width_0_1_4 = unicode_width_0_1_4_ rec { unicode_segmentation_1_1_0.default = (f.unicode_segmentation_1_1_0.default or true);
features = mkFeatures unicode_width_0_1_4_features; }) [];
unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
features = mkFeatures (features.unicode_width_0_1_4 or {});
}; };
unicode_width_0_1_4_features."".self = true; unicode_width_0_1_4_features = f: updateFeatures f (rec {
vec_map_0_7_0 = vec_map_0_7_0_ rec { unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
dependencies = []; }) [];
features = mkFeatures vec_map_0_7_0_features; vec_map_0_7_0 = { features?(vec_map_0_7_0_features {}) }: vec_map_0_7_0_ {
dependencies = mapFeatures features ([]);
features = mkFeatures (features.vec_map_0_7_0 or {});
}; };
vec_map_0_7_0_features."serde".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); vec_map_0_7_0_features = f: updateFeatures f (rec {
vec_map_0_7_0_features."serde_derive".self_eders = hasFeature (vec_map_0_7_0_features."eders" or {}); vec_map_0_7_0.default = (f.vec_map_0_7_0.default or true);
serde_0_0_0_features."default".from_vec_map_0_7_0__default = true; vec_map_0_7_0.serde =
serde_derive_0_0_0_features."default".from_vec_map_0_7_0__default = true; (f.vec_map_0_7_0.serde or false) ||
wc_grab_0_2_0 = wc_grab_0_2_0_ rec { (f.vec_map_0_7_0.eders or false) ||
dependencies = [ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]; (vec_map_0_7_0.eders or false);
vec_map_0_7_0.serde_derive =
(f.vec_map_0_7_0.serde_derive or false) ||
(f.vec_map_0_7_0.eders or false) ||
(vec_map_0_7_0.eders or false);
}) [];
wc_grab_0_3_0 = { features?(wc_grab_0_3_0_features {}) }: wc_grab_0_3_0_ {
dependencies = mapFeatures features ([ clap_2_22_0 dbus_0_5_2 image_0_12_3 ]);
}; };
clap_2_22_0_features."default".from_wc_grab_0_2_0__default = true; wc_grab_0_3_0_features = f: updateFeatures f (rec {
dbus_0_5_2_features."default".from_wc_grab_0_2_0__default = true; clap_2_22_0.default = true;
image_0_12_3_features."default".from_wc_grab_0_2_0__default = true; dbus_0_5_2.default = true;
winapi_0_2_8 = winapi_0_2_8_ rec {}; image_0_12_3.default = true;
winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; wc_grab_0_3_0.default = (f.wc_grab_0_3_0.default or true);
}) [ clap_2_22_0_features dbus_0_5_2_features image_0_12_3_features ];
winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
winapi_0_2_8_features = f: updateFeatures f (rec {
winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
}) [];
winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
winapi_build_0_1_1_features = f: updateFeatures f (rec {
winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
}) [];
} }

1417
pkgs/applications/window-managers/way-cooler/wc-lock.nix
View File

File diff suppressed because it is too large Load Diff

26
pkgs/build-support/rust/default-crate-overrides.nix
View File

@ -1,5 +1,5 @@
{ stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,
openssl, sqlite, zlib, ... }: openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, ... }:
let let
inherit (darwin.apple_sdk.frameworks) CoreFoundation; inherit (darwin.apple_sdk.frameworks) CoreFoundation;
@ -36,4 +36,28 @@ in
openssl-sys = attrs: { openssl-sys = attrs: {
buildInputs = [ pkgconfig openssl ]; buildInputs = [ pkgconfig openssl ];
}; };
dbus = attrs: {
buildInputs = [ pkgconfig dbus_libs ];
};
libdbus-sys = attrs: {
buildInputs = [ pkgconfig dbus_libs ];
};
gobject-sys = attrs: {
buildInputs = [ dbus_glib ];
};
gio-sys = attrs: {
buildInputs = [ dbus_glib ];
};
gdk-pixbuf-sys = attrs: {
buildInputs = [ dbus_glib ];
};
gdk-pixbuf = attrs: {
buildInputs = [ gdk_pixbuf ];
};
cairo-rs = attrs: {
buildInputs = [ cairo ];
};
xcb = attrs: {
buildInputs = [ python3 ];
};
} }

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

@ -125,7 +125,7 @@ let
milou = callPackage ./milou.nix {}; milou = callPackage ./milou.nix {};
oxygen = callPackage ./oxygen.nix {}; oxygen = callPackage ./oxygen.nix {};
plasma-desktop = callPackage ./plasma-desktop {}; plasma-desktop = callPackage ./plasma-desktop {};
plasma-integration = callPackage ./plasma-integration.nix {}; plasma-integration = callPackage ./plasma-integration {};
plasma-nm = callPackage ./plasma-nm {}; plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
plasma-vault = callPackage ./plasma-vault {}; plasma-vault = callPackage ./plasma-vault {};

24
pkgs/desktops/plasma-5/plasma-integration/D9070.patch Normal file
View File

@ -0,0 +1,24 @@
Index: src/platformtheme/kfontsettingsdata.cpp
===================================================================
--- src/platformtheme/kfontsettingsdata.cpp
+++ src/platformtheme/kfontsettingsdata.cpp
@@ -70,15 +70,18 @@
const KFontData &fontData = DefaultFontData[fontType];
cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight);
cachedFont->setStyleHint(fontData.StyleHint);
- cachedFont->setStyleName(QLatin1String(fontData.StyleName));
const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey);
QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString());
//If we have serialized information for this font, restore it
//NOTE: We are not using KConfig directly because we can't call QFont::QFont from here
if (!fontInfo.isEmpty()) {
cachedFont->fromString(fontInfo);
+ } else {
+ // set the canonical stylename here, where it cannot override
+ // user-specific font attributes if those do not include a stylename.
+ cachedFont->setStyleName(QLatin1String(fontData.StyleName));
}
mFonts[fontType] = cachedFont;

7
pkgs/desktops/plasma-5/plasma-integration.nix → pkgs/desktops/plasma-5/plasma-integration/default.nix
View File

@ -14,4 +14,11 @@ mkDerivation {
breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
libXcursor qtquickcontrols2 libXcursor qtquickcontrols2
]; ];
patches = [
# See also: https://phabricator.kde.org/D9070
# ttuegel: The patch is checked into Nixpkgs because I could not get
# Phabricator to give me a stable link to it.
./D9070.patch
];
patchFlags = "-p0";
} }

6
pkgs/development/compilers/arachne-pnr/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "arachne-pnr-${version}"; name = "arachne-pnr-${version}";
version = "2018.01.10"; version = "2018.02.04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cseed"; owner = "cseed";
repo = "arachne-pnr"; repo = "arachne-pnr";
rev = "24f6b9c341910f6aaca1498872fe2e99ff8210cf"; rev = "c21df0062c6ee13e8c8280cefbb7c017823336c0";
sha256 = "0jd91hx16jx0p0jiqhgh1kbh59k82i4979f4xp4wzc249br7lxlv"; sha256 = "1ah1gn07av3ff5lnay4p7dahaacbyj0mfakbx7g5fs3p1m1m8p1k";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

8
pkgs/development/compilers/yosys/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "yosys-${version}"; name = "yosys-${version}";
version = "2018.01.10"; version = "2018.02.04";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
owner = "cliffordwolf"; owner = "yosyshq";
repo = "yosys"; repo = "yosys";
rev = "9ac560f5d3e5847b7e475195f66b7034e91fd938"; rev = "0659d9eac7b546ee6f5acab46dbc83c91d556a34";
sha256 = "01p1bcjq030y7g21lsghgkqj23x6yl8cwrcx2xpik45xls6pxrg7"; sha256 = "1hy21gxcp3q3hlbh5sh46h2340r11fwalkb9if9sbpc9y3279njj";
name = "yosys"; name = "yosys";
}) })
(fetchFromBitbucket { (fetchFromBitbucket {

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

@ -281,6 +281,7 @@ self: super: {
hashed-storage = dontCheck super.hashed-storage; hashed-storage = dontCheck super.hashed-storage;
hashring = dontCheck super.hashring; hashring = dontCheck super.hashring;
hath = dontCheck super.hath; hath = dontCheck super.hath;
haxl = dontCheck super.haxl; # non-deterministic failure https://github.com/facebook/Haxl/issues/85
haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing
hdbi-postgresql = dontCheck super.hdbi-postgresql; hdbi-postgresql = dontCheck super.hdbi-postgresql;
hedis = dontCheck super.hedis; hedis = dontCheck super.hedis;

4
pkgs/development/interpreters/python/cpython/3.4/default.nix
View File

@ -27,7 +27,7 @@ with stdenv.lib;
let let
majorVersion = "3.4"; majorVersion = "3.4";
minorVersion = "7"; minorVersion = "8";
minorVersionSuffix = ""; minorVersionSuffix = "";
pythonVersion = majorVersion; pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@ -48,7 +48,7 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
sha256 = "06wx2ag0dnixny67jfdl5z10243fjga898cgxhnr4dnxaqmwy547"; sha256 = "1sn3i9z9m56inlfrqs250qv8snl8w211wpig2pfjlyrcj3x75919";
}; };
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

4
pkgs/development/interpreters/python/cpython/3.5/default.nix
View File

@ -27,7 +27,7 @@ with stdenv.lib;
let let
majorVersion = "3.5"; majorVersion = "3.5";
minorVersion = "4"; minorVersion = "5";
minorVersionSuffix = ""; minorVersionSuffix = "";
pythonVersion = majorVersion; pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@ -48,7 +48,7 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
sha256 = "0k68ai0a204piwibz013ds6ck7hgj9gk4nin2259y41vpgx3pncl"; sha256 = "02ahsijk3a42sdzfp2il49shx0v4birhy7kkj0dikmh20hxjqg86";
}; };
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

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

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pth, libgpgerror }: { fetchurl, stdenv, gettext, pth, libgpgerror }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libassuan-2.5.1"; name = "libassuan-2.5.1";
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];
outputBin = "dev"; # libassuan-config outputBin = "dev"; # libassuan-config
buildInputs = [ libgpgerror pth ]; buildInputs = [ libgpgerror pth ]
++ stdenv.lib.optional stdenv.isDarwin gettext;
doCheck = true; doCheck = true;
@ -20,18 +21,16 @@ stdenv.mkDerivation rec {
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h
''; '';
meta = { meta = with stdenv.lib; {
description = "IPC library used by GnuPG and related software"; description = "IPC library used by GnuPG and related software";
longDescription = '' longDescription = ''
Libassuan is a small library implementing the so-called Assuan Libassuan is a small library implementing the so-called Assuan
protocol. This protocol is used for IPC between most newer protocol. This protocol is used for IPC between most newer
GnuPG components. Both, server and client side functions are GnuPG components. Both, server and client side functions are
provided. provided.
''; '';
homepage = http://gnupg.org; homepage = http://gnupg.org;
license = stdenv.lib.licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: { stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap }:
assert enableCapabilities -> stdenv.isLinux; assert enableCapabilities -> stdenv.isLinux;
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
buildInputs = [ libgpgerror ] buildInputs = [ libgpgerror ]
++ stdenv.lib.optional stdenv.isDarwin gettext
++ stdenv.lib.optional enableCapabilities libcap; ++ stdenv.lib.optional enableCapabilities libcap;
# Make sure libraries are correct for .pc and .la files # Make sure libraries are correct for .pc and .la files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgpgerror }: { stdenv, fetchurl, gettext, libgpgerror }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libksba-1.3.5"; name = "libksba-1.3.5";
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
propagatedBuildInputs = [ libgpgerror ]; propagatedBuildInputs = [ libgpgerror ];
postInstall = '' postInstall = ''

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

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libwhereami-${version}"; name = "libwhereami-${version}";
version = "0.1.1"; version = "0.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "0nhbmxm626cgawprszw6c03a3hasxjn1i9ldhhj5xyvxp8r5l9q4"; sha256 = "0mpy2rkxcm2nz1qvldih01czxlsksqfkzgh58pnrw8yva31wv9q6";
rev = version; rev = version;
repo = "libwhereami"; repo = "libwhereami";
owner = "puppetlabs"; owner = "puppetlabs";

40
pkgs/development/libraries/mpich2/default.nix
View File

@ -1,19 +1,35 @@
{ stdenv, fetchurl, python, perl, gfortran }: { stdenv, fetchurl, python, perl, gfortran
, slurm, openssh, hwloc
} :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mpich-${version}"; name = "mpich-${version}";
version = "3.2"; version = "3.2.1";
src = fetchurl { src = fetchurl {
url = "http://www.mpich.org/static/downloads/3.2/mpich-3.2.tar.gz"; url = "http://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
sha256 = "0bvvk4n9g4rmrncrgs9jnkcfh142i65wli5qp1akn9kwab1q80z6"; sha256 = "1w9h4g7d46d9l5jbcyfxpaqzpjrc5hyvr9d0ns7278psxpr3pdax";
}; };
configureFlags = "--enable-shared --enable-sharedlib"; configureFlags = [
"--enable-shared"
"--enable-sharedlib"
];
buildInputs = [ perl gfortran ]; buildInputs = [ perl gfortran slurm openssh hwloc ];
meta = { doCheck = true;
preFixup = ''
# /tmp/nix-build... ends up in the RPATH, fix it manually
for entry in $out/bin/mpichversion $out/bin/mpivars; do
echo "fix rpath: $entry"
patchelf --set-rpath "$out/lib" $entry
done
'';
meta = with stdenv.lib; {
description = "Implementation of the Message Passing Interface (MPI) standard"; description = "Implementation of the Message Passing Interface (MPI) standard";
longDescription = '' longDescription = ''
@ -22,9 +38,11 @@ stdenv.mkDerivation rec {
version 2. version 2.
''; '';
homepage = http://www.mcs.anl.gov/mpi/mpich2/; homepage = http://www.mcs.anl.gov/mpi/mpich2/;
license = "free, see http://www.mcs.anl.gov/research/projects/mpich2/downloads/index.php?s=license"; license = {
url = http://git.mpich.org/mpich.git/blob/a385d6d0d55e83c3709ae851967ce613e892cd21:/COPYRIGHT;
maintainers = [ ]; fullName = "MPICH license (permissive)";
platforms = stdenv.lib.platforms.unix; };
maintainers = [ maintainers.markuskowa ];
platforms = platforms.unix;
}; };
} }

26
pkgs/development/python-modules/aioimaplib/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils }:
buildPythonPackage rec {
pname = "aioimaplib";
version = "0.7.13";
# PyPI tarball doesn't ship tests
src = fetchFromGitHub {
owner = "bamthomas";
repo = pname;
rev = version;
sha256 = "19yhk4ixfw46d0bvx6a40r23nvia5a83dzn5rzwaq1wdjr186bbn";
};
disbaled = pythonOlder "3.4";
checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils ];
meta = with lib; {
description = "Python asyncio IMAP4rev1 client library";
homepage = https://github.com/bamthomas/aioimaplib;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

33
pkgs/development/python-modules/asynctest/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, pythonOlder, python }:
buildPythonPackage rec {
pname = "asynctest";
version = "0.11.1";
disabled = pythonOlder "3.4";
# PyPI tarball doesn't ship test/__init__.py
src = fetchFromGitHub {
owner = "Martiusweb";
repo = pname;
rev = "v${version}";
sha256 = "1vvh5vbq2fbz6426figs85z8779r7svb4dp2v3xynhhv05nh2y6v";
};
postPatch = ''
# Skip failing test, probably caused by file system access
substituteInPlace test/test_selector.py \
--replace "test_events_watched_outside_test_are_ignored" "xtest_events_watched_outside_test_are_ignored"
'';
checkPhase = ''
${python.interpreter} -m unittest test
'';
meta = with lib; {
description = "Enhance the standard unittest package with features for testing asyncio libraries";
homepage = https://github.com/Martiusweb/asynctest;
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};
}

27
pkgs/development/python-modules/can/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pyserial
, nose
, mock }:
buildPythonPackage rec {
pname = "python-can";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "1c6zfd29ck9ffdklfb5xgxvfl52xdaqd89isykkypm1ll97yk2fs";
};
propagatedBuildInputs = [ pyserial ];
checkInputs = [ nose mock ];
meta = with lib; {
homepage = https://github.com/hardbyte/python-can;
description = "CAN support for Python";
license = licenses.lgpl3;
maintainers = with maintainers; [ sorki ];
};
}

46
pkgs/development/python-modules/canmatrix/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, python
, lxml
, xlwt
, xlrd
, XlsxWriter
, pyyaml
, future }:
buildPythonPackage rec {
pname = "canmatrix";
version = "0.6";
# uses fetchFromGitHub as PyPi release misses test/ dir
src = fetchFromGitHub {
owner = "ebroecker";
repo = pname;
rev = version;
sha256 = "1lb0krhchja2jqfsh5lsfgmqcchs1pd38akvc407jfmll96f4yqz";
};
checkPhase = ''
cd test
${python.interpreter} ./test.py
'';
propagatedBuildInputs =
[ lxml
xlwt
xlrd
XlsxWriter
pyyaml
future
];
meta = with lib; {
homepage = https://github.com/ebroecker/canmatrix;
description = "Support and convert several CAN (Controller Area Network) database formats .arxml .dbc .dbf .kcd .sym fibex xls(x)";
license = licenses.bsd2;
maintainers = with maintainers; [ sorki ];
};
}

46
pkgs/development/python-modules/canopen/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, nose
, can
, canmatrix }:
buildPythonPackage rec {
pname = "canopen";
version = "0.5.1";
# use fetchFromGitHub until version containing test/sample.eds
# is available on PyPi
# https://github.com/christiansandberg/canopen/pull/57
src = fetchFromGitHub {
owner = "christiansandberg";
repo = "canopen";
rev = "b20575d84c3aef790fe7c38c5fc77601bade0ea4";
sha256 = "1qg47qrkyvyxiwi13sickrkk89jp9s91sly2y90bz0jhws2bxh64";
};
#src = fetchPypi {
# inherit pname version;
# sha256 = "0806cykarpjb9ili3mf82hsd9gdydbks8532nxgz93qzg4zdbv2g";
#};
# test_pdo failure https://github.com/christiansandberg/canopen/issues/58
doCheck = false;
propagatedBuildInputs =
[ can
canmatrix
];
checkInputs = [ nose ];
meta = with lib; {
homepage = https://github.com/christiansandberg/canopen/;
description = "CANopen stack implementation";
license = licenses.lgpl3;
maintainers = with maintainers; [ sorki ];
};
}

22
pkgs/development/python-modules/imaplib2/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "imaplib2";
version = "2.45.0";
src = fetchPypi {
inherit pname version;
sha256 = "a35b6d88258696e80aabecfb784e08730b8558fcaaa3061ff2c7f8637afbd0b3";
};
# No tests on PyPI and no tags on GitHub :(
doCheck = false;
meta = with lib; {
description = "A threaded Python IMAP4 client";
homepage = https://github.com/bcoe/imaplib2;
# See https://github.com/bcoe/imaplib2/issues/25
license = licenses.psfl;
maintainers = with maintainers; [ dotlambda ];
};
}

25
pkgs/development/python-modules/luftdaten/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, buildPythonPackage, isPy3k, fetchPypi, aiohttp, async-timeout }:
buildPythonPackage rec {
pname = "luftdaten";
version = "0.1.4";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "d3e3af830ad2b731c36af223bbb5d47d68aa3786b2965411216917a7381e1179";
};
propagatedBuildInputs = [ aiohttp async-timeout ];
# No tests implemented
doCheck = false;
meta = with lib; {
description = "Python API for interacting with luftdaten.info";
homepage = https://github.com/fabaff/python-luftdaten;
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

22
pkgs/development/python-modules/nose-parameterized/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: { fetchPypi, parameterized }:
buildPythonPackage rec { parameterized.overrideAttrs (o: rec {
pname = "nose-parameterized"; pname = "nose-parameterized";
version = "0.6.0"; version = "0.6.0";
@ -8,20 +8,4 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk"; sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk";
}; };
})
# Tests require some python3-isms but code works without.
doCheck = isPy3k;
buildInputs = [ nose glibcLocales ];
propagatedBuildInputs = [ six ];
checkPhase = ''
LC_ALL="en_US.UTF-8" nosetests -v
'';
meta = with stdenv.lib; {
description = "Parameterized testing with any Python test framework";
homepage = https://pypi.python.org/pypi/nose-parameterized;
license = licenses.bsd3;
};
}

28
pkgs/development/python-modules/parameterized/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }:
buildPythonPackage rec {
pname = "parameterized";
version = "0.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa";
};
# Tests require some python3-isms but code works without.
doCheck = isPy3k;
checkInputs = [ nose glibcLocales ];
propagatedBuildInputs = [ six ];
checkPhase = ''
LC_ALL="en_US.UTF-8" nosetests -v
'';
meta = with stdenv.lib; {
description = "Parameterized testing with any Python test framework";
homepage = https://pypi.python.org/pypi/parameterized;
license = licenses.bsd3;
maintainers = with maintainers; [ ma27 ];
};
}

25
pkgs/development/python-modules/pybase64/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ buildPythonPackage, stdenv, fetchPypi, parameterized, six, nose }:
buildPythonPackage rec {
pname = "pybase64";
version = "0.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "1hggg69s5r8jyqdwyzri5sn3f19p7ayl0fjhjma0qzgfp7bk6zjc";
};
propagatedBuildInputs = [ six ];
checkInputs = [ parameterized nose ];
checkPhase = ''
nosetests
'';
meta = with stdenv.lib; {
homepage = https://pypi.python.org/pypi/pybase64;
description = "Fast Base64 encoding/decoding";
license = licenses.bsd2;
maintainers = with maintainers; [ ma27 ];
};
}

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jenkins-${version}"; name = "jenkins-${version}";
version = "2.103"; version = "2.105";
src = fetchurl { src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
sha256 = "1d771q4xjjji7ydh6xjz3j6hz2mszxh0m3zqjh4khlzqhnvydlha"; sha256 = "0q6xyjkqlrwjgf7rzmyy8m0w7lhqyavici76zzngg159xkyh5cfh";
}; };
buildCommand = '' buildCommand = ''

10
pkgs/development/tools/electron/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
let let
version = "1.7.9"; version = "1.7.11";
name = "electron-${version}"; name = "electron-${version}";
throwSystem = throw "Unsupported system: ${stdenv.system}"; throwSystem = throw "Unsupported system: ${stdenv.system}";
@ -20,15 +20,15 @@ let
src = { src = {
i686-linux = fetchurl { i686-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
sha256 = "0m87n7hqimg93z3m8pa1ggs69f3h5mjrsrrl7x80hxmp3w142krc"; sha256 = "0mxrayczs6fc2a53fzfbgs88l71wm7hadq9ir510kicakblmdbyx";
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
sha256 = "17ii0x6326mwjd0x5dj2693r67y0jra88hkqcpddcq08vf1knr2f"; sha256 = "0v22xhzbq9lcbc83laqs45pbx8gzv648qfkj01pxfsmv3lb4myrl";
}; };
armv7l-linux = fetchurl { armv7l-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
sha256 = "17jkma50d6az8dbyrym8z2lsw2n0r6jhdlm8pb5c928bzgshryqm"; sha256 = "02n2y69zwzacigqp6f4vg47cmjzf8gvbbispmzkg3pnzk4qc9473";
}; };
}.${stdenv.system} or throwSystem; }.${stdenv.system} or throwSystem;
@ -56,7 +56,7 @@ let
src = fetchurl { src = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
sha256 = "1s8kslp101xyaffb3rf8p5cw3p6zij2mn19fa68ykx4naykkwaly"; sha256 = "19kfb09ap780ayk7miqfr6gmba9rd10f9q9aphj35yk7cl22znbr";
}; };
buildInputs = [ unzip ]; buildInputs = [ unzip ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icestorm-${version}"; name = "icestorm-${version}";
version = "2018.01.10"; version = "2018.02.04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cliffordwolf"; owner = "cliffordwolf";
repo = "icestorm"; repo = "icestorm";
rev = "bca8c3c88f5707213a6cc55ec7b06b576ab98809"; rev = "722790ad3cdb497e1b13cd1b4368d8380371eb37";
sha256 = "00g1xd70dlgvyfyk5ivj71dpk0vzx3xka60f6x3hm4frl9ahyhj7"; sha256 = "0l04c6dshhhdcgqg1bdlw215wbn52fsg2fm2cvavhvf64c18lwd1";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

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

@ -1,7 +1,7 @@
{ stdenv, lib, buildGoPackage, fetchFromGitLab }: { stdenv, lib, buildGoPackage, fetchFromGitLab }:
buildGoPackage rec { buildGoPackage rec {
name = "loccount-${version}"; name = "loccount-${version}";
version = "1.1"; version = "1.2";
goPackagePath = "gitlab.com/esr/loccount"; goPackagePath = "gitlab.com/esr/loccount";
excludedPackages = "tests"; excludedPackages = "tests";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "esr"; owner = "esr";
repo = "loccount"; repo = "loccount";
rev = version; rev = version;
sha256 = "1wx31hraxics8x8w42jy5b10wdx1368zp2p6gplcfmpjssf9pacr"; sha256 = "18z7ai7wy2k9yd3w65d37apfqs3h9bc2c15y7v1bydppi44zfsdk";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

11
pkgs/games/assaultcube/assaultcube-next.patch Normal file
View File

@ -0,0 +1,11 @@
--- 1.1.0.4/source/src/Makefile
+++ 1.1.0.4/source/src/Makefile
@@ -6,7 +6,7 @@
# found to have been caused by the g++ compiler in the past. This seems to have
# been fixed now by relaxing the optimization that g++ does, so although we'll
# continue using clang++ (just in case), you can use g++ if you prefer.
-CXX=clang++
+#CXX=clang++
# Changing this to ACDEBUG=yes will compile a debug version of AssaultCube.
ACDEBUG=no

82
pkgs/games/assaultcube/default.nix Normal file
View File

@ -0,0 +1,82 @@
{ fetchFromGitHub, stdenv, makeDesktopItem, openal, pkgconfig, libogg,
libvorbis, SDL, SDL_image, makeWrapper, zlib,
client ? true, server ? true }:
with stdenv.lib;
stdenv.mkDerivation rec {
# master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix.
pname = "assaultcube";
version = "01052017";
name = "${pname}-${version}";
meta = {
description = "Fast and fun first-person-shooter based on the Cube fps";
homepage = http://assault.cubers.net;
maintainers = [ maintainers.genesis ];
platforms = platforms.linux; # should work on darwin with a little effort.
license = stdenv.lib.licenses.zlib;
};
src = fetchFromGitHub {
owner = "assaultcube";
repo = "AC";
rev = "9f537b0876a39d7686e773040469fbb1417de18b";
sha256 = "0nvckn67mmfaa7x3j41xyxjllxqzfx1dxg8pnqsaak3kkzds34pl";
};
# ${branch} not accepted as a value ?
# TODO: write a functional BUNDLED_ENET option and restore it in deps.
patches = [ ./assaultcube-next.patch ];
nativeBuildInputs = [ pkgconfig ];
# add optional for server only ?
buildInputs = [ makeWrapper openal SDL SDL_image libogg libvorbis zlib ];
#makeFlags = [ "CXX=g++" ];
targets = (optionalString server "server") + (optionalString client " client");
buildPhase = ''
make -C source/src ${targets}
'';
desktop = makeDesktopItem {
name = "AssaultCube";
desktopName = "AssaultCube";
comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay.";
genericName = "First-person shooter";
categories = "Application;Game;ActionGame;Shooter";
icon = "assaultcube.png";
exec = "${pname}";
};
gamedatadir = "/share/games/${pname}";
installPhase = ''
bindir=$out/bin
mkdir -p $bindir $out/$gamedatadir
cp -r config packages $out/$gamedatadir
# install custom script
substituteAll ${./launcher.sh} $bindir/assaultcube
chmod +x $bindir/assaultcube
if (test -e source/src/ac_client) then
cp source/src/ac_client $bindir
mkdir -p $out/share/applications
cp ${desktop}/share/applications/* $out/share/applications
install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png
install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png
fi
if (test -e source/src/ac_server) then
cp source/src/ac_server $bindir
ln -s $bindir/${pname} $bindir/${pname}-server
fi
'';
}

20
pkgs/games/assaultcube/launcher.sh Normal file
View File

@ -0,0 +1,20 @@
#!@shell@
# original scripts are very awful
CUBE_DIR=@out@@gamedatadir@
case $(basename "$0") in
assaultcube-server)
CUBE_OPTIONS="-Cconfig/servercmdline.txt"
BINARYPATH=@out@/bin/ac_server
;;
assaultcube)
CUBE_OPTIONS="--home=${HOME}/.assaultcube/v1.2next --init"
BINARYPATH=@out@/bin/ac_client
;;
*) echo "$0" is not supported.
exit 1
esac
cd $CUBE_DIR
exec "${BINARYPATH}" ${CUBE_OPTIONS} "$@"

4
pkgs/misc/themes/greybird/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "greybird"; pname = "greybird";
version = "3.22.5"; version = "3.22.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shimmerproject"; owner = "shimmerproject";
repo = "${pname}"; repo = "${pname}";
rev = "v${version}"; rev = "v${version}";
sha256 = "0l107q9fcbgp73r4p4fmyy3a7pmc4mi4km5hgp67fm2a4dna7rkd"; sha256 = "16rifkyy8l4v03rx85j7m6rfdal99l1xdmghysh95r6lx4y6r01i";
}; };
nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];

7
pkgs/os-specific/linux/cifs-utils/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, fetchurl, kerberos, keyutils, pam, talloc }: { stdenv, fetchurl, autoreconfHook, pkgconfig, kerberos, keyutils, pam, talloc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cifs-utils-${version}"; name = "cifs-utils-${version}";
version = "6.6"; version = "6.7";
src = fetchurl { src = fetchurl {
url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
sha256 = "09biws1jm23l3mjb9kh99v57z8bgzybrmimwddb40s6y0yl54wfh"; sha256 = "1ayghnkryy1n1zm5dyvyyr7n3807nsm6glfcbbki5c2a8w91dwmj";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ kerberos keyutils pam talloc ]; buildInputs = [ kerberos keyutils pam talloc ];
makeFlags = "root_sbindir=$(out)/sbin"; makeFlags = "root_sbindir=$(out)/sbin";

24
pkgs/os-specific/linux/cpupower/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];
buildInputs = [ pciutils ]; buildInputs = [ pciutils ];
configurePhase = '' postPatch = ''
cd tools/power/cpupower cd tools/power/cpupower
sed -i 's,/bin/true,${buildPackages.coreutils}/bin/true,' Makefile sed -i 's,/bin/true,${buildPackages.coreutils}/bin/true,' Makefile
sed -i 's,/bin/pwd,${buildPackages.coreutils}/bin/pwd,' Makefile sed -i 's,/bin/pwd,${buildPackages.coreutils}/bin/pwd,' Makefile
@ -17,18 +17,16 @@ stdenv.mkDerivation {
makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ]; makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ];
installPhase = '' installFlags = [
make \ "bindir=$(out)/bin"
bindir="$out/bin" \ "sbindir=$(out)/sbin"
sbindir="$out/sbin" \ "mandir=$(out)/share/man"
mandir="$out/share/man" \ "includedir=$(out)/include"
includedir="$out/include" \ "libdir=$(out)/lib"
libdir="$out/lib" \ "localedir=$(out)/share/locale"
localedir="$out/share/locale" \ "docdir=$(out)/share/doc/cpupower"
docdir="$out/share/doc/cpupower" \ "confdir=$(out)/etc"
confdir="$out/etc" \ ];
install install-man
'';
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hwdata-${version}"; name = "hwdata-${version}";
version = "0.300"; version = "0.308";
src = fetchurl { src = fetchurl {
url = "http://pkgs.fedoraproject.org/repo/pkgs/hwdata/v0.300.tar.gz/sha512/34294fcf65c3cb17c19d625732d1656ec1992dde254a68ee35681ad2f310bc05028a85889efa2c1d1e8a2d10885ccc00185475a00f6f2fb82d07e2349e604a51/v0.300.tar.gz"; url = "https://github.com/vcrhonek/hwdata/archive/v0.308.tar.gz";
sha256 = "03xlj05qyixhnsybq1qnr7j5q2nvirs4jxpgg4sbw8swsqj3dgqi"; sha256 = "17zcwplw41dfwb2l9jfgvm65rjzlsbv30f56d6vgiix042f92vcq";
}; };
preConfigure = "patchShebangs ./configure"; preConfigure = "patchShebangs ./configure";

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

@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
let let
name = "wireguard-${version}"; name = "wireguard-${version}";
version = "0.0.20180118"; version = "0.0.20180202";
src = fetchurl { src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "18x8ndnr4lvl3in5sian6f9q69pk8h4xbwldmk7bfrpb5m03ngs6"; sha256 = "ee3415b482265ad9e8721aa746aaffdf311058a2d1a4d80e7b6d11bbbf71c722";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/servers/misc/airsonic/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "airsonic-${version}"; name = "airsonic-${version}";
version = "10.0.1"; version = "10.1.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war";
sha256 = "1qky8dz49200f6100ivkn5g7i0hzkv3gpq2r0cj6z53s8d1ayblc"; sha256 = "0acj6la88lnbfdp0nilvsll48zfig7sgibgwfjjckialppyg4ir6";
}; };
buildCommand = '' buildCommand = ''

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name= "nextcloud-${version}"; name= "nextcloud-${version}";
version = "12.0.4"; version = "12.0.5";
src = fetchurl { src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
sha256 = "1dh9knqbw6ph2rfrb5rscdraj4375rqddmrifw6adyga9jkn2hb5"; sha256 = "0hya524d8wqia5v2wz8cmasi526j97z6d0l1h7l7j442wsn2kgn8";
}; };
installPhase = '' installPhase = ''

22
pkgs/tools/admin/fastlane/Gemfile.lock
View File

@ -4,6 +4,7 @@ GEM
CFPropertyList (2.3.6) CFPropertyList (2.3.6)
addressable (2.5.2) addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 4.0)
atomos (0.1.2)
babosa (1.0.2) babosa (1.0.2)
claide (1.0.2) claide (1.0.2)
colored (1.2) colored (1.2)
@ -16,7 +17,7 @@ GEM
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
dotenv (2.2.1) dotenv (2.2.1)
excon (0.60.0) excon (0.60.0)
faraday (0.13.1) faraday (0.14.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6) faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4) faraday (>= 0.7.4)
@ -24,8 +25,8 @@ GEM
faraday_middleware (0.12.2) faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0) faraday (>= 0.7.4, < 1.0)
fastimage (2.1.1) fastimage (2.1.1)
fastlane (2.75.1) fastlane (2.80.0)
CFPropertyList (>= 2.3, < 3.0.0) CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0) babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 2.0.0) bundler (>= 1.12.0, < 2.0.0)
@ -49,16 +50,16 @@ GEM
public_suffix (~> 2.0.0) public_suffix (~> 2.0.0)
rubyzip (>= 1.1.0, < 2.0.0) rubyzip (>= 1.1.0, < 2.0.0)
security (= 0.1.3) security (= 0.1.3)
slack-notifier (>= 1.3, < 2.0.0) slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0) terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-table (>= 1.4.5, < 2.0.0) terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0) tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.7.0, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0) word_wrap (~> 1.0.0)
xcodeproj (>= 1.5.2, < 2.0.0) xcodeproj (>= 1.5.2, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0) xcpretty (>= 0.2.4, < 1.0.0)
xcpretty-travis-formatter (>= 0.0.3) xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.0.3) gh_inspector (1.1.1)
google-api-client (0.13.6) google-api-client (0.13.6)
addressable (~> 2.5, >= 2.5.1) addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.5) googleauth (~> 0.5)
@ -89,7 +90,7 @@ GEM
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mini_magick (4.5.1) mini_magick (4.5.1)
multi_json (1.13.0) multi_json (1.13.1)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.0.0) multipart-post (2.0.0)
nanaimo (0.2.3) nanaimo (0.2.3)
@ -109,13 +110,13 @@ GEM
faraday (~> 0.9) faraday (~> 0.9)
jwt (>= 1.5, < 3.0) jwt (>= 1.5, < 3.0)
multi_json (~> 1.10) multi_json (~> 1.10)
slack-notifier (1.5.1) slack-notifier (2.3.2)
terminal-notifier (1.8.0) terminal-notifier (1.8.0)
terminal-table (1.8.0) terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)
tty-cursor (0.5.0) tty-cursor (0.5.0)
tty-screen (0.6.4) tty-screen (0.6.4)
tty-spinner (0.7.0) tty-spinner (0.8.0)
tty-cursor (>= 0.5.0) tty-cursor (>= 0.5.0)
uber (0.1.0) uber (0.1.0)
unf (0.1.4) unf (0.1.4)
@ -123,8 +124,9 @@ GEM
unf_ext (0.0.7.4) unf_ext (0.0.7.4)
unicode-display_width (1.3.0) unicode-display_width (1.3.0)
word_wrap (1.0.0) word_wrap (1.0.0)
xcodeproj (1.5.4) xcodeproj (1.5.6)
CFPropertyList (~> 2.3.3) CFPropertyList (~> 2.3.3)
atomos (~> 0.1.2)
claide (>= 1.0.2, < 2.0) claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1) colored2 (~> 3.1)
nanaimo (~> 0.2.3) nanaimo (~> 0.2.3)

38
pkgs/tools/admin/fastlane/gemset.nix
View File

@ -8,6 +8,14 @@
}; };
version = "2.5.2"; version = "2.5.2";
}; };
atomos = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "10z69hjv30r2w5q5wmlf0cq4jv3w744jrac8ylln8sf45ckqj7wk";
type = "gem";
};
version = "0.1.2";
};
babosa = { babosa = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
@ -102,10 +110,10 @@
dependencies = ["multipart-post"]; dependencies = ["multipart-post"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw"; sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
type = "gem"; type = "gem";
}; };
version = "0.13.1"; version = "0.14.0";
}; };
faraday-cookie_jar = { faraday-cookie_jar = {
dependencies = ["faraday" "http-cookie"]; dependencies = ["faraday" "http-cookie"];
@ -137,18 +145,18 @@
dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0v5i9wnbmsmvz3xhbkvs1w5qj9b0ib5431i3zlimfasf8h138l9y"; sha256 = "0saas50qdfipkms66snyg7imvzn1vfngd87dfygj9x8v18bqwvis";
type = "gem"; type = "gem";
}; };
version = "2.75.1"; version = "2.80.0";
}; };
gh_inspector = { gh_inspector = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x"; sha256 = "0mpfl279k8yff2ia601b37zw31blwh2plkr501iz6qj8drx3mq3c";
type = "gem"; type = "gem";
}; };
version = "1.0.3"; version = "1.1.1";
}; };
google-api-client = { google-api-client = {
dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
@ -262,10 +270,10 @@
multi_json = { multi_json = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "05rrhxl08qvd37g5q13v6k8qqbr1ixn6g53ld6rxrvj4lxrjvxns"; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
type = "gem"; type = "gem";
}; };
version = "1.13.0"; version = "1.13.1";
}; };
multi_xml = { multi_xml = {
source = { source = {
@ -368,10 +376,10 @@
slack-notifier = { slack-notifier = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv";
type = "gem"; type = "gem";
}; };
version = "1.5.1"; version = "2.3.2";
}; };
terminal-notifier = { terminal-notifier = {
source = { source = {
@ -410,10 +418,10 @@
dependencies = ["tty-cursor"]; dependencies = ["tty-cursor"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sblbhnscgchnxpbsxa5xmnxnpw13nd4lgsykazm9mhsxmjmhggw"; sha256 = "1xv5bycgmiyx00bq0kx2bdixi3h1ffi86mwj858gqbxlpjbzsi94";
type = "gem"; type = "gem";
}; };
version = "0.7.0"; version = "0.8.0";
}; };
uber = { uber = {
source = { source = {
@ -457,13 +465,13 @@
version = "1.0.0"; version = "1.0.0";
}; };
xcodeproj = { xcodeproj = {
dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "04kv04y5yz2zniwwywh5ik29gpnjpsp23yr6w07qn3m243icvi76"; sha256 = "0zqx24qhax7p91rs1114da0v86cy9m7an1bjwxq6dyccp8g6kb50";
type = "gem"; type = "gem";
}; };
version = "1.5.4"; version = "1.5.6";
}; };
xcpretty = { xcpretty = {
dependencies = ["rouge"]; dependencies = ["rouge"];

6
pkgs/tools/graphics/fim/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fim-${version}"; name = "fim-${version}";
version = "0.5rc3"; version = "0.6";
src = fetchurl { src = fetchurl {
url = mirror://savannah/fbi-improved/fim-0.5-rc3.tar.gz; url = "mirror://savannah/fbi-improved/${name}-trunk.tar.gz";
sha256 = "12aka85h469zfj0zcx3xdpan70gq8nf5rackgb1ldcl9mqjn50c2"; sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp";
}; };
postPatch = '' postPatch = ''

26
pkgs/tools/misc/edid-decode/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchgit }:
let
version = "2017-09-18";
in stdenv.mkDerivation rec {
name = "edid-decode-unstable-${version}";
src = fetchgit {
url = "git://anongit.freedesktop.org/xorg/app/edid-decode";
rev = "f56f329ed23a25d002352dedba1e8f092a47286f";
sha256 = "1qzaq342dsdid0d99y7kj60p6bzgp2zjsmspyckddc68mmz4cs9n";
};
installPhase = ''
mkdir -p $out/bin
cp edid-decode $out/bin
'';
meta = {
description = "EDID decoder and conformance tester";
homepage = http://cgit.freedesktop.org/xorg/app/edid-decode/;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.chiiruno ];
platforms = stdenv.lib.platforms.all;
};
}

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pick-${version}"; name = "pick-${version}";
version = "1.9.0"; version = "2.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "calleerlandsson"; owner = "calleerlandsson";
repo = "pick"; repo = "pick";
rev = "v${version}"; rev = "v${version}";
sha256 = "0s0mn9iz17ldhvahggh9rsmgfrjh0kvk5bh4p9xhxcn7rcp0h5ka"; sha256 = "0ypawbzpw188rxgv8x044iib3a517j5grgqnxy035ax5zzjavsrr";
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "picocom-${version}"; name = "picocom-${version}";
version = "3.0"; version = "3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "npat-efault"; owner = "npat-efault";
repo = "picocom"; repo = "picocom";
rev = version; rev = version;
sha256 = "1i75ksm44la8kn82v71hzq0q5642y108rascdb94zilhagdhilk2"; sha256 = "1vvjydqf0ax47nvdyyl67jafw5b3sfsav00xid6qpgia1gs2r72n";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];

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

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "facter-${version}"; name = "facter-${version}";
version = "3.9.0"; version = "3.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "1picxrmvka57ph4zqgwqdsqvz3mqppg41wkj8dx37hscwwlbdw0s"; sha256 = "1qd0xsw49nbj22czddxk90di31gx43hacvnmh08gp3001a8g0qcj";
rev = version; rev = version;
repo = "facter"; repo = "facter";
owner = "puppetlabs"; owner = "puppetlabs";

8
pkgs/tools/system/freeipmi/default.nix
View File

@ -1,15 +1,15 @@
{ fetchurl, stdenv, libgcrypt, readline }: { fetchurl, stdenv, libgcrypt, readline, libgpgerror }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.5.7"; version = "1.6.1";
name = "freeipmi-${version}"; name = "freeipmi-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/freeipmi/${name}.tar.gz"; url = "mirror://gnu/freeipmi/${name}.tar.gz";
sha256 = "1rdxs33klk6956rg8mn2dxwkk43y5yilvgvbcka8g6v4x0r98v5l"; sha256 = "0jdm1nwsnkj0nzjmcqprmjk25449mhjj25khwzpq3mpjw440wmd2";
}; };
buildInputs = [ libgcrypt readline ]; buildInputs = [ libgcrypt readline libgpgerror ];
doCheck = true; doCheck = true;

11
pkgs/tools/system/htop/default.nix
View File

@ -1,19 +1,24 @@
{ lib, fetchurl, stdenv, ncurses, { lib, fetchurl, stdenv, ncurses,
IOKit }: IOKit, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "htop-${version}"; name = "htop-${version}";
version = "2.0.2"; version = "2.1.0";
src = fetchurl { src = fetchurl {
sha256 = "11zlwadm6dpkrlfvf3z3xll26yyffa7qrxd1w72y1kl0rgffk6qp";
url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz";
sha256 = "0j07z0xm2gj1vzvbgh4323k4db9mr7drd7gw95mmpqi61ncvwq1j";
}; };
nativeBuildInputs = [ python ];
buildInputs = buildInputs =
[ ncurses ] ++ [ ncurses ] ++
lib.optionals stdenv.isDarwin [ IOKit ]; lib.optionals stdenv.isDarwin [ IOKit ];
prePatch = ''
patchShebangs scripts/MakeHeader.py
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An interactive process viewer for Linux"; description = "An interactive process viewer for Linux";
homepage = https://hisham.hm/htop/; homepage = https://hisham.hm/htop/;

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

@ -1,13 +1,13 @@
{ stdenv, fetchurl, python27Packages }: { stdenv, fetchurl, python27Packages }:
python27Packages.buildPythonApplication rec { python27Packages.buildPythonApplication rec {
version = "2.16.0"; version = "2.22.0";
name = "fanficfare-${version}"; name = "fanficfare-${version}";
nameprefix = ""; nameprefix = "";
src = fetchurl { src = fetchurl {
url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
sha256 = "0c31z7w4b3wz5nahsmnfhvp3srprfsqbp3zyngw4cqw3dm17kvvi"; sha256 = "1gwr2qk0wff8f69w21ffj6cq8jklqd89vcdhhln6ii1h1kf8k031";
}; };
propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];

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

@ -1953,6 +1953,8 @@ with pkgs;
ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { }; ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { };
edid-decode = callPackage ../tools/misc/edid-decode { };
editres = callPackage ../tools/graphics/editres { }; editres = callPackage ../tools/graphics/editres { };
edit = callPackage ../applications/editors/edit { }; edit = callPackage ../applications/editors/edit { };
@ -18193,6 +18195,8 @@ with pkgs;
physfs = physfs_2; physfs = physfs_2;
}; };
assaultcube = callPackage ../games/assaultcube { };
astromenace = callPackage ../games/astromenace { }; astromenace = callPackage ../games/astromenace { };
atanks = callPackage ../games/atanks {}; atanks = callPackage ../games/atanks {};

10
pkgs/top-level/lua-packages.nix
View File

@ -9,7 +9,7 @@
, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
, mysql, postgresql, cyrus_sasl , mysql, postgresql, cyrus_sasl
, fetchFromGitHub, libmpack, which , fetchFromGitHub, libmpack, which, fetchpatch
}: }:
let let
@ -671,6 +671,14 @@ let
sed -i "s|/usr/local|$out|" lgi/Makefile sed -i "s|/usr/local|$out|" lgi/Makefile
''; '';
patches = [
(fetchpatch {
name = "lgi-find-cairo-through-typelib.patch";
url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch";
sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c";
})
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; description = "GObject-introspection based dynamic Lua binding to GObject based libraries";
homepage = https://github.com/pavouk/lgi; homepage = https://github.com/pavouk/lgi;

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

@ -155,6 +155,8 @@ in {
agate-sql = callPackage ../development/python-modules/agate-sql { }; agate-sql = callPackage ../development/python-modules/agate-sql { };
aioimaplib = callPackage ../development/python-modules/aioimaplib { };
aioamqp = callPackage ../development/python-modules/aioamqp { }; aioamqp = callPackage ../development/python-modules/aioamqp { };
ansicolor = callPackage ../development/python-modules/ansicolor { }; ansicolor = callPackage ../development/python-modules/ansicolor { };
@ -623,6 +625,8 @@ in {
}; };
}; };
asynctest = callPackage ../development/python-modules/asynctest { };
async-timeout = callPackage ../development/python-modules/async_timeout { }; async-timeout = callPackage ../development/python-modules/async_timeout { };
asn1ate = callPackage ../development/python-modules/asn1ate { }; asn1ate = callPackage ../development/python-modules/asn1ate { };
@ -2028,6 +2032,11 @@ in {
doCheck = false; doCheck = false;
}); });
can = callPackage ../development/python-modules/can {};
canopen = callPackage ../development/python-modules/canopen {};
canmatrix = callPackage ../development/python-modules/canmatrix {};
cairocffi = buildPythonPackage rec { cairocffi = buildPythonPackage rec {
name = "cairocffi-0.7.2"; name = "cairocffi-0.7.2";
@ -2124,26 +2133,6 @@ in {
}; };
}; };
github-cli = buildPythonPackage rec {
version = "1.0.0";
name = "github-cli-${version}";
src = pkgs.fetchFromGitHub {
owner = "jsmits";
repo = "github-cli";
rev = version;
sha256 = "16bwn42wqd76zs97v8p6mqk79p5i2mb06ljk67lf8gy6kvqc1x8y";
};
buildInputs = with self; [ nose pkgs.git ];
propagatedBuildInputs = with self; [ simplejson ];
# skipping test_issues_cli.py since it requires access to the github.com
patchPhase = "rm tests/test_issues_cli.py";
checkPhase = "nosetests tests/";
meta.maintainers = with maintainers; [ garbas ];
};
case = buildPythonPackage rec { case = buildPythonPackage rec {
name = "case-${version}"; name = "case-${version}";
version = "1.5.2"; version = "1.5.2";
@ -3797,7 +3786,8 @@ in {
}; };
}); });
nose-parameterized = callPackage ../development/python-modules/nose-parameterized {}; nose-parameterized = warn "Warning: `nose-parameterized` is deprecated! Use `parameterized` instead."
(callPackage ../development/python-modules/nose-parameterized {});
neurotools = buildPythonPackage (rec { neurotools = buildPythonPackage (rec {
name = "NeuroTools-${version}"; name = "NeuroTools-${version}";
@ -5222,6 +5212,8 @@ in {
}; };
}; };
imaplib2 = callPackage ../development/python-modules/imaplib2 { };
ipfsapi = buildPythonPackage rec { ipfsapi = buildPythonPackage rec {
name = "ipfsapi-${version}"; name = "ipfsapi-${version}";
version = "0.4.2.post1"; version = "0.4.2.post1";
@ -5568,6 +5560,8 @@ in {
}; };
}; };
luftdaten = callPackage ../development/python-modules/luftdaten { };
m2r = callPackage ../development/python-modules/m2r { }; m2r = callPackage ../development/python-modules/m2r { };
mailchimp = buildPythonPackage rec { mailchimp = buildPythonPackage rec {
@ -12357,6 +12351,8 @@ in {
}; };
}; };
parameterized = callPackage ../development/python-modules/parameterized { };
paramz = callPackage ../development/python-modules/paramz { }; paramz = callPackage ../development/python-modules/paramz { };
parsel = buildPythonPackage rec { parsel = buildPythonPackage rec {
@ -12780,6 +12776,8 @@ in {
kmsxx = callPackage ../development/libraries/kmsxx { }; kmsxx = callPackage ../development/libraries/kmsxx { };
pybase64 = callPackage ../development/python-modules/pybase64 { };
pylibconfig2 = buildPythonPackage rec { pylibconfig2 = buildPythonPackage rec {
name = "pylibconfig2-${version}"; name = "pylibconfig2-${version}";
version = "0.2.4"; version = "0.2.4";