b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
This commit is contained in:
John Ericson 2018-05-16 15:16:08 -04:00
parent 16b6f53910 f3fcf1b0a9
commit ddbe9191ef
78 changed files with 2125 additions and 1081 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/types.nix
View file

@ -372,7 +372,13 @@ rec {
# This is mandatory as some option declaration might use the
# "name" attribute given as argument of the submodule and use it
# as the default of option declarations.
args.name = "<name>";
#
# Using lookalike unicode single angle quotation marks because
# of the docbook transformation the options receive. In all uses
# > and < wouldn't be encoded correctly so the encoded values
# would be used, and use of `<` and `>` would break the XML document.
# It shouldn't cause an issue since this is cosmetic for the manual.
args.name = "‹name›";
}).options;
getSubModules = opts';
substSubModules = m: submodule m;

5
maintainers/maintainer-list.nix
View file

@ -2036,6 +2036,11 @@
github = "kristoff3r";
name = "Kristoffer Søholm";
};
ktf = {
email = "giulio.eulisse@cern.ch";
github = "ktf";
name = "Giuluo Eulisse";
};
ktosiek = {
email = "tomasz.kontusz@gmail.com";
github = "ktosiek";

2
nixos/doc/manual/installation/installing-from-other-distro.xml
View file

@ -47,7 +47,7 @@
Short version:
</para>
<screen>
$ bash &lt;(curl https://nixos.org/nix/install)
$ curl https://nixos.org/nix/install | sh
$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell</screen>
<para>
More details in the

3
nixos/modules/module-list.nix
View file

@ -102,6 +102,7 @@
./programs/qt5ct.nix
./programs/rootston.nix
./programs/screen.nix
./programs/sedutil.nix
./programs/slock.nix
./programs/shadow.nix
./programs/shell.nix
@ -382,6 +383,7 @@
./services/misc/sundtek.nix
./services/misc/svnserve.nix
./services/misc/synergy.nix
./services/misc/sysprof.nix
./services/misc/taskserver
./services/misc/tzupdate.nix
./services/misc/uhub.nix
@ -568,6 +570,7 @@
./services/networking/strongswan.nix
./services/networking/strongswan-swanctl/module.nix
./services/networking/stunnel.nix
./services/networking/stubby.nix
./services/networking/supplicant.nix
./services/networking/supybot.nix
./services/networking/syncthing.nix

18
nixos/modules/programs/sedutil.nix Normal file
View file

@ -0,0 +1,18 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.sedutil;
in {
options.programs.sedutil.enable = mkEnableOption "sedutil";
config = mkIf cfg.enable {
boot.kernelParams = [
"libata.allow_tpm=1"
];
environment.systemPackages = with pkgs; [ sedutil ];
};
}

4
nixos/modules/programs/zsh/zsh.nix
View file

@ -108,8 +108,6 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.shellInit}
${cfg.shellInit}
@ -129,6 +127,8 @@ in
if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
__ETC_ZPROFILE_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.loginShellInit}
${cfg.loginShellInit}

19
nixos/modules/services/misc/sysprof.nix Normal file
View file

@ -0,0 +1,19 @@
{ config, lib, pkgs, ... }:
{
options = {
services.sysprof = {
enable = lib.mkEnableOption "sysprof profiling daemon";
};
};
config = lib.mkIf config.services.sysprof.enable {
environment.systemPackages = [ pkgs.sysprof ];
services.dbus.packages = [ pkgs.sysprof ];
systemd.packages = [ pkgs.sysprof ];
};
meta.maintainers = pkgs.sysprof.meta.maintainers;
}

214
nixos/modules/services/networking/stubby.nix Normal file
View file

@ -0,0 +1,214 @@
{ config, lib, pkgs, ...}:
with lib;
let
cfg = config.services.stubby;
fallbacks = concatMapStringsSep "\n " (x: "- ${x}") cfg.fallbackProtocols;
listeners = concatMapStringsSep "\n " (x: "- ${x}") cfg.listenAddresses;
# By default, the recursive resolvers maintained by the getdns
# project itself are enabled. More information about both getdns's servers,
# as well as third party options for upstream resolvers, can be found here:
# https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Test+Servers
#
# You can override these values by supplying a yaml-formatted array of your
# preferred upstream resolvers in the following format:
#
# 106 # - address_data: IPv4 or IPv6 address of the upstream
# port: Port for UDP/TCP (default is 53)
# tls_auth_name: Authentication domain name checked against the server
# certificate
# tls_pubkey_pinset: An SPKI pinset verified against the keys in the server
# certificate
# - digest: Only "sha256" is currently supported
# value: Base64 encoded value of the sha256 fingerprint of the public
# key
# tls_port: Port for TLS (default is 853)
defaultUpstream = ''
- address_data: 145.100.185.15
tls_auth_name: "dnsovertls.sinodun.com"
tls_pubkey_pinset:
- digest: "sha256"
value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
- address_data: 145.100.185.16
tls_auth_name: "dnsovertls1.sinodun.com"
tls_pubkey_pinset:
- digest: "sha256"
value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
- address_data: 185.49.141.37
tls_auth_name: "getdnsapi.net"
tls_pubkey_pinset:
- digest: "sha256"
value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
- address_data: 2001:610:1:40ba:145:100:185:15
tls_auth_name: "dnsovertls.sinodun.com"
tls_pubkey_pinset:
- digest: "sha256"
value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
- address_data: 2001:610:1:40ba:145:100:185:16
tls_auth_name: "dnsovertls1.sinodun.com"
tls_pubkey_pinset:
- digest: "sha256"
value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
- address_data: 2a04:b900:0:100::38
tls_auth_name: "getdnsapi.net"
tls_pubkey_pinset:
- digest: "sha256"
value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
'';
# Resolution type is not changeable here because it is required per the
# stubby documentation:
#
# "resolution_type: Work in stub mode only (not recursive mode) - required for Stubby
# operation."
#
# https://dnsprivacy.org/wiki/display/DP/Configuring+Stubby
confFile = pkgs.writeText "stubby.yml" ''
resolution_type: GETDNS_RESOLUTION_STUB
dns_transport_list:
${fallbacks}
tls_authentication: ${cfg.authenticationMode}
tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize}
edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"}
idle_timeout: ${toString cfg.idleTimeout}
listen_addresses:
${listeners}
round_robin_upstreams: ${if cfg.roundRobinUpstreams then "1" else "0"}
${cfg.extraConfig}
upstream_recursive_servers:
${cfg.upstreamServers}
'';
in
{
options = {
services.stubby = {
enable = mkEnableOption "Stubby DNS resolver";
fallbackProtocols = mkOption {
default = [ "GETDNS_TRANSPORT_TLS" ];
type = with types; listOf (enum [
"GETDNS_TRANSPORT_TLS"
"GETDNS_TRANSPORT_TCP"
"GETDNS_TRANSPORT_UDP"
]);
description = ''
Ordered list composed of one or more transport protocols.
Strict mode should only use <literal>GETDNS_TRANSPORT_TLS</literal>.
Other options are <literal>GETDNS_TRANSPORT_UDP</literal> and
<literal>GETDNS_TRANSPORT_TCP</literal>.
'';
};
authenticationMode = mkOption {
default = "GETDNS_AUTHENTICATION_REQUIRED";
type = types.enum [
"GETDNS_AUTHENTICATION_REQUIRED"
"GETDNS_AUTHENTICATION_NONE"
];
description = ''
Selects the Strict or Opportunistic usage profile.
For strict, set to <literal>GETDNS_AUTHENTICATION_REQUIRED</literal>.
for opportunistic, use <literal>GETDNS_AUTHENTICATION_NONE</literal>.
'';
};
queryPaddingBlocksize = mkOption {
default = 128;
type = types.int;
description = ''
EDNS0 option to pad the size of the DNS query to the given blocksize.
'';
};
subnetPrivate = mkOption {
default = true;
type = types.bool;
description = ''
EDNS0 option for ECS client privacy. Default is
<literal>true</literal>. If set, this option prevents the client
subnet from being sent to authoritative nameservers.
'';
};
idleTimeout = mkOption {
default = 10000;
type = types.int;
description = "EDNS0 option for keepalive idle timeout expressed in
milliseconds.";
};
listenAddresses = mkOption {
default = [ "127.0.0.1" "0::1" ];
type = with types; listOf str;
description = ''
Sets the listen address for the stubby daemon.
Uses port 53 by default.
Ise IP@port to specify a different port.
'';
};
roundRobinUpstreams = mkOption {
default = true;
type = types.bool;
description = ''
Instructs stubby to distribute queries across all available name
servers. Default is <literal>true</literal>. Set to
<literal>false</literal> in order to use the first available.
'';
};
upstreamServers = mkOption {
default = defaultUpstream;
type = types.lines;
description = ''
Add additional upstreams. See <citerefentry><refentrytitle>stubby
</refentrytitle><manvolnum>1</manvolnum></citerefentry> for an
example of the entry formatting. In Strict mode, at least one of the
following settings must be supplied for each nameserver:
<literal>tls_auth_name</literal> or
<literal>tls_pubkey_pinset</literal>.
'';
};
debugLogging = mkOption {
default = false;
type = types.bool;
description = "Enable or disable debug level logging.";
};
extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
Add additional configuration options. see <citerefentry>
<refentrytitle>stubby</refentrytitle><manvolnum>1</manvolnum>
</citerefentry>for more options.
'';
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.stubby ];
systemd.services.stubby = {
description = "Stubby local DNS resolver";
after = [ "network.target" ];
before = [ "nss-lookup.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}";
DynamicUser = true;
};
};
};
}

3
nixos/modules/services/x11/display-managers/gdm.nix
View file

@ -135,6 +135,9 @@ in
systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];
# Allow choosing an user account
services.accounts-daemon.enable = true;
services.dbus.packages = [ gdm ];
systemd.user.services.dbus.wantedBy = [ "default.target" ];

19
nixos/tests/statsd.nix
View file

@ -8,7 +8,7 @@ with lib;
maintainers = [ ma27 ];
};
nodes.statsd1 = {
machine = {
services.statsd.enable = true;
services.statsd.backends = [ "statsd-influxdb-backend" "console" ];
services.statsd.extraConfig = ''
@ -33,8 +33,19 @@ with lib;
};
testScript = ''
$statsd1->start();
$statsd1->waitForUnit("statsd.service");
$statsd1->waitUntilSucceeds("nc -z 127.0.0.1 8126");
$machine->start();
$machine->waitForUnit("statsd.service");
$machine->waitForOpenPort(8126);
# check state of the `statsd` server
$machine->succeed('[ "health: up" = "$(echo health | nc 127.0.0.1 8126 -w 120 -N)" ];');
# confirm basic examples for metrics derived from docs:
# https://github.com/etsy/statsd/blob/v0.8.0/README.md#usage and
# https://github.com/etsy/statsd/blob/v0.8.0/docs/admin_interface.md
$machine->succeed("echo 'foo:1|c' | nc -u -w 0 127.0.0.1 8125");
$machine->succeed("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo");
$machine->succeed("echo 'delcounters foo' | nc -w 120 127.0.0.1 8126 -N");
$machine->fail("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo");
'';
})

41
pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix Normal file
View file

@ -0,0 +1,41 @@
{ stdenv, fetchFromGitHub, cmake, emacs, libvterm-neovim }:
let
emacsSources = stdenv.mkDerivation {
name = emacs.name + "-sources";
src = emacs.src;
configurePhase = ":";
dontBuild = true;
doCheck = false;
fixupPhase = ":";
installPhase = ''
mkdir -p $out
cp -a * $out
'';
};
in stdenv.mkDerivation rec {
name = "emacs-libvterm-${version}";
version = "unstable-2017-11-24";
src = fetchFromGitHub {
owner = "akermu";
repo = "emacs-libvterm";
rev = "829ae86f60c3a54048804997edffa161c77a2f4b";
sha256 = "1xb24kpvypvskh4vr3b45nl2m2vsczcr9rnsr2sjzf32mnapyjnp";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ emacs libvterm-neovim ];
cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ];
installPhase = ''
install -d $out/share/emacs/site-lisp
install ../*.el $out/share/emacs/site-lisp
install ../*.so $out/share/emacs/site-lisp
'';
}

16
pkgs/applications/editors/jetbrains/default.nix
View file

@ -276,12 +276,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "0s5vbdg8ajaac1jqh8ypy20fp061aqjhiyi20kdcsb0856nw5frg"; /* updated by script */
sha256 = "0ws5s8bvjpz60pdyak3vb22x27qi00ajxx18wia1hql8831gsk3m"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IDEA_Release";
@ -289,12 +289,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
sha256 = "1rrqc9sj0ibkkj627hzwdh7l5z8zm6cmaz0yzx6xhyi989ivfy2r"; /* updated by script */
sha256 = "14h71x3jidwiwv73g48f6bd0y4p3s33jb4wdr5grdhm677pqb702"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";
@ -354,12 +354,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2018.1.1"; /* updated by script */
version = "2018.1.2"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "1nh2m10ikwl85n66aspkmgxmbk98amhlgj2xl2sasjfwn5pn1wmf"; /* updated by script */
sha256 = "0bnzn811rmgn0kig3mzbwgx85490dqg4sg3pmmmk20n8hcph8zca"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "rm2018.1";
@ -367,12 +367,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.3"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "14fmny9i0cgkplna0li5q2c5wiqk71k6c5h480ia85jaqi2vm8jh"; /* updated by script */
sha256 = "03nhs4vmqbm5s4ykjz475nvcbwvp2hb0bq5ijfjxwayj3jgv0zbm"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WS_Release";

32
pkgs/applications/editors/neovim/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
, libtool, libuv, luaPackages, ncurses, perl, pkgconfig
, unibilium, vimUtils, xsel, gperf, callPackage
, libvterm-neovim
, withJemalloc ? true, jemalloc
}:
@ -8,35 +9,6 @@ with stdenv.lib;
let
# Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
neovimLibvterm = stdenv.mkDerivation rec {
name = "neovim-libvterm-${version}";
version = "2017-11-05";
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
rev = "4ca7ebf7d25856e90bc9d9cc49412e80be7c4ea8";
sha256 = "05kyvvz8af90mvig11ya5xd8f4mbvapwyclyrihm9lwas706lzf6";
};
buildInputs = [ perl ];
nativeBuildInputs = [ libtool ];
makeFlags = [ "PREFIX=$(out)" ]
++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
enableParallelBuilding = true;
meta = {
description = "VT220/xterm/ECMA-48 terminal emulator library";
homepage = http://www.leonerd.org.uk/code/libvterm/;
license = licenses.mit;
maintainers = with maintainers; [ garbas ];
platforms = platforms.unix;
};
};
neovim = stdenv.mkDerivation rec {
name = "neovim-unwrapped-${version}";
version = "0.2.2";
@ -55,7 +27,7 @@ let
libuv
libmsgpack
ncurses
neovimLibvterm
libvterm-neovim
unibilium
luaPackages.lua
gperf

8
pkgs/applications/editors/vscode/default.nix
View file

@ -2,7 +2,7 @@
makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
let
version = "1.23.0";
version = "1.23.1";
channel = "stable";
plat = {
@ -12,9 +12,9 @@ let
}.${stdenv.system};
sha256 = {
"i686-linux" = "1nyrcgnf18752n3i7xaq6gpb2k4wsfzk671kxg6za4ycrriw1f5l";
"x86_64-linux" = "1mkxyavzav522sl3fjn2hdlbj0bkdl3hagqiw9i6h8wgkxcvsszy";
"x86_64-darwin" = "123ggzssd5qd80jxar2pf5g2n2473pd2j8pfjyir1c7xkaqji2w6";
"i686-linux" = "0vqaxyg6r6mfm1gz8j7wxgg426hjsmv2ybyi8rfjcm9s8d23y9n6";
"x86_64-linux" = "0zycl8zqf5yiqq6k6mr28a20yg37whb8iw527pavvm74knzx3lgk";
"x86_64-darwin" = "03r2cvim7swq1fjxh6m9f7rifww3hddnyzpzniqb5132nnq4mrmc";
}.${stdenv.system};
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

29
pkgs/applications/graphics/draftsight/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc,
xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
libXrender, libXcomposite }:
let version = "2017-SP2"; in
let version = "2018SP2"; in
stdenv.mkDerivation {
name = "draftsight-${version}";
@ -31,7 +31,7 @@ stdenv.mkDerivation {
$out/bin/$exe \
--prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
done
for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so; do
for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so*; do
# DraftSight ships with broken symlinks for some reason
if [ -f $(readlink -f $lib) ]
then
@ -41,6 +41,19 @@ stdenv.mkDerivation {
echo "Ignoring broken link $lib"
fi
done
for lib in $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/lib/cpp/*.so*; do
if [ -f $(readlink $lib) ]
then
echo "Patching $lib..."
chmod u+w $lib
patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib
else
echo "Ignoring broken link $lib"
fi
done
# These libraries shouldn't really be here anyway:
find $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/Samples/C++ \
-type d -name _lib | xargs rm -r
'';
# TODO: Figure out why HelpGuide segfaults at startup.
@ -51,15 +64,15 @@ stdenv.mkDerivation {
# that it dlopen()'s libraries in paths removed by shrinking RPATH.
dontPatchELF = true;
src = requireFile {
src = fetchurl {
name = "draftSight.deb";
url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0";
sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr";
url = "http://dl-ak.solidworks.com/nonsecure/draftsight/${version}/draftSight.deb";
sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx";
};
libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11
xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
libXcursor libXrandr libxcb libXi libSM libICE libXrender
libXcomposite ];

12
pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
View file

@ -1,12 +0,0 @@
diff -Naur kdenlive-17.04.1-upstream/CMakeLists.txt kdenlive-17.04.1/CMakeLists.txt
--- kdenlive-17.04.1-upstream/CMakeLists.txt 2017-06-10 00:06:44.773146595 -0400
+++ kdenlive-17.04.1/CMakeLists.txt 2017-06-10 00:07:35.766596566 -0400
@@ -79,7 +79,7 @@
check_include_files(malloc.h HAVE_MALLOC_H)
check_include_files(pthread.h HAVE_PTHREAD_H)
-find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick )
+find_package(Qt5 REQUIRED COMPONENTS Core Concurrent DBus Widgets Script Svg Quick )
find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)

3
pkgs/applications/kde/kdenlive.nix
View file

@ -34,9 +34,6 @@
mkDerivation {
name = "kdenlive";
patches = [
./kdenlive-cmake-concurrent-module.patch
];
nativeBuildInputs = [
extra-cmake-modules
kdoctools

4
pkgs/applications/misc/chirp/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "chirp-daily-${version}";
version = "20180412";
version = "20180512";
src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9";
sha256 = "111pijr0v36n3yg0p58mgvfxvz088axnxvgfhs8cblssi931mimm";
};
nativeBuildInputs = [ makeWrapper ];

30
pkgs/applications/misc/redshift/default.nix
View file

@ -1,6 +1,12 @@
{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool
, libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection
, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }:
, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection
, gtk3, python, pygobject3, hicolor-icon-theme, pyxdg
, withCoreLocation ? stdenv.isDarwin, CoreLocation, Foundation, Cocoa
, withQuartz ? stdenv.isDarwin, ApplicationServices
, withRandr ? stdenv.isLinux, libxcb
, withDrm ? stdenv.isLinux, libdrm
, withGeoclue ? stdenv.isLinux, geoclue }:
stdenv.mkDerivation rec {
name = "redshift-${version}";
@ -29,15 +35,25 @@ stdenv.mkDerivation rec {
wrapPython
];
configureFlags = [
"--enable-randr=${if withRandr then "yes" else "no"}"
"--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
"--enable-drm=${if withDrm then "yes" else "no"}"
"--enable-quartz=${if withQuartz then "yes" else "no"}"
"--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
];
buildInputs = [
geoclue2
gobjectIntrospection
gtk3
libdrm
libxcb
python
hicolor-icon-theme
];
] ++ stdenv.lib.optional withRandr libxcb
++ stdenv.lib.optional withGeoclue geoclue
++ stdenv.lib.optional withDrm libdrm
++ stdenv.lib.optional withQuartz ApplicationServices
++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
;
pythonPath = [ pygobject3 pyxdg ];
@ -59,7 +75,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3Plus;
homepage = http://jonls.dk/redshift;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ yegortimoshenko ];
};
}

37
pkgs/applications/misc/vcal/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ stdenv, lib, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "vcal-${version}";
version = "2.7";
src = fetchurl {
url = "http://waynemorrison.com/software/vcal";
sha256 = "0fknrlad7vb84ngh242xjaq96vkids85ksnxaflk2cr9wcwxfmix";
};
nativeBuildInputs = [ perl ]; # for pod2man
unpackPhase = ":";
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/man/man1}
substitute ${src} $out/bin/vcal \
--replace /usr/bin/perl ${perl}/bin/perl
chmod 0755 $out/bin/*
pod2man -n vcal ${src} > $out/share/man/man1/vcal.1
runHook postInstall
'';
# There are no tests
doCheck = false;
meta = with lib; {
description = "Parser for VCalendar and ICalendar files, usable from the command line";
homepage = http://waynemorrison.com/software/;
license = licenses.unfree; # "These are made publicly available for personal use."
maintainers = with maintainers; [ peterhoeg ];
};
}

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.
{
beta = {
sha256 = "136gx9qqbzfzaf19k0gxb8n4ypd4ycyr83i9v68nqdvy2k26vf4n";
sha256bin64 = "0w628afj5k4xygizlznwxkljgc1prxqc3lanaz6gdmyrl7gk1s7n";
version = "67.0.3396.18";
sha256 = "169lxj6rhpqcnrg3n2api82975hkifz6wmks1bh04jkxw0z2vkny";
sha256bin64 = "1hd4s35yhi2xidy3xncp66p03cv715bzbf3gcv5dl0d1h3nmhhdf";
version = "67.0.3396.40";
};
dev = {
sha256 = "1yspf0n385ail9qxsmax58mfk5yi473ygsraqs83q30pfgxc5z2f";
sha256bin64 = "1gi1xpnjwkg7sxv94ksv6fiymw13rxdq2hyvza8b9famvfcaz07j";
version = "68.0.3409.2";
sha256 = "0j4vcfbdj8cvdsmnb6pz0k71w559rm3ka1yyv0yfq7f756hinpvp";
sha256bin64 = "1qqhyjdd227psvr904w3d3lq47bfwmpk6f7sam2gp4j0wxn23w8w";
version = "68.0.3423.2";
};
stable = {
sha256 = "1ck4wbi28702p1lfs4sz894ysbgm7fj79wrqj8srsy65z2ssaxdy";
sha256bin64 = "1vgrgay3h0961vj96ql2p0pb16gzfr48r4hk25rxdqbflnz7njz0";
version = "66.0.3359.139";
sha256 = "06g9m7lxm9g63dcci25dqiglyjxjfy7v05vjhdda4rdk84vngrip";
sha256bin64 = "105ds6r6awzhf5sq3nf43b6zb84lb4qbhjnfk3fnxfqvskq3b6r2";
version = "66.0.3359.181";
};
}

786
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View file

File diff suppressed because it is too large Load diff

786
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View file

File diff suppressed because it is too large Load diff

37
pkgs/applications/networking/browsers/qtchan/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ stdenv, fetchFromGitHub, qt, makeWrapper }:
stdenv.mkDerivation rec {
name = "qtchan-${version}";
version = "0.100";
src = fetchFromGitHub {
owner = "siavash119";
repo = "qtchan";
rev = "v${version}";
sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a";
};
enableParallelBuilding = true;
nativeBuildInputs = [ qt.qmake makeWrapper ];
buildInputs = [ qt.qtbase ];
qmakeFlags = [ "CONFIG-=app_bundle" ];
installPhase = ''
mkdir -p $out/bin
cp qtchan $out/bin
'';
preFixup = ''
wrapProgram $out/bin/qtchan \
--suffix QT_PLUGIN_PATH : ${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}
'';
meta = with stdenv.lib; {
description = "4chan browser in qt5";
homepage = "https://github.com/siavash119/qtchan";
license = licenses.mit;
maintainers = with maintainers; [ chiiruno ];
platforms = platforms.unix;
};
}

27
pkgs/applications/networking/flent/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, netperf, procps, pyqt5 }:
buildPythonApplication rec {
pname = "flent";
version = "1.2.2";
src = fetchFromGitHub {
owner = "tohojo";
repo = "flent";
rev = version;
sha256 = "0rl4ahynl6ymw7r04vpg9p90pplrxc41rjlzvm0swxsvpw40yvkm";
};
buildInputs = [ netperf ];
propagatedBuildInputs = [
matplotlib
procps
pyqt5
];
meta = with stdenv.lib; {
description = "The FLExible Network Tester";
homepage = https://flent.org;
license = licenses.gpl3;
maintainers = [ maintainers.mmlb ];
};
}

6
pkgs/applications/networking/mailreaders/neomutt/default.nix
View file

@ -15,14 +15,14 @@ let
'';
in stdenv.mkDerivation rec {
version = "20180323";
version = "20180512";
name = "neomutt-${version}";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = "neomutt-${version}";
sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w";
sha256 = "12779h2ich6w79bm2wgaaxd9hr6kpxavj4bdrnvm44a0r02kk2vl";
};
buildInputs = [
@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
--replace /etc/mime.types ${mime-types}/etc/mime.types
# The string conversion tests all fail with the first version of neomutt
# that has tests (20180223) as well as 20180323 so we disable them for now.
# that has tests (20180223) as well as 20180512 so we disable them for now.
# I don't know if that is related to the tests or our build environment.
# Try again with a later release.
sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c

25
pkgs/applications/window-managers/btops/default.nix Normal file
View file

@ -0,0 +1,25 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
name = "btops-${version}";
version = "0.1.0";
goPackagePath = "github.com/cmschuetz/btops";
src = fetchgit {
url = "https://github.com/cmschuetz/btops.git";
rev = version;
sha256 = "1ilidvpy7gz49zqp6rf0q7wjrc3r0brdrcp4r5f6i6p9cwybqkbq";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "bspwm desktop management that supports dymanic appending, removing, and renaming";
homepage = https://github.com/cmschuetz/btops;
maintainers = with maintainers; [ mnacamura ];
license = licenses.mit;
platforms = platforms.linux;
};
}

120
pkgs/applications/window-managers/btops/deps.nix generated Normal file
View file

@ -0,0 +1,120 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
};
}
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
rev = "c2353362d570a7bfa228149c62842019201cfb71";
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
};
}
{
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
rev = "63644898a8da0bc22138abf860edaf5277b6102e";
sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
};
}
{
goPackagePath = "github.com/spf13/cast";
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
rev = "8965335b8c7107321228e3e3702cab9832751bac";
sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
};
}
{
goPackagePath = "github.com/spf13/jwalterweatherman";
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
};
}
{
goPackagePath = "github.com/spf13/viper";
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
};
}
]

2
pkgs/build-support/trivial-builders.nix
View file

@ -138,6 +138,7 @@ rec {
, sha1 ? null
, url ? null
, message ? null
, hashMode ? "flat"
} :
assert (message != null) || (url != null);
assert (sha256 != null) || (sha1 != null);
@ -158,6 +159,7 @@ rec {
in
stdenv.mkDerivation {
name = name_;
outputHashMode = hashMode;
outputHashAlgo = hashAlgo;
outputHash = hash;
preferLocalBuild = true;

3
pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
View file

@ -39,8 +39,5 @@ stdenv.mkDerivation rec {
intltoolize --force
'';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
doCheck = false; # requires X11 daemon
}

66
pkgs/desktops/gnome-3/core/gdm/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus
, intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
, gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
, librsvg, coreutils }:
, librsvg, coreutils, xwayland }:
stdenv.mkDerivation rec {
name = "gdm-${version}";
@ -12,50 +12,56 @@ stdenv.mkDerivation rec {
sha256 = "1yxjjyrp0ywrc25cp81bsdhp79zn0c0jag48hlp00b5wfnkqy1kp";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gdm"; attrPath = "gnome3.gdm"; };
};
# Only needed to make it build
preConfigure = ''
substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
'';
postPatch = ''
substituteInPlace daemon/gdm-manager.c --replace "/bin/plymouth" "${plymouth}/bin/plymouth"
substituteInPlace data/gdm.service.in --replace "/bin/kill" "${coreutils}/bin/kill"
'';
configureFlags = [ "--sysconfdir=/etc"
"--localstatedir=/var"
"--with-plymouth=yes"
"--with-initial-vt=7"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-plymouth=yes"
"--with-initial-vt=7"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ];
buildInputs = [ glib accountsservice systemd
gobjectIntrospection libX11 gtk
libcanberra-gtk3 pam plymouth librsvg ];
buildInputs = [
glib accountsservice systemd
gobjectIntrospection libX11 gtk
libcanberra-gtk3 pam plymouth librsvg
];
enableParallelBuilding = true;
# Disable Access Control because our X does not support FamilyServerInterpreted yet
patches = [ ./sessions_dir.patch
./gdm-x-session_extra_args.patch
./gdm-session-worker_xserver-path.patch
];
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit coreutils plymouth xwayland;
})
./sessions_dir.patch
./gdm-x-session_extra_args.patch
./gdm-session-worker_xserver-path.patch
];
postInstall = ''
# Prevent “Could not parse desktop file orca-autostart.desktop or it references a not found TryExec binary”
rm $out/share/gdm/greeter/autostart/orca-autostart.desktop
'';
installFlags = [
"sysconfdir=$(out)/etc"
"dbusconfdir=$(out)/etc/dbus-1/system.d"
];
installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
passthru = {
updateScript = gnome3.updateScript {
packageName = "gdm";
attrPath = "gnome3.gdm";
};
};
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GDM;
description = "A program that manages graphical display servers and handles graphical user logins";
platforms = platforms.linux;
homepage = https://wiki.gnome.org/Projects/GDM;
license = licenses.gpl2Plus;
maintainers = gnome3.maintainers;
platforms = platforms.linux;
};
}

60
pkgs/desktops/gnome-3/core/gdm/fix-paths.patch Normal file
View file

@ -0,0 +1,60 @@
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -450,7 +450,7 @@
#ifdef ENABLE_WAYLAND_SUPPORT
gboolean wayland_enabled = FALSE;
if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) {
- if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) {
+ if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) {
session_type = "wayland";
}
}
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -147,7 +147,7 @@
GError *error;
error = NULL;
- res = g_spawn_command_line_sync ("/bin/plymouth --ping",
+ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping",
NULL, NULL, &status, &error);
if (! res) {
g_debug ("Could not ping plymouth: %s", error->message);
@@ -165,7 +165,7 @@
GError *error;
error = NULL;
- res = g_spawn_command_line_sync ("/bin/plymouth deactivate",
+ res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate",
NULL, NULL, NULL, &error);
if (! res) {
g_warning ("Could not deactivate plymouth: %s", error->message);
@@ -180,7 +180,7 @@
GError *error;
error = NULL;
- res = g_spawn_command_line_async ("/bin/plymouth quit --retain-splash", &error);
+ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error);
if (! res) {
g_warning ("Could not quit plymouth: %s", error->message);
g_error_free (error);
@@ -196,7 +196,7 @@
GError *error;
error = NULL;
- res = g_spawn_command_line_async ("/bin/plymouth quit", &error);
+ res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error);
if (! res) {
g_warning ("Could not quit plymouth: %s", error->message);
g_error_free (error);
--- a/data/gdm.service.in
+++ b/data/gdm.service.in
@@ -28,7 +28,7 @@
StandardOutput=syslog
StandardError=inherit
EnvironmentFile=-@LANG_CONFIG_FILE@
-ExecReload=/bin/kill -SIGHUP $MAINPID
+ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID
[Install]
Alias=display-manager.service

9
pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3, libintlOrEmpty }:
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3
, libintl }:
let
pname = "libgnome-games-support";
@ -11,10 +12,8 @@ in stdenv.mkDerivation rec {
sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1";
};
nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty;
buildInputs = [ glib gtk3 libgee ];
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ glib gtk3 libgee libintl ];
passthru = {
updateScript = gnome3.updateScript {

6
pkgs/desktops/lxde/core/lxtask/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3 }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }:
stdenv.mkDerivation rec {
name = "lxtask-${version}";
@ -11,12 +11,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ gtk3 ];
buildInputs = [ gtk3 libintl ];
configureFlags = [ "--enable-gtk3" ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
meta = {
description = "Lightweight and desktop independent task manager";
longDescription = ''

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

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

2
pkgs/desktops/xfce/default.nix
View file

@ -97,6 +97,8 @@ lib.makeScope pkgs.newScope (self: with self; {
#### PANEL PLUGINS
xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { };

31
pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix Normal file
View file

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, substituteAll, cmake, vala, glib, gtk2, gtk3 }:
stdenv.mkDerivation rec {
name = "vala-panel-appmenu-xfce-${version}";
version = "0.6.94";
src = "${fetchFromGitHub {
owner = "rilian-la-te";
repo = "vala-panel-appmenu";
rev = version;
fetchSubmodules = true;
sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p";
}}/subprojects/appmenu-gtk-module";
nativeBuildInputs = [ cmake vala ];
buildInputs = [ glib gtk2 gtk3 ];
configurePhase = ''
cmake . -DGTK3_INCLUDE_GDK=
'';
installPhase = ''
make DESTDIR=output install
cp -r output/var/empty/* "$out"
'';
meta = with stdenv.lib; {
description = "Port of the Unity GTK+ Module";
license = licenses.lgpl3;
maintainers = with maintainers; [ jD91mZM2 ];
};
}

49
pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix Normal file
View file

@ -0,0 +1,49 @@
{ stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2,
glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "xfce4-vala-panel-appmenu-plugin-${version}";
version = "0.6.94";
src = fetchFromGitHub {
owner = "rilian-la-te";
repo = "vala-panel-appmenu";
rev = version;
fetchSubmodules = true;
sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p";
};
nativeBuildInputs = [ pkgconfig cmake vala libxml2.bin ];
buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
libwnck3 libdbusmenu-glib gobjectIntrospection ];
patches = [
(substituteAll {
src = ./fix-bamf-dependency.patch;
bamf = bamf;
})
];
cmakeFlags = [
"-DENABLE_XFCE=ON"
"-DENABLE_BUDGIE=OFF"
"-DENABLE_VALAPANEL=OFF"
"-DENABLE_MATE=OFF"
"-DENABLE_JAYATANA=OFF"
"-DENABLE_APPMENU_GTK_MODULE=OFF"
];
preConfigure = ''
mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake
'';
meta = with stdenv.lib; {
description = "Global Menu applet for XFCE4";
license = licenses.lgpl3;
maintainers = with maintainers; [ jD91mZM2 ];
};
}

12
pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch Normal file
View file

@ -0,0 +1,12 @@
+++ source/cmake/FindBAMF.cmake 2018-05-11 17:03:44.385917811 +0200
@@ -80,9 +80,7 @@
find_program(BAMF_DAEMON_EXECUTABLE
bamfdaemon
- HINTS ${CMAKE_INSTALL_FULL_LIBDIR}
- ${CMAKE_INSTALL_FULL_LIBEXECDIR}
- ${BAMF_LIBDIR}
+ HINTS "@bamf@/libexec/bamf/"
PATH_SUFFIXES bamf
)

2
pkgs/development/libraries/atk/default.nix
View file

@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
glib
];
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
doCheck = true;
passthru = {

22
pkgs/development/libraries/dyncall/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "dyncall-${version}";
version = "1.0";
src = fetchurl {
url = http://www.dyncall.org/r1.0/dyncall-1.0.tar.gz;
# http://www.dyncall.org/r1.0/SHA256
sha256 = "d1b6d9753d67dcd4d9ea0708ed4a3018fb5bfc1eca5f37537fba2bc4f90748f2";
};
doCheck = true;
checkTarget = "run-tests";
meta = with stdenv.lib; {
description = "Highly dynamic multi-platform foreign function call interface library";
homepage = http://dyncall.org;
license = licenses.isc;
maintainers = with maintainers; [ dtzWill ];
};
}

6
pkgs/development/libraries/gtksourceview/3.x.nix
View file

@ -21,10 +21,10 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection vala_0_40 ]
nativeBuildInputs = [ pkgconfig intltool perl gobjectIntrospection vala_0_40 ]
++ stdenv.lib.optionals doCheck checkInputs;
buildInputs = [ atk cairo glib pango libxml2 ];
buildInputs = [ atk cairo glib pango libxml2 gettext ];
preBuild = ''
substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
@ -32,8 +32,6 @@ in stdenv.mkDerivation rec {
patches = [ ./3.x-nix_share_path.patch ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
enableParallelBuilding = true;
doCheck = stdenv.isLinux;

4
pkgs/development/libraries/libite/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libite-${version}";
version = "2.0.1";
version = "2.0.2";
src = fetchFromGitHub {
owner = "troglobit";
repo = "libite";
rev = "v${version}";
sha256 = "07zypi3f02ygl7h5yc9sy136iiwgdi3r3nkjai9bq4gzjmzsvyl9";
sha256 = "0qk7231c1xwvjhkc9w7hasvafvgns10cx9kdhfdbc4r1hsh6d1ca";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
version = "18.03.1";
version = "18.05";
name = "libmediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "183gcb6h81blgvssfl5lxsv8h5izkgg6b86z0jy9g699adgkchq2";
sha256 = "08ajrmbvqn2cvfq3jjdh64lma77kx4di5vg632c6bmbir89rcxbn";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

33
pkgs/development/libraries/libvterm-neovim/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ stdenv
, fetchFromGitHub
, perl
, libtool
}:
stdenv.mkDerivation rec {
name = "neovim-libvterm-${version}";
version = "2017-11-05";
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
rev = "4ca7ebf7d25856e90bc9d9cc49412e80be7c4ea8";
sha256 = "05kyvvz8af90mvig11ya5xd8f4mbvapwyclyrihm9lwas706lzf6";
};
buildInputs = [ perl ];
nativeBuildInputs = [ libtool ];
makeFlags = [ "PREFIX=$(out)" ]
++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "VT220/xterm/ECMA-48 terminal emulator library";
homepage = http://www.leonerd.org.uk/code/libvterm/;
license = licenses.mit;
maintainers = with maintainers; [ garbas ];
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/mlt/qt-5.nix
View file

@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec {
name = "mlt-${version}";
version = "6.6.0";
version = "6.8.0";
src = fetchFromGitHub {
owner = "mltframework";
repo = "mlt";
rev = "v${version}";
sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8";
};
buildInputs = [

1
pkgs/development/node-packages/default-v6.nix
View file

@ -59,6 +59,7 @@ nodePackages // {
ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"

1
pkgs/development/node-packages/default-v8.nix
View file

@ -59,6 +59,7 @@ nodePackages // {
ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"

4
pkgs/development/python-modules/ipython/5.nix
View file

@ -27,11 +27,11 @@
buildPythonPackage rec {
pname = "ipython";
version = "5.6.0";
version = "5.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "00g696r9rk1c4p3sycnv7by55cp9mm7r6zkkdqbiw9l0mk8k58wb";
sha256 = "0g1jm06qriq48m58311cs7askp83ipq3yq96hv4kg431nxzkmd4d";
};
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''

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

@ -0,0 +1,22 @@
{lib, fetchPypi, buildPythonPackage, numpy}:
buildPythonPackage rec {
pname = "uproot";
version = "2.8.23";
src = fetchPypi {
inherit pname version;
sha256 = "121ggyl5s0q66yrbdfznvzrc793zq1w2xnr3baadlzfvqdlkhgj7";
};
propagatedBuildInputs = [
numpy
];
meta = with lib; {
homepage = https://github.com/scikit-hep/uproot;
description = "ROOT I/O in pure Python and Numpy";
license = licenses.bsd3;
maintainers = with maintainers; [ ktf ];
};
}

17
pkgs/development/tools/fac/default.nix
View file

@ -1,14 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }:
let
# TODO: Remove this on next update, should be included
fac_1 = fetchurl {
url = https://raw.githubusercontent.com/mkchoi212/fac/0a500c2a2dba9017fe7c2a45f15c328755f561a6/doc/fac.1;
sha256 = "1fsyx9i20ryhpihdpvs2z7vccl13b9bnh5hcdxn7bvqjz78mbqhw";
};
in buildGoPackage rec {
buildGoPackage rec {
name = "fac-${version}";
version = "1.0.4";
version = "1.1.0";
goPackagePath = "github.com/mkchoi212/fac";
@ -16,16 +10,19 @@ in buildGoPackage rec {
owner = "mkchoi212";
repo = "fac";
rev = "v${version}";
sha256 = "0jhx80jbkxfxj95hmdpb9wwwya064xpfkaa218l1lwm3qwfbpk95";
sha256 = "054j8yrblf1frcfn3dwrjbgf000i3ngbaz2c172nwbx75g309ihx";
};
goDeps = ./deps.nix;
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $bin/bin/fac \
--prefix PATH : ${git}/bin
install -D ${fac_1} $out/share/man/man1/fac.1
# Install man page, not installed by default
install -D go/src/${goPackagePath}/assets/doc/fac.1 $out/share/man/man1/fac.1
'';
meta = with stdenv.lib; {

66
pkgs/development/tools/fac/deps.nix generated Normal file
View file

@ -0,0 +1,66 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/alecthomas/chroma";
fetch = {
type = "git";
url = "https://github.com/alecthomas/chroma";
rev = "1b755a90bd109f170385cb3964f0abdfd3451145";
sha256 = "1ilmavg291qhb0xq881f5h172zw40aaynqfb0y4yjyq13jnrf8p8";
};
}
{
goPackagePath = "github.com/danwakefield/fnmatch";
fetch = {
type = "git";
url = "https://github.com/danwakefield/fnmatch";
rev = "cbb64ac3d964b81592e64f957ad53df015803288";
sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
};
}
{
goPackagePath = "github.com/dlclark/regexp2";
fetch = {
type = "git";
url = "https://github.com/dlclark/regexp2";
rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1";
sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2";
};
}
{
goPackagePath = "github.com/jroimartin/gocui";
fetch = {
type = "git";
url = "https://github.com/jroimartin/gocui";
rev = "c055c87ae801372cd74a0839b972db4f7697ae5f";
sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
};
}
{
goPackagePath = "github.com/mkchoi212/fac";
fetch = {
type = "git";
url = "https://github.com/mkchoi212/fac";
rev = "642a3ad8d8b4b76c7eb201e6f69b3bddb210c502";
sha256 = "10rsmnixs3lybnj4xv09b2ya6x0hjjd03y148f78qfppyz2hsvaz";
};
}
{
goPackagePath = "github.com/nsf/termbox-go";
fetch = {
type = "git";
url = "https://github.com/nsf/termbox-go";
rev = "21a4d435a86280a2927985fd6296de56cbce453e";
sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7";
};
}
]

6
pkgs/development/tools/jbake/default.nix
View file

@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/jbake --set JAVA_HOME "${jre}"
'';
checkPhase = ''
export JAVA_HOME=${jre}
bin/jbake | grep -q "${version}" || (echo "jbake did not return correct version"; exit 1)
'';
doCheck = true;
meta = with stdenv.lib; {
description = "JBake is a Java based, open source, static site/blog generator for developers & designers";
homepage = "https://jbake.org/";

17
pkgs/development/tools/profiling/sysprof/configure.patch
View file

@ -1,17 +0,0 @@
--- sysprof-1.0.10/configure 2008-04-28 01:41:25.000000000 +0200
+++ sysprof-1.0.10/configure 2008-06-07 15:40:07.000000000 +0200
@@ -3342,14 +3342,6 @@ if test $kernel_module = "yes"; then
echo \*
exit 1
fi
-
- if ! test -f /lib/modules/`uname -r`/build/Makefile ; then
- echo \*
- echo \* Sysprof requires the kernel source code to be installed.
- echo \* On a Fedora Core system the relevant package is kernel-devel
- echo \*
- exit 1
- fi
fi
# Pkgconfig dependencies

55
pkgs/development/tools/profiling/sysprof/default.nix
View file

@ -1,24 +1,53 @@
{ stdenv
, fetchurl, pkgconfig
, gtk2, glib, pango, libglade
, desktop-file-utils
, fetchurl
, gettext
, glib
, gtk3
, itstool
, libxml2
, meson, ninja
, pango
, pkgconfig
, polkit
, shared-mime-info
, systemd
, wrapGAppsHook
, gnome3
}:
let
version = "3.28.1";
pname = "sysprof";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
stdenv.mkDerivation rec {
name = "sysprof-1.2.0";
outputs = [ "out" "lib" "dev" ];
src = fetchurl {
url = "http://www.sysprof.com/sysprof-1.2.0.tar.gz";
sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "05534dvwrzrmryb4y2m1sb2q0r8i6nr88pzjg7xs5nr9zq8a87p3";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 glib pango libglade ];
nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig shared-mime-info wrapGAppsHook ];
buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
meta = {
homepage = http://sysprof.com/;
mesonFlags = [
"-Dsystemdunitdir=lib/systemd/system"
];
postInstall = ''
rm $out/share/applications/mimeinfo.cache
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
description = "System-wide profiler for Linux";
license = stdenv.lib.licenses.gpl2Plus;
homepage = https://wiki.gnome.org/Apps/Sysprof;
longDescription = ''
Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open
system call to profile the entire system, not just a single
@ -26,6 +55,8 @@ stdenv.mkDerivation rec {
do not need to be recompiled. In fact they don't even have to
be restarted.
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
platforms = stdenv.lib.platforms.linux;
};
}

12
pkgs/development/tools/sass/Gemfile.lock
View file

@ -1,7 +1,15 @@
GEM
remote: https://rubygems.org/
specs:
sass (3.4.22)
ffi (1.9.23)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
PLATFORMS
ruby
@ -10,4 +18,4 @@ DEPENDENCIES
sass
BUNDLED WITH
1.11.2
1.14.6

11
pkgs/development/tools/sass/default.nix
View file

@ -1,14 +1,13 @@
{ lib, bundlerEnv, ruby }:
{ lib, bundlerApp }:
bundlerEnv {
name = "sass-3.4.22";
inherit ruby;
bundlerApp {
pname = "sass";
gemdir = ./.;
exes = [ "sass" "sass-convert" "scss" ];
meta = with lib; {
description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS";
homepage = http://sass-lang.com/;
homepage = https://sass-lang.com;
license = licenses.mit;
maintainers = [ maintainers.romildo ];
platforms = platforms.unix;

41
pkgs/development/tools/sass/gemset.nix
View file

@ -1,10 +1,45 @@
{
sass = {
ffi = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy";
sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
type = "gem";
};
version = "3.4.22";
version = "1.9.23";
};
rb-fsevent = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
type = "gem";
};
version = "0.10.3";
};
rb-inotify = {
dependencies = ["ffi"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
type = "gem";
};
version = "0.9.10";
};
sass = {
dependencies = ["sass-listen"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
type = "gem";
};
version = "3.5.6";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
type = "gem";
};
version = "4.0.0";
};
}

6
pkgs/development/tools/watchman/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre,
libtool, pkgconfig, openssl,
confFile ? config.watchman.confFile or null
confFile ? config.watchman.confFile or null,
withApple ? stdenv.isDarwin, CoreServices, CoreFoundation
}:
stdenv.mkDerivation rec {
@ -15,7 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
};
buildInputs = [ pcre openssl ];
buildInputs = [ pcre openssl ]
++ lib.optionals withApple [ CoreFoundation CoreServices ];
nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
configureFlags = [

4
pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
View file

@ -3,6 +3,10 @@
appleDerivation {
postUnpack = "sourceRoot=$sourceRoot/libiconv";
preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isiOS ''
sed -i 's/darwin\*/ios\*/g' configure libcharset/configure
'';
postInstall = ''
mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib

44
pkgs/os-specific/linux/i7z/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, qt4, ncurses }:
{ stdenv, lib, fetchurl, ncurses
, withGui ? false, qt4 ? null }:
stdenv.mkDerivation rec {
name = "i7z-0.27.2";
@ -8,29 +9,46 @@ stdenv.mkDerivation rec {
sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7";
};
buildInputs = [ qt4 ncurses ];
buildInputs = [ ncurses ] ++ lib.optional withGui qt4;
enableParallelBuilding = true;
buildPhase = ''
runHook preBuild
make
cd GUI
qmake
make clean
make
cd ..
${lib.optionalString withGui ''
cd GUI
qmake
make clean
make
cd ..
''}
runHook postBuild
'';
installPhase = ''
mkdir -p $out/sbin
runHook preInstall
mkdir -p $out/{bin,sbin}
make install prefix=$out
install -Dm755 GUI/i7z_GUI $out/sbin/i7z-gui
${lib.optionalString withGui ''
install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui
''}
mv $out/sbin/* $out/bin/
rmdir $out/sbin
runHook postInstall
'';
meta = {
meta = with lib; {
description = "A better i7 (and now i3, i5) reporting tool for Linux";
homepage = https://github.com/ajaiantilal/i7z;
repositories.git = https://github.com/ajaiantilal/i7z.git;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ bluescreen303 ];
# broken on ARM
platforms = [ "x86_64-linux" ];
};
}

11
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -37,7 +37,12 @@ with stdenv.lib;
DEBUG_STACKOVERFLOW n
SCHEDSTATS n
DETECT_HUNG_TASK y
DEBUG_INFO n # Not until we implement a separate debug output
${if (features.debug or false) then ''
DEBUG_INFO y
'' else ''
DEBUG_INFO n
''}
${optionalString (versionOlder version "4.4") ''
CPU_NOTIFIER_ERROR_INJECT? n
@ -709,9 +714,5 @@ with stdenv.lib;
DEBUG_MEMORY_INIT? y
''}
${optionalString (features.debug or false) ''
DEBUG_INFO y
''}
${extraConfig}
''

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

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

4
pkgs/os-specific/linux/kernel/linux-4.16.nix
View file

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

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

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

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

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

4
pkgs/servers/osrm-backend/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "osrm-backend-${version}";
version = "5.17.2";
version = "5.18.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "Project-OSRM";
repo = "osrm-backend";
sha256 = "0ar94wpsc2vr6pn4x5wy7mkpjlilgnyw545wm0l78174q43460y9";
sha256 = "0ffdw02rgjb4z7xi8fk97c0hl1i7z04csjh3yd18zsb19bk1mkva";
};
nativeBuildInputs = [ cmake pkgconfig ];

4
pkgs/servers/sql/postgresql/timescaledb/default.nix
View file

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
name = "timescaledb-${version}";
version = "0.9.1";
version = "0.9.2";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
sha256 = "00k8fk5a1xpv9nxlmafnngk31wh80h6m72vsl1hnyq7nhby7ylic";
sha256 = "1zgyd407skqbsw2zj3l9hixwlisnj82yb6hbq5khjg9k0ifvvgyp";
};
# Fix the install phase which tries to install into the pgsql extension dir,

41
pkgs/tools/inputmethods/uim/data-hook.patch
View file

@ -1,6 +1,6 @@
--- a/gtk2/immodule/Makefile.in 2015-11-24 16:21:08.967087208 +0900
+++ b/gtk2/immodule/Makefile.in 2015-11-24 16:22:53.316095150 +0900
@@ -806,7 +806,6 @@
@@ -928,7 +928,6 @@
install-data-am: install-moduleLTLIBRARIES
@$(NORMAL_INSTALL)
@ -8,19 +8,18 @@
install-dvi: install-dvi-am
install-dvi-am:
@@ -861,7 +860,7 @@
ctags distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-data-hook install-dvi install-dvi-am \
+ install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man \
install-moduleLTLIBRARIES install-pdf install-pdf-am \
@@ -993,7 +992,7 @@
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-data-hook install-dvi install-dvi-am install-exec \
+ install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-moduleLTLIBRARIES \
install-pdf install-pdf-am install-ps install-ps-am \
--- a/gtk3/immodule/Makefile.in 2015-11-24 16:21:08.971087209 +0900
+++ b/gtk3/immodule/Makefile.in 2015-11-24 16:23:28.251097832 +0900
@@ -824,7 +824,6 @@
@@ -896,7 +896,6 @@
install-data-am: install-moduleLTLIBRARIES
@$(NORMAL_INSTALL)
@ -28,12 +27,12 @@
install-dvi: install-dvi-am
install-dvi-am:
@@ -879,7 +878,7 @@
ctags distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-data-hook install-dvi install-dvi-am \
+ install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man \
install-moduleLTLIBRARIES install-pdf install-pdf-am
@@ -959,7 +958,7 @@
cscopelist-am ctags ctags-am distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-hook install-dvi \
+ install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-moduleLTLIBRARIES install-pdf install-pdf-am \

74
pkgs/tools/inputmethods/uim/default.nix
View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, intltool, pkgconfig, cmake
{ stdenv, fetchFromGitHub
, autoconf, automake, intltool, libtool, pkgconfig, cmake
, ruby, librsvg
, ncurses, m17n_lib, m17n_db, expat
, withAnthy ? true, anthy ? null
, withGtk ? true
@ -6,6 +8,7 @@
, withGtk3 ? withGtk, gtk3 ? null
, withQt ? true
, withQt4 ? withQt, qt4 ? null
, withQt5 ? false, qt5 ? null
, withLibnotify ? true, libnotify ? null
, withSqlite ? true, sqlite ? null
, withNetworking ? true, curl ? null, openssl ? null
@ -17,10 +20,17 @@
with stdenv.lib;
assert withAnthy -> anthy != null;
assert withGtk2 -> gtk2 != null;
assert withGtk3 -> gtk3 != null;
assert withQt4 -> qt4 != null;
# TODO(@oxij): ./configure can't find both qmakes at the same time
# this can be fixed by adding an alias qmake -> qmaka${version} in qmake derivation
assert withQt4 -> !withQt5 && qt4 != null;
assert withQt5 -> !withQt4 && qt5 != null;
assert !withQt5; # fails to build with "Makefile.qmake: No such file or directory"
assert withAnthy -> anthy != null;
assert withLibnotify -> libnotify != null;
assert withSqlite -> sqlite != null;
assert withNetworking -> curl != null && openssl != null;
@ -28,22 +38,32 @@ assert withFFI -> libffi != null;
assert withMisc -> libeb != null;
stdenv.mkDerivation rec {
version = "1.8.6";
version = "1.8.6-20180501-git";
name = "uim-${version}";
src = fetchFromGitHub {
owner = "uim";
repo = "uim";
rev = "c79432cb5aba3a67fb7e7557f4817c749865cc8a";
fetchSubmodules = true;
sha256 = "12rznfwq1mh750i18bl1743c51akyyvy6la5rgrxmrnp0mha9ba5";
};
nativeBuildInputs = [
autoconf automake intltool libtool pkgconfig cmake
ruby # used by sigscheme build to generate function tables
librsvg # used by uim build to generate png pixmaps from svg
];
buildInputs = [
intltool
pkgconfig
ncurses
cmake
m17n_lib
m17n_db
expat
ncurses m17n_lib m17n_db expat
]
++ optional withAnthy anthy
++ optional withGtk2 gtk2
++ optional withGtk3 gtk3
++ optional withQt4 qt4
++ optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ]
++ optional withLibnotify libnotify
++ optional withSqlite sqlite
++ optionals withNetworking [
@ -52,9 +72,27 @@ stdenv.mkDerivation rec {
++ optional withFFI libffi
++ optional withMisc libeb;
prePatch = ''
patchShebangs *.sh */*.sh */*/*.sh
# configure sigscheme in maintainer mode or else some function tables won't get autogenerated
substituteInPlace configure.ac \
--replace "--with-master-pkg=uim --enable-conf=uim" \
"--enable-maintainer-mode --with-master-pkg=uim --enable-conf=uim"
# generate ./configure files
(cd sigscheme/libgcroots; ./autogen.sh)
(cd sigscheme; ./autogen.sh)
./autogen.sh
'';
patches = [ ./data-hook.patch ];
configureFlags = [
# configure in maintainer mode or else some pixmaps won't get autogenerated
# this should imply the above `--enable-maintainer-mode`, but it does not
"--enable-maintainer-mode"
"--enable-pref"
"--with-skk"
"--with-x"
@ -68,6 +106,10 @@ stdenv.mkDerivation rec {
"--with-qt4"
"--with-qt4-immodule"
]
++ optionals withQt5 [
"--with-qt5"
"--with-qt5-immodule"
]
++ optional withLibnotify "--enable-notify=libnotify"
++ optional withSqlite "--with-sqlite3"
++ optionals withNetworking [
@ -87,16 +129,12 @@ stdenv.mkDerivation rec {
dontUseCmakeConfigure = true;
src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/uim/uim-${version}.tar.bz2";
sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777";
};
meta = with stdenv.lib; {
homepage = "https://github.com/uim/uim";
homepage = src.meta.homepage;
description = "A multilingual input method framework";
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.unix;
broken = stdenv.hostPlatform.isAarch64; # fails to build libgcroots (not supported on aarch64)
maintainers = with maintainers; [ ericsagnes oxij ];
};
}

10
pkgs/tools/networking/aircrack-ng/default.nix
View file

@ -1,19 +1,19 @@
{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools
, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper }:
, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper
, autoreconfHook }:
stdenv.mkDerivation rec {
name = "aircrack-ng-1.2-rc4";
name = "aircrack-ng-1.2";
src = fetchurl {
url = "http://download.aircrack-ng.org/${name}.tar.gz";
sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr";
sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ];
buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ];
patchPhase = ''
sed -e 's@^prefix.*@prefix = '$out@ -i common.mak
sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c
'';

29
pkgs/tools/networking/mpack/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib }:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "mpack-1.6";
@ -10,10 +10,31 @@ stdenv.mkDerivation rec {
patches = [ ./build-fix.patch ];
preConfigure = "configureFlags=--mandir=$out/share/man";
postPatch = ''
for f in *.{c,man,pl,unix} ; do
substituteInPlace $f --replace /usr/tmp /tmp
done
meta = {
for f in unixpk.c ; do
substituteInPlace $f \
--replace /usr/sbin /run/current-system/sw/bin
done
# this just shuts up some warnings
for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do
sed -i 'i#include <stdlib.h>' $f
done
'';
postInstall = ''
install -Dm644 -t $out/share/doc/mpack INSTALL README.*
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Utilities for encoding and decoding binary files in MIME";
platforms = stdenv.lib.platforms.linux;
license = licenses.free;
platforms = platforms.linux;
};
}

4
pkgs/tools/networking/stubby/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "stubby";
name = "${pname}-${version}";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "getdnsapi";
repo = pname;
rev = "v${version}";
sha256 = "1zq7h3jx6v821phcbjp348ncdicx9s4gqkj7mcz8kd6ps902iag8";
sha256 = "1n02dj1hvh0aml54asxj42f0j9wfgiyavbh0gr0j9lm4f2xcd60w";
};
nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ];

28
pkgs/tools/security/sedutil/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
name = "sedutil-${version}";
version = "1.15.1";
src = fetchFromGitHub {
owner = "Drive-Trust-Alliance";
repo = "sedutil";
rev = version;
sha256 = "0zg5v27vbrzzl2vqzks91zj48z30qgcshkqkm1g8ycnhi145l0mf";
};
postPatch = ''
patchShebangs .
'';
nativeBuildInputs = [ autoreconfHook ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "DTA sedutil Self encrypting drive software";
homepage = https://www.drivetrust.com;
license = licenses.gpl3;
platforms = platforms.linux;
};
}

8
pkgs/tools/text/mdbook/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "mdbook-${version}";
version = "0.1.5";
version = "0.1.7";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "mdBook";
rev = "v${version}";
sha256 = "0k86zjrqb5wdxvmzz9cxl9c0mpjnr46fh5r5sbs5q9fk2h4lp4ip";
rev = "ea0b835b38aba9566c1cc50ad119fbbf2c56f59d";
sha256 = "0jkyys8dg5mchbj8b73mmzsgv0k0zp7knima9s69s5ybplmd2n8s";
};
cargoSha256 = "0gj1x996lvn9j87dfmng2fn3fgz8rgvrw3akcz641psj4hlfgm5w";
cargoSha256 = "0w3slfzm29pkyr6zhr7k9rx9mddh42asyb46bzy57j0a2qvan3k4";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];

35
pkgs/top-level/all-packages.nix
View file

@ -629,6 +629,8 @@ with pkgs;
ecdsautils = callPackage ../tools/security/ecdsautils { };
sedutil = callPackage ../tools/security/sedutil { };
elvish = callPackage ../shells/elvish { };
encryptr = callPackage ../tools/security/encryptr {
@ -1162,6 +1164,8 @@ with pkgs;
dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
dyncall = callPackage ../development/libraries/dyncall { };
earlyoom = callPackage ../os-specific/linux/earlyoom { };
EBTKS = callPackage ../development/libraries/science/biology/EBTKS { };
@ -2335,6 +2339,8 @@ with pkgs;
flashrom = callPackage ../tools/misc/flashrom { };
flent = python3Packages.callPackage ../applications/networking/flent { };
flpsed = callPackage ../applications/editors/flpsed { };
fluentd = callPackage ../tools/misc/fluentd { };
@ -5473,7 +5479,10 @@ with pkgs;
watchexec = callPackage ../tools/misc/watchexec { };
watchman = callPackage ../development/tools/watchman { };
watchman = callPackage ../development/tools/watchman {
inherit (darwin.apple_sdk.frameworks) CoreServices;
CoreFoundation = darwin.cf-private;
};
wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {};
@ -10480,6 +10489,7 @@ with pkgs;
libvpx-git = callPackage ../development/libraries/libvpx/git.nix { };
libvterm = callPackage ../development/libraries/libvterm { };
libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { };
libvorbis = callPackage ../development/libraries/libvorbis { };
@ -10750,13 +10760,16 @@ with pkgs;
notify-sharp = callPackage ../development/libraries/notify-sharp { };
ncurses5 = ncurses.override {
ncurses5 = ncursesReal.override {
abiVersion = "5";
};
ncurses6 = ncurses.override {
ncurses6 = ncursesReal.override {
abiVersion = "6";
};
ncurses = callPackage ../development/libraries/ncurses { };
ncurses =
if hostPlatform.useiOSPrebuilt
then null
else callPackage ../development/libraries/ncurses { };
neardal = callPackage ../development/libraries/neardal { };
@ -13980,9 +13993,7 @@ with pkgs;
sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
sysprof = callPackage ../development/tools/profiling/sysprof {
inherit (gnome2) libglade;
};
sysprof = callPackage ../development/tools/profiling/sysprof { };
sysklogd = callPackage ../os-specific/linux/sysklogd { };
@ -14948,6 +14959,8 @@ with pkgs;
bspwm-unstable = callPackage ../applications/window-managers/bspwm/unstable.nix { };
btops = callPackage ../applications/window-managers/btops { };
bvi = callPackage ../applications/editors/bvi { };
bviplus = callPackage ../applications/editors/bviplus { };
@ -15861,6 +15874,8 @@ with pkgs;
gcalcli = callPackage ../applications/misc/gcalcli { };
vcal = callPackage ../applications/misc/vcal { };
gcolor2 = callPackage ../applications/graphics/gcolor2 { };
gcolor3 = callPackage ../applications/graphics/gcolor3 { };
@ -17414,6 +17429,10 @@ with pkgs;
qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
qtchan = callPackage ../applications/networking/browsers/qtchan {
qt = qt5;
};
qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
@ -19612,6 +19631,8 @@ with pkgs;
redshift = callPackage ../applications/misc/redshift {
inherit (python3Packages) python pygobject3 pyxdg wrapPython;
inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
geoclue = geoclue2;
};
redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };

2
pkgs/top-level/emacs-packages.nix
View file

@ -178,6 +178,8 @@ let
};
};
emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { };
evil-jumper = melpaBuild rec {
pname = "evil-jumper";
version = "20151017";

2
pkgs/top-level/python-packages.nix
View file

@ -14605,6 +14605,8 @@ in {
uritemplate = callPackage ../development/python-modules/uritemplate { };
uproot = callPackage ../development/python-modules/uproot {};
uptime = buildPythonPackage rec {
name = "uptime-${version}";
version = "3.0.1";