Merge branch 'master' into upd.lxqt

This commit is contained in:
José Romildo Malaquias 2017-11-02 10:27:39 -02:00 committed by GitHub
commit 62204a59c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 1059 additions and 1055 deletions

96
.github/CODEOWNERS vendored
View file

@ -8,75 +8,75 @@
# Mentioned users will get code review requests. # Mentioned users will get code review requests.
# This file # This file
.github/CODEOWNERS @edolstra /.github/CODEOWNERS @edolstra
# Boostraping and core infra # Boostraping and core infra
pkgs/stdenv/ @edolstra /pkgs/stdenv @edolstra
pkgs/build-support/cc-wrapper/ @edolstra /pkgs/build-support/cc-wrapper @edolstra
# Libraries # Libraries
lib/ @edolstra @nbp /lib @edolstra @nbp
# Nixpkgs Internals # Nixpkgs Internals
default.nix @nbp /default.nix @nbp
pkgs/top-level/default.nix @nbp /pkgs/top-level/default.nix @nbp
pkgs/top-level/impure.nix @nbp /pkgs/top-level/impure.nix @nbp
pkgs/top-level/stage.nix @nbp /pkgs/top-level/stage.nix @nbp
# NixOS Internals # NixOS Internals
nixos/default.nix @nbp /nixos/default.nix @nbp
nixos/lib/from-env.nix @nbp /nixos/lib/from-env.nix @nbp
nixos/lib/eval-config.nix @nbp /nixos/lib/eval-config.nix @nbp
nixos/doc/manual/configuration/abstractions.xml @nbp /nixos/doc/manual/configuration/abstractions.xml @nbp
nixos/doc/manual/configuration/config-file.xml @nbp /nixos/doc/manual/configuration/config-file.xml @nbp
nixos/doc/manual/configuration/config-syntax.xml @nbp /nixos/doc/manual/configuration/config-syntax.xml @nbp
nixos/doc/manual/configuration/modularity.xml @nbp /nixos/doc/manual/configuration/modularity.xml @nbp
nixos/doc/manual/development/assertions.xml @nbp /nixos/doc/manual/development/assertions.xml @nbp
nixos/doc/manual/development/meta-attributes.xml @nbp /nixos/doc/manual/development/meta-attributes.xml @nbp
nixos/doc/manual/development/option-declarations.xml @nbp /nixos/doc/manual/development/option-declarations.xml @nbp
nixos/doc/manual/development/option-def.xml @nbp /nixos/doc/manual/development/option-def.xml @nbp
nixos/doc/manual/development/option-types.xml @nbp /nixos/doc/manual/development/option-types.xml @nbp
nixos/doc/manual/development/replace-modules.xml @nbp /nixos/doc/manual/development/replace-modules.xml @nbp
nixos/doc/manual/development/writing-modules.xml @nbp /nixos/doc/manual/development/writing-modules.xml @nbp
nixos/doc/manual/man-nixos-option.xml @nbp /nixos/doc/manual/man-nixos-option.xml @nbp
nixos/modules/installer/tools/nixos-option.sh @nbp /nixos/modules/installer/tools/nixos-option.sh @nbp
# Python-related code and docs # Python-related code and docs
pkgs/top-level/python-packages.nix @FRidh /pkgs/top-level/python-packages.nix @FRidh
pkgs/development/interpreters/python/* @FRidh /pkgs/development/interpreters/python @FRidh
pkgs/development/python-modules/* @FRidh /pkgs/development/python-modules @FRidh
doc/languages-frameworks/python.md @FRidh /doc/languages-frameworks/python.md @FRidh
# Haskell # Haskell
pkgs/development/compilers/ghc @peti /pkgs/development/compilers/ghc @peti
pkgs/development/haskell-modules @peti /pkgs/development/haskell-modules @peti
pkgs/development/haskell-modules/default.nix @peti /pkgs/development/haskell-modules/default.nix @peti
pkgs/development/haskell-modules/generic-builder.nix @peti /pkgs/development/haskell-modules/generic-builder.nix @peti
pkgs/development/haskell-modules/hoogle.nix @peti /pkgs/development/haskell-modules/hoogle.nix @peti
# R # R
pkgs/applications/science/math/R @peti /pkgs/applications/science/math/R @peti
pkgs/development/r-modules @peti /pkgs/development/r-modules @peti
# Ruby # Ruby
pkgs/development/interpreters/ruby/* @zimbatm /pkgs/development/interpreters/ruby @zimbatm
pkgs/development/ruby-modules/* @zimbatm /pkgs/development/ruby-modules @zimbatm
# Darwin-related # Darwin-related
/pkgs/stdenv/darwin/ @org/darwin-maintainers /pkgs/stdenv/darwin @NixOS/darwin-maintainers
/pkgs/os-specific/darwin/ @org/darwin-maintainers /pkgs/os-specific/darwin @NixOS/darwin-maintainers
# Beam-related (Erlang, Elixir, LFE, etc) # Beam-related (Erlang, Elixir, LFE, etc)
pkgs/development/beam-modules/* @gleber /pkgs/development/beam-modules @gleber
pkgs/development/interpreters/erlang/* @gleber /pkgs/development/interpreters/erlang @gleber
pkgs/development/interpreters/lfe/* @gleber /pkgs/development/interpreters/lfe @gleber
pkgs/development/interpreters/elixir/* @gleber /pkgs/development/interpreters/elixir @gleber
pkgs/development/tools/build-managers/rebar/* @gleber /pkgs/development/tools/build-managers/rebar @gleber
pkgs/development/tools/build-managers/rebar3/* @gleber /pkgs/development/tools/build-managers/rebar3 @gleber
pkgs/development/tools/erlang/* @gleber /pkgs/development/tools/erlang @gleber
# Jetbrains # Jetbrains
pkgs/applications/editors/jetbrains @edwtjo /pkgs/applications/editors/jetbrains @edwtjo
# Eclipse # Eclipse
pkgs/applications/editors/eclipse @rycee /pkgs/applications/editors/eclipse @rycee

View file

@ -93,7 +93,7 @@ in
hardware.opengl.extraPackages = mkOption { hardware.opengl.extraPackages = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = []; default = [];
example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]";
description = '' description = ''
Additional packages to add to OpenGL drivers. This can be used Additional packages to add to OpenGL drivers. This can be used
to add OpenCL drivers, VA-API/VDPAU drivers etc. to add OpenCL drivers, VA-API/VDPAU drivers etc.

View file

@ -139,6 +139,20 @@ in
''; '';
}; };
production = mkOption {
type = types.bool;
default = true;
description = ''
If set to true, use Let's Encrypt's production environment
instead of the staging environment. The main benefit of the
staging environment is to get much higher rate limits.
See
<literal>https://letsencrypt.org/docs/staging-environment</literal>
for more detail.
'';
};
certs = mkOption { certs = mkOption {
default = { }; default = { };
type = with types; attrsOf (submodule certOpts); type = with types; attrsOf (submodule certOpts);
@ -177,7 +191,9 @@ in
cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
++ optionals (data.email != null) [ "--email" data.email ] ++ optionals (data.email != null) [ "--email" data.email ]
++ concatMap (p: [ "-f" p ]) data.plugins ++ concatMap (p: [ "-f" p ]) data.plugins
++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains); ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
++ (if cfg.production then []
else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]);
acmeService = { acmeService = {
description = "Renew ACME Certificate for ${cert}"; description = "Renew ACME Certificate for ${cert}";
after = [ "network.target" "network-online.target" ]; after = [ "network.target" "network-online.target" ];

View file

@ -1,20 +1,17 @@
{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
let python2Packages.buildPythonApplication rec {
pname = "puddletag"; name = "puddletag-${version}";
in python2Packages.buildPythonApplication rec {
name = "${pname}-${version}";
version = "1.2.0"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "keithgg"; owner = "keithgg";
repo = pname; repo = "puddletag";
rev = "v${version}"; rev = "v${version}";
sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
}; };
sourceRoot = "${pname}-v${version}-src/source"; sourceRoot = "source/source";
disabled = python2Packages.isPy3k; # work to support python 3 has not begun disabled = python2Packages.isPy3k; # work to support python 3 has not begun
@ -29,17 +26,21 @@ in python2Packages.buildPythonApplication rec {
dontStrip = true; # we are not generating any binaries dontStrip = true; # we are not generating any binaries
installPhase = '' installPhase = ''
runHook preInstall
siteDir=$(toPythonPath $out) siteDir=$(toPythonPath $out)
mkdir -p $siteDir mkdir -p $siteDir
PYTHONPATH=$PYTHONPATH:$siteDir PYTHONPATH=$PYTHONPATH:$siteDir
${python2Packages.python.interpreter} setup.py install --prefix $out ${python2Packages.python.interpreter} setup.py install --prefix $out
runHook postInstall
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://puddletag.net; homepage = https://puddletag.net;
description = "An audio tag editor similar to the Windows program, Mp3tag"; description = "An audio tag editor similar to the Windows program, Mp3tag";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
}; };
} }

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem { stdenv, fetchurl, makeDesktopItem, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ makeWrapper ];
unpackPhase = '' unpackPhase = ''
tar xzf $src tar xzf $src
''; '';
@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
paxmark m $out/opt/franz/Franz paxmark m $out/opt/franz/Franz
wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -11,13 +11,13 @@ group :default do
gem 'oauth', '>= 0.5.1' gem 'oauth', '>= 0.5.1'
gem 'json_pure', '~> 1.8' gem 'json_pure', '~> 1.8'
gem 'addressable', '~> 2.3' gem 'addressable', '~> 2.3'
gem 'memoist', '~> 0.14' gem 'memoist', '>= 0.16', '< 0.17'
gem 'ruby-hmac', '~> 0.4' gem 'ruby-hmac', '~> 0.4'
gem 'typed-array', '~> 0.1' gem 'typed-array', '~> 0.1'
gem 'delayer', '~> 0.0' gem 'delayer', '~> 0.0'
gem 'pluggaloid', '>= 1.1.1', '< 2.0' gem 'pluggaloid', '>= 1.1.1', '< 2.0'
gem 'delayer-deferred', '>= 1.0.4', '< 2.0' gem 'delayer-deferred', '>= 1.0.4', '< 1.1'
gem 'twitter-text', '1.14.2' gem 'twitter-text', '>= 1.14.6'
end end
group :test do group :test do
@ -31,7 +31,10 @@ end
group :plugin do group :plugin do
Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "core/plugin/*/Gemfile"))){ |path| Dir.glob(File.expand_path(File.join(__dir__, 'core/plugin/*/Gemfile'))){ |path|
eval File.open(path).read
}
Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path|
eval File.open(path).read eval File.open(path).read
} }
end end

View file

@ -1,67 +1,72 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.5.1) addressable (2.5.2)
public_suffix (~> 2.0, >= 2.0.2) public_suffix (>= 2.0.2, < 4.0)
atk (3.1.1) atk (3.1.9)
glib2 (= 3.1.1) glib2 (= 3.1.9)
cairo (1.15.7) cairo (1.15.10)
native-package-installer native-package-installer (>= 1.0.3)
pkg-config (>= 1.1.5) pkg-config (>= 1.2.2)
cairo-gobject (3.1.9)
cairo
glib2 (= 3.1.9)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
delayer (0.0.2) delayer (0.0.2)
delayer-deferred (1.1.1) delayer-deferred (1.0.4)
delayer (>= 0.0.2, < 0.1) delayer (>= 0.0.2, < 0.1)
gdk_pixbuf2 (3.1.1) gdk_pixbuf2 (3.1.9)
gio2 (= 3.1.1) gio2 (= 3.1.9)
gettext (3.0.9) gettext (3.0.9)
locale (>= 2.0.5) locale (>= 2.0.5)
text text
gio2 (3.1.1) gio2 (3.1.9)
glib2 (= 3.1.1) glib2 (= 3.1.9)
gobject-introspection (= 3.1.1) gobject-introspection (= 3.1.9)
glib2 (3.1.1) glib2 (3.1.9)
pkg-config native-package-installer (>= 1.0.3)
gobject-introspection (3.1.1) pkg-config (>= 1.2.2)
glib2 (= 3.1.1) gobject-introspection (3.1.9)
gtk2 (3.1.1) glib2 (= 3.1.9)
atk (= 3.1.1) gtk2 (3.1.9)
gdk_pixbuf2 (= 3.1.1) atk (= 3.1.9)
pango (= 3.1.1) gdk_pixbuf2 (= 3.1.9)
hashdiff (0.3.4) pango (= 3.1.9)
hashdiff (0.3.7)
httpclient (2.8.3) httpclient (2.8.3)
instance_storage (1.0.0) instance_storage (1.0.0)
json_pure (1.8.6) json_pure (1.8.6)
locale (2.1.2) locale (2.1.2)
memoist (0.15.0) memoist (0.16.0)
metaclass (0.0.4) metaclass (0.0.4)
mini_portile2 (2.1.0) mini_portile2 (2.3.0)
mocha (0.14.0) mocha (0.14.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
moneta (1.0.0) moneta (1.0.0)
native-package-installer (1.0.1) native-package-installer (1.0.4)
nokogiri (1.7.2) nokogiri (1.8.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.3.0)
oauth (0.5.1) oauth (0.5.3)
pango (3.1.1) pango (3.1.9)
cairo (>= 1.14.0) cairo (>= 1.14.0)
glib2 (= 3.1.1) cairo-gobject (= 3.1.9)
pkg-config (1.2.0) gobject-introspection (= 3.1.9)
pkg-config (1.2.8)
pluggaloid (1.1.1) pluggaloid (1.1.1)
delayer delayer
instance_storage (>= 1.0.0, < 2.0.0) instance_storage (>= 1.0.0, < 2.0.0)
power_assert (1.0.2) power_assert (1.1.1)
public_suffix (2.0.5) public_suffix (3.0.0)
rake (10.5.0) rake (10.5.0)
ruby-hmac (0.4.0) ruby-hmac (0.4.0)
ruby-prof (0.16.2) ruby-prof (0.16.2)
safe_yaml (1.0.4) safe_yaml (1.0.4)
test-unit (3.2.3) test-unit (3.2.6)
power_assert power_assert
text (1.3.1) text (1.3.1)
totoridipjp (0.1.0) totoridipjp (0.1.0)
twitter-text (1.14.2) twitter-text (1.14.7)
unf (~> 0.1.0) unf (~> 0.1.0)
typed-array (0.1.2) typed-array (0.1.2)
unf (0.1.4) unf (0.1.4)
@ -79,12 +84,12 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
addressable (~> 2.3) addressable (~> 2.3)
delayer (~> 0.0) delayer (~> 0.0)
delayer-deferred (>= 1.0.4, < 2.0) delayer-deferred (>= 1.0.4, < 1.1)
gettext (~> 3.0.1) gettext (~> 3.0.1)
gtk2 (= 3.1.1) gtk2 (= 3.1.9)
httpclient httpclient
json_pure (~> 1.8) json_pure (~> 1.8)
memoist (~> 0.14) memoist (>= 0.16, < 0.17)
mocha (~> 0.14) mocha (~> 0.14)
moneta moneta
nokogiri nokogiri
@ -95,10 +100,10 @@ DEPENDENCIES
ruby-prof ruby-prof
test-unit (~> 3.0) test-unit (~> 3.0)
totoridipjp totoridipjp
twitter-text (= 1.14.2) twitter-text (>= 1.14.6)
typed-array (~> 0.1) typed-array (~> 0.1)
watch (~> 0.1) watch (~> 0.1)
webmock (~> 1.17) webmock (~> 1.17)
BUNDLED WITH BUNDLED WITH
1.14.4 1.14.6

View file

@ -1,3 +1,3 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'gtk2', '3.1.1' gem 'gtk2', '3.1.9'

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mikutter-${version}"; name = "mikutter-${version}";
version = "3.5.7"; version = "3.5.13";
src = fetchurl { src = fetchurl {
url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz"; url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
sha256 = "1vh5ap92q869j69hmmbznailaflmdp0km4sqdv06cpq7v8pwm28w"; sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320";
}; };
env = bundlerEnv { env = bundlerEnv {
@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
broken = true;
description = "An extensible Twitter client"; description = "An extensible Twitter client";
homepage = https://mikutter.hachune.net; homepage = https://mikutter.hachune.net;
maintainers = with maintainers; [ midchildan ]; maintainers = with maintainers; [ midchildan ];

View file

@ -3,28 +3,37 @@
dependencies = ["public_suffix"]; dependencies = ["public_suffix"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh"; sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem"; type = "gem";
}; };
version = "2.5.1"; version = "2.5.2";
}; };
atk = { atk = {
dependencies = ["glib2"]; dependencies = ["glib2"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "17x88g596s3pqfxplm5ia7anpcmd9kxs4nzmpf2h74bqwkbq2jrz"; sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
cairo = { cairo = {
dependencies = ["native-package-installer" "pkg-config"]; dependencies = ["native-package-installer" "pkg-config"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "115ksrswbs7pg7kdfi2w8bi9xxv9gzmfvcjj8qj4dxy8dkvp3k4d"; sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c";
type = "gem"; type = "gem";
}; };
version = "1.15.7"; version = "1.15.10";
};
cairo-gobject = {
dependencies = ["cairo" "glib2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26";
type = "gem";
};
version = "3.1.9";
}; };
crack = { crack = {
dependencies = ["safe_yaml"]; dependencies = ["safe_yaml"];
@ -47,19 +56,19 @@
dependencies = ["delayer"]; dependencies = ["delayer"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bw48i6qbxmjf2al4a0mw23nlkcrjrwsrdrabbwz62v8sdmdynpc"; sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb";
type = "gem"; type = "gem";
}; };
version = "1.1.1"; version = "1.0.4";
}; };
gdk_pixbuf2 = { gdk_pixbuf2 = {
dependencies = ["gio2"]; dependencies = ["gio2"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0x9fzsazfi6f3iq7zkqc0vjl6311876dvff0000vg41rajv3rhh1"; sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
gettext = { gettext = {
dependencies = ["locale" "text"]; dependencies = ["locale" "text"];
@ -74,45 +83,45 @@
dependencies = ["glib2" "gobject-introspection"]; dependencies = ["glib2" "gobject-introspection"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ki9yxp860xk5cf04hrgvh386n93bkr0pf4c0kl3fx6pnwr4w3v0"; sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
glib2 = { glib2 = {
dependencies = ["pkg-config"]; dependencies = ["native-package-installer" "pkg-config"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "131jd26n2wwp2lrkyyfq5nb3qriasaym1zpygm991qzcaq79i444"; sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
gobject-introspection = { gobject-introspection = {
dependencies = ["glib2"]; dependencies = ["glib2"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0fbi1pxyq73d674cwznya6kda38yjp4ahc2xgxi9shsdqmqcx3vs"; sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
gtk2 = { gtk2 = {
dependencies = ["atk" "gdk_pixbuf2" "pango"]; dependencies = ["atk" "gdk_pixbuf2" "pango"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "00cbfl306xkglk0cc758vsvv1saaa24gvwh0m2jnzwgfwxk7mc5w"; sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
hashdiff = { hashdiff = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
type = "gem"; type = "gem";
}; };
version = "0.3.4"; version = "0.3.7";
}; };
httpclient = { httpclient = {
source = { source = {
@ -149,10 +158,10 @@
memoist = { memoist = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q"; sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
type = "gem"; type = "gem";
}; };
version = "0.15.0"; version = "0.16.0";
}; };
metaclass = { metaclass = {
source = { source = {
@ -165,10 +174,10 @@
mini_portile2 = { mini_portile2 = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
type = "gem"; type = "gem";
}; };
version = "2.1.0"; version = "2.3.0";
}; };
mocha = { mocha = {
dependencies = ["metaclass"]; dependencies = ["metaclass"];
@ -190,44 +199,44 @@
native-package-installer = { native-package-installer = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zh5x87y9dr16ic7vif2c3rnpr5k5wfs6kihpy4dnb9s0mqyqhsj"; sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a";
type = "gem"; type = "gem";
}; };
version = "1.0.1"; version = "1.0.4";
}; };
nokogiri = { nokogiri = {
dependencies = ["mini_portile2"]; dependencies = ["mini_portile2"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0jd8q3pr5rkrxx1vklvhcqcgl8kmfv5c8ny36ni3z5mirw6cm70c"; sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
type = "gem"; type = "gem";
}; };
version = "1.7.2"; version = "1.8.1";
}; };
oauth = { oauth = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b";
type = "gem"; type = "gem";
}; };
version = "0.5.1"; version = "0.5.3";
}; };
pango = { pango = {
dependencies = ["cairo" "glib2"]; dependencies = ["cairo" "cairo-gobject" "gobject-introspection"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18cc24lz4dmb7pavfspivbhbsypf40fhcbdzj8885zs0zr0dknby"; sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.1.9";
}; };
pkg-config = { pkg-config = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0fklf2dnk354ahxma3iki5cx7b8yn9khby162pz17z6f1f3xk84g"; sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws";
type = "gem"; type = "gem";
}; };
version = "1.2.0"; version = "1.2.8";
}; };
pluggaloid = { pluggaloid = {
dependencies = ["delayer" "instance_storage"]; dependencies = ["delayer" "instance_storage"];
@ -241,18 +250,18 @@
power_assert = { power_assert = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "168ac459nv45a2lhdf86zv35lv9nr569ny5nh3kfnglnxyzyx0kr"; sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz";
type = "gem"; type = "gem";
}; };
version = "1.0.2"; version = "1.1.1";
}; };
public_suffix = { public_suffix = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
type = "gem"; type = "gem";
}; };
version = "2.0.5"; version = "3.0.0";
}; };
rake = { rake = {
source = { source = {
@ -290,10 +299,10 @@
dependencies = ["power_assert"]; dependencies = ["power_assert"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1kngxp21sqbm7kv7wnxfqk99ik3wv1bjab519vcbj8xj30a5y4py"; sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv";
type = "gem"; type = "gem";
}; };
version = "3.2.3"; version = "3.2.6";
}; };
text = { text = {
source = { source = {
@ -315,10 +324,10 @@
dependencies = ["unf"]; dependencies = ["unf"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0lld6d8rzj1zrgs6b227mp675bn8ds56f1c9w9wvx321f6ibn6np"; sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
type = "gem"; type = "gem";
}; };
version = "1.14.2"; version = "1.14.7";
}; };
typed-array = { typed-array = {
source = { source = {

View file

@ -8,6 +8,7 @@ pkgs.stdenv.mkDerivation {
]; ];
shellHook = '' shellHook = ''
export MIKUTTER_CONFROOT="/homeless-shelter"
truncate --size 0 Gemfile.lock truncate --size 0 Gemfile.lock
bundle lock bundle lock
bundle package --path=vendor/bundle --no-install bundle package --path=vendor/bundle --no-install

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, dpkg { stdenv, fetchurl, dpkg, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
let let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32"; else "ia32";
version = "0.5.12"; version = "0.5.13";
runtimeDeps = [ runtimeDeps = [
udev libnotify udev libnotify
@ -23,14 +23,14 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb"; url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
sha256 = if bits == "x64" then sha256 = if bits == "x64" then
"1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else "0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else
"063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa"; "180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4";
}; };
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ dpkg ]; buildInputs = [ dpkg makeWrapper ];
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = "dpkg-deb -x $src .";
@ -50,6 +50,7 @@ in stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
paxmark m $out/opt/Rambox/rambox paxmark m $out/opt/Rambox/rambox
wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,26 +1,26 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l { stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }: , libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "utox-${version}"; name = "utox-${version}";
# >= 0.14 should have unit tests and dbus support
version = "0.13.1"; version = "0.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "uTox"; owner = "uTox";
repo = "uTox"; repo = "uTox";
rev = "v${version}"; rev = "v${version}";
sha256 = "07aa92isknxf7531jr9kgk89wl5rvv34jrvir043fs9xvim5zq99"; sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828";
}; };
buildInputs = [ buildInputs = [
libtoxcore dbus libvpx libX11 openal freetype libtoxcore dbus libvpx libX11 openal freetype
libv4l libXrender fontconfig libXext libXft filter-audio libv4l libXrender fontconfig libXext libXft filter-audio
libsodium libsodium libopus
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake git pkgconfig cmake git pkgconfig check
]; ];
cmakeFlags = [ cmakeFlags = [
@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
checkTarget = "test";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Lightweight Tox client"; description = "Lightweight Tox client";
homepage = https://github.com/uTox/uTox; homepage = https://github.com/uTox/uTox;

View file

@ -1,17 +1,17 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtmultimedia, qtsvg , qtbase, qtmultimedia, qtsvg
, lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol , lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol
}: }:
mkDerivation rec { mkDerivation rec {
name = "virt-manager-qt-${version}"; name = "virt-manager-qt-${version}";
version = "0.43.72"; version = "0.45.75";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "F1ash"; owner = "F1ash";
repo = "qt-virt-manager"; repo = "qt-virt-manager";
rev = "${version}"; rev = "${version}";
sha256 = "0m8aqs58wnk404z2hav5j4yjsy8f0vfsm771pm0gprsfbx4sm3qg"; sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n";
}; };
cmakeFlags = [ cmakeFlags = [
@ -26,15 +26,17 @@ mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
homepage = http://f1ash.github.io/qt-virt-manager; homepage = https://f1ash.github.io/qt-virt-manager;
description = "Desktop user interface for managing virtual machines (QT)"; description = "Desktop user interface for managing virtual machines (QT)";
longDescription = '' longDescription = ''
The virt-manager application is a desktop user interface for managing The virt-manager application is a desktop user interface for managing
virtual machines through libvirt. It primarily targets KVM VMs, but also virtual machines through libvirt. It primarily targets KVM VMs, but also
manages Xen and LXC (linux containers). manages Xen and LXC (linux containers).
''; '';
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
}; };
} }

View file

@ -0,0 +1,30 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "iwona-${version}";
version = "0_995";
src = fetchzip {
url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip";
sha256 = "1wj5bxbxpz5a8p3rhw708cyjc0lgqji8g0iv6brmmbrrkpb3jq2s";
};
installPhase = ''
install -m 444 -D -t $out/share/fonts/opentype/ *.otf
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa";
meta = with stdenv.lib; {
description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
homepage = http://jmn.pl/en/kurier-i-iwona/;
# "[...] GUST Font License (GFL), which is a free license, legally
# equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
# later." - GUST website
license = licenses.lppl13c;
maintainers = with maintainers; [ siddharthist ];
platforms = platforms.all;
};
}

View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.1/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.2/ -A '*.tar.xz' )

View file

@ -3,355 +3,355 @@
{ {
bluedevil = { bluedevil = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/bluedevil-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/bluedevil-5.11.2.tar.xz";
sha256 = "0p1y3p87xg7rjj35n81jg4v4yr2k7bf80qzfnwslbvwrpnzs982q"; sha256 = "0gwvmy8zn3wcdvcgc5j84gy1y7cxysy7bvnppg34rh6l5qc7vvjq";
name = "bluedevil-5.11.1.tar.xz"; name = "bluedevil-5.11.2.tar.xz";
}; };
}; };
breeze = { breeze = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/breeze-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/breeze-5.11.2.tar.xz";
sha256 = "0yqbr7j0iqnmczbfv454f1l5x3787vzfchgkrd995d6za2d0w2lp"; sha256 = "1wv5dp657gw4vyiv9zf6r8qbs67sp5g0x0kf1vmr1bp0gkw0ai81";
name = "breeze-5.11.1.tar.xz"; name = "breeze-5.11.2.tar.xz";
}; };
}; };
breeze-grub = { breeze-grub = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/breeze-grub-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/breeze-grub-5.11.2.tar.xz";
sha256 = "0pcri1z4min5m6wb6ncyjavwd9nszyis3cqdyw6mqb4av55z0xl0"; sha256 = "04m74iy0rijccmvqd7c9n4p6nk3flmb3zaf5qk8hv31qscg5qjaj";
name = "breeze-grub-5.11.1.tar.xz"; name = "breeze-grub-5.11.2.tar.xz";
}; };
}; };
breeze-gtk = { breeze-gtk = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/breeze-gtk-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/breeze-gtk-5.11.2.tar.xz";
sha256 = "0qb3ykf1mdw1iparsaxnypc4z41lfal6idksz9va25p3vclh02gr"; sha256 = "0c3vshnkgp6c38rwr1x34hn244r78qkc7fj0ax2cibydv3l852d4";
name = "breeze-gtk-5.11.1.tar.xz"; name = "breeze-gtk-5.11.2.tar.xz";
}; };
}; };
breeze-plymouth = { breeze-plymouth = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/breeze-plymouth-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/breeze-plymouth-5.11.2.tar.xz";
sha256 = "1z175176583aqdvv6gwy7mdkndr50x1c8xdihrrcvdhvqy9qc7hr"; sha256 = "1v43z59y0zzwsrwa0y255i2q8krvr9yafdciyr63v4pb2564v4sd";
name = "breeze-plymouth-5.11.1.tar.xz"; name = "breeze-plymouth-5.11.2.tar.xz";
}; };
}; };
discover = { discover = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/discover-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/discover-5.11.2.tar.xz";
sha256 = "0zr53nw9lix80wlf7wa7irng2vvy80wccjs439ib8r1yh3ggiq4c"; sha256 = "0j31x26s446xvi6dxr83v15xbr6ysifiwvdzil8yfsynifhjk5n3";
name = "discover-5.11.1.tar.xz"; name = "discover-5.11.2.tar.xz";
}; };
}; };
drkonqi = { drkonqi = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/drkonqi-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/drkonqi-5.11.2.tar.xz";
sha256 = "0kq06sz39m8qg19b4cjqfwnx19j3s29hddhls8wywswwxlz4aq35"; sha256 = "1mgcp8zk4md0cyx6z6zz9s64jx9yshlnmsf1jxzhqwg8lyhyb77b";
name = "drkonqi-5.11.1.tar.xz"; name = "drkonqi-5.11.2.tar.xz";
}; };
}; };
kactivitymanagerd = { kactivitymanagerd = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kactivitymanagerd-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kactivitymanagerd-5.11.2.tar.xz";
sha256 = "1j36mbngga492xxhm1ndw1bnq1qn480qpvzi94wyax9y3r4szmhg"; sha256 = "165nybhn7pwgr6fds6frwcp3qsnxpmkz3842h0ni0flkkcl74n52";
name = "kactivitymanagerd-5.11.1.tar.xz"; name = "kactivitymanagerd-5.11.2.tar.xz";
}; };
}; };
kde-cli-tools = { kde-cli-tools = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kde-cli-tools-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kde-cli-tools-5.11.2.tar.xz";
sha256 = "0di7ypyhda4gpadhi0lbji4nyi9xk1y844kxfb586wpzkim5w82c"; sha256 = "18pl9v2dxayzwzk4rw674ka3j45dj864604hgg0874kkr3kgsgka";
name = "kde-cli-tools-5.11.1.tar.xz"; name = "kde-cli-tools-5.11.2.tar.xz";
}; };
}; };
kdecoration = { kdecoration = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kdecoration-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kdecoration-5.11.2.tar.xz";
sha256 = "1jpvdscmy5ymyvj22784swvf6181f7ggr875djhx57c7i4shb3ph"; sha256 = "0qkh3p1zzvk0yvlpbvwfgmb2wvj0gd3j2sbz10vplf66fm3ck2va";
name = "kdecoration-5.11.1.tar.xz"; name = "kdecoration-5.11.2.tar.xz";
}; };
}; };
kde-gtk-config = { kde-gtk-config = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kde-gtk-config-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kde-gtk-config-5.11.2.tar.xz";
sha256 = "1afbwdrjdv9a2qwyxysgnslavan20cmhrz88kmnf9imxlll0i7al"; sha256 = "0vhmpma2ssp7nqdy8yd12d42y2a2fnsyyz9msi4s7n1w5qga0g5p";
name = "kde-gtk-config-5.11.1.tar.xz"; name = "kde-gtk-config-5.11.2.tar.xz";
}; };
}; };
kdeplasma-addons = { kdeplasma-addons = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kdeplasma-addons-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kdeplasma-addons-5.11.2.tar.xz";
sha256 = "09dwmd1aiiivkvdbyv97fili067sd8mw9dpknawair4mh7qb0zln"; sha256 = "0x1lgvcnrc9vcy9fqvc60ilmcm8pbym76fq784qmgnmzm0br3bq6";
name = "kdeplasma-addons-5.11.1.tar.xz"; name = "kdeplasma-addons-5.11.2.tar.xz";
}; };
}; };
kgamma5 = { kgamma5 = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kgamma5-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kgamma5-5.11.2.tar.xz";
sha256 = "1m9maxzn5y3zijmj2fkwsfwhinprhz97v9fi312dmwyvfhq3qvyd"; sha256 = "0k6j6nl26bhdavfr4y0ph17fywprzxjnamh67vibk39xg6vwa56d";
name = "kgamma5-5.11.1.tar.xz"; name = "kgamma5-5.11.2.tar.xz";
}; };
}; };
khotkeys = { khotkeys = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/khotkeys-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/khotkeys-5.11.2.tar.xz";
sha256 = "0d1p1sia9qvdls38m29jijsf1ya8zvza557flmhcajb5ldn243l5"; sha256 = "1w1a06v2cgq48z0b1rz6px1g14hm7f5jxzxf7sa26yszsyhwqglm";
name = "khotkeys-5.11.1.tar.xz"; name = "khotkeys-5.11.2.tar.xz";
}; };
}; };
kinfocenter = { kinfocenter = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kinfocenter-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kinfocenter-5.11.2.tar.xz";
sha256 = "0ivhf460y83qv4qdphdvskx2nlfqzy453xfnq7ldyzp2yacdmcc8"; sha256 = "1131gnqapnin8i4bm3skzhfsqgcaynaxn9xgfwxnj64z41cc8z8l";
name = "kinfocenter-5.11.1.tar.xz"; name = "kinfocenter-5.11.2.tar.xz";
}; };
}; };
kmenuedit = { kmenuedit = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kmenuedit-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kmenuedit-5.11.2.tar.xz";
sha256 = "081lqh5ck854pha1f99w6w4j032spl3v28ild61fmhvhzkvx48a6"; sha256 = "03412s6wc9h2422lx57rg65zln9ywjk5gbs5mqjr6fi46a1zp5lg";
name = "kmenuedit-5.11.1.tar.xz"; name = "kmenuedit-5.11.2.tar.xz";
}; };
}; };
kscreen = { kscreen = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kscreen-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kscreen-5.11.2.tar.xz";
sha256 = "1skdg59qacxxkiyz3gc1nn4y4lflbynpcb4mpsliqb2n2xdhvg8r"; sha256 = "0bs09zfq1cs1ajgvz4p7l5naa3g3vzp72v9q7qkncx8yqiffxlnc";
name = "kscreen-5.11.1.tar.xz"; name = "kscreen-5.11.2.tar.xz";
}; };
}; };
kscreenlocker = { kscreenlocker = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kscreenlocker-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kscreenlocker-5.11.2.tar.xz";
sha256 = "0jgq2w7zi1i4wdlfmfz1jh1kbkcn2lxkdg9ds5brisc3f6r4n3vg"; sha256 = "1k32nzhv9d4g5ijkx8bl22hp5j1g22frriwq14xjw47ga8vkqmxw";
name = "kscreenlocker-5.11.1.tar.xz"; name = "kscreenlocker-5.11.2.tar.xz";
}; };
}; };
ksshaskpass = { ksshaskpass = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/ksshaskpass-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/ksshaskpass-5.11.2.tar.xz";
sha256 = "00ghycjmagc8mjwsgny9bkr45ppnad6aay44ha6fn5gyx973xcmx"; sha256 = "1z3vm8kwyi9pf51bhpqf3phbjkbrqfj4iiqzzs0aqm0l5db5il0r";
name = "ksshaskpass-5.11.1.tar.xz"; name = "ksshaskpass-5.11.2.tar.xz";
}; };
}; };
ksysguard = { ksysguard = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/ksysguard-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/ksysguard-5.11.2.tar.xz";
sha256 = "11z29w95ji815gwaggs0n9bw8f040z4fd87ci2wmqcpyrjs7a6z1"; sha256 = "0vy2ivsn0cg70n1cxwa2385fwh350xngc1429zjfcs0jj8lcj21l";
name = "ksysguard-5.11.1.tar.xz"; name = "ksysguard-5.11.2.tar.xz";
}; };
}; };
kwallet-pam = { kwallet-pam = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kwallet-pam-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kwallet-pam-5.11.2.tar.xz";
sha256 = "0zipldqjg3mazm2j7vrxkc0pqp7x7mmdq7cg1vlb1xlj8ld2vl7y"; sha256 = "1jr4zvf9c5npi9mcgil5byx4bwh6kaa205329p5z8i15n1zf250f";
name = "kwallet-pam-5.11.1.tar.xz"; name = "kwallet-pam-5.11.2.tar.xz";
}; };
}; };
kwayland-integration = { kwayland-integration = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kwayland-integration-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kwayland-integration-5.11.2.tar.xz";
sha256 = "1h1lcvzbcf628hs5hj3ykpzy086ylvf5bz63gr0clhyckjxrbbkh"; sha256 = "1dzlf9638d36h8z5a7rjbb0xl2wjqg04j37gn4jnjclm57bwlrjm";
name = "kwayland-integration-5.11.1.tar.xz"; name = "kwayland-integration-5.11.2.tar.xz";
}; };
}; };
kwin = { kwin = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kwin-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kwin-5.11.2.tar.xz";
sha256 = "1anc8pblpsb8g7lvnq43ji6fgpwxsnmypc3gkip26lb4j7gqfhqm"; sha256 = "1wvq4pll1adncj88qd7isc0ip7hx2c72ah0vvmvxmkwxa4r5a89b";
name = "kwin-5.11.1.tar.xz"; name = "kwin-5.11.2.tar.xz";
}; };
}; };
kwrited = { kwrited = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/kwrited-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/kwrited-5.11.2.tar.xz";
sha256 = "11y2dpjs0g01nah1924dzf39y1smzlswc6nx1cwgfky3raaz3cj0"; sha256 = "17i33yvpvpj6q42c58adb99xs1yb7yfchs626vw5nmllv7r7496l";
name = "kwrited-5.11.1.tar.xz"; name = "kwrited-5.11.2.tar.xz";
}; };
}; };
libkscreen = { libkscreen = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/libkscreen-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/libkscreen-5.11.2.tar.xz";
sha256 = "0drv6f8gzilirwp7p31qrng7cdp7b23ar5v1d5bkdrr1q29z8wdv"; sha256 = "18bf7mzzri7fj8iw60wqbs6w46lin8lninpqpcs5fwz6m81lcxsg";
name = "libkscreen-5.11.1.tar.xz"; name = "libkscreen-5.11.2.tar.xz";
}; };
}; };
libksysguard = { libksysguard = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/libksysguard-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/libksysguard-5.11.2.tar.xz";
sha256 = "1m8514jv2487fbypxys65qb0a55psqvyzkw5l81ka4ydnrhl2hhm"; sha256 = "12d0r4rilydbqdgkm256khvkb9m0hya3p27xqvv3hg77wgxzdl3f";
name = "libksysguard-5.11.1.tar.xz"; name = "libksysguard-5.11.2.tar.xz";
}; };
}; };
milou = { milou = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/milou-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/milou-5.11.2.tar.xz";
sha256 = "1v7rbjw8i1pdvl60xh8s0srrp17jks360zk42rp3hq9srsffd8cp"; sha256 = "0kxf2q0pk7kyfirrspgpwlnj18v8q2770rrmrv0jcfsgv4jhl2gj";
name = "milou-5.11.1.tar.xz"; name = "milou-5.11.2.tar.xz";
}; };
}; };
oxygen = { oxygen = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/oxygen-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/oxygen-5.11.2.tar.xz";
sha256 = "0b3yl4q5cbcj6d07xrmifpvwysaa870gf56a7l38zjba6z04819z"; sha256 = "18nkw02q7lzdhalmbwsb5i704szs19zc5a0z73smanf20cfq7a91";
name = "oxygen-5.11.1.tar.xz"; name = "oxygen-5.11.2.tar.xz";
}; };
}; };
plasma-desktop = { plasma-desktop = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-desktop-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plasma-desktop-5.11.2.tar.xz";
sha256 = "1r7chviykyq2650k513qcp665pv8vpdczvbrvqfhbpn4yy47crps"; sha256 = "0dz57qywlircjjybxzb3mqxwaid86zdfwjgfwcb6fhm8rxhbhrzq";
name = "plasma-desktop-5.11.1.tar.xz"; name = "plasma-desktop-5.11.2.tar.xz";
}; };
}; };
plasma-integration = { plasma-integration = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-integration-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plasma-integration-5.11.2.tar.xz";
sha256 = "0jpshilcpklyx7cbpn0cf96md2h6pwd86bk8lphzm64zv3c655ly"; sha256 = "15vjmmrlk9dw0if0z3xam171f8z3qkjcllj3zyc0zxdwi2zw6i2l";
name = "plasma-integration-5.11.1.tar.xz"; name = "plasma-integration-5.11.2.tar.xz";
}; };
}; };
plasma-nm = { plasma-nm = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-nm-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plasma-nm-5.11.2.tar.xz";
sha256 = "0479cqy7503krish11djg7rc4g7kdlbj3gapsbgvlq9x6j7ixz1p"; sha256 = "1h3ajq3fdv8fn0r51cpkhihacpjvpgzpfyg2m9aydh7ajygf0njq";
name = "plasma-nm-5.11.1.tar.xz"; name = "plasma-nm-5.11.2.tar.xz";
}; };
}; };
plasma-pa = { plasma-pa = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-pa-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plasma-pa-5.11.2.tar.xz";
sha256 = "0g565v4dwcn6jppn1p2dvljg5r39xmgjzgf8rcipw70kcwc1nx4c"; sha256 = "1ckk4ckhy5y3b6cm7gahwkqvf8bxndk0srij3ggqdasxzdc4fjn8";
name = "plasma-pa-5.11.1.tar.xz"; name = "plasma-pa-5.11.2.tar.xz";
}; };
}; };
plasma-sdk = { plasma-sdk = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-sdk-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plasma-sdk-5.11.2.tar.xz";
sha256 = "0ss148yig5zzprkk2ydq3np34gr0bnbh1gn18hgb5z33iglbdl3n"; sha256 = "10ayy3r36ysq3a79nlpqspfff0s28iq2xyp5767qpmzfrjby4bcx";
name = "plasma-sdk-5.11.1.tar.xz"; name = "plasma-sdk-5.11.2.tar.xz";
}; };
}; };
plasma-tests = { plasma-tests = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-tests-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plasma-tests-5.11.2.tar.xz";
sha256 = "03r5dczb9iqigg2s7h0k6zgb616358lqvl2h0k0bg2hxggnh8lpk"; sha256 = "06k1cmmbyp4rslhmj6b1ngq6pg0hv9hmc3yi135vjgppj5x523mm";
name = "plasma-tests-5.11.1.tar.xz"; name = "plasma-tests-5.11.2.tar.xz";
}; };
}; };
plasma-vault = { plasma-vault = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-vault-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plasma-vault-5.11.2.tar.xz";
sha256 = "09wbjk0bsbjyh5n1d5gywdvaimajqr50sd23dbfdbnpi3br0gk10"; sha256 = "1lxp40lmb03aicw9lz742i1lrigkki76yy7p5h9gnb4djzv5h0m6";
name = "plasma-vault-5.11.1.tar.xz"; name = "plasma-vault-5.11.2.tar.xz";
}; };
}; };
plasma-workspace = { plasma-workspace = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-5.11.2.tar.xz";
sha256 = "1fy4bdxrz8mn29nc2qjxjnpxzjy9mynwwdjxj0jr61w0ljd40wiy"; sha256 = "12i7raf4qqinr3wd4kzz96pkng19c7mdjqz28m8jwb3c1gdlps2w";
name = "plasma-workspace-5.11.1.tar.xz"; name = "plasma-workspace-5.11.2.tar.xz";
}; };
}; };
plasma-workspace-wallpapers = { plasma-workspace-wallpapers = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-wallpapers-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-wallpapers-5.11.2.tar.xz";
sha256 = "0dcfrad2543fxapizmlikv52m9nmdg45gddvh9chc83kangsydlc"; sha256 = "01a4cz7d15mrb96yhfvck61vbqdnw208mgssrllrmcfdn7hwalv1";
name = "plasma-workspace-wallpapers-5.11.1.tar.xz"; name = "plasma-workspace-wallpapers-5.11.2.tar.xz";
}; };
}; };
plymouth-kcm = { plymouth-kcm = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plymouth-kcm-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/plymouth-kcm-5.11.2.tar.xz";
sha256 = "0w3yhazbx79s9k1yc3lj16hanc3wrqphhk9zjl9q1vxsn2rzas8h"; sha256 = "1dig5msins4grby4lvrrby0adjci8yplq1nw52xq571qvvcixjf4";
name = "plymouth-kcm-5.11.1.tar.xz"; name = "plymouth-kcm-5.11.2.tar.xz";
}; };
}; };
polkit-kde-agent = { polkit-kde-agent = {
version = "1-5.11.1"; version = "1-5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/polkit-kde-agent-1-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/polkit-kde-agent-1-5.11.2.tar.xz";
sha256 = "04ycjqx9hnk3ab8qxk5gqz7b4r7im3bwap613qcgxjqr5cagp66w"; sha256 = "0qbr8c3fn6yp6ixfcfg4190q2wdj1xlm6791nn23bynd0nrxmxb3";
name = "polkit-kde-agent-1-5.11.1.tar.xz"; name = "polkit-kde-agent-1-5.11.2.tar.xz";
}; };
}; };
powerdevil = { powerdevil = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/powerdevil-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/powerdevil-5.11.2.tar.xz";
sha256 = "02rf8iz2spcc78xs88dknl6a7slwgfgh4ra8lhwk69d210cxgahq"; sha256 = "10ah28rqdn8xhz578yhcnampbfq7vh89gm0jzjx9ryxiv6rch2cw";
name = "powerdevil-5.11.1.tar.xz"; name = "powerdevil-5.11.2.tar.xz";
}; };
}; };
sddm-kcm = { sddm-kcm = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/sddm-kcm-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/sddm-kcm-5.11.2.tar.xz";
sha256 = "0sac2cknq7m26v8a59q1aakn6xjzmspnslfs6k633a8yz8w4lh19"; sha256 = "159qwvzk7g4ygg2sdb6k84vq0k1yadrgwzgq6sfbfhffim1w6dr1";
name = "sddm-kcm-5.11.1.tar.xz"; name = "sddm-kcm-5.11.2.tar.xz";
}; };
}; };
systemsettings = { systemsettings = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/systemsettings-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/systemsettings-5.11.2.tar.xz";
sha256 = "0bnygmb3g573b7a8g0qg3ddj65miw29v3p25sh0ic9ij5bx6f4rw"; sha256 = "11gcrd1i28hifjysvnj97fcy619h660j4bgszj9lmr8w554j0cri";
name = "systemsettings-5.11.1.tar.xz"; name = "systemsettings-5.11.2.tar.xz";
}; };
}; };
user-manager = { user-manager = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/user-manager-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/user-manager-5.11.2.tar.xz";
sha256 = "1iz5wm8d3ljn97msbh1bc7v8zmmgxrfr5mwfzh0ssdldba4wqlpm"; sha256 = "1pyyhhi276s8503q65n25rqwcddcbzy6l2vl844dnmmpd1m0gi4r";
name = "user-manager-5.11.1.tar.xz"; name = "user-manager-5.11.2.tar.xz";
}; };
}; };
xdg-desktop-portal-kde = { xdg-desktop-portal-kde = {
version = "5.11.1"; version = "5.11.2";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/xdg-desktop-portal-kde-5.11.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.2/xdg-desktop-portal-kde-5.11.2.tar.xz";
sha256 = "0w822jlg0h7qim70zamm7q5x2b614qmiggz9wr8yxq80lajizxnf"; sha256 = "0yjidwqk25c7grj42facqfl84ai7h4fin0zlf8y9jdksv26hskl0";
name = "xdg-desktop-portal-kde-5.11.1.tar.xz"; name = "xdg-desktop-portal-kde-5.11.2.tar.xz";
}; };
}; };
} }

View file

@ -976,4 +976,6 @@ self: super: {
# Build with gi overloading feature disabled. # Build with gi overloading feature disabled.
ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; }); ltk = super.ltk.overrideScope (self: super: { haskell-gi-overloading = self.haskell-gi-overloading_0_0; });
# missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4
stack2nix = doJailbreak super.stack2nix;
} }

View file

@ -15,34 +15,34 @@
, mesa_noglu , mesa_noglu
, makeWrapper , makeWrapper
, beignet , beignet
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "beignet-${version}"; name = "beignet-${version}";
version = "1.3.1"; version = "1.3.2";
src = fetchurl { src = fetchurl {
url = "https://01.org/sites/default/files/${name}-source.tar.gz"; url = "https://01.org/sites/default/files/${name}-source.tar.gz";
sha256 = "07snrgjlhwl5fxz82dyqp632cnf5hp0gfqrjd2930jv79p37p6rr"; sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5";
}; };
patches = [ ./clang_llvm.patch ]; patches = [ ./clang_llvm.patch ];
enableParallelBuilding = true; enableParallelBuilding = true;
postPatch = '' postPatch = ''
patchShebangs src/git_sha1.sh patchShebangs src/git_sha1.sh
''; '';
cmakeFlags = [ "-DCLANG_LIBRARY_DIR=${clang-unwrapped}/lib" ]; cmakeFlags = [ "-DCLANG_LIBRARY_DIR=${clang-unwrapped}/lib" ];
buildInputs = [ buildInputs = [
llvm llvm
clang-unwrapped clang-unwrapped
libX11 libX11
libXext libXext
libpthreadstubs libpthreadstubs
libdrm libdrm
libXdmcp libXdmcp
libXdamage libXdamage
ocl-icd ocl-icd
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
It supports the Intel OpenCL runtime library and compiler. It supports the Intel OpenCL runtime library and compiler.
''; '';
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ artuuge ]; maintainers = with maintainers; [ artuuge zimbatm ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -3,11 +3,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libva-intel-driver-1.7.3"; name = "intel-vaapi-driver-${version}";
version = "1.8.2";
src = fetchurl { src = fetchurl {
url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
sha256 = "0dzryi9x873p9gikzcb9wzwqv2j3wssm0b85ws63vqjszpckgbbn"; sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46";
}; };
patchPhase = '' patchPhase = ''

View file

@ -6,6 +6,7 @@
, numpydoc , numpydoc
, isPy3k , isPy3k
, stdenv , stdenv
, pytest
}: }:
@ -18,14 +19,10 @@ buildPythonPackage rec {
sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085"; sha256 = "7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085";
}; };
checkInputs = [ nose sphinx numpydoc ]; checkInputs = [ sphinx numpydoc pytest ];
# Failing test on Python 3.x and Darwin checkPhase = ''
postPatch = '''' + lib.optionalString (isPy3k || stdenv.isDarwin) '' py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test
sed -i -e '70,84d' joblib/test/test_format_stack.py
# test_nested_parallel_warnings: ValueError: Non-zero return code: -9.
# Not sure why but it's nix-specific. Try removing for new joblib releases.
rm joblib/test/test_parallel.py
''; '';
meta = { meta = {
@ -33,4 +30,4 @@ buildPythonPackage rec {
homepage = http://pythonhosted.org/joblib/; homepage = http://pythonhosted.org/joblib/;
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
}; };
} }

View file

@ -1,13 +1,15 @@
{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, cython, networkx, joblib, nose }: { stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pomegranate"; pname = "pomegranate";
version = "0.8.0"; version = "0.8.1";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; repo = pname;
sha256 = "6b03d05bffbe46c674800652cf273a8d338a2e40001b763cd6925aac0b578a43"; owner = "jmschrei";
rev = "v${version}";
sha256 = "085nka5bh88bxbd5vl1azyv9cfpp6grz2ngclc85f9kgccac1djr";
}; };
propagatedBuildInputs = [ numpy scipy cython networkx joblib ]; propagatedBuildInputs = [ numpy scipy cython networkx joblib ];

View file

@ -22,7 +22,7 @@
, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xlibs, gtk2, buildRubyGem , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xlibs, gtk2, buildRubyGem
, re2 , cairo, re2, rake, gobjectIntrospection, gdk_pixbuf
}@args: }@args:
let let
@ -41,7 +41,7 @@ in
{ {
atk = attrs: { atk = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 pcre ]; buildInputs = [ gtk2 pcre rake ];
}; };
bundler = attrs: bundler = attrs:
@ -64,6 +64,11 @@ in
buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp]; buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp];
}; };
cairo-gobject = attrs: {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo pcre xlibs.libpthreadstubs xlibs.libXdmcp ];
};
capybara-webkit = attrs: { capybara-webkit = attrs: {
buildInputs = [ qt48 ]; buildInputs = [ qt48 ];
}; };
@ -71,7 +76,7 @@ in
charlock_holmes = attrs: { charlock_holmes = attrs: {
buildInputs = [ which icu zlib ]; buildInputs = [ which icu zlib ];
}; };
curb = attrs: { curb = attrs: {
buildInputs = [ curl ]; buildInputs = [ curl ];
}; };
@ -93,6 +98,11 @@ in
buildInputs = [ libffi ]; buildInputs = [ libffi ];
}; };
gdk_pixbuf2 = attrs: {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ rake gdk_pixbuf ];
};
gpgme = attrs: { gpgme = attrs: {
buildInputs = [ gpgme ]; buildInputs = [ gpgme ];
}; };
@ -116,8 +126,10 @@ in
CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
}; };
nativeBuildInputs = [ pkgconfig ]; gobject-introspection = attrs: {
gobject-introspection = attrs: { buildInputs = [ gtk2 pcre ]; }; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gobjectIntrospection gtk2 pcre ];
};
grpc = attrs: { grpc = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, jdk }: { stdenv, fetchurl, jdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.5.2"; version = "2.7.2";
name = "boot-${version}"; name = "boot-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh"; url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh";
sha256 = "0brsimvmmpksxwc4l5c0x0cl5hhdjz76crd26yxphjvzyf7fypc9"; sha256 = "1hqp3xxmsj5vkym0l3blhlaq9g3w0lhjgmp37g6y3rr741znkk8c";
}; };
inherit jdk; inherit jdk;
@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ jdk ]; propagatedBuildInputs = [ jdk ];
meta = { meta = with stdenv.lib; {
description = "Build tooling for Clojure"; description = "Build tooling for Clojure";
homepage = http://boot-clj.com/; homepage = http://boot-clj.com/;
license = stdenv.lib.licenses.epl10; license = licenses.epl10;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
maintainers = [ stdenv.lib.maintainers.ragge ]; maintainers = with maintainers; [ ragge ];
}; };
} }

View file

@ -13,13 +13,12 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz"; cargoSha256 = "0y0rkxhkv31v5sa0425dwskd80i6srwbqhqkrw1g1kbmbs9y0vxz";
installPhase = '' buildPhase = ''
mkdir -p $out/bin # do not pass --frozen since Cargo.lock has the wrong tokei version
cp -p target/release/tokei $out/bin/ cargo build --release
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
broken = true;
description = "Count code, quickly"; description = "Count code, quickly";
homepage = https://github.com/Aaronepower/tokei; homepage = https://github.com/Aaronepower/tokei;
license = licenses.mit; license = licenses.mit;

View file

@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
if [ -e git-export ]; then if [ -e git-export ]; then
mv git-export/src/pypi2nix $out/pkgs/pypi2nix mv git-export/src/pypi2nix $out/pkgs/pypi2nix
else else
mv pypi2nix*/src/pypi2nix $out/pkgs/pypi2nix mv source/src/pypi2nix $out/pkgs/pypi2nix
fi fi
fi fi
''; '';

View file

@ -1,16 +1,20 @@
{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser
, pkgconfig, runCommand, which, libtool, fetchpatch , pkgconfig, which
, callPackage
, darwin ? null , darwin ? null
, enableNpm ? true
}: }:
with stdenv.lib; with stdenv.lib;
{ enableNpm ? true, version, sha256, patches }:
let let
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
baseName = if enableNpm then "nodejs" else "nodejs-slim";
sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; }); sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; });
sharedConfigureFlags = concatMap (name: [ sharedConfigureFlags = concatMap (name: [
@ -25,12 +29,20 @@ let
extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ];
in in
rec { stdenv.mkDerivation {
inherit version;
name = "${baseName}-${version}";
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
inherit sha256;
};
buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
++ [ python2 which zlib libuv openssl ] ++ [ python2 which zlib libuv openssl ]
++ optionals stdenv.isLinux [ utillinux http-parser ] ++ optionals stdenv.isLinux [ utillinux http-parser ]
++ optionals stdenv.isDarwin [ pkgconfig libtool ]; ++ optionals stdenv.isDarwin [ pkgconfig darwin.cctools ];
configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags; configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags;
@ -40,10 +52,9 @@ in
passthru.interpreterName = "nodejs"; passthru.interpreterName = "nodejs";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
patches = optionals stdenv.isDarwin [ ./no-xcode.patch ]; inherit patches;
preBuild = optionalString stdenv.isDarwin '' preBuild = optionalString stdenv.isDarwin ''
sed -i -e "s|tr1/type_traits|type_traits|g" \ sed -i -e "s|tr1/type_traits|type_traits|g" \
@ -59,7 +70,7 @@ in
paxmark m $out/bin/node paxmark m $out/bin/node
PATH=$out/bin:$PATH patchShebangs $out PATH=$out/bin:$PATH patchShebangs $out
${optionalString enableNpm '' ${optionalString enableNpm ''
mkdir -p $out/share/bash-completion/completions/ mkdir -p $out/share/bash-completion/completions/
$out/bin/npm completion > $out/share/bash-completion/completions/npm $out/bin/npm completion > $out/share/bash-completion/completions/npm
''} ''}

View file

@ -1,20 +1,11 @@
{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser { stdenv, callPackage, lib, enableNpm ? true }:
, pkgconfig, runCommand, which, libtool, fetchpatch
, callPackage
, darwin ? null
, enableNpm ? true
}@args:
let let
nodejs = import ./nodejs.nix args; buildNodejs = callPackage ./nodejs.nix {};
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in in
stdenv.mkDerivation (nodejs // rec { buildNodejs {
inherit enableNpm;
version = "4.8.5"; version = "4.8.5";
name = "${baseName}-${version}"; sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4";
src = fetchurl { patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; }
sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4";
};
})

View file

@ -1,19 +1,11 @@
{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser { stdenv, callPackage, lib, enableNpm ? true }:
, pkgconfig, runCommand, which, libtool, fetchpatch
, callPackage
, darwin ? null
, enableNpm ? true
}@args:
let let
nodejs = import ./nodejs.nix args; buildNodejs = callPackage ./nodejs.nix {};
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in in
stdenv.mkDerivation (nodejs // rec { buildNodejs {
inherit enableNpm;
version = "6.11.5"; version = "6.11.5";
name = "${baseName}-${version}"; sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w";
src = fetchurl { patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; }
sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w";
};
})

View file

@ -1,21 +1,11 @@
{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser { stdenv, callPackage, lib, enableNpm ? true }:
, pkgconfig, runCommand, which, libtool, fetchpatch
, callPackage
, darwin ? null
, enableNpm ? true
}@args:
let let
nodejs = import ./nodejs.nix args; buildNodejs = callPackage ./nodejs.nix {};
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in in
stdenv.mkDerivation (nodejs // rec { buildNodejs {
inherit enableNpm;
version = "8.9.0"; version = "8.9.0";
name = "${baseName}-${version}"; sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf";
src = fetchurl { patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; }
sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
})

View file

@ -1,21 +1,11 @@
{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser { stdenv, callPackage, lib, enableNpm ? true }:
, pkgconfig, runCommand, which, libtool, fetchpatch
, callPackage
, darwin ? null
, enableNpm ? true
}@args:
let let
nodejs = import ./nodejs.nix args; buildNodejs = callPackage ./nodejs.nix {};
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in in
stdenv.mkDerivation (nodejs // rec { buildNodejs {
inherit enableNpm;
version = "9.0.0"; version = "9.0.0";
name = "${baseName}-${version}"; sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv";
src = fetchurl { patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; }
sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
})

View file

@ -1,26 +1,27 @@
{ stdenv, fetchurl, protobuf, protobufc, asciidoc { stdenv, fetchurl, protobuf, protobufc, asciidoc
, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, pkgconfig , xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
, python }: , python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "criu-${version}"; name = "criu-${version}";
version = "2.0"; version = "2.12.1";
src = fetchurl { src = fetchurl {
url = "http://download.openvz.org/criu/${name}.tar.bz2"; url = "http://download.openvz.org/criu/${name}.tar.bz2";
sha256 = "1zqqshslcf503lqip89azp1zz0i8kb7v19b3dyp52izpak62c1z8"; sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig docbook_xsl ]; nativeBuildInputs = [ pkgconfig docbook_xsl ];
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ];
patchPhase = '' patchPhase = ''
chmod +w ./scripts/gen-offsets.sh chmod +w ./scripts/gen-offsets.sh
substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3"
substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0"
ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
# Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
@ -31,7 +32,9 @@ stdenv.mkDerivation rec {
makeFlags = "PREFIX=$(out)"; makeFlags = "PREFIX=$(out)";
hardeningDisable = [ "stackprotector" ]; hardeningDisable = [ "stackprotector" "fortify" ];
# dropping fortify here as well as package uses it by default:
# command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
installPhase = '' installPhase = ''
mkdir -p $out/etc/logrotate.d mkdir -p $out/etc/logrotate.d

View file

@ -1,12 +1,12 @@
{ stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: { stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "r4.0-59481";
name = "intel-ocl-${version}"; name = "intel-ocl-${version}";
version = "5.0-63503";
src = fetchzip { src = fetchzip {
url = "https://software.intel.com/sites/default/files/managed/48/96/SRB4_linux64.zip"; url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip";
sha256 = "1q69g28i6l7p13hnsk82g2qhdf2chwh4f0wvzac6xml67hna3v34"; sha256 = "0qbp63l74s0i80ysh9ya8x7r79xkddbbz4378nms9i7a0kprg9p2";
stripRoot = false; stripRoot = false;
}; };
@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
postUnpack = '' postUnpack = ''
# Extract the RPMs contained within the source ZIP. # Extract the RPMs contained within the source ZIP.
rpmextract SRB4_linux64.zip/intel-opencl-${version}.x86_64.rpm rpmextract source/intel-opencl-r${version}.x86_64.rpm
rpmextract SRB4_linux64.zip/intel-opencl-cpu-${version}.x86_64.rpm rpmextract source/intel-opencl-cpu-r${version}.x86_64.rpm
''; '';
patchPhase = '' patchPhase = ''

View file

@ -1,11 +1,11 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.13.10"; version = "4.13.11";
extraMeta.branch = "4.13"; extraMeta.branch = "4.13";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0c33v0y4hyklhz7i00sjrj2cpn6zlwc7qjj7w2zzxmnr9yn90c6x"; sha256 = "1vzl2i72c8iidhdc8a490npsbk7q7iphjqil4i9609disqw75gx4";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

View file

@ -1,11 +1,11 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.4.95"; version = "4.4.96";
extraMeta.branch = "4.4"; extraMeta.branch = "4.4";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "07vkxhh435gilxsh9ag6zvf2r9k5l9ffqp72900c50nsfjrdgdrx"; sha256 = "1asvcqip5w9nkg4c5jllbjygski9cnw7qn6ci7p6zwnd2mfks794";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

View file

@ -1,11 +1,11 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.9.59"; version = "4.9.60";
extraMeta.branch = "4.9"; extraMeta.branch = "4.9";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "16rj4wg8psh3d47x8disk275nzzv26drvp03hi0r44mxw0lmd53k"; sha256 = "015dzkrhadmr3kadz0m3yhjikkmga8dv90f6s5ji5i2ja5f6qchf";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

View file

@ -1,18 +1,18 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
mptcpVersion = "0.91.3"; mptcpVersion = "0.92.1";
modDirVersion = "4.1.38"; modDirVersion = "4.4.83";
version = "${modDirVersion}-mptcp_v${mptcpVersion}"; version = "${modDirVersion}-mptcp_v${mptcpVersion}";
extraMeta = { extraMeta = {
branch = "4.1"; branch = "4.4";
maintainers = [ stdenv.lib.maintainers.layus ]; maintainers = with stdenv.lib.maintainers; [ teto layus ];
}; };
src = fetchurl { src = fetchurl {
url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz";
sha256 = "0vqjnkzcbbvyq24w3cryfmw7hhws1xqkkxqcv71szkbqqs6mcr14"; sha256 = "1afjqmxq9p5gyr6r607bx3mqpnx451kfpwlffzxwgdwnf93alngz";
}; };
extraConfig = '' extraConfig = ''

View file

@ -58,15 +58,6 @@ rec {
cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
DCCP_double_free_vulnerability_CVE-2017-6074 = rec
{ name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch";
patch = fetchpatch {
inherit name;
url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4";
sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
};
};
tag_hardened = rec { tag_hardened = rec {
name = "tag-hardened"; name = "tag-hardened";
patch = ./tag-hardened.patch; patch = ./tag-hardened.patch;

View file

@ -24,7 +24,7 @@ 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.0) fastimage (2.1.0)
fastlane (2.62.1) fastlane (2.63.0)
CFPropertyList (>= 2.3, < 3.0.0) CFPropertyList (>= 2.3, < 3.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)

View file

@ -137,10 +137,10 @@
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" "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" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1r6ci3rkrzsdk8cbxidzcjv94hbwq7ljwvm5whgxb8lcxcfl696k"; sha256 = "1al75bb3zq0y9r1ilrbhks198zmvwykmqnn2675jd9i2ijcbxv78";
type = "gem"; type = "gem";
}; };
version = "2.62.1"; version = "2.63.0";
}; };
gh_inspector = { gh_inspector = {
source = { source = {

View file

@ -3,16 +3,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "unetbootin-${version}"; name = "unetbootin-${version}";
version = "655"; version = "657";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unetbootin"; owner = "unetbootin";
repo = "unetbootin"; repo = "unetbootin";
rev = version; rev = version;
sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py"; sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy";
}; };
sourceRoot = "${name}-src/src/unetbootin"; sourceRoot = "source/src/unetbootin";
buildInputs = [ qt4 ]; buildInputs = [ qt4 ];
nativeBuildInputs = [ makeWrapper qmake4Hook ]; nativeBuildInputs = [ makeWrapper qmake4Hook ];
@ -42,18 +42,17 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin runHook preInstall
cp unetbootin $out/bin
mkdir -p $out/share/unetbootin install -Dm755 -t $out/bin unetbootin
cp unetbootin_*.qm $out/share/unetbootin install -Dm644 -t $out/share/unetbootin unetbootin_*.qm
install -Dm644 -t $out/share/applications unetbootin.desktop
mkdir -p $out/share/applications
cp unetbootin.desktop $out/share/applications
wrapProgram $out/bin/unetbootin \ wrapProgram $out/bin/unetbootin \
--prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \ --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \
--set QT_X11_NO_MITSHM 1 --set QT_X11_NO_MITSHM 1
runHook postInstall
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,4 +1,3 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar'
gem 'fpm' gem 'fpm'

View file

@ -1,22 +1,16 @@
GIT
remote: git://github.com/peterhoeg/archive-tar-minitar.git
revision: dae32ca550a87dba32597115ae18805db4782ebe
specs:
archive-tar-minitar (0.5.2.1)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
arr-pm (0.0.10) arr-pm (0.0.10)
cabin (> 0) cabin (> 0)
backports (3.6.8) backports (3.10.3)
cabin (0.8.1) cabin (0.9.0)
childprocess (0.5.9) childprocess (0.8.0)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
clamp (1.0.0) clamp (1.0.1)
ffi (1.9.14) dotenv (2.2.1)
fpm (1.6.2) ffi (1.9.18)
archive-tar-minitar fpm (1.9.3)
arr-pm (~> 0.0.10) arr-pm (~> 0.0.10)
backports (>= 2.6.2) backports (>= 2.6.2)
cabin (>= 0.6.0) cabin (>= 0.6.0)
@ -24,29 +18,30 @@ GEM
clamp (~> 1.0.0) clamp (~> 1.0.0)
ffi ffi
json (>= 1.7.7, < 2.0) json (>= 1.7.7, < 2.0)
pleaserun (~> 0.0.24) pleaserun (~> 0.0.29)
ruby-xz ruby-xz
stud
insist (1.0.0) insist (1.0.0)
io-like (0.3.0) io-like (0.3.0)
json (1.8.3) json (1.8.6)
mustache (0.99.8) mustache (0.99.8)
pleaserun (0.0.24) pleaserun (0.0.30)
cabin (> 0) cabin (> 0)
clamp clamp
dotenv
insist insist
mustache (= 0.99.8) mustache (= 0.99.8)
stud stud
ruby-xz (0.2.3) ruby-xz (0.2.3)
ffi (~> 1.9) ffi (~> 1.9)
io-like (~> 0.3) io-like (~> 0.3)
stud (0.0.22) stud (0.0.23)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
archive-tar-minitar (>= 0.5.2.1)!
fpm fpm
BUNDLED WITH BUNDLED WITH
1.14.3 1.14.6

View file

@ -1,15 +1,6 @@
{ {
archive-tar-minitar = {
source = {
fetchSubmodules = false;
rev = "dae32ca550a87dba32597115ae18805db4782ebe";
sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd";
type = "git";
url = "git://github.com/peterhoeg/archive-tar-minitar.git";
};
version = "0.5.2.1";
};
arr-pm = { arr-pm = {
dependencies = ["cabin"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg";
@ -20,50 +11,60 @@
backports = { backports = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k"; sha256 = "1agsk23kfr194s690jnrpijh9pf3hq4a9yy66j1wzzj2x19ss9y0";
type = "gem"; type = "gem";
}; };
version = "3.6.8"; version = "3.10.3";
}; };
cabin = { cabin = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "06b5ri2629ad9xjc419xswz17zli90v8x640k2sd6v2yb90zkr1b"; sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici";
type = "gem"; type = "gem";
}; };
version = "0.8.1"; version = "0.9.0";
}; };
childprocess = { childprocess = {
dependencies = ["ffi"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1is253wm9k2s325nfryjnzdqv9flq8bm4y2076mhdrncxamrh7r2"; sha256 = "081hxbgrqjxha0jz0p0wkncdqawdvlsxb3awsx195g0pgkpqrcms";
type = "gem"; type = "gem";
}; };
version = "0.5.9"; version = "0.8.0";
}; };
clamp = { clamp = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vy6ghz9l84qazlza30z0dwwrlifc5c7akgrl1v72ivmmjga45hw"; sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az";
type = "gem"; type = "gem";
}; };
version = "1.0.0"; version = "1.0.1";
};
dotenv = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv";
type = "gem";
};
version = "2.2.1";
}; };
ffi = { ffi = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1nkcrmxqr0vb1y4rwliclwlj2ajsi4ddpdx2gvzjy0xbkk5iqzfp"; sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
type = "gem"; type = "gem";
}; };
version = "1.9.14"; version = "1.9.18";
}; };
fpm = { fpm = {
dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ids20mcs6w8nf4bpjj749ayc7h637kqx0pdw5d5a0yzik34daaj"; sha256 = "0yvp9cifzfrxv3pr1kvcvvnyrcz8vxf6yd43hg5blaick50sbm23";
type = "gem"; type = "gem";
}; };
version = "1.6.2"; version = "1.9.3";
}; };
insist = { insist = {
source = { source = {
@ -84,10 +85,10 @@
json = { json = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
type = "gem"; type = "gem";
}; };
version = "1.8.3"; version = "1.8.6";
}; };
mustache = { mustache = {
source = { source = {
@ -98,14 +99,16 @@
version = "0.99.8"; version = "0.99.8";
}; };
pleaserun = { pleaserun = {
dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0s26216ip6skzbdl48z8wbrzqbvwq1q4s6sm8r209zvvlp0rinkw"; sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p";
type = "gem"; type = "gem";
}; };
version = "0.0.24"; version = "0.0.30";
}; };
ruby-xz = { ruby-xz = {
dependencies = ["ffi" "io-like"];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw";
@ -116,9 +119,9 @@
stud = { stud = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1raavxgn5k4bxap5wqdl7zmfw5k4ndl8aagnajlfg4f0bmm8yni7"; sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb";
type = "gem"; type = "gem";
}; };
version = "0.0.22"; version = "0.0.23";
}; };
} }

View file

@ -0,0 +1,10 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p bash ruby bundler bundix
rm Gemfile.lock
bundler install
bundix
if [ "clean" == "$1" ]; then
rm -r ~/.gem
fi

View file

@ -1,40 +1,39 @@
{ stdenv, fetchurl, gmp }: { stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }:
assert stdenv.isLinux;
let
bits = if stdenv.system == "x86_64-linux" then "64" else "32";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hashcat-${version}"; name = "hashcat-${version}";
version = "2.00"; version = "4.0.0";
src = fetchurl { src = fetchurl {
name = "${name}.tar.gz"; url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
url = "https://codeload.github.com/hashcat/hashcat/tar.gz/${version}"; sha256 = "0l1vq4h1gfxc2yclxkvy6gfz6sii2vyzip8pw6ifq930y8dvi34y";
sha256 = "0i2l4i1jkdhj9bkvycgd2nf809kki3jp83y0vrd4iwsdbbbyc9b3";
}; };
buildInputs = [ gmp ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ opencl-headers ];
buildFlags = [ "posix${bits}" ] makeFlags = [
++ stdenv.lib.optionals (bits == "64") [ "posixXOP" "posixAVX" ]; "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include"
"COMPTIME=1337"
"VERSION_TAG=${version}"
];
# Upstream Makefile doesn't have 'install' target # $out is not known until the build has started.
installPhase = '' configurePhase = ''
mkdir -p $out/bin $out/libexec runHook preConfigure
cp -R * $out/libexec makeFlags="$makeFlags PREFIX=$out"
runHook postConfigure
ln -s $out/libexec/hashcat-cli${bits}.bin $out/bin/hashcat
ln -s $out/libexec/hashcat-cliXOP.bin $out/bin/hashcat-xop
ln -s $out/libexec/hashcat-cliAVX.bin $out/bin/hashcat-avx
''; '';
meta = { postFixup = ''
wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib
'';
meta = with stdenv.lib; {
description = "Fast password cracker"; description = "Fast password cracker";
homepage = "https://hashcat.net/hashcat/"; homepage = https://hashcat.net/hashcat/;
license = stdenv.lib.licenses.mit; license = licenses.mit;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; maintainers = with maintainers; [ kierdavis zimbatm ];
}; };
} }

View file

@ -1,37 +0,0 @@
{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "hashcat-${version}";
version = "3.6.0";
src = fetchurl {
url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
sha256 = "127hdvq6ikah7r5vch63jnnkcsj7y61f9h8x79c3w25x9w55bxry";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ opencl-headers ];
makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ];
# $out is not known until the build has started.
configurePhase = ''
runHook preConfigure
makeFlags="$makeFlags PREFIX=$out"
runHook postConfigure
'';
postFixup = ''
wrapProgram $out/bin/hashcat --prefix LD_LIBRARY_PATH : ${ocl-icd}/lib
'';
meta = {
description = "Fast password cracker";
homepage = https://hashcat.net/hashcat/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.kierdavis ];
};
}

View file

@ -1,29 +1,33 @@
{ fetchurl, stdenv, unzip }: { stdenv, fetchurl, pcre2 }:
let
rev = "3ec908d539"; stdenv.mkDerivation rec {
in name = "hardlink-${version}";
stdenv.mkDerivation { version = "1.3-4";
name = "hardlink-2012.9.${rev}";
src = fetchurl { src = fetchurl {
url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; url = "http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz";
sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647"; sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2";
name = "hardlink-${rev}.zip";
}; };
buildInputs = [ pcre2 ];
NIX_CFLAGS_LINK = "-lpcre2-8";
buildPhase = ''
$CC -O2 hardlink.c -o hardlink $NIX_CFLAGS_LINK
'';
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share/man/man1 mkdir -p $out/bin $out/share/man/man1
cc -O2 hardlink.c -o $out/bin/hardlink cp -f hardlink $out/bin/hardlink
mv hardlink.1 $out/share/man/man1/hardlink.1 cp -f hardlink.1 $out/share/man/man1/hardlink.1
''; '';
buildInputs = [ unzip ]; meta = with stdenv.lib; {
meta = {
homepage = http://pkgs.fedoraproject.org/cgit/hardlink.git/;
description = "Consolidate duplicate files via hardlinks"; description = "Consolidate duplicate files via hardlinks";
license = stdenv.lib.licenses.gpl2Plus; homepage = https://pagure.io/hardlink;
platforms = stdenv.lib.platforms.unix; repositories.git = http://pkgs.fedoraproject.org/cgit/rpms/hardlink.git;
license = licenses.gpl2Plus;
platforms = platforms.unix;
}; };
} }

View file

@ -2525,7 +2525,6 @@ with pkgs;
hardlink = callPackage ../tools/system/hardlink { }; hardlink = callPackage ../tools/system/hardlink { };
hashcat = callPackage ../tools/security/hashcat { }; hashcat = callPackage ../tools/security/hashcat { };
hashcat3 = callPackage ../tools/security/hashcat/hashcat3 { };
hash-slinger = callPackage ../tools/security/hash-slinger { }; hash-slinger = callPackage ../tools/security/hash-slinger { };
@ -3028,41 +3027,17 @@ with pkgs;
nodejs-slim = nodejs-slim-6_x; nodejs-slim = nodejs-slim-6_x;
nodejs-4_x = callPackage ../development/web/nodejs/v4.nix { nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {};
libtool = darwin.cctools; nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix { enableNpm = false; };
};
nodejs-slim-4_x = callPackage ../development/web/nodejs/v4.nix { nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {};
libtool = darwin.cctools; nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { enableNpm = false; };
enableNpm = false;
};
nodejs-6_x = callPackage ../development/web/nodejs/v6.nix { nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {};
libtool = darwin.cctools; nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; };
};
nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {};
libtool = darwin.cctools; nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; };
enableNpm = false;
};
nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {
libtool = darwin.cctools;
};
nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix {
libtool = darwin.cctools;
enableNpm = false;
};
nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {
libtool = darwin.cctools;
};
nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix {
libtool = darwin.cctools;
enableNpm = false;
};
nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
nodejs = pkgs.nodejs-6_x; nodejs = pkgs.nodejs-6_x;
@ -12419,11 +12394,12 @@ with pkgs;
}; };
}; };
# linux mptcp is based on the 4.4 kernel
linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes kernelPatches.p9_fixes
kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 kernelPatches.cpu-cgroup-v2."4.4"
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
@ -13344,6 +13320,8 @@ with pkgs;
ipafont = callPackage ../data/fonts/ipafont {}; ipafont = callPackage ../data/fonts/ipafont {};
ipaexfont = callPackage ../data/fonts/ipaexfont {}; ipaexfont = callPackage ../data/fonts/ipaexfont {};
iwona = callPackage ../data/fonts/iwona { };
junicode = callPackage ../data/fonts/junicode { }; junicode = callPackage ../data/fonts/junicode { };
kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {};
@ -15712,6 +15690,7 @@ with pkgs;
lua5_sockets = lua5_1_sockets; lua5_sockets = lua5_1_sockets;
youtube-dl = pythonPackages.youtube-dl; youtube-dl = pythonPackages.youtube-dl;
libva = libva-full; libva = libva-full;
waylandSupport = stdenv.isLinux;
}; };
mpvScripts = { mpvScripts = {