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

Merge branch 'master' into staging

Browse Source 
Mass rebuild, mainly on Darwin.
This commit is contained in:
Vladimír Čunát 2017-11-09 22:35:56 +01:00
commit 304259bdb1
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
311 changed files with 8569 additions and 7472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
COPYING
View File

@ -23,9 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Note: the license above does not apply to the packages built by the
Nix Packages collection, merely to the package descriptions (i.e., Nix
expressions, build scripts, etc.). Also, the license does not apply
to some of the binaries used for bootstrapping Nixpkgs (e.g.,
pkgs/stdenv/linux/tools/bash). It also might not apply to patches
expressions, build scripts, etc.). It also might not apply to patches
included in Nixpkgs, which may be derivative works of the packages to
which they apply. The aforementioned artifacts are all covered by the
licenses of the respective packages.

2
lib/maintainers.nix
View File

@ -518,6 +518,7 @@
rardiol = "Ricardo Ardissone <ricardo.ardissone@gmail.com>";
rasendubi = "Alexey Shmalko <rasen.dubi@gmail.com>";
raskin = "Michael Raskin <7c6f434c@mail.ru>";
ravloony = "Tom Macdonald <ravloony@gmail.com>";
rbasso = "Rafael Basso <rbasso@sharpgeeks.net>";
redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
redvers = "Redvers Davies <red@infect.me>";
@ -613,6 +614,7 @@
sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
tailhook = "Paul Colomiets <paul@colomiets.name>";
taketwo = "Sergey Alexandrov <alexandrov88@gmail.com>";
takikawa = "Asumu Takikawa <asumu@igalia.com>";
taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>";

2
lib/systems/platforms.nix
View File

@ -462,7 +462,7 @@ rec {
beaglebone = armv7l-hf-multiplatform // {
name = "beaglebone";
kernelBaseConfig = "omap2plus_defconfig";
kernelBaseConfig = "bb.org_defconfig";
kernelAutoModules = false;
kernelExtraConfig = ""; # TBD kernel config
kernelTarget = "zImage";

2
nixos/modules/services/databases/mysql.nix
View File

@ -67,7 +67,7 @@ in
type = types.nullOr types.str;
default = null;
example = literalExample "0.0.0.0";
description = "Address to bind to. The default it to bind to all addresses";
description = "Address to bind to. The default is to bind to all addresses";
};
port = mkOption {

16
nixos/modules/services/web-apps/atlassian/confluence.nix
View File

@ -127,14 +127,11 @@ in
jrePackage = let
jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
in mkOption {
jrePackage = mkOption {
type = types.package;
default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
example = literalExample "pkgs.openjdk8.jre";
description = "Java Runtime to use for Confluence. Note that Atlassian recommends the Oracle JRE.";
default = pkgs.oraclejre8;
defaultText = "pkgs.oraclejre8";
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@ -178,14 +175,13 @@ in
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
'';
script = "${pkg}/bin/start-confluence.sh -fg";
stopScript = "${pkg}/bin/stop-confluence.sh";
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
ExecStart = "${pkg}/bin/start-confluence.sh -fg";
ExecStop = "${pkg}/bin/stop-confluence.sh";
};
};
};

19
nixos/modules/services/web-apps/atlassian/crowd.nix
View File

@ -9,9 +9,10 @@ let
pkg = pkgs.atlassian-crowd.override {
home = cfg.home;
port = cfg.listenPort;
proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
openidPassword = cfg.openidPassword;
};
} // (optionalAttrs cfg.proxy.enable {
proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
});
in
@ -92,14 +93,11 @@ in
};
};
jrePackage = let
jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
in mkOption {
jrePackage = mkOption {
type = types.package;
default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
example = literalExample "pkgs.openjdk8.jre";
description = "Java Runtime to use for Crowd. Note that Atlassian recommends the Oracle JRE.";
default = pkgs.oraclejre8;
defaultText = "pkgs.oraclejre8";
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@ -142,13 +140,12 @@ in
${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
'';
script = "${pkg}/start_crowd.sh -fg";
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
ExecStart = "${pkg}/start_crowd.sh -fg";
};
};
};

20
nixos/modules/services/web-apps/atlassian/jira.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.services.jira;
pkg = pkgs.atlassian-jira.override {
pkg = pkgs.atlassian-jira.override (optionalAttrs cfg.sso.enable {
enableSSO = cfg.sso.enable;
crowdProperties = ''
application.name ${cfg.sso.applicationName}
@ -21,7 +21,7 @@ let
session.validationinterval ${toString cfg.sso.validationInterval}
session.lastvalidation session.lastvalidation
'';
};
});
in
@ -131,14 +131,11 @@ in
};
};
jrePackage = let
jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
in mkOption {
jrePackage = mkOption {
type = types.package;
default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
example = literalExample "pkgs.openjdk8.jre";
description = "Java Runtime to use for JIRA. Note that Atlassian recommends the Oracle JRE.";
default = pkgs.oraclejre8;
defaultText = "pkgs.oraclejre8";
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@ -183,14 +180,13 @@ in
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
'';
script = "${pkg}/bin/start-jira.sh -fg";
stopScript = "${pkg}/bin/stop-jira.sh";
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
ExecStart = "${pkg}/bin/start-jira.sh -fg";
ExecStop = "${pkg}/bin/stop-jira.sh";
};
};
};

2
nixos/modules/services/web-apps/mattermost.nix
View File

@ -173,7 +173,7 @@ in
preStart = ''
mkdir -p ${cfg.statePath}/{data,config,logs}
ln -sf ${pkgs.mattermost}/{bin,fonts,i18n,templates,webapp} ${cfg.statePath}
ln -sf ${pkgs.mattermost}/{bin,fonts,i18n,templates,client} ${cfg.statePath}
'' + lib.optionalString (!cfg.mutableConfig) ''
ln -sf ${mattermostConfJSON} ${cfg.statePath}/config/config.json
'' + lib.optionalString cfg.mutableConfig ''

2
nixos/modules/services/x11/compton.nix
View File

@ -221,7 +221,7 @@ in {
};
extraOptions = mkOption {
type = types.str;
type = types.lines;
default = "";
example = ''
unredir-if-possible = true;

8
nixos/modules/tasks/network-interfaces.nix
View File

@ -924,6 +924,14 @@ in
(flip map interfaces (i: {
assertion = i.subnetMask == null;
message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
})) ++ (flip map interfaces (i: {
# With the linux kernel, interface name length is limited by IFNAMSIZ
# to 16 bytes, including the trailing null byte.
# See include/linux/if.h in the kernel sources
assertion = stringLength i.name < 16;
message = ''
The name of networking.interfaces."${i.name}" is too long, it needs to be less than 16 characters.
'';
})) ++ (flip map slaveIfs (i: {
assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null;
message = "The networking.interfaces.${i.name} must not have any defined ips when it is a slave.";

2
nixos/modules/virtualisation/amazon-image.nix
View File

@ -33,7 +33,7 @@ let cfg = config.ec2; in
config.boot.kernelPackages.ena
];
boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
boot.initrd.availableKernelModules = [ "ixgbevf" "ena" ];
boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ];
boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];
# Prevent the nouveau kernel module from being loaded, as it

4
pkgs/applications/altcoins/bitcoin-abc.nix
View File

@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
sha256 = "1fygn6cc99iasg5g5jyps5ps873hfnn4ln4hsmcwlwiqd591qxyv";
sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh";
};
patches = [ ./fix-bitcoin-qt-build.patch ];

36
pkgs/applications/audio/lmms/default.nix
View File

@ -1,31 +1,47 @@
{ stdenv, fetchFromGitHub, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
, fltk13, libjack2, libvorbis , libsamplerate, libsndfile, pkgconfig
, libpulseaudio, qt4, freetype, libgig
}:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13
, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
, qtbase, qttools, SDL ? null }:
stdenv.mkDerivation rec {
name = "lmms-${version}";
version = "1.1.90";
version = "1.2.0-rc4";
src = fetchFromGitHub {
owner = "LMMS";
repo = "lmms";
rev = "v${version}";
sha256 = "0njiarndwqamqiinr1wbwkzjn87yzr1z5k9cfwk0jdkbalgakkq3";
sha256 = "1n3py18zqbvfnkdiz4wc6z60xaajpkd3kn1wxmby5dmc4vccvjj5";
};
nativeBuildInputs = [ cmake qttools pkgconfig ];
buildInputs = [
SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth libjack2 libgig
libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4
alsaLib
fftwFloat
fltk13
fluidsynth
lame
libgig
libjack2
libpulseaudio
libsamplerate
libsndfile
libsoundio
libvorbis
portaudio
qtbase
SDL # TODO: switch to SDL2 in the next version
];
cmakeFlags = [ "-DWANT_QT5=ON" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Linux MultiMedia Studio";
description = "DAW similar to FL Studio (music production software)";
homepage = https://lmms.io;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
maintainers = with maintainers; [ goibhniu yegortimoshenko ];
};
}

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

@ -24,9 +24,7 @@ rec {
buildEclipsePluginBase (attrs // {
srcs = [ srcFeature srcPlugin ];
phases = [ "installPhase" ];
installPhase = ''
buildCommand = ''
dropinDir="$out/eclipse/dropins/${name}"
mkdir -p $dropinDir/features
@ -35,7 +33,6 @@ rec {
mkdir -p $dropinDir/plugins
cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar
'';
});
# Helper for the case where the build directory has the layout of an
@ -44,7 +41,8 @@ rec {
# directories will be installed.
buildEclipseUpdateSite = { name, ... } @ attrs:
buildEclipsePluginBase (attrs // {
phases = [ "unpackPhase" "installPhase" ];
dontBuild = true;
doCheck = false;
installPhase = ''
dropinDir="$out/eclipse/dropins/${name}"
@ -152,16 +150,16 @@ rec {
bytecode-outline = buildEclipsePlugin rec {
name = "bytecode-outline-${version}";
version = "2.4.3";
version = "2.5.0.201711011753-5a57fdf";
srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/de.loskutov.BytecodeOutline.feature_${version}.jar";
sha256 = "0imhwp73gxy1y5d5gpjgd05ywn0xg3vqc5980wcx3fd51g4ifc67";
sha256 = "0yciqhcq0n5i326mwy57r4ywmkz2c2jky7r4pcmznmhvks3z65ps";
};
srcPlugin = fetchurl {
url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.BytecodeOutline_${version}.jar";
sha256 = "0230i88mvvxhn11m9c5mv3494zhh1xkxyfyva9qahck0wbqwpzkw";
sha256 = "1vmsqv32jfl7anvdkw0vir342miv5sr9df7vd1w44lf1yf97vxlw";
};
meta = with stdenv.lib; {

23
pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ fetchurl, stdenv, melpaBuild }:
melpaBuild {
pname = "font-lock-plus";
version = "20170222.1755";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
name = "font-lock+.el";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
name = "font-lock-plus";
};
meta = with stdenv.lib; {
homepage = "https://melpa.org/#/font-lock+";
license = lib.licenses.gpl2Plus;
};
}

37
pkgs/applications/editors/rednotebook/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib, buildPythonApplication, fetchFromGitHub
, gdk_pixbuf, glib, gtk3, pango, webkitgtk
, pygobject3, pyyaml
}:
buildPythonApplication rec {
name = "rednotebook-${version}";
version = "2.3";
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
rev = "v${version}";
sha256 = "0zkfid104hcsf20r6829v11wxdghqkd3j1zbgyvd1s7q4nxjn5lj";
};
# We have not packaged tests.
doCheck = false;
propagatedBuildInputs = [
gdk_pixbuf glib gtk3 pango webkitgtk
pygobject3 pyyaml
];
makeWrapperArgs = [
"--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"
"--prefix XDG_DATA_DIRS : $out/share"
"--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
];
meta = with lib; {
homepage = http://rednotebook.sourceforge.net/;
description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
license = licenses.gpl2;
maintainers = with maintainers; [ orivej tstrobel ];
};
}

24
pkgs/applications/editors/zed/default.nix
View File

@ -5,22 +5,16 @@ let
name = "zed-${version}";
version = "1.1.0";
# When upgrading node.nix / node packages:
# fetch package.json from Zed's repository
# run `npm2nix package.json node.nix`
# and replace node.nix with new one
nodePackages = import ../../../../pkgs/top-level/node-packages.nix {
nodePackages = import ./node.nix {
inherit pkgs;
inherit (pkgs) stdenv nodejs fetchurl fetchgit;
neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux;
self = nodePackages;
generated = ./node.nix;
system = stdenv.system;
};
node_env = buildEnv {
name = "node_env";
paths = [ nodePackages."body-parser" nodePackages.express
nodePackages.request nodePackages.tar nodePackages.ws ];
paths = [ nodePackages."body-parser-~1.6.3" nodePackages."express-~4.8.3"
nodePackages."request-~2.34.0" nodePackages."tar-~0.1.19"
nodePackages."ws-~0.4.32" ];
pathsToLink = [ "/lib" ];
ignoreCollisions = true;
};
@ -78,11 +72,11 @@ in stdenv.mkDerivation rec {
ln -s ${zed_script} $out/bin/zed
'';
meta = {
meta = with stdenv.lib; {
description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users";
license = stdenv.lib.licenses.mit;
license = licenses.mit;
homepage = http://zedapp.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
maintainers = with maintainers; [ matejc ma27 ];
platforms = platforms.linux;
};
}

6
pkgs/applications/editors/zed/deps.json Normal file
View File

@ -0,0 +1,6 @@
[ { "body-parser": "~1.6.3" }
, { "express": "~4.8.3" }
, { "request": "~2.34.0" }
, { "tar": "~0.1.19" }
, { "ws": "~0.4.32" }
]

7
pkgs/applications/editors/zed/deps.sh Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
node2nix -6 -i deps.json \
-e ../../../development/node-packages/node-env.nix \
--no-copy-node-env \
-c node.nix

877
pkgs/applications/editors/zed/node-packages.nix Normal file
View File

@ -0,0 +1,877 @@
# This file has been generated by node2nix 1.3.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
let
sources = {
"bytes-1.0.0" = {
name = "bytes";
packageName = "bytes";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
};
};
"depd-0.4.4" = {
name = "depd";
packageName = "depd";
version = "0.4.4";
src = fetchurl {
url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
};
};
"iconv-lite-0.4.4" = {
name = "iconv-lite";
packageName = "iconv-lite";
version = "0.4.4";
src = fetchurl {
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
};
};
"media-typer-0.2.0" = {
name = "media-typer";
packageName = "media-typer";
version = "0.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
};
};
"on-finished-2.1.0" = {
name = "on-finished";
packageName = "on-finished";
version = "2.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
};
};
"qs-2.2.2" = {
name = "qs";
packageName = "qs";
version = "2.2.2";
src = fetchurl {
url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
};
};
"raw-body-1.3.0" = {
name = "raw-body";
packageName = "raw-body";
version = "1.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
};
};
"type-is-1.3.2" = {
name = "type-is";
packageName = "type-is";
version = "1.3.2";
src = fetchurl {
url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
};
};
"ee-first-1.0.5" = {
name = "ee-first";
packageName = "ee-first";
version = "1.0.5";
src = fetchurl {
url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
};
};
"mime-types-1.0.2" = {
name = "mime-types";
packageName = "mime-types";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
};
};
"accepts-1.0.7" = {
name = "accepts";
packageName = "accepts";
version = "1.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
};
};
"buffer-crc32-0.2.3" = {
name = "buffer-crc32";
packageName = "buffer-crc32";
version = "0.2.3";
src = fetchurl {
url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
};
};
"debug-1.0.4" = {
name = "debug";
packageName = "debug";
version = "1.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
};
};
"escape-html-1.0.1" = {
name = "escape-html";
packageName = "escape-html";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
};
};
"finalhandler-0.1.0" = {
name = "finalhandler";
packageName = "finalhandler";
version = "0.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz";
sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa";
};
};
"methods-1.1.0" = {
name = "methods";
packageName = "methods";
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
};
};
"parseurl-1.3.2" = {
name = "parseurl";
packageName = "parseurl";
version = "1.3.2";
src = fetchurl {
url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
};
};
"path-to-regexp-0.1.3" = {
name = "path-to-regexp";
packageName = "path-to-regexp";
version = "0.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
};
};
"proxy-addr-1.0.1" = {
name = "proxy-addr";
packageName = "proxy-addr";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
};
};
"range-parser-1.0.0" = {
name = "range-parser";
packageName = "range-parser";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
};
};
"send-0.8.5" = {
name = "send";
packageName = "send";
version = "0.8.5";
src = fetchurl {
url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz";
sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7";
};
};
"serve-static-1.5.4" = {
name = "serve-static";
packageName = "serve-static";
version = "1.5.4";
src = fetchurl {
url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz";
sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782";
};
};
"vary-0.1.0" = {
name = "vary";
packageName = "vary";
version = "0.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
};
};
"cookie-0.1.2" = {
name = "cookie";
packageName = "cookie";
version = "0.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
};
};
"fresh-0.2.2" = {
name = "fresh";
packageName = "fresh";
version = "0.2.2";
src = fetchurl {
url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
};
};
"cookie-signature-1.0.4" = {
name = "cookie-signature";
packageName = "cookie-signature";
version = "1.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
};
};
"merge-descriptors-0.0.2" = {
name = "merge-descriptors";
packageName = "merge-descriptors";
version = "0.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
};
};
"utils-merge-1.0.0" = {
name = "utils-merge";
packageName = "utils-merge";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
};
};
"negotiator-0.4.7" = {
name = "negotiator";
packageName = "negotiator";
version = "0.4.7";
src = fetchurl {
url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
};
};
"ms-0.6.2" = {
name = "ms";
packageName = "ms";
version = "0.6.2";
src = fetchurl {
url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
};
};
"ipaddr.js-0.1.2" = {
name = "ipaddr.js";
packageName = "ipaddr.js";
version = "0.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
};
};
"destroy-1.0.3" = {
name = "destroy";
packageName = "destroy";
version = "1.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
};
};
"mime-1.2.11" = {
name = "mime";
packageName = "mime";
version = "1.2.11";
src = fetchurl {
url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
};
};
"qs-0.6.6" = {
name = "qs";
packageName = "qs";
version = "0.6.6";
src = fetchurl {
url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
};
};
"json-stringify-safe-5.0.1" = {
name = "json-stringify-safe";
packageName = "json-stringify-safe";
version = "5.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
};
};
"forever-agent-0.5.2" = {
name = "forever-agent";
packageName = "forever-agent";
version = "0.5.2";
src = fetchurl {
url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
};
};
"node-uuid-1.4.8" = {
name = "node-uuid";
packageName = "node-uuid";
version = "1.4.8";
src = fetchurl {
url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
};
};
"tough-cookie-2.3.3" = {
name = "tough-cookie";
packageName = "tough-cookie";
version = "2.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
};
};
"form-data-0.1.4" = {
name = "form-data";
packageName = "form-data";
version = "0.1.4";
src = fetchurl {
url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
};
};
"tunnel-agent-0.3.0" = {
name = "tunnel-agent";
packageName = "tunnel-agent";
version = "0.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
};
};
"http-signature-0.10.1" = {
name = "http-signature";
packageName = "http-signature";
version = "0.10.1";
src = fetchurl {
url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
};
};
"oauth-sign-0.3.0" = {
name = "oauth-sign";
packageName = "oauth-sign";
version = "0.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
};
};
"hawk-1.0.0" = {
name = "hawk";
packageName = "hawk";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
};
};
"aws-sign2-0.5.0" = {
name = "aws-sign2";
packageName = "aws-sign2";
version = "0.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
};
};
"punycode-1.4.1" = {
name = "punycode";
packageName = "punycode";
version = "1.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
};
};
"combined-stream-0.0.7" = {
name = "combined-stream";
packageName = "combined-stream";
version = "0.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
};
};
"async-0.9.2" = {
name = "async";
packageName = "async";
version = "0.9.2";
src = fetchurl {
url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
};
};
"delayed-stream-0.0.5" = {
name = "delayed-stream";
packageName = "delayed-stream";
version = "0.0.5";
src = fetchurl {
url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
};
};
"assert-plus-0.1.5" = {
name = "assert-plus";
packageName = "assert-plus";
version = "0.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
sha1 = "ee74009413002d84cec7219c6ac811812e723160";
};
};
"asn1-0.1.11" = {
name = "asn1";
packageName = "asn1";
version = "0.1.11";
src = fetchurl {
url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
};
};
"ctype-0.5.3" = {
name = "ctype";
packageName = "ctype";
version = "0.5.3";
src = fetchurl {
url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
};
};
"hoek-0.9.1" = {
name = "hoek";
packageName = "hoek";
version = "0.9.1";
src = fetchurl {
url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
};
};
"boom-0.4.2" = {
name = "boom";
packageName = "boom";
version = "0.4.2";
src = fetchurl {
url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
};
};
"cryptiles-0.2.2" = {
name = "cryptiles";
packageName = "cryptiles";
version = "0.2.2";
src = fetchurl {
url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
};
};
"sntp-0.2.4" = {
name = "sntp";
packageName = "sntp";
version = "0.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
};
};
"block-stream-0.0.9" = {
name = "block-stream";
packageName = "block-stream";
version = "0.0.9";
src = fetchurl {
url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
};
};
"fstream-0.1.31" = {
name = "fstream";
packageName = "fstream";
version = "0.1.31";
src = fetchurl {
url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
};
};
"inherits-2.0.3" = {
name = "inherits";
packageName = "inherits";
version = "2.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
sha1 = "633c2c83e3da42a502f52466022480f4208261de";
};
};
"graceful-fs-3.0.11" = {
name = "graceful-fs";
packageName = "graceful-fs";
version = "3.0.11";
src = fetchurl {
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
};
};
"mkdirp-0.5.1" = {
name = "mkdirp";
packageName = "mkdirp";
version = "0.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
};
};
"rimraf-2.6.2" = {
name = "rimraf";
packageName = "rimraf";
version = "2.6.2";
src = fetchurl {
url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
};
};
"natives-1.1.0" = {
name = "natives";
packageName = "natives";
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz";
sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31";
};
};
"minimist-0.0.8" = {
name = "minimist";
packageName = "minimist";
version = "0.0.8";
src = fetchurl {
url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
};
};
"glob-7.1.2" = {
name = "glob";
packageName = "glob";
version = "7.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
};
};
"fs.realpath-1.0.0" = {
name = "fs.realpath";
packageName = "fs.realpath";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
};
};
"inflight-1.0.6" = {
name = "inflight";
packageName = "inflight";
version = "1.0.6";
src = fetchurl {
url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
};
};
"minimatch-3.0.4" = {
name = "minimatch";
packageName = "minimatch";
version = "3.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
};
};
"once-1.4.0" = {
name = "once";
packageName = "once";
version = "1.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
};
};
"path-is-absolute-1.0.1" = {
name = "path-is-absolute";
packageName = "path-is-absolute";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
};
};
"wrappy-1.0.2" = {
name = "wrappy";
packageName = "wrappy";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
};
};
"brace-expansion-1.1.8" = {
name = "brace-expansion";
packageName = "brace-expansion";
version = "1.1.8";
src = fetchurl {
url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
};
};
"balanced-match-1.0.0" = {
name = "balanced-match";
packageName = "balanced-match";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
};
};
"concat-map-0.0.1" = {
name = "concat-map";
packageName = "concat-map";
version = "0.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
};
};
"commander-2.1.0" = {
name = "commander";
packageName = "commander";
version = "2.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
};
};
"nan-1.0.0" = {
name = "nan";
packageName = "nan";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
};
};
"tinycolor-0.0.1" = {
name = "tinycolor";
packageName = "tinycolor";
version = "0.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
};
};
"options-0.0.6" = {
name = "options";
packageName = "options";
version = "0.0.6";
src = fetchurl {
url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
};
};
};
in
{
"body-parser-~1.6.3" = nodeEnv.buildNodePackage {
name = "body-parser";
packageName = "body-parser";
version = "1.6.7";
src = fetchurl {
url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz";
sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
};
dependencies = [
sources."bytes-1.0.0"
sources."depd-0.4.4"
sources."iconv-lite-0.4.4"
sources."media-typer-0.2.0"
sources."on-finished-2.1.0"
sources."qs-2.2.2"
sources."raw-body-1.3.0"
sources."type-is-1.3.2"
sources."ee-first-1.0.5"
sources."mime-types-1.0.2"
];
buildInputs = globalBuildInputs;
meta = {
description = "Node.js body parsing middleware";
homepage = https://github.com/expressjs/body-parser;
license = "MIT";
};
production = true;
};
"express-~4.8.3" = nodeEnv.buildNodePackage {
name = "express";
packageName = "express";
version = "4.8.8";
src = fetchurl {
url = "https://registry.npmjs.org/express/-/express-4.8.8.tgz";
sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e";
};
dependencies = [
sources."accepts-1.0.7"
sources."buffer-crc32-0.2.3"
sources."debug-1.0.4"
sources."depd-0.4.4"
sources."escape-html-1.0.1"
sources."finalhandler-0.1.0"
sources."media-typer-0.2.0"
sources."methods-1.1.0"
sources."parseurl-1.3.2"
sources."path-to-regexp-0.1.3"
sources."proxy-addr-1.0.1"
sources."qs-2.2.2"
sources."range-parser-1.0.0"
sources."send-0.8.5"
sources."serve-static-1.5.4"
sources."type-is-1.3.2"
sources."vary-0.1.0"
sources."cookie-0.1.2"
sources."fresh-0.2.2"
sources."cookie-signature-1.0.4"
sources."merge-descriptors-0.0.2"
sources."utils-merge-1.0.0"
sources."mime-types-1.0.2"
sources."negotiator-0.4.7"
sources."ms-0.6.2"
sources."ipaddr.js-0.1.2"
sources."destroy-1.0.3"
sources."mime-1.2.11"
sources."on-finished-2.1.0"
sources."ee-first-1.0.5"
];
buildInputs = globalBuildInputs;
meta = {
description = "Fast, unopinionated, minimalist web framework";
homepage = http://expressjs.com/;
license = "MIT";
};
production = true;
};
"request-~2.34.0" = nodeEnv.buildNodePackage {
name = "request";
packageName = "request";
version = "2.34.0";
src = fetchurl {
url = "https://registry.npmjs.org/request/-/request-2.34.0.tgz";
sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
};
dependencies = [
sources."qs-0.6.6"
sources."json-stringify-safe-5.0.1"
sources."forever-agent-0.5.2"
sources."node-uuid-1.4.8"
sources."mime-1.2.11"
sources."tough-cookie-2.3.3"
sources."form-data-0.1.4"
sources."tunnel-agent-0.3.0"
sources."http-signature-0.10.1"
sources."oauth-sign-0.3.0"
sources."hawk-1.0.0"
sources."aws-sign2-0.5.0"
sources."punycode-1.4.1"
sources."combined-stream-0.0.7"
sources."async-0.9.2"
sources."delayed-stream-0.0.5"
sources."assert-plus-0.1.5"
sources."asn1-0.1.11"
sources."ctype-0.5.3"
sources."hoek-0.9.1"
sources."boom-0.4.2"
sources."cryptiles-0.2.2"
sources."sntp-0.2.4"
];
buildInputs = globalBuildInputs;
meta = {
description = "Simplified HTTP request client.";
homepage = https://github.com/mikeal/request;
license = "Apache, Version 2.0";
};
production = true;
};
"tar-~0.1.19" = nodeEnv.buildNodePackage {
name = "tar";
packageName = "tar";
version = "0.1.20";
src = fetchurl {
url = "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
};
dependencies = [
sources."block-stream-0.0.9"
sources."fstream-0.1.31"
sources."inherits-2.0.3"
sources."graceful-fs-3.0.11"
sources."mkdirp-0.5.1"
sources."rimraf-2.6.2"
sources."natives-1.1.0"
sources."minimist-0.0.8"
sources."glob-7.1.2"
sources."fs.realpath-1.0.0"
sources."inflight-1.0.6"
sources."minimatch-3.0.4"
sources."once-1.4.0"
sources."path-is-absolute-1.0.1"
sources."wrappy-1.0.2"
sources."brace-expansion-1.1.8"
sources."balanced-match-1.0.0"
sources."concat-map-0.0.1"
];
buildInputs = globalBuildInputs;
meta = {
description = "tar for node";
homepage = https://github.com/isaacs/node-tar;
license = "BSD";
};
production = true;
};
"ws-~0.4.32" = nodeEnv.buildNodePackage {
name = "ws";
packageName = "ws";
version = "0.4.32";
src = fetchurl {
url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
};
dependencies = [
sources."commander-2.1.0"
sources."nan-1.0.0"
sources."tinycolor-0.0.1"
sources."options-0.0.6"
];
buildInputs = globalBuildInputs;
meta = {
description = "simple to use, blazing fast and thoroughly tested websocket client, server and console for node.js, up-to-date against RFC-6455";
homepage = https://github.com/einaros/ws;
};
production = true;
};
}

1839
pkgs/applications/editors/zed/node.nix
View File

File diff suppressed because it is too large Load Diff

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

@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "feh-${version}";
version = "2.22";
version = "2.22.2";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "0yqcczb9c126zgfvjq2fpzqz0rg16yad8mfr3gryxwlbymy2cmxj";
sha256 = "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05";
};
outputs = [ "out" "man" "doc" ];

6
pkgs/applications/kde/kdenlive.nix
View File

@ -2,7 +2,6 @@
, lib
, extra-cmake-modules
, kdoctools
, qtscript
, kactivities
, kconfig
, kcrash
@ -27,7 +26,10 @@
, kfilemetadata
, ffmpeg
, phonon-backend-gstreamer
, qtdeclarative
, qtquickcontrols
, qtscript
, qtwebkit
}:
mkDerivation {
@ -56,8 +58,10 @@ mkDerivation {
ktextwidgets
mlt
phonon-backend-gstreamer
qtdeclarative
qtquickcontrols
qtscript
qtwebkit
shared_mime_info
libv4l
ffmpeg

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

@ -30,14 +30,14 @@ in
buildRustPackage rec {
name = "alacritty-unstable-${version}";
version = "2017-10-22";
version = "2017-10-31";
# At the moment we cannot handle git dependencies in buildRustPackage.
# This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
src = fetchgit {
url = https://github.com/Mic92/alacritty.git;
rev = "rev-${version}";
sha256 = "02wvwi72hnqmy12n0b248wzhajni9ipyayz6vnn3ryhnrccrrp7j";
sha256 = "1yybx23smwdkzb6byvxd6zxi7asmrzvp9h1ihmy6xlzwjfbsalj0";
fetchSubmodules = true;
};

2
pkgs/applications/misc/keepassx/community.nix
View File

@ -6,7 +6,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "keepassx-community-${version}";
name = "keepassxc-${version}";
version = "2.2.2";
src = fetchFromGitHub {

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

@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
hunspell makeWrapper # enchant
];
# bogus configure script tests
preConfigure = ''
NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags Qt5Core)"
'';
configureFlags = [
"--enable-qt5"
#"--without-included-boost"

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

@ -2,11 +2,11 @@
, desktop_file_utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
version = "0.7.99";
version = "17.10";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "127d6wsrq3wg3ibbb28m26wrm54qbkv8h8xycanvml6ys4zqsc6a";
sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sourceRoot = "./MediaInfo/Project/GNU/GUI/";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Supplies technical and tag information about a video or audio file (GUI version)";
longDescription = ''

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
version = "0.7.99";
version = "17.10";
name = "mediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "127d6wsrq3wg3ibbb28m26wrm54qbkv8h8xycanvml6ys4zqsc6a";
sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-libmediainfo=${libmediainfo}" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Supplies technical and tag information about a video or audio file";
longDescription = ''

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "tint2-${version}";
version = "15.2";
version = "15.3";
src = fetchFromGitLab {
owner = "o9000";
repo = "tint2";
rev = version;
sha256 = "1lfk3zcgmmlby353gs70gpi0m28nx2c20wxqgaw7268a69r5cz7a";
sha256 = "1d83ppwckc2yix1grw8w31rlkyz6naa40pd3dg7n6nidx00zwn91";
};
enableParallelBuilding = true;

20
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -37,7 +37,7 @@
let
mirror = https://get.geo.opera.com/pub/opera/desktop;
version = "46.0.2597.39";
version = "48.0.2685.52";
rpath = stdenv.lib.makeLibraryPath [
@ -87,19 +87,10 @@ in stdenv.mkDerivation {
name = "opera-${version}";
src =
#if stdenv.system == "i686-linux" then
# fetchurl {
# url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
# sha256 = "...";
# }
#else
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
sha256 = "1ladvqilm5rr222wjybvribnyii2l0p8jbsd10xr06wps63g1kia";
}
else throw "Opera is not supported on ${stdenv.system} (only x86_64 linux is supported)";
src = fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
sha256 = "027njqh2as4d0xsnvzamqiplghb8cxqnc19y0vqkvjnsw57v828p";
};
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
@ -123,6 +114,7 @@ in stdenv.mkDerivation {
meta = {
homepage = http://www.opera.com;
description = "Web browser";
platforms = [ "x86_64-linux" ];
license = stdenv.lib.licenses.unfree;
};
}

4
pkgs/applications/networking/browsers/surf/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "2.0";
src = fetchurl {
url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
url = "https://dl.suckless.org/surf/surf-${version}.tar.gz";
sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps";
};
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
possible to embed it in another application. Furthermore, one can point
surf to another URI by setting its XProperties.
'';
homepage = http://surf.suckless.org;
homepage = https://surf.suckless.org;
license = licenses.mit;
platforms = webkitgtk.meta.platforms;
maintainers = with maintainers; [ joachifm ];

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

@ -60,6 +60,8 @@ in stdenv.mkDerivation rec {
"CXXFLAGS=-O2 -Wno-error=strict-aliasing"
)
substituteInPlace 3rdparty/stout/include/stout/jsonify.hpp \
--replace '<xlocale.h>' '<locale.h>'
# Fix cases where makedev(),major(),minor() are referenced through
# <sys/types.h> instead of <sys/sysmacros.h>
sed 1i'#include <sys/sysmacros.h>' -i src/linux/fs.cpp

14
pkgs/applications/networking/flexget/default.nix
View File

@ -24,9 +24,6 @@ buildPythonApplication rec {
# unicode-capable filesystem (and setting LC_ALL doesn't work).
# setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
postPatch = ''
sed -i '/def test_non_ascii/i\ import pytest\
@pytest.mark.skip' flexget/tests/test_filesystem.py
substituteInPlace requirements.txt \
--replace "chardet==3.0.3" "chardet" \
--replace "rebulk==0.8.2" "rebulk" \
@ -35,7 +32,13 @@ buildPythonApplication rec {
--replace "sqlalchemy==1.1.10" "sqlalchemy" \
--replace "zxcvbn-python==4.4.15" "zxcvbn-python" \
--replace "flask-cors==3.0.2" "flask-cors" \
--replace "certifi==2017.4.17" "certifi"
--replace "certifi==2017.4.17" "certifi" \
--replace "apscheduler==3.3.1" "apscheduler" \
--replace "path.py==10.3.1" "path.py" \
--replace "tempora==1.8" "tempora" \
--replace "cheroot==5.5.0" "cheroot" \
--replace "six==1.10.0" "six" \
--replace "aniso8601==1.2.1" "aniso8601"
'';
checkPhase = ''
@ -47,7 +50,8 @@ buildPythonApplication rec {
and not test_double_episodes \
and not test_inject_force \
and not test_double_prefered \
and not test_double"
and not test_double \
and not test_non_ascii"
'';
buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ];

4
pkgs/applications/networking/ftp/filezilla/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
let version = "3.28.0"; in
let version = "3.29.0"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
sha256 = "1dxzmpqrb3a29ln9vx10n438w5i649729vy911sm92bwn2p235p4";
sha256 = "0najf2w6p5j4qc8jmglx6j63mph749s5p90lz2nkmwwwy5sfvlga";
};
configureFlags = [

6
pkgs/applications/networking/gns3/default.nix
View File

@ -2,7 +2,7 @@
let
stableVersion = "2.0.3";
previewVersion = "2.1.0rc3";
previewVersion = "2.1.0rc4";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
@ -16,7 +16,7 @@ in {
};
guiPreview = mkGui {
stable = false;
sha256Hash = "0yc5lr01xb7lk4dsrwx79mimbr91vldpvqbrx37j3kym6p5m84cn";
sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s";
};
serverStable = mkServer {
@ -25,6 +25,6 @@ in {
};
serverPreview = mkServer {
stable = false;
sha256Hash = "1lac88d9cmlhrwmlvxv1sk86600rwznw3lpsm440bax6qbdfcis3";
sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd";
};
}

36
pkgs/applications/networking/gns3/server.nix
View File

@ -4,7 +4,23 @@
let
pythonPackages = python3Packages;
yarl = if (!stable) then pythonPackages.yarl
# TODO: Not sure if all these overwrites are really required...
# Upstream seems to have some reasons (bugs, incompatibilities) though.
multidict_3_1_3 =
(stdenv.lib.overrideDerivation pythonPackages.multidict (oldAttrs:
rec {
pname = "multidict";
version = "3.1.3";
name = "${pname}-${version}";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7";
};
doInstallCheck = false;
}));
yarl = if (!stable)
then (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
{ propagatedBuildInputs = [ multidict_3_1_3 ]; }))
else (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
rec {
pname = "yarl";
@ -15,7 +31,19 @@ let
sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7";
};
}));
aiohttp = if (!stable) then pythonPackages.aiohttp
aiohttp = if (!stable)
then (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
rec {
pname = "aiohttp";
version = "2.2.5";
name = "${pname}-${version}";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1g6kzkf5in0briyscwxsihgps833dq2ggcq6lfh1hq95ck8zsnxg";
};
propagatedBuildInputs = [ yarl multidict_3_1_3 ]
++ (with pythonPackages; [ async-timeout chardet ]);
}))
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
rec {
pname = "aiohttp";
@ -28,7 +56,9 @@ let
propagatedBuildInputs = [ yarl ]
++ (with pythonPackages; [ async-timeout chardet multidict ]);
}));
aiohttp-cors = if (!stable) then pythonPackages.aiohttp-cors
aiohttp-cors = if (!stable)
then (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
{ propagatedBuildInputs = [ aiohttp ]; }))
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
rec {
pname = "aiohttp-cors";

15
pkgs/applications/networking/instant-messengers/qtox/default.nix
View File

@ -2,29 +2,29 @@
libtoxcore,
libpthreadstubs, libXdmcp, libXScrnSaver,
qtbase, qtsvg, qttools, qttranslations,
ffmpeg, filter-audio, libsodium, libopus,
ffmpeg, filter-audio, libexif, libsodium, libopus,
libvpx, openal, opencv, pcre, qrencode, sqlcipher }:
mkDerivation rec {
name = "qtox-${version}";
version = "1.11.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "tux3";
owner = "qTox";
repo = "qTox";
rev = "v${version}";
sha256 = "0h8v359h1xn2xm6xa9q56mjiw58ap1bpiwx1dxxmphjildxadwck";
sha256 = "1l1k8s10jj6nm9i33m8xhjwdhikvp7csdp6x1gxjxdj526aak8q9";
};
buildInputs = [
libtoxcore
libpthreadstubs libXdmcp libXScrnSaver
qtbase qtsvg qttools qttranslations
ffmpeg filter-audio libopus libsodium
qtbase qtsvg qttranslations
ffmpeg filter-audio libexif libopus libsodium
libvpx openal opencv pcre qrencode sqlcipher
];
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true;
@ -37,6 +37,7 @@ mkDerivation rec {
meta = with lib; {
description = "Qt Tox client";
homepage = https://tox.chat;
license = licenses.gpl3;
maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
platforms = platforms.all;

61
pkgs/applications/networking/instant-messengers/rambox/bare.nix Normal file
View File

@ -0,0 +1,61 @@
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha }:
stdenv.mkDerivation rec {
name = "rambox-bare-${version}";
version = "0.5.13";
src = fetchFromGitHub {
owner = "saenzramiro";
repo = "rambox";
rev = version;
sha256 = "0c770a9z017y6gcrpyri7s1gifm8zi5f29bq5nvh3zzg4wgqh326";
};
nativeBuildInputs = [ nodejs-8_x ruby sencha ];
node_modules = fetchNodeModules {
inherit src;
nodejs = nodejs-8_x;
sha256 = "1y3q8ggyvfywxqi5hn9mvr1sjfylspis43iyf4b7snyr1a1br3r4";
};
patches = [ ./hide-check-for-updates.patch ./isDev.patch ];
# These credentials are only for this derivation. If you want to get credentials
# for another distribution, go to https://auth0.com. If you want to reuse the same
# domain, drop a line at yegortimoshenko@gmail.com!
auth0ClientID = "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU";
auth0Domain = "nixpkgs.auth0.com";
configurePhase = ''
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
ln -s ${node_modules} node_modules
'';
buildPhase = ''
mkdir ../rambox-build
npm run sencha:compile:build
'';
installPhase = ''
mv ../rambox-build/ $out
# https://github.com/saenzramiro/rambox/issues/1281
echo '{"name": "rambox", "version": "${version}", "main": "electron/main.js"}' > $out/package.json
# https://github.com/saenzramiro/rambox/issues/1282
cp --parents ext/packages/ext-locale/build/ext-locale-*.js $out
# Symbolic link causes `Uncaught Error: Cannot find module 'immutable'`
cp -r ${node_modules} $out/node_modules
'';
meta = with stdenv.lib; {
description = "Messaging and emailing app that combines common web applications into one";
homepage = http://rambox.pro;
license = licenses.gpl3;
maintainers = with maintainers; [ gnidorah ];
platforms = platforms.linux;
};
}

80
pkgs/applications/networking/instant-messengers/rambox/default.nix
View File

@ -1,64 +1,36 @@
{ stdenv, fetchurl, dpkg, makeWrapper
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem }:
let
bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32";
version = "0.5.13";
runtimeDeps = [
udev libnotify
];
deps = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver libxcb
]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
] ++ runtimeDeps;
in stdenv.mkDerivation rec {
name = "rambox-${version}";
src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
sha256 = if bits == "x64" then
"0bn562fr1wsnn3xsd4q2rrxi6c56vckrkfmjl2dqb30hpmj2vn0d" else
"180ndvkil5mk5idwnn7spfygnhhll6pjc342pfzgmzk46a723qs4";
callPackage = newScope self;
self = {
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
rambox-bare = callPackage ./bare.nix {};
sencha = callPackage ./sencha {};
};
desktopItem = makeDesktopItem rec {
name = "Rambox";
exec = "rambox";
icon = "${self.rambox-bare}/resources/Icon.png";
desktopName = name;
genericName = "Rambox messenger";
categories = "Network;";
};
in
# don't remove runtime deps
dontPatchELF = true;
with self;
buildInputs = [ dpkg makeWrapper ];
stdenv.mkDerivation {
name = "rambox-${rambox-bare.version}";
unpackPhase = "dpkg-deb -x $src .";
nativeBuildInputs = [ makeWrapper ];
unpackPhase = ":";
installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" opt/Rambox/rambox
patchelf --set-rpath "$out/opt/Rambox:${stdenv.lib.makeLibraryPath deps}" opt/Rambox/rambox
mkdir -p $out/bin
cp -r opt $out
ln -s $out/opt/Rambox/rambox $out/bin
# provide resources
cp -r usr/share $out
substituteInPlace $out/share/applications/rambox.desktop \
--replace Exec=\"/opt/Rambox/rambox\" Exec=rambox
makeWrapper ${electron}/bin/electron $out/bin/rambox \
--add-flags "${rambox-bare} --without-update" \
--prefix PATH : ${xdg_utils}/bin
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications
'';
postFixup = ''
paxmark m $out/opt/Rambox/rambox
wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
'';
meta = with stdenv.lib; {
description = "Free and Open Source messaging and emailing app that combines common web applications into one";
homepage = http://rambox.pro;
license = licenses.mit;
maintainers = [ maintainers.gnidorah ];
platforms = ["i686-linux" "x86_64-linux"];
hydraPlatforms = [];
};
}

26
pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, jq }: { src, nodejs, sha256 }:
# Only npm >= 5.4.2 is deterministic, see:
# https://github.com/npm/npm/issues/17979#issuecomment-332701215
assert stdenv.lib.versionAtLeast nodejs.version "8.9.0";
stdenv.mkDerivation {
name = "node_modules";
outputHashAlgo = "sha256";
outputHash = sha256;
outputHashMode = "recursive";
nativeBuildInputs = [ jq nodejs ];
buildCommand = ''
cp -r ${src}/* .
HOME=. npm install --force --ignore-scripts --only=production
for f in $(find node_modules -name package.json); do
# https://github.com/npm/npm/issues/10393
jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp
mv $f.tmp $f
done
mv node_modules $out
'';
}

35
pkgs/applications/networking/instant-messengers/rambox/hide-check-for-updates.patch Normal file
View File

@ -0,0 +1,35 @@
https://github.com/saenzramiro/rambox/issues/1283
diff -urNZ a/electron/menu.js b/electron/menu.js
--- a/electron/menu.js 2017-11-02 22:02:59.753119865 +0000
+++ b/electron/menu.js 2017-11-02 22:08:34.419698562 +0000
@@ -220,14 +220,6 @@
}
},
{
- label: locale['menu.help[5]'],
- click(item, win) {
- const webContents = win.webContents;
- const send = webContents.send.bind(win.webContents);
- send('autoUpdater:check-update');
- }
- },
- {
label: locale['menu.help[6]'],
click() {
sendAction('showAbout')
@@ -290,14 +282,6 @@
type: 'separator'
});
helpSubmenu.push({
- label: `&`+locale['menu.help[5]'],
- click(item, win) {
- const webContents = win.webContents;
- const send = webContents.send.bind(win.webContents);
- send('autoUpdater:check-update');
- }
- });
- helpSubmenu.push({
label: `&`+locale['menu.help[6]'],
click() {
sendAction('showAbout')

14
pkgs/applications/networking/instant-messengers/rambox/isDev.patch Normal file
View File

@ -0,0 +1,14 @@
https://github.com/saenzramiro/rambox/issues/1280
diff -urNZ a/electron/main.js b/electron/main.js
--- a/electron/main.js 2017-11-02 14:58:06.085127616 +0000
+++ b/electron/main.js 2017-11-02 14:58:18.316887679 +0000
@@ -8,7 +8,7 @@
// Configuration
const Config = require('electron-config');
// Development
-const isDev = require('electron-is-dev');
+const isDev = false;
// Updater
const updater = require('./updater');
// File System

43
pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchurl, gzip, which, unzip, jdk }:
let
version = "6.5.2";
srcs = {
i686-linux = fetchurl {
url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
sha256 = "18gcqw9434xab97skcb97iw4p4s2pgggvq7jaisblap0ja00kqjr";
};
x86_64-linux = fetchurl {
url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
sha256 = "1b8jv99k37q1bi7b29f23lfzxc66v5fqdmr1rxsrqchwcrllc0z7";
};
};
in
stdenv.mkDerivation rec {
inherit version;
name = "sencha-bare-${version}";
src = srcs.${stdenv.system};
nativeBuildInputs = [ gzip which unzip ];
buildInputs = [ jdk ];
sourceRoot = ".";
configurePhase = ''
substituteAll ${./response.varfile} response.varfile
'';
installPhase = ''
./SenchaCmd*.sh -q -dir $out -varfile response.varfile
# disallow sencha writing into /nix/store/repo
echo "repo.local.dir=$TMP/repo" >> $out/sencha.cfg
rm $out/shell-wrapper.sh $out/Uninstaller
'';
meta = with stdenv.lib; {
license = licenses.unfree;
platforms = attrNames srcs;
};
}

17
pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ stdenv, callPackage, makeWrapper }:
let
sencha-bare = callPackage ./bare.nix {};
in
stdenv.mkDerivation {
name = "sencha-${sencha-bare.version}";
nativeBuildInputs = [ makeWrapper ];
unpackPhase = ":";
installPhase = ''
makeWrapper ${sencha-bare}/sencha $out/bin/sencha
'';
}

13
pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile Normal file
View File

@ -0,0 +1,13 @@
addToPath$Integer=1
parentDir=.
sys.adminRights$Boolean=false
sys.component.148$Boolean=true
sys.component.157$Boolean=true
sys.component.26$Boolean=true
sys.component.30$Boolean=true
sys.component.90$Boolean=true
sys.component.91$Boolean=true
sys.component.92$Boolean=true
sys.component.94$Boolean=true
sys.installationDir=@out@
sys.languageId=en

88
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix Normal file
View File

@ -0,0 +1,88 @@
{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype,
fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr,
libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
nspr, alsaLib, cups, expat, udev
}:
let
rpath = lib.makeLibraryPath [
alsaLib
atk
cairo
cups
dbus
expat
fontconfig
freetype
gdk_pixbuf
glib
gnome2.GConf
gnome2.gtk
gnome2.pango
libX11
libXScrnSaver
libXcomposite
libXcursor
libXdamage
libXext
libXfixes
libXi
libXrandr
libXrender
libXtst
nspr
nss
stdenv.cc.cc
udev
xlibs.libxcb
];
in
stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
version = "1.0.35";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "d9f9d4d54f4121efc8eadf1cf0ff957828088b313e53b66dc540b851c44c1860";
}
else
throw "Signal for Desktop is not currently supported on ${stdenv.system}";
phases = [ "unpackPhase" "installPhase" ];
nativeBuildInputs = [ dpkg ];
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
mkdir -p $out
cp -R opt $out
mv ./usr/share $out/share
mv $out/opt/Signal $out/libexec
rmdir $out/opt
chmod -R g-w $out
# Patch signal
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop
# Symlink to bin
mkdir -p $out/bin
ln -s $out/libexec/signal-desktop $out/bin/signal-desktop
# Fix the desktop link
substituteInPlace $out/share/applications/signal-desktop.desktop \
--replace /opt/Signal/signal-desktop $out/bin/signal-desktop
'';
meta = {
description = "Signal Private Messenger for the Desktop.";
homepage = https://signal.org/;
license = lib.licenses.gpl3;
platforms = [
"x86_64-linux"
];
};
}

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

@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_UPDATER=OFF"
];
] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
doCheck = false;
doCheck = true;
checkTarget = "test";

15
pkgs/applications/networking/mailreaders/mailnag/default.nix
View File

@ -2,11 +2,13 @@
, gdk_pixbuf, libnotify, gst_all_1
, libgnome_keyring3, networkmanager
, wrapGAppsHook, gnome3
, withGnomeKeyring ? false
, withNetworkManager ? true
# otherwise passwords are stored unencrypted
, withGnomeKeyring ? true
}:
pythonPackages.buildPythonApplication rec {
let
inherit (pythonPackages) python;
in pythonPackages.buildPythonApplication rec {
name = "mailnag-${version}";
version = "1.2.1";
@ -20,8 +22,7 @@ pythonPackages.buildPythonApplication rec {
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gnome3.defaultIconTheme
] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3
++ stdenv.lib.optional withNetworkManager networkmanager;
] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3;
nativeBuildInputs = [
wrapGAppsHook
@ -31,6 +32,10 @@ pythonPackages.buildPythonApplication rec {
pygobject3 dbus-python pyxdg
];
buildPhase = "";
installPhase = "${python}/bin/python setup.py install --prefix=$out";
doCheck = false;
meta = with stdenv.lib; {

5
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -22,9 +22,8 @@ stdenv.mkDerivation rec {
buildInputs = [ boost libtorrentRasterbar qtbase qttools ]
++ optional guiSupport dbus_libs;
preConfigure = ''
export QT_QMAKE=$(dirname "$QMAKE")
'';
# Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist.
QMAKE_LRELEASE = "lrelease";
configureFlags = [
"--with-boost-libdir=${boost.out}/lib"

4
pkgs/applications/networking/syncthing/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
stdenv.mkDerivation rec {
version = "0.14.39";
version = "0.14.40";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "0bq2vdfnl77qldg1zvfhdbmhsj80qz8pds4slqlwjmmjmk19sqnh";
sha256 = "0fd4k09sb91d1bjqj2v1fh7raq98fdw45aaa58kramwhidsf9sy5";
};
buildInputs = [ go removeReferencesTo ];

39
pkgs/applications/office/paperwork/backend.nix Normal file
View File

@ -0,0 +1,39 @@
{ buildPythonPackage, lib, fetchFromGitHub
, isPy3k, isPyPy
, pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor
, python-Levenshtein, pyinsane2, pygobject3, pyocr, natsort
, pkgs
}:
buildPythonPackage rec {
name = "paperwork-backend-${version}";
version = "1.2.1";
src = fetchFromGitHub {
owner = "openpaperwork";
repo = "paperwork-backend";
rev = version;
sha256 = "1lrawibm6jnykj1bkrl8196kcxrhndzp7r0brdrb4hs54gql7j5x";
};
# Python 2.x is not supported.
disabled = !isPy3k && !isPyPy;
preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend";
propagatedBuildInputs = [
pyenchant simplebayes pillow pycountry whoosh termcolor
python-Levenshtein pyinsane2 pygobject3 pyocr natsort
pkgs.poppler_gi pkgs.gtk3
];
meta = {
description = "Backend part of Paperwork (Python API, no UI)";
homepage = https://openpaper.work/;
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.aszlig ];
};
}

15
pkgs/applications/office/paperwork/default.nix
View File

@ -1,19 +1,19 @@
{ lib, python3Packages, fetchFromGitHub, gtk3, cairo
, aspellDicts, buildEnv
, gnome3, hicolor_icon_theme
, gnome3, hicolor_icon_theme, librsvg
, xvfb_run, dbus, libnotify
}:
python3Packages.buildPythonApplication rec {
name = "paperwork-${version}";
# Don't forget to also update paperwork-backend when updating this!
version = "1.2";
version = "1.2.1";
src = fetchFromGitHub {
repo = "paperwork";
owner = "jflesch";
owner = "openpaperwork";
rev = version;
sha256 = "1cb9wnhhpm3dyxjrkyl9bbva56xx85vlwlb7z07m1icflcln14x5";
sha256 = "0lqnq74hdjj778j2k0syibwy4i37l8w932gmibs8617s4yi34rxz";
};
# Patch out a few paths that assume that we're using the FHS:
@ -47,7 +47,9 @@ python3Packages.buildPythonApplication rec {
}}/lib/aspell";
checkInputs = [ xvfb_run dbus.daemon ];
buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme libnotify ];
buildInputs = [
gnome3.defaultIconTheme hicolor_icon_theme libnotify librsvg
];
# A few parts of chkdeps need to have a display and a dbus session, so we not
# only need to run a virtual X server + dbus but also have a large enough
@ -64,13 +66,14 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs = [
"--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
"--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
"--prefix XDG_DATA_DIRS : \"$out/share\""
"--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\""
];
meta = {
description = "A personal document manager for scanned documents";
homepage = https://github.com/jflesch/paperwork;
homepage = https://openpaper.work/;
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.aszlig ];
platforms = lib.platforms.linux;

10
pkgs/applications/science/logic/glucose/default.nix
View File

@ -1,19 +1,21 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
name = "glucose-${version}";
version = "4.0";
version = "4.1";
src = fetchurl {
url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-${version}.tgz";
sha256 = "0aahrkaq7n0z986fpqz66yz946nxardfi6dh8calzcfjpvqiraji";
};
buildInputs = [ zlib ];
sourceRoot = "glucose-syrup/simp";
sourceRoot = "glucose-syrup-${version}/simp";
makeFlags = [ "r" ];
installPhase = ''
install -Dm0755 glucose_release $out/bin/glucose
mkdir -p "$out/share/doc/${name}/"
install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
'';
meta = with stdenv.lib; {

13
pkgs/applications/science/logic/glucose/syrup.nix
View File

@ -1,19 +1,18 @@
{ stdenv, fetchurl, zlib }:
{ stdenv, fetchurl, zlib, glucose }:
stdenv.mkDerivation rec {
name = "glucose-syrup-${version}";
version = "4.0";
version = glucose.version;
src = fetchurl {
url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
};
src = glucose.src;
buildInputs = [ zlib ];
sourceRoot = "glucose-syrup/parallel";
sourceRoot = "glucose-syrup-${version}/parallel";
makeFlags = [ "r" ];
installPhase = ''
install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup
mkdir -p "$out/share/doc/${name}/"
install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
'';
meta = with stdenv.lib; {

6
pkgs/applications/science/logic/z3/default.nix
View File

@ -4,13 +4,13 @@ let
python = python2;
in stdenv.mkDerivation rec {
name = "z3-${version}";
version = "4.5.0";
version = "4.5.0-2017-11-06";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = "z3";
rev = "z3-${version}";
sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp";
rev = "3350f32e1f2c01c9df63b7d71899796a18ce2272";
sha256 = "00jn0njn5h9v49pl67yxj6225m6334ndrx6mp37vcqac05pdbpw7";
};
buildInputs = [ python fixDarwinDylibNames ];

29
pkgs/applications/version-management/cvs/CVE-2017-12836.patch Normal file
View File

@ -0,0 +1,29 @@
--- a/src/rsh-client.c.orig 2005-10-02 17:17:21.000000000 +0200
+++ b/src/rsh-client.c 2017-11-07 16:56:06.957370469 +0100
@@ -53,7 +53,7 @@
char *cvs_server = (root->cvs_server != NULL
? root->cvs_server : getenv ("CVS_SERVER"));
int i = 0;
- /* This needs to fit "rsh", "-b", "-l", "USER", "host",
+ /* This needs to fit "rsh", "-b", "-l", "USER", "--", "host",
"cmd (w/ args)", and NULL. We leave some room to grow. */
char *rsh_argv[10];
@@ -97,6 +97,9 @@
rsh_argv[i++] = root->username;
}
+ /* Only non-option arguments from here. (CVE-2017-12836) */
+ rsh_argv[i++] = "--";
+
rsh_argv[i++] = root->hostname;
rsh_argv[i++] = cvs_server;
rsh_argv[i++] = "server";
@@ -171,6 +174,7 @@
*p++ = root->username;
}
+ *p++ = "--";
*p++ = root->hostname;
*p++ = command;
*p++ = NULL;

1
pkgs/applications/version-management/cvs/default.nix
View File

@ -11,6 +11,7 @@ stdenv.mkDerivation {
patches = [
./getcwd-chroot.patch
./CVE-2012-0804.patch
./CVE-2017-12836.patch
];
hardeningDisable = [ "fortify" "format" ];

4
pkgs/applications/version-management/gitaly/Gemfile
View File

@ -3,3 +3,7 @@ source 'https://rubygems.org'
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly'
gem 'activesupport'
group :development, :test do
gem 'gitlab-styles', '~> 2.0.0', require: false
end

26
pkgs/applications/version-management/gitaly/Gemfile.lock
View File

@ -8,6 +8,7 @@ GEM
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
ast (2.3.0)
charlock_holmes (0.7.5)
concurrent-ruby (1.0.5)
escape_utils (1.1.1)
@ -21,6 +22,10 @@ GEM
escape_utils (~> 1.1.0)
mime-types (>= 1.19)
rugged (>= 0.23.0b)
gitlab-styles (2.0.0)
rubocop (~> 0.49)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.15)
google-protobuf (3.4.0.2)
googleauth (0.5.3)
faraday (~> 0.12)
@ -47,7 +52,26 @@ GEM
multi_json (1.12.1)
multipart-post (2.0.0)
os (0.9.6)
parallel (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
powerpack (0.1.1)
public_suffix (2.0.5)
rainbow (2.2.2)
rake
rake (12.1.0)
rubocop (0.50.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-gitlab-security (0.1.0)
rubocop (>= 0.47.1)
rubocop-rspec (1.17.0)
rubocop (>= 0.50.0)
ruby-progressbar (1.8.3)
rugged (0.26.0)
signet (0.7.3)
addressable (~> 2.3)
@ -57,6 +81,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
unicode-display_width (1.3.0)
PLATFORMS
ruby
@ -65,6 +90,7 @@ DEPENDENCIES
activesupport
gitaly-proto (~> 0.37.0)
github-linguist (~> 4.7.0)
gitlab-styles (~> 2.0.0)
BUNDLED WITH
1.15.4

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

@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
version = "0.38.0";
version = "0.43.1";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "02s5gjxbjvm990n4h5zkyqj71a9mp4yj83hfl8mma0g7gx00icsf";
sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";

102
pkgs/applications/version-management/gitaly/gemset.nix
View File

@ -17,6 +17,14 @@
};
version = "2.5.1";
};
ast = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
type = "gem";
};
version = "2.3.0";
};
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
@ -68,6 +76,15 @@
};
version = "4.7.6";
};
gitlab-styles = {
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k8xrkjx8rcny8p0gsp18wskvn1qbw4rfgdp1f6x0p4xp6dlhjf4";
type = "gem";
};
version = "2.0.0";
};
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
@ -184,6 +201,31 @@
};
version = "0.9.6";
};
parallel = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
type = "gem";
};
version = "1.12.0";
};
parser = {
dependencies = ["ast"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq";
type = "gem";
};
version = "2.4.0.0";
};
powerpack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
type = "gem";
};
version = "0.1.1";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
@ -192,6 +234,58 @@
};
version = "2.0.5";
};
rainbow = {
dependencies = ["rake"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w";
type = "gem";
};
version = "2.2.2";
};
rake = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
type = "gem";
};
version = "12.1.0";
};
rubocop = {
dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hpd7zcv4y9y750wj630abvmcjwv39dsrj1fjff60ik7gfri0xlz";
type = "gem";
};
version = "0.50.0";
};
rubocop-gitlab-security = {
dependencies = ["rubocop"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy";
type = "gem";
};
version = "0.1.0";
};
rubocop-rspec = {
dependencies = ["rubocop"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hf48ng67yswvshmv4cyysj1rs1z3fnvlycr50jdcgwlynpyxkhs";
type = "gem";
};
version = "1.17.0";
};
ruby-progressbar = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "029kv0q3kfq53rjyak4ypn7196l8z4hflfmv4p5787n78z7baiqf";
type = "gem";
};
version = "1.8.3";
};
rugged = {
source = {
remotes = ["https://rubygems.org"];
@ -226,4 +320,12 @@
};
version = "1.2.2";
};
unicode-display_width = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8";
type = "gem";
};
version = "1.3.0";
};
}

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

@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
version = "5.9.0";
version = "5.9.3";
name = "gitlab-shell-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "1zjlwivksaqlfxxhxjgpqa3293nhijw76fj7nv0l11820wplc7yf";
sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p";
};
buildInputs = [

4
pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
View File

@ -3,7 +3,7 @@ index 0b11ce3..ffc3faf 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -8,7 +8,7 @@ require_relative 'gitlab_metrics'
require_relative 'gitlab_reference_counter'
require_relative 'gitlab_metrics'
class GitlabProjects
- GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
@ -15,7 +15,7 @@ diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index e7d0254..181ec8a 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -163,7 +163,8 @@ class GitlabShell
@@ -188,7 +188,8 @@ class GitlabShell
end
# We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.

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

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitLab, git, go }:
stdenv.mkDerivation rec {
version = "3.0.0";
version = "3.2.0";
name = "gitlab-workhorse-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "0lz3bgwww640c7gh97vf40a8h6cz4znscl0r00z6iiwkc0xxzp7j";
sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r";
};
buildInputs = [ git go ];

4
pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
View File

@ -2,11 +2,11 @@ diff --git a/internal/git/command.go b/internal/git/command.go
index 0e5496c..5778294 100644
--- a/internal/git/command.go
+++ b/internal/git/command.go
@@ -16,6 +16,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
@@ -19,6 +19,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
cmd.Env = []string{
fmt.Sprintf("HOME=%s", os.Getenv("HOME")),
fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
+ fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")),
fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")),
fmt.Sprintf("GL_ID=%s", gl_id),
fmt.Sprintf("GL_PROTOCOL=http"),
}

17
pkgs/applications/version-management/gitlab/Gemfile
View File

@ -23,10 +23,10 @@ gem 'faraday', '~> 0.12'
# Authentication libraries
gem 'devise', '~> 4.2'
gem 'doorkeeper', '~> 4.2.0'
gem 'doorkeeper-openid_connect', '~> 1.1.0'
gem 'doorkeeper-openid_connect', '~> 1.2.0'
gem 'omniauth', '~> 1.4.2'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
@ -105,7 +105,7 @@ gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.1.0'
# for Google storage
gem 'google-api-client', '~> 0.8.6'
gem 'google-api-client', '~> 0.13.6'
# for aws storage
gem 'unf', '~> 0.1.4'
@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.5'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
gem 'deckar01-task_list', '2.0.0'
gem 'gitlab-markup', '~> 1.5.1'
gem 'gitlab-markup', '~> 1.6.2'
gem 'redcarpet', '~> 3.4'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 4.2'
@ -239,7 +239,7 @@ gem 'rack-proxy', '~> 0.6.0'
gem 'sass-rails', '~> 5.0.6'
gem 'uglifier', '~> 2.7.2'
gem 'addressable', '~> 2.3.8'
gem 'addressable', '~> 2.5.2'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
@ -281,7 +281,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
gem 'prometheus-client-mmap', '~>0.7.0.beta14'
gem 'prometheus-client-mmap', '~>0.7.0.beta18'
gem 'raindrops', '~> 0.18'
end
@ -356,12 +356,13 @@ end
group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 1.6.0'
gem 'json-schema', '~> 2.6.2'
gem 'json-schema', '~> 2.8.0'
gem 'webmock', '~> 2.3.2'
gem 'test_after_commit', '~> 1.1'
gem 'sham_rack', '~> 1.3.6'
gem 'timecop', '~> 0.8.0'
gem 'concurrent-ruby', '~> 1.0.5'
gem 'test-prof', '~> 0.2.5'
end
gem 'octokit', '~> 4.6.2'
@ -397,7 +398,7 @@ group :ed25519 do
end
# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly'
gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false

102
pkgs/applications/version-management/gitlab/Gemfile.lock
View File

@ -47,7 +47,8 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.3.8)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
akismet (2.0.0)
allocations (1.0.5)
arel (6.0.4)
@ -64,10 +65,6 @@ GEM
attr_encrypted (3.0.3)
encryptor (~> 3.0.0)
attr_required (1.0.0)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
autoprefixer-rails (6.2.3)
execjs
json
@ -85,7 +82,7 @@ GEM
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
bindata (2.3.5)
bindata (2.4.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.6)
@ -148,6 +145,8 @@ GEM
debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.0.0)
html-pipeline
declarative (0.0.10)
declarative-option (0.1.0)
default_value_for (3.0.2)
activerecord (>= 3.2.0, < 5.1)
descendants_tracker (0.0.4)
@ -169,9 +168,9 @@ GEM
docile (1.1.5)
domain_name (0.5.20161021)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.2.0)
doorkeeper (4.2.6)
railties (>= 4.2)
doorkeeper-openid_connect (1.1.2)
doorkeeper-openid_connect (1.2.0)
doorkeeper (~> 4.0)
json-jwt (~> 1.6)
dropzonejs-rails (0.7.2)
@ -190,13 +189,12 @@ GEM
excon (0.57.1)
execjs (2.6.0)
expression_parser (0.9.0)
extlib (0.9.16)
factory_girl (4.7.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
railties (>= 3.0.0)
faraday (0.12.1)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.11.0.1)
faraday (>= 0.7.4, < 1.0)
@ -277,7 +275,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
gitaly-proto (0.33.0)
gitaly-proto (0.39.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@ -290,12 +288,12 @@ GEM
flowdock (~> 0.7)
gitlab-grit (>= 2.4.1)
multi_json
gitlab-grit (2.8.1)
gitlab-grit (2.8.2)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gitlab-markup (1.5.1)
gitlab-markup (1.6.2)
gitlab_omniauth-ldap (2.0.4)
net-ldap (~> 0.16)
omniauth (~> 1.3)
@ -321,20 +319,16 @@ GEM
json
multi_json
request_store (>= 1.0)
google-api-client (0.8.7)
activesupport (>= 3.2, < 5.0)
addressable (~> 2.3)
autoparse (~> 0.3)
extlib (~> 0.9)
faraday (~> 0.9)
googleauth (~> 0.3)
launchy (~> 2.4)
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
google-api-client (0.13.6)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.5)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google-protobuf (3.4.0.2)
googleauth (0.5.1)
faraday (~> 0.9)
googleauth (0.5.3)
faraday (~> 0.12)
jwt (~> 1.4)
logging (~> 2.0)
memoist (~> 0.12)
@ -359,7 +353,7 @@ GEM
rake
grape_logging (1.7.0)
grape
grpc (1.4.5)
grpc (1.6.0)
google-protobuf (~> 3.1)
googleauth (~> 0.5.1)
haml (4.0.7)
@ -418,14 +412,14 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
json-jwt (1.7.1)
json-jwt (1.7.2)
activesupport
bindata
multi_json (>= 1.3)
securecompare
url_safe_base64
json-schema (2.6.2)
addressable (~> 2.3.8)
json-schema (2.8.0)
addressable (>= 2.4)
jwt (1.5.6)
kaminari (1.0.1)
activesupport (>= 4.1.0)
@ -477,18 +471,20 @@ GEM
mail (2.6.6)
mime-types (>= 1.16, < 4)
mail_room (0.9.1)
memoist (0.15.0)
memoist (0.16.0)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.99.3)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.0)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.7.0)
mmap2 (2.2.7)
mousetrap-rails (1.4.6)
multi_json (1.12.1)
multi_json (1.12.2)
multi_xml (0.6.0)
multipart-post (2.0.0)
mustermann (1.0.0)
@ -518,10 +514,10 @@ GEM
omniauth-oauth2 (~> 1.1)
omniauth-authentiq (0.3.1)
omniauth-oauth2 (~> 1.3, >= 1.3.1)
omniauth-azure-oauth2 (0.0.6)
omniauth-azure-oauth2 (0.0.9)
jwt (~> 1.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (~> 1.4)
omniauth-cas3 (1.1.4)
addressable (~> 2.3)
nokogiri (~> 1.7, >= 1.7.1)
@ -547,7 +543,7 @@ GEM
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.3.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-oauth2-generic (0.2.2)
@ -626,7 +622,7 @@ GEM
parser
unparser
procto (0.0.3)
prometheus-client-mmap (0.7.0.beta14)
prometheus-client-mmap (0.7.0.beta18)
mmap2 (~> 2.2, >= 2.2.7)
pry (0.10.4)
coderay (~> 1.1.0)
@ -637,6 +633,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.5)
pry (>= 0.9.10)
public_suffix (3.0.0)
pyu-ruby-sasl (0.0.3.3)
rack (1.6.8)
rack-accept (0.4.5)
@ -686,7 +683,7 @@ GEM
rainbow (2.2.2)
rake
raindrops (0.18.0)
rake (12.0.0)
rake (12.1.0)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
rbnacl (4.0.2)
@ -719,6 +716,10 @@ GEM
redis-store (~> 1.2.0)
redis-store (1.2.0)
redis (>= 2.2)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
request_store (1.3.1)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
@ -726,7 +727,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (1.4.1)
retriable (3.1.1)
rinku (2.0.0)
rotp (2.1.2)
rouge (2.2.1)
@ -884,6 +885,7 @@ GEM
ffi
sysexits (1.2.0)
temple (0.7.7)
test-prof (0.2.5)
test_after_commit (1.1.0)
activerecord (>= 3.2)
text (1.3.1)
@ -904,12 +906,13 @@ GEM
tzinfo (1.2.3)
thread_safe (~> 0.1)
u2f (0.2.1)
uber (0.1.0)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unf_ext (0.0.7.4)
unicode-display_width (1.3.0)
unicorn (5.1.0)
kgio (~> 2.6)
@ -965,7 +968,7 @@ DEPENDENCIES
activerecord-nulldb-adapter
activerecord_sane_schema_dumper (= 0.2)
acts-as-taggable-on (~> 4.0)
addressable (~> 2.3.8)
addressable (~> 2.5.2)
akismet (~> 2.0)
allocations (~> 1.0)
asana (~> 0.6.0)
@ -1002,7 +1005,7 @@ DEPENDENCIES
devise-two-factor (~> 3.0.0)
diffy (~> 3.1.0)
doorkeeper (~> 4.2.0)
doorkeeper-openid_connect (~> 1.1.0)
doorkeeper-openid_connect (~> 1.2.0)
dropzonejs-rails (~> 0.7.1)
email_reply_trimmer (~> 0.1)
email_spec (~> 1.6.0)
@ -1027,15 +1030,15 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
gitaly-proto (~> 0.33.0)
gitaly-proto (~> 0.39.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.5.1)
gitlab-markup (~> 1.6.2)
gitlab_omniauth-ldap (~> 2.0.4)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.4)
gon (~> 6.1.0)
google-api-client (~> 0.8.6)
google-api-client (~> 0.13.6)
gpgme
grape (~> 1.0)
grape-entity (~> 0.6.0)
@ -1053,7 +1056,7 @@ DEPENDENCIES
jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2)
jquery-rails (~> 4.1.0)
json-schema (~> 2.6.2)
json-schema (~> 2.8.0)
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.11.0)
@ -1077,7 +1080,7 @@ DEPENDENCIES
omniauth (~> 1.4.2)
omniauth-auth0 (~> 1.4.1)
omniauth-authentiq (~> 0.3.1)
omniauth-azure-oauth2 (~> 0.0.6)
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
omniauth-facebook (~> 4.0.0)
omniauth-github (~> 1.1.1)
@ -1103,7 +1106,7 @@ DEPENDENCIES
pg (~> 0.18.2)
poltergeist (~> 1.9.0)
premailer-rails (~> 1.9.7)
prometheus-client-mmap (~> 0.7.0.beta14)
prometheus-client-mmap (~> 0.7.0.beta18)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
@ -1166,6 +1169,7 @@ DEPENDENCIES
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.4.0)
sys-filesystem (~> 1.1.6)
test-prof (~> 0.2.5)
test_after_commit (~> 1.1)
thin (~> 1.7.0)
timecop (~> 0.8.0)

6
pkgs/applications/version-management/gitlab/default.nix
View File

@ -18,11 +18,11 @@ let
};
};
version = "10.0.2";
version = "10.1.1";
gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
sha256 = "0jsqjarvjzbxv1yiddzp5xwsqqrq5cvam0xn749p1vzqhcp8pahc";
sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2";
};
in
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
sha256 = "1602d6nkb41gg80n6p0wqxrjsn79s0z3817461d8dw2ha2dmbl34";
sha256 = "0p118msad6l12pd4q3vkvjggiiasbkh6pnl94riqyb5zkb7yrb1a";
};
patches = [

166
pkgs/applications/version-management/gitlab/gemset.nix
View File

@ -115,12 +115,13 @@
version = "0.2.0";
};
addressable = {
dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1533axm85gpz267km9gnfarf9c78g2scrysd6b8yw33vmhkz2km6";
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem";
};
version = "2.3.8";
version = "2.5.2";
};
akismet = {
source = {
@ -205,15 +206,6 @@
};
version = "1.0.0";
};
autoparse = {
dependencies = ["addressable" "extlib" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q5wkd8gc2ckmgry9fba4b8vxb5kr8k8gqq2wycbirgq06mbllb6";
type = "gem";
};
version = "0.3.3";
};
autoprefixer-rails = {
dependencies = ["execjs" "json"];
source = {
@ -292,10 +284,10 @@
bindata = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "07i51jzq9iamw40xmmcgkrdq4m8f0vb5gp53p6q1vggj7z53q3v7";
sha256 = "0anbg203zjr4crql20ss5b9xg2c6a7j8nm6hs8w3ll1h1akkpp2z";
type = "gem";
};
version = "2.3.5";
version = "2.4.1";
};
binding_of_caller = {
dependencies = ["debug_inspector"];
@ -592,6 +584,22 @@
};
version = "2.0.0";
};
declarative = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j";
type = "gem";
};
version = "0.0.10";
};
declarative-option = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
type = "gem";
};
version = "0.1.0";
};
default_value_for = {
dependencies = ["activerecord"];
source = {
@ -665,19 +673,19 @@
dependencies = ["railties"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hs8r280k7a1kibzxrhifjps880n43jfrybf4mqpffw669jrwk3v";
sha256 = "0r5rfvjjnlf9cn97cdrfw260zkg785k4197xqidgb35445k62mah";
type = "gem";
};
version = "4.2.0";
version = "4.2.6";
};
doorkeeper-openid_connect = {
dependencies = ["doorkeeper" "json-jwt"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pla85j5wxra0k9rhj04g2ai5d5jg97fiavi0s9v2hjba2l54cni";
sha256 = "13k0xlr1grjj8ri26qy2zwbgi3fqxinvnygh53bnyi9qcynx5827";
type = "gem";
};
version = "1.1.2";
version = "1.2.0";
};
dropzonejs-rails = {
dependencies = ["rails"];
@ -778,14 +786,6 @@
};
version = "0.9.0";
};
extlib = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cbw3vgb189z3vfc1arijmsd604m3w5y5xvdfkrblc9qh7sbk2rh";
type = "gem";
};
version = "0.9.16";
};
factory_girl = {
dependencies = ["activesupport"];
source = {
@ -808,10 +808,10 @@
dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wkx9844vacsk2229xbc27djf6zw15kqd60ifr78whf9mp9v6l03";
sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
type = "gem";
};
version = "0.12.1";
version = "0.12.2";
};
faraday_middleware = {
dependencies = ["faraday"];
@ -1071,10 +1071,10 @@
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0f15idw1850kwi0na6x3xlk13ljwx3mpfnxfv58631cmb3ac7wf8";
sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k";
type = "gem";
};
version = "0.33.0";
version = "0.39.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@ -1106,18 +1106,18 @@
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
type = "gem";
};
version = "2.8.1";
version = "2.8.2";
};
gitlab-markup = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1aam7zvvbai5nv7vf0c0640pvik6s71f276lip4yb4slbg0pfpn2";
sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz";
type = "gem";
};
version = "1.5.1";
version = "1.6.2";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@ -1174,13 +1174,13 @@
version = "6.1.0";
};
google-api-client = {
dependencies = ["activesupport" "addressable" "autoparse" "extlib" "faraday" "googleauth" "launchy" "multi_json" "retriable" "signet"];
dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11wr57j9fp6x6fym4k1a7jqp72qgc8l24mfwb4y55bbvdmkv1b2d";
sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y";
type = "gem";
};
version = "0.8.7";
version = "0.13.6";
};
google-protobuf = {
source = {
@ -1194,10 +1194,10 @@
dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nzkg63s161c6jsia92c1jfwpayzbpwn588smd286idn07y0az2m";
sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli";
type = "gem";
};
version = "0.5.1";
version = "0.5.3";
};
gpgme = {
dependencies = ["mini_portile2"];
@ -1248,10 +1248,10 @@
dependencies = ["google-protobuf" "googleauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38";
sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
type = "gem";
};
version = "1.4.5";
version = "1.6.0";
};
haml = {
dependencies = ["tilt"];
@ -1471,19 +1471,19 @@
dependencies = ["activesupport" "bindata" "multi_json" "securecompare" "url_safe_base64"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ylvlnb6assan9qkhz1vq1gbfwxg35q9a8f8qhlyx0fak5fyks23";
sha256 = "15a3v498lvsshzgjnk2dmyvjv87y3lffq71axj5xq3iz4mp1r4b2";
type = "gem";
};
version = "1.7.1";
version = "1.7.2";
};
json-schema = {
dependencies = ["addressable"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15bva4w940ckan3q89in5f98s8zz77nxglylgm98697wa4fbfqp9";
sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz";
type = "gem";
};
version = "2.6.2";
version = "2.8.0";
};
jwt = {
source = {
@ -1662,10 +1662,10 @@
memoist = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q";
sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
type = "gem";
};
version = "0.15.0";
version = "0.16.0";
};
memoizable = {
dependencies = ["thread_safe"];
@ -1685,12 +1685,21 @@
version = "0.8.2";
};
mime-types = {
dependencies = ["mime-types-data"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
type = "gem";
};
version = "2.99.3";
version = "3.1";
};
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
type = "gem";
};
version = "3.2016.0521";
};
mimemagic = {
source = {
@ -1743,10 +1752,10 @@
multi_json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
type = "gem";
};
version = "1.12.1";
version = "1.12.2";
};
multi_xml = {
source = {
@ -1895,10 +1904,10 @@
dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s";
sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx";
type = "gem";
};
version = "0.0.6";
version = "0.0.9";
};
omniauth-cas3 = {
dependencies = ["addressable" "nokogiri" "omniauth"];
@ -1976,10 +1985,10 @@
dependencies = ["oauth2" "omniauth"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm";
sha256 = "0aykbg5qfm37ywrq34dydrhxa5jwpski71dpspgp2fi6dinx09f5";
type = "gem";
};
version = "1.3.1";
version = "1.4.0";
};
omniauth-oauth2-generic = {
dependencies = ["omniauth-oauth2"];
@ -2247,10 +2256,10 @@
dependencies = ["mmap2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r9s30hypcpw4abxlzcjlkcwkckqvr5sbph3blbl0rq2r8c8h25p";
sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh";
type = "gem";
};
version = "0.7.0.beta14";
version = "0.7.0.beta18";
};
pry = {
dependencies = ["coderay" "method_source" "slop"];
@ -2279,6 +2288,14 @@
};
version = "0.3.5";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
type = "gem";
};
version = "3.0.0";
};
pyu-ruby-sasl = {
source = {
remotes = ["https://rubygems.org"];
@ -2431,10 +2448,10 @@
rake = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
type = "gem";
};
version = "12.0.0";
version = "12.1.0";
};
rblineprof = {
dependencies = ["debugger-ruby_core_source"];
@ -2575,6 +2592,15 @@
};
version = "1.2.0";
};
representable = {
dependencies = ["declarative" "declarative-option" "uber"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
type = "gem";
};
version = "3.0.4";
};
request_store = {
source = {
remotes = ["https://rubygems.org"];
@ -2604,10 +2630,10 @@
retriable = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cmhwgv5r4vn7iqy4bfbnbb73pzl8ik69zrwq9vdim45v8b13gsj";
sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar";
type = "gem";
};
version = "1.4.1";
version = "3.1.1";
};
rinku = {
source = {
@ -3195,6 +3221,14 @@
};
version = "0.7.7";
};
test-prof = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3";
type = "gem";
};
version = "0.2.5";
};
test_after_commit = {
dependencies = ["activerecord"];
source = {
@ -3296,6 +3330,14 @@
};
version = "0.2.1";
};
uber = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
type = "gem";
};
version = "0.1.0";
};
uglifier = {
dependencies = ["execjs" "json"];
source = {
@ -3317,10 +3359,10 @@
unf_ext = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8";
sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
type = "gem";
};
version = "0.0.7.2";
version = "0.0.7.4";
};
unicode-display_width = {
source = {

6
pkgs/applications/version-management/gitlab/nulladapter.patch
View File

@ -14,7 +14,7 @@ diff --git a/Gemfile.lock b/Gemfile.lock
index 38944248f9..08ce4486ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,6 +32,8 @@ GEM
@@ -33,6 +33,8 @@ GEM
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
@ -23,11 +23,11 @@ index 38944248f9..08ce4486ba 100644
activerecord_sane_schema_dumper (0.2)
rails (>= 4, < 5)
activesupport (4.2.8)
@@ -926,6 +928,7 @@ PLATFORMS
@@ -963,6 +965,7 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
+ activerecord-nulldb-adapter
activerecord_sane_schema_dumper (= 0.2)
acts-as-taggable-on (~> 4.0)
addressable (~> 2.3.8)
addressable (~> 2.5.2)

20
pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
View File

@ -27,20 +27,20 @@ diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 0b33783869..cd4e41d9bd 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -521,7 +521,7 @@ production: &base
@@ -574,7 +574,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:
- bin_path: /usr/bin/git
+ bin_path: git
# The next value is the maximum memory size grit can use
# Given in number of bytes per git object (e.g. a commit)
# This value can be increased if you have very large commits
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 8ddf8e4d2e..559cf9adf7 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -219,7 +219,7 @@ Settings.gitlab['user'] ||= 'git'
@@ -252,7 +252,7 @@ Settings.gitlab['user'] ||= 'git'
Settings.gitlab['user_home'] ||= begin
Etc.getpwnam(Settings.gitlab['user']).dir
rescue ArgumentError # no user configured
@ -49,15 +49,15 @@ index 8ddf8e4d2e..559cf9adf7 100644
end
Settings.gitlab['time_zone'] ||= nil
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
@@ -454,7 +454,7 @@ Settings.backup['upload']['storage_class'] ||= nil
@@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil
# Git
#
Settings['git'] ||= Settingslogic.new({})
Settings.git['max_size'] ||= 20971520 # 20.megabytes
-Settings.git['bin_path'] ||= '/usr/bin/git'
+Settings.git['bin_path'] ||= 'git'
Settings.git['timeout'] ||= 10
-Settings.git['bin_path'] ||= '/usr/bin/git'
+Settings.git['bin_path'] ||= 'git'
# Important: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
index 59b21149a9..4f4a39a06c 100644
--- a/lib/gitlab/logger.rb

8
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -94,6 +94,14 @@ in stdenv.mkDerivation {
postPatch = ''
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
patch -p0 < ${
fetchurl { # for glibc-2.26
name = "conflicting-types-for-greg_t.patch";
url = "http://www.linuxquestions.org/questions/"
+ "attachment.php?attachmentid=25801&d=1504099531";
sha256 = "1bcyf9qrqxizyjp1s662k6n1cfyfjbl7256r4n20kbr65yxcydps";
}
}
'';
# first line: ugly hack, and it isn't yet clear why it's a problem

5
pkgs/applications/window-managers/i3/lock-color.nix
View File

@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
homepage = https://i3wm.org/i3lock/;
maintainers = with maintainers; [ garbas malyn ];
license = licenses.bsd3;
platforms = platforms.all;
# Needs the SSE2 instruction set. See upstream issue
# https://github.com/chrjguill/i3lock-color/issues/44
platforms = platforms.i686 ++ platforms.x86_64;
};
}

8
pkgs/applications/window-managers/sway/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "sway-${version}";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "Sircmpwn";
owner = "swaywm";
repo = "sway";
rev = "${version}";
sha256 = "1l8v9cdzd44bm4q71d47vqg6933b8j42q1a61r362vz2la1rcpq2";
rev = version;
sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh";
};
nativeBuildInputs = [

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

@ -1,34 +1,6 @@
{ fetchFromGitHub
, stdenv
, pkgconfig
, libarchive
, glib
, # Override this to use a different revision
src-spec ?
{ owner = "commercialhaskell";
repo = "all-cabal-hashes";
rev = "5e87c40f2cd96bd5dd953758e82f302107c7895e";
sha256 = "12rw5fld64s0a2zjsdijfs0dv6vc6z7gcf24h4m2dmymzms4namg";
}
, lib
}:
{ fetchurl }:
# Use builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"
# instead if you want the latest Hackage automatically at the price of frequent re-downloads.
let partition-all-cabal-hashes = stdenv.mkDerivation
{ name = "partition-all-cabal-hashes";
src = ./partition-all-cabal-hashes.c;
unpackPhase = "true";
buildInputs = [ libarchive glib ];
nativeBuildInputs = [ pkgconfig ];
buildPhase =
"cc -O3 $(pkg-config --cflags --libs libarchive glib-2.0) $src -o partition-all-cabal-hashes";
installPhase =
''
mkdir -p $out/bin
install -m755 partition-all-cabal-hashes $out/bin
'';
};
in fetchFromGitHub (src-spec //
{ postFetch = "${partition-all-cabal-hashes}/bin/partition-all-cabal-hashes $downloadedFile $out";
})
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/5e87c40f2cd96bd5dd953758e82f302107c7895e.tar.gz";
sha256 = "0hjkddda9mdm21nb9bkhr9n5r9jllisif1qmzha91a9cps5w1mx5";
}

190
pkgs/data/misc/hackage/partition-all-cabal-hashes.c
View File

@ -1,190 +0,0 @@
#include <stdio.h>
#include <ctype.h>
#include <glib.h>
#include <string.h>
#include <locale.h>
#include <archive.h>
#include <archive_entry.h>
static char * case_normalize(char * str) {
for (char * iter = str; *iter; ++iter) {
*iter = tolower(*iter);
}
return str;
}
static gint compare_str(const void * a, const void * b, void * _) {
return strcmp(a, b);
}
int main(int argc, char ** argv) {
if (argc != 3) {
fprintf(stderr, "Usage: %s TARBALL OUTPUT\n", argv[0]);
return 1;
}
size_t output_len = strlen(argv[2]);
/* Switch to standard locale to ensure consistency in case-folding.
*/
setlocale(LC_CTYPE, "C");
/* Map from case-normalized package name to a sorted sequence of
* package names in the equivalence class defined by
* case-normalization.
*/
GHashTable * equivalence_classes =
g_hash_table_new(g_str_hash, g_str_equal);
/* Open up the tarball.
*/
struct archive * ar = archive_read_new();
if (!ar) {
perror("Allocating archive structure");
return 1;
}
archive_read_support_filter_gzip(ar);
archive_read_support_format_tar(ar);
if (archive_read_open_filename( ar
, argv[1]
, 10240
) == ARCHIVE_FATAL) {
fprintf( stderr
, "Error opening %s: %s\n"
, argv[0]
, archive_error_string(ar)
);
return 1;
}
/* Extract the length of the output directory that prefixes all
* tarball entries from the first entry in the tarball.
*/
struct archive_entry * ent;
int err = archive_read_next_header(ar, &ent);
if (err != ARCHIVE_OK) {
if (err == ARCHIVE_EOF) {
fprintf( stderr
, "No entries in %s, surely this is an error!\n"
, argv[1]
);
} else {
fprintf( stderr
, "Error reading entry from %s: %s\n"
, argv[1]
, archive_error_string(ar)
);
}
return 1;
}
const char * path = archive_entry_pathname(ent);
/* Number of characters from the start of the path name until after
* the slash after the leading directory.
*/
size_t prefix_len = strchr(path, '/') - path + 1;
/* Extract each entry to the right partition.
*/
do {
path = archive_entry_pathname(ent) + prefix_len;
const char * pkg_end = strchr(path, '/');
if (!pkg_end)
/* If there is no second slash, then this is either just the entry
* corresponding to the root or some non-package file (e.g.
* travis.yml). In either case, we don't care.
*/
continue;
/* Find our package in the equivalence class map.
*/
char * pkg_name = g_strndup(path, pkg_end - path);
char * pkg_normalized =
case_normalize(g_strndup(path, pkg_end - path));
GSequence * pkg_class =
g_hash_table_lookup(equivalence_classes, pkg_normalized);
gint partition_num;
if (!pkg_class) {
/* We haven't seen any packages with this normalized name yet,
* so we need to initialize the sequence and add it to the map.
*/
pkg_class = g_sequence_new(NULL);
g_sequence_append(pkg_class, pkg_name);
g_hash_table_insert( equivalence_classes
, pkg_normalized
, pkg_class
);
partition_num = 1;
} else {
g_free(pkg_normalized);
/* Find the package name in the equivalence class */
GSequenceIter * pkg_iter =
g_sequence_search( pkg_class
, pkg_name
, compare_str
, NULL
);
if (!g_sequence_iter_is_end(pkg_iter)) {
/* If there are any packages after this one in the list, bail
* out. In principle we could solve this by moving them up to
* the next partition, but so far I've never seen any github
* tarballs out of order so let's save ourselves the work
* until we know we need it.
*/
fprintf( stderr
, "Out of order github tarball: %s is after %s\n"
, pkg_name
, (char *) g_sequence_get(pkg_iter)
);
return 1;
}
pkg_iter = g_sequence_iter_prev(pkg_iter);
if (strcmp( g_sequence_get(pkg_iter)
, pkg_name
) != 0) {
/* This package doesn't have the same name as the one right
* before where it should be in the sequence, which means it's
* new and needs to be added to the sequence.
*
* !!! We need to change this to use g_sequence_insert_before
* if we ever get an out-of-order github tarball, see comment
* after the check for !g_sequence_iter_is_end(pkg_iter).
*/
pkg_iter = g_sequence_append(pkg_class, pkg_name);
} else {
g_free(pkg_name);
}
/* Get the partition number, starting with 1.
*/
partition_num = g_sequence_iter_get_position(pkg_iter) + 1;
}
/* Set the destination path.
* The 3 below is for the length of /#/, the partition number part
* of the path. If we have more than 9 partitions, we deserve to
* segfault. The 1 at the end is for the trailing null.
*/
char * dest_path = g_malloc(output_len + 3 + strlen(path) + 1);
sprintf(dest_path, "%s/%d/%s", argv[2], partition_num, path);
archive_entry_set_pathname(ent, dest_path);
if (archive_read_extract(ar, ent, 0) != ARCHIVE_OK) {
fprintf( stderr
, "Error extracting entry %s from %s: %s\n"
, dest_path
, argv[1]
, archive_error_string(ar)
);
return 1;
}
} while ((err = archive_read_next_header(ar, &ent)) == ARCHIVE_OK);
if (err != ARCHIVE_EOF) {
fprintf( stderr
, "Error reading entry from %s: %s\n"
, argv[1]
, archive_error_string(ar)
);
return 1;
}
return 0;
}

2
pkgs/desktops/plasma-5/fetch.sh
View File

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

152
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
View File

@ -8,7 +8,7 @@ index 7e2d9758..40a5797b 100644
import org.kde.kcoreaddons 1.0 as KCoreAddons
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
Item {
id: batteryItem
diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
@ -21,7 +21,7 @@ index ae6d5919..c2f99c86 100644
import org.kde.kquickcontrolsaddons 2.0
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
Item {
id: batterymonitor
diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
@ -34,7 +34,7 @@ index 80e7e53b..0083cf01 100644
import org.kde.kquickcontrolsaddons 2.0
-import "data.js" as Data
+import "../code/data.js" as Data
Flow {
id: lockout
diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
@ -42,12 +42,12 @@ index acdda88f..989de8ab 100644
--- a/applets/notifications/package/contents/ui/main.qml
+++ b/applets/notifications/package/contents/ui/main.qml
@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.plasma.private.notifications 1.0
-import "uiproperties.js" as UiProperties
+import "../code/uiproperties.js" as UiProperties
MouseEventListener {
id: notificationsApplet
diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in
@ -59,7 +59,7 @@ index 85715214..294eab08 100644
Name=org.kde.krunner
-Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner
diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in
index 7a86d07f..5b3030cc 100644
--- a/kuiserver/org.kde.kuiserver.service.in
@ -76,7 +76,7 @@ index fe29f57a..247db953 100644
@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig)
add_subdirectory(ksyncdbusenv)
add_subdirectory(waitforname)
-#FIXME: reconsider, looks fishy
-if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
@ -106,7 +106,7 @@ index e9fa0bee..79e50a96 100644
-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
+# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
+if test "x$1" = x--failsafe; then
+ KDE_FAILSAFE=1 # General failsafe flag
+ KWIN_COMPOSE=N # Disable KWin's compositing
@ -117,7 +117,7 @@ index e9fa0bee..79e50a96 100644
# When the X server dies we get a HUP signal from xinit. We must ignore it
# because we still need to do some cleanup.
trap 'echo GOT SIGHUP' HUP
-# Check if a Plasma session already is running and whether it's possible to connect to X
-kcheckrunning
+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@ -140,12 +140,12 @@ index e9fa0bee..79e50a96 100644
+ echo "\$DISPLAY is not set or cannot connect to the X server."
+ exit 1
fi
# Boot sequence:
@@ -33,59 +42,132 @@ fi
#
# * Then ksmserver is started which takes control of the rest of the startup sequence
-# We need to create config folder so we can write startupconfigkeys
-if [ ${XDG_CONFIG_HOME} ]; then
- configDir=$XDG_CONFIG_HOME;
@ -174,7 +174,7 @@ index e9fa0bee..79e50a96 100644
+if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
+ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
fi
-mkdir -p $configDir
+@NIXPKGS_KBUILDSYCOCA5@
+
@ -227,7 +227,7 @@ index e9fa0bee..79e50a96 100644
+cursorSize=0
+EOF
+fi
#This is basically setting defaults so we can use them with kstartupconfig5
-cat >$configDir/startupconfigkeys <<EOF
+cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF
@ -240,7 +240,7 @@ index e9fa0bee..79e50a96 100644
kcmfonts General forceFontDPI 0
+kcmfonts General dontChangeAASettings true
EOF
# preload the user's locale on first start
-plasmalocalerc=$configDir/plasma-localerc
-test -f $plasmalocalerc || {
@ -253,7 +253,7 @@ index e9fa0bee..79e50a96 100644
EOF
-}
+fi
# export LC_* variables set by kcmshell5 formats into environment
# so it can be picked up by QLocale and friends.
-exportformatssettings=$configDir/plasma-locale-settings.sh
@ -264,7 +264,7 @@ index e9fa0bee..79e50a96 100644
+if [ -r "$exportformatssettings" ]; then
+ . "$exportformatssettings"
+fi
# Write a default kdeglobals file to set up the font
-kdeglobalsfile=$configDir/kdeglobals
-test -f $kdeglobalsfile || {
@ -287,7 +287,7 @@ index e9fa0bee..79e50a96 100644
EOF
-}
+fi
-kstartupconfig5
-returncode=$?
-if test $returncode -ne 0; then
@ -300,13 +300,13 @@ index e9fa0bee..79e50a96 100644
+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
+ . "$XDG_CONFIG_HOME/startupconfig"
+fi
if [ "$kdeglobals_kscreen_screenscalefactors" ]; then
export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors"
@@ -94,26 +176,33 @@ fi
#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
export QT_AUTO_SCREEN_SCALE_FACTOR=0
+#Set the QtQuickControls style to our own: for QtQuickControls1
+#it will fall back to Desktop, while it will use our own org.kde.desktop
+#for QtQuickControlsStyle and Kirigami
@ -342,7 +342,7 @@ index e9fa0bee..79e50a96 100644
+ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
fi
fi
-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
- xrdb -quiet -merge -nocpp <<EOF
+if [ "${kcmfonts_general_forcefontdpi:-0}" -ne 0 ]; then
@ -352,7 +352,7 @@ index e9fa0bee..79e50a96 100644
fi
@@ -122,11 +211,11 @@ dl=$DESKTOP_LOCKED
unset DESKTOP_LOCKED # Don't want it in the environment
ksplash_pid=
-if test -z "$dl"; then
+if [ -z "$dl" ]; then
@ -367,7 +367,7 @@ index e9fa0bee..79e50a96 100644
@@ -135,71 +224,6 @@ if test -z "$dl"; then
esac
fi
-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
-# (where <config locations> correspond to the system and user's configuration
-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
@ -451,9 +451,9 @@ index e9fa0bee..79e50a96 100644
- export GS_LIB
-fi
+@NIXPKGS_XSETROOT@ -cursor_name left_ptr
echo 'startkde: Starting up...' 1>&2
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
@ -472,19 +472,19 @@ index e9fa0bee..79e50a96 100644
export KDE_FULL_SESSION
-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
KDE_SESSION_VERSION=5
export KDE_SESSION_VERSION
-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-KDE_SESSION_UID=`id -ru`
+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru)
export KDE_SESSION_UID
XDG_CURRENT_DESKTOP=KDE
export XDG_CURRENT_DESKTOP
+# Enforce xcb QPA. Helps switching between Wayland and X sessions.
+export QT_QPA_PLATFORM=xcb
+
@ -527,7 +527,7 @@ index e9fa0bee..79e50a96 100644
- xmessage -geometry 500x100 "Could not sync environment to dbus."
exit 1
fi
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
# kdeinit unsets this variable before loading applications.
-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
@ -539,10 +539,10 @@ index e9fa0bee..79e50a96 100644
- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
exit 1
fi
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -303,34 +330,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
@ -568,12 +568,12 @@ index e9fa0bee..79e50a96 100644
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
fi
#Anything after here is logout/shutdown
-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
-if test x"$wait_drkonqi"x = x"true"x ; then
+if [ x"$wait_drkonqi"x = x"true"x ]; then
# wait for remaining drkonqi instances with timeout (in seconds)
@ -595,18 +595,18 @@ index e9fa0bee..79e50a96 100644
break
fi
@@ -339,15 +369,17 @@ fi
echo 'startkde: Shutting down...' 1>&2
# just in case
-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+if [ -n "$ksplash_pid" ]; then
+ kill "$ksplash_pid" 2>/dev/null
+fi
# Clean up
-kdeinit5_shutdown
+@NIXPKGS_KDEINIT5_SHUTDOWN@
unset KDE_FULL_SESSION
-xprop -root -remove KDE_FULL_SESSION
+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
@ -614,24 +614,24 @@ index e9fa0bee..79e50a96 100644
-xprop -root -remove KDE_SESSION_VERSION
+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
unset KDE_SESSION_UID
echo 'startkde: Done.' 1>&2
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
index fd232bdf..e1c8fff6 100644
--- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake
@@ -1,6 +1,6 @@
@@ -1,4 +1,4 @@
#!/bin/sh
#
-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
# Boot sequence:
@@ -17,17 +17,13 @@
#
# * Then ksmserver is started which takes control of the rest of the startup sequence
-# We need to create config folder so we can write startupconfigkeys
-if [ ${XDG_CONFIG_HOME} ]; then
- configDir=$XDG_CONFIG_HOME;
@ -641,7 +641,7 @@ index fd232bdf..e1c8fff6 100644
+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
+ . "$XDG_CONFIG_HOME/startupconfig"
fi
-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
-
-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
@ -653,7 +653,7 @@ index fd232bdf..e1c8fff6 100644
fi
@@ -36,11 +32,11 @@ dl=$DESKTOP_LOCKED
unset DESKTOP_LOCKED # Don't want it in the environment
ksplash_pid=
-if test -z "$dl"; then
+if [ -z "$dl" ]; then
@ -668,7 +668,7 @@ index fd232bdf..e1c8fff6 100644
@@ -52,48 +48,6 @@ fi
#In wayland we want Plasma to use Qt's scaling
export PLASMA_USE_QT_SCALING=1
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
@ -729,15 +729,15 @@ index fd232bdf..e1c8fff6 100644
- export GS_LIB
-fi
+@NIXPKGS_XSETROOT@ -cursor_name left_ptr
echo 'startplasma: Starting up...' 1>&2
# export our session variables to the Xwayland server
-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
# kdeinit unsets this variable before loading applications.
-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
@ -749,10 +749,10 @@ index fd232bdf..e1c8fff6 100644
- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
exit 1
fi
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -145,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
@ -767,10 +767,10 @@ index fd232bdf..e1c8fff6 100644
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
fi
-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
-if test x"$wait_drkonqi"x = x"true"x ; then
+if [ x"$wait_drkonqi"x = x"true"x ]; then
# wait for remaining drkonqi instances with timeout (in seconds)
@ -792,18 +792,18 @@ index fd232bdf..e1c8fff6 100644
break
fi
@@ -174,15 +117,17 @@ fi
echo 'startplasma: Shutting down...' 1>&2
# just in case
-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+if [ -n "$ksplash_pid" ]; then
+ kill "$ksplash_pid" 2>/dev/null
+fi
# Clean up
-kdeinit5_shutdown
+@NIXPKGS_KDEINIT5_SHUTDOWN@
unset KDE_FULL_SESSION
-xprop -root -remove KDE_FULL_SESSION
+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
@ -811,7 +811,7 @@ index fd232bdf..e1c8fff6 100644
-xprop -root -remove KDE_SESSION_VERSION
+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
unset KDE_SESSION_UID
echo 'startplasma: Done.' 1>&2
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
index 417a87d4..3f62745a 100644
@ -823,7 +823,7 @@ index 417a87d4..3f62745a 100644
-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
@ -861,7 +861,7 @@ index 417a87d4..3f62745a 100644
+if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
+ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
fi
-# We need to create config folder so we can write startupconfigkeys
-if [ ${XDG_CONFIG_HOME} ]; then
- configDir=$XDG_CONFIG_HOME;
@ -891,7 +891,7 @@ index 417a87d4..3f62745a 100644
+gtk-button-images=1
+EOF
fi
-mkdir -p $configDir
+# Set the default GTK 3 theme
+gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini"
@ -919,7 +919,7 @@ index 417a87d4..3f62745a 100644
+cursorSize=0
+EOF
+fi
#This is basically setting defaults so we can use them with kstartupconfig5
-cat >$configDir/startupconfigkeys <<EOF
+cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF
@ -933,7 +933,7 @@ index 417a87d4..3f62745a 100644
+kcmfonts General forceFontDPI 0
+kcmfonts General dontChangeAASettings true
EOF
# preload the user's locale on first start
-plasmalocalerc=$configDir/plasma-localerc
-test -f $plasmalocalerc || {
@ -946,7 +946,7 @@ index 417a87d4..3f62745a 100644
EOF
-}
+fi
# export LC_* variables set by kcmshell5 formats into environment
# so it can be picked up by QLocale and friends.
-exportformatssettings=$configDir/plasma-locale-settings.sh
@ -957,7 +957,7 @@ index 417a87d4..3f62745a 100644
+if [ -r "$exportformatssettings" ]; then
+ . "$exportformatssettings"
+fi
# Write a default kdeglobals file to set up the font
-kdeglobalsfile=$configDir/kdeglobals
-test -f $kdeglobalsfile || {
@ -1011,7 +1011,7 @@ index 417a87d4..3f62745a 100644
- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
- }
fi
-kstartupconfig5
-returncode=$?
-if test $returncode -ne 0; then
@ -1022,11 +1022,11 @@ index 417a87d4..3f62745a 100644
+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
+ . "$XDG_CONFIG_HOME/startupconfig"
+fi
#Manually disable auto scaling because we are scaling above
#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output
export QT_AUTO_SCREEN_SCALE_FACTOR=0
+XCURSOR_PATH=~/.icons
+IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
+for xdgDir in "${xdgDirs[@]}"; do
@ -1060,14 +1060,14 @@ index 417a87d4..3f62745a 100644
+ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
fi
fi
-if test "$kcmfonts_general_forcefontdpiwayland" -ne 0; then
+if [ "${kcmfonts_general_forcefontdpiwayland:-0}" -ne 0 ]; then
export QT_WAYLAND_FORCE_DPI=$kcmfonts_general_forcefontdpiwayland
else
export QT_WAYLAND_FORCE_DPI=96
fi
-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
-# (where <config locations> correspond to the system and user's configuration
-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
@ -1093,7 +1093,7 @@ index 417a87d4..3f62745a 100644
-done
-
echo 'startplasmacompositor: Starting up...' 1>&2
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
@ -1114,16 +1114,16 @@ index 417a87d4..3f62745a 100644
@@ -202,7 +200,7 @@ export KDE_FULL_SESSION
KDE_SESSION_VERSION=5
export KDE_SESSION_VERSION
-KDE_SESSION_UID=`id -ru`
+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru)
export KDE_SESSION_UID
XDG_CURRENT_DESKTOP=KDE
@@ -212,26 +210,47 @@ export XDG_CURRENT_DESKTOP
QT_QPA_PLATFORM=wayland
export QT_QPA_PLATFORM
+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
+# (where <config locations> correspond to the system and user's configuration
+# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
@ -1165,12 +1165,12 @@ index 417a87d4..3f62745a 100644
+ echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2
+ exit 1
fi
-@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma
+@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@
echo 'startplasmacompositor: Shutting down...' 1>&2
unset KDE_FULL_SESSION
-xprop -root -remove KDE_FULL_SESSION
+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
@ -1178,7 +1178,7 @@ index 417a87d4..3f62745a 100644
-xprop -root -remove KDE_SESSION_VERSION
+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
unset KDE_SESSION_UID
echo 'startplasmacompositor: Done.' 1>&2
diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in
index 0a51b84b..f48b5d8a 100644

352
pkgs/desktops/plasma-5/srcs.nix
View File

@ -3,355 +3,355 @@
{
bluedevil = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/bluedevil-5.11.2.tar.xz";
sha256 = "0gwvmy8zn3wcdvcgc5j84gy1y7cxysy7bvnppg34rh6l5qc7vvjq";
name = "bluedevil-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/bluedevil-5.11.3.tar.xz";
sha256 = "1sgnj3z4s1k7h2ddvcq9r67qc8gbd4yv7zb9a24gi3x3iwd5hsf3";
name = "bluedevil-5.11.3.tar.xz";
};
};
breeze = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/breeze-5.11.2.tar.xz";
sha256 = "1wv5dp657gw4vyiv9zf6r8qbs67sp5g0x0kf1vmr1bp0gkw0ai81";
name = "breeze-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/breeze-5.11.3.tar.xz";
sha256 = "1xlh8m9fw3009gdi0v1nn945rm1zg908apv8v9lgkgks6s2sspxk";
name = "breeze-5.11.3.tar.xz";
};
};
breeze-grub = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/breeze-grub-5.11.2.tar.xz";
sha256 = "04m74iy0rijccmvqd7c9n4p6nk3flmb3zaf5qk8hv31qscg5qjaj";
name = "breeze-grub-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/breeze-grub-5.11.3.tar.xz";
sha256 = "1v1ha0j9kh4vcxknnwk78lzigvpqdrcj4gv6h86pxmwsipr5l2bl";
name = "breeze-grub-5.11.3.tar.xz";
};
};
breeze-gtk = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/breeze-gtk-5.11.2.tar.xz";
sha256 = "0c3vshnkgp6c38rwr1x34hn244r78qkc7fj0ax2cibydv3l852d4";
name = "breeze-gtk-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/breeze-gtk-5.11.3.tar.xz";
sha256 = "1f9xlmc6mhr25mji8ir46qslnfa0i7q7pqkzp1hm5ss3kzdd45gb";
name = "breeze-gtk-5.11.3.tar.xz";
};
};
breeze-plymouth = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/breeze-plymouth-5.11.2.tar.xz";
sha256 = "1v43z59y0zzwsrwa0y255i2q8krvr9yafdciyr63v4pb2564v4sd";
name = "breeze-plymouth-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/breeze-plymouth-5.11.3.tar.xz";
sha256 = "11m65cg74cfhglsppahnppisqp4rnj528b93k78pgvb4xazm7s76";
name = "breeze-plymouth-5.11.3.tar.xz";
};
};
discover = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/discover-5.11.2.tar.xz";
sha256 = "0j31x26s446xvi6dxr83v15xbr6ysifiwvdzil8yfsynifhjk5n3";
name = "discover-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/discover-5.11.3.tar.xz";
sha256 = "1bavw2hynmznd72wmh4cmy6zs4a13gxcsh6gznd99g6shry8svix";
name = "discover-5.11.3.tar.xz";
};
};
drkonqi = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/drkonqi-5.11.2.tar.xz";
sha256 = "1mgcp8zk4md0cyx6z6zz9s64jx9yshlnmsf1jxzhqwg8lyhyb77b";
name = "drkonqi-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/drkonqi-5.11.3.tar.xz";
sha256 = "1683h4nzk9kgwzwjzkr0bmk8vmq07991x4239z3p39z4gnvsmb0h";
name = "drkonqi-5.11.3.tar.xz";
};
};
kactivitymanagerd = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kactivitymanagerd-5.11.2.tar.xz";
sha256 = "165nybhn7pwgr6fds6frwcp3qsnxpmkz3842h0ni0flkkcl74n52";
name = "kactivitymanagerd-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kactivitymanagerd-5.11.3.tar.xz";
sha256 = "1syprfgbcg1821v0mqnalnn3gr40sfvi3m9wcy1hbffqm2k561qq";
name = "kactivitymanagerd-5.11.3.tar.xz";
};
};
kde-cli-tools = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kde-cli-tools-5.11.2.tar.xz";
sha256 = "18pl9v2dxayzwzk4rw674ka3j45dj864604hgg0874kkr3kgsgka";
name = "kde-cli-tools-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kde-cli-tools-5.11.3.tar.xz";
sha256 = "0yhghfsyvx0xlmyigjm8hvp8d4s6pp8h6wbqrbfngslayq624cvi";
name = "kde-cli-tools-5.11.3.tar.xz";
};
};
kdecoration = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kdecoration-5.11.2.tar.xz";
sha256 = "0qkh3p1zzvk0yvlpbvwfgmb2wvj0gd3j2sbz10vplf66fm3ck2va";
name = "kdecoration-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kdecoration-5.11.3.tar.xz";
sha256 = "0ik62pavf9bw1mahiyqlc9qh2za31l4qa3fyz42y81phmr8hbj4a";
name = "kdecoration-5.11.3.tar.xz";
};
};
kde-gtk-config = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kde-gtk-config-5.11.2.tar.xz";
sha256 = "0vhmpma2ssp7nqdy8yd12d42y2a2fnsyyz9msi4s7n1w5qga0g5p";
name = "kde-gtk-config-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kde-gtk-config-5.11.3.tar.xz";
sha256 = "09k02ghsrc5bwk05a7jlyzgwr6a1mzwypy6q1yhkl8jcqaim18ff";
name = "kde-gtk-config-5.11.3.tar.xz";
};
};
kdeplasma-addons = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kdeplasma-addons-5.11.2.tar.xz";
sha256 = "0x1lgvcnrc9vcy9fqvc60ilmcm8pbym76fq784qmgnmzm0br3bq6";
name = "kdeplasma-addons-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kdeplasma-addons-5.11.3.tar.xz";
sha256 = "13vmr5m3gx2b757bnb74qjjr6faj2bn1qb9cngj0gnk9gbdgrwh1";
name = "kdeplasma-addons-5.11.3.tar.xz";
};
};
kgamma5 = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kgamma5-5.11.2.tar.xz";
sha256 = "0k6j6nl26bhdavfr4y0ph17fywprzxjnamh67vibk39xg6vwa56d";
name = "kgamma5-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kgamma5-5.11.3.tar.xz";
sha256 = "18g8rj4l1y1lwl2wrk4cdlpdn6gibbwbipdkmlk0hb4ad1bxkc96";
name = "kgamma5-5.11.3.tar.xz";
};
};
khotkeys = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/khotkeys-5.11.2.tar.xz";
sha256 = "1w1a06v2cgq48z0b1rz6px1g14hm7f5jxzxf7sa26yszsyhwqglm";
name = "khotkeys-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/khotkeys-5.11.3.tar.xz";
sha256 = "1bykjywj6yass35xv858azv9pw74wlqsss6hs9ra4sx0yh0n9ffp";
name = "khotkeys-5.11.3.tar.xz";
};
};
kinfocenter = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kinfocenter-5.11.2.tar.xz";
sha256 = "1131gnqapnin8i4bm3skzhfsqgcaynaxn9xgfwxnj64z41cc8z8l";
name = "kinfocenter-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kinfocenter-5.11.3.tar.xz";
sha256 = "1ip6zkrl81v987z7bj0mvkjmydyarxgih4gzkbgnpppl7746bs5n";
name = "kinfocenter-5.11.3.tar.xz";
};
};
kmenuedit = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kmenuedit-5.11.2.tar.xz";
sha256 = "03412s6wc9h2422lx57rg65zln9ywjk5gbs5mqjr6fi46a1zp5lg";
name = "kmenuedit-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kmenuedit-5.11.3.tar.xz";
sha256 = "1nks0lk1xnywx5r3bzr5npzapg5d25l73ygxq8988q1f4q39jlj6";
name = "kmenuedit-5.11.3.tar.xz";
};
};
kscreen = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kscreen-5.11.2.tar.xz";
sha256 = "0bs09zfq1cs1ajgvz4p7l5naa3g3vzp72v9q7qkncx8yqiffxlnc";
name = "kscreen-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kscreen-5.11.3.tar.xz";
sha256 = "03wcrqvqcsw47x504ydk3dkqw6x9dc2n3skh7asznmpda8ryb6dp";
name = "kscreen-5.11.3.tar.xz";
};
};
kscreenlocker = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kscreenlocker-5.11.2.tar.xz";
sha256 = "1k32nzhv9d4g5ijkx8bl22hp5j1g22frriwq14xjw47ga8vkqmxw";
name = "kscreenlocker-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kscreenlocker-5.11.3.tar.xz";
sha256 = "0i0xcakzznxsk0zqa664xavp64wbqgqim57bkp01wl82s3aik82v";
name = "kscreenlocker-5.11.3.tar.xz";
};
};
ksshaskpass = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/ksshaskpass-5.11.2.tar.xz";
sha256 = "1z3vm8kwyi9pf51bhpqf3phbjkbrqfj4iiqzzs0aqm0l5db5il0r";
name = "ksshaskpass-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/ksshaskpass-5.11.3.tar.xz";
sha256 = "1ij2xspd6clf8plqqgzx6zjq7c1sxrlf7ch9brnxprw29h5qfz34";
name = "ksshaskpass-5.11.3.tar.xz";
};
};
ksysguard = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/ksysguard-5.11.2.tar.xz";
sha256 = "0vy2ivsn0cg70n1cxwa2385fwh350xngc1429zjfcs0jj8lcj21l";
name = "ksysguard-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/ksysguard-5.11.3.tar.xz";
sha256 = "17b5lddmas5n1726xa5r8v0v6gmw6bzpvhcljk2r4yrly6gy3pv9";
name = "ksysguard-5.11.3.tar.xz";
};
};
kwallet-pam = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kwallet-pam-5.11.2.tar.xz";
sha256 = "1jr4zvf9c5npi9mcgil5byx4bwh6kaa205329p5z8i15n1zf250f";
name = "kwallet-pam-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kwallet-pam-5.11.3.tar.xz";
sha256 = "04ps2p3hjvkca8miqmg0xwh3i5van0jld2hb1xp737hy1dfpi9h4";
name = "kwallet-pam-5.11.3.tar.xz";
};
};
kwayland-integration = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kwayland-integration-5.11.2.tar.xz";
sha256 = "1dzlf9638d36h8z5a7rjbb0xl2wjqg04j37gn4jnjclm57bwlrjm";
name = "kwayland-integration-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kwayland-integration-5.11.3.tar.xz";
sha256 = "0j5czhq5r8pxy7pw00by0v75kk4lbijn7mrdnydlca3jjrdcgz6f";
name = "kwayland-integration-5.11.3.tar.xz";
};
};
kwin = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kwin-5.11.2.tar.xz";
sha256 = "1wvq4pll1adncj88qd7isc0ip7hx2c72ah0vvmvxmkwxa4r5a89b";
name = "kwin-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kwin-5.11.3.tar.xz";
sha256 = "1xgx7xn27lzqdwla45scfcnyxva97j2y2m7hgj60cd1mz686pill";
name = "kwin-5.11.3.tar.xz";
};
};
kwrited = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/kwrited-5.11.2.tar.xz";
sha256 = "17i33yvpvpj6q42c58adb99xs1yb7yfchs626vw5nmllv7r7496l";
name = "kwrited-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/kwrited-5.11.3.tar.xz";
sha256 = "0qm3x6ahnis1b98q9h53wdldsj7nqw35s1hcgfqzjqk7nnxzim5i";
name = "kwrited-5.11.3.tar.xz";
};
};
libkscreen = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/libkscreen-5.11.2.tar.xz";
sha256 = "18bf7mzzri7fj8iw60wqbs6w46lin8lninpqpcs5fwz6m81lcxsg";
name = "libkscreen-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/libkscreen-5.11.3.tar.xz";
sha256 = "01wbl1kinsvxfw5lq0wrhsk0fmv8gvkhr7m0w4lq1827wx68lfzw";
name = "libkscreen-5.11.3.tar.xz";
};
};
libksysguard = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/libksysguard-5.11.2.tar.xz";
sha256 = "12d0r4rilydbqdgkm256khvkb9m0hya3p27xqvv3hg77wgxzdl3f";
name = "libksysguard-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/libksysguard-5.11.3.tar.xz";
sha256 = "1jbcd2n1zd6ijybaffm5vs5b80130vii562s98xhinmifzsahzmy";
name = "libksysguard-5.11.3.tar.xz";
};
};
milou = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/milou-5.11.2.tar.xz";
sha256 = "0kxf2q0pk7kyfirrspgpwlnj18v8q2770rrmrv0jcfsgv4jhl2gj";
name = "milou-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/milou-5.11.3.tar.xz";
sha256 = "02j6f4ip7hgb5qpq9812g1pnm8fjd83dc923gyfpzb4i0nf6j93g";
name = "milou-5.11.3.tar.xz";
};
};
oxygen = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/oxygen-5.11.2.tar.xz";
sha256 = "18nkw02q7lzdhalmbwsb5i704szs19zc5a0z73smanf20cfq7a91";
name = "oxygen-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/oxygen-5.11.3.tar.xz";
sha256 = "0zg3qdnip1ad6980ga0lmxndbph3y4dw0qk73dd8022qw5f3ysyp";
name = "oxygen-5.11.3.tar.xz";
};
};
plasma-desktop = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plasma-desktop-5.11.2.tar.xz";
sha256 = "0dz57qywlircjjybxzb3mqxwaid86zdfwjgfwcb6fhm8rxhbhrzq";
name = "plasma-desktop-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plasma-desktop-5.11.3.tar.xz";
sha256 = "1igmq8zj71wf34ap2g0iakpjfq08mlg6yf1ly06111ygsinbg55a";
name = "plasma-desktop-5.11.3.tar.xz";
};
};
plasma-integration = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plasma-integration-5.11.2.tar.xz";
sha256 = "15vjmmrlk9dw0if0z3xam171f8z3qkjcllj3zyc0zxdwi2zw6i2l";
name = "plasma-integration-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plasma-integration-5.11.3.tar.xz";
sha256 = "0bqw5xp71yxciqzd3bmlgsd4mkjl4vcysd9s6bka5mxrlhkqxgx1";
name = "plasma-integration-5.11.3.tar.xz";
};
};
plasma-nm = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plasma-nm-5.11.2.tar.xz";
sha256 = "1h3ajq3fdv8fn0r51cpkhihacpjvpgzpfyg2m9aydh7ajygf0njq";
name = "plasma-nm-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plasma-nm-5.11.3.tar.xz";
sha256 = "1zqlg5jm3pgiirr98j3fl1h6wbhf4f06qainpy42b5w42vhizspk";
name = "plasma-nm-5.11.3.tar.xz";
};
};
plasma-pa = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plasma-pa-5.11.2.tar.xz";
sha256 = "1ckk4ckhy5y3b6cm7gahwkqvf8bxndk0srij3ggqdasxzdc4fjn8";
name = "plasma-pa-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plasma-pa-5.11.3.tar.xz";
sha256 = "07rwlqpmvbvdidhfhw8xk6lvarimd1mhm085vjk7g2wmzw5n69wl";
name = "plasma-pa-5.11.3.tar.xz";
};
};
plasma-sdk = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plasma-sdk-5.11.2.tar.xz";
sha256 = "10ayy3r36ysq3a79nlpqspfff0s28iq2xyp5767qpmzfrjby4bcx";
name = "plasma-sdk-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plasma-sdk-5.11.3.tar.xz";
sha256 = "17h42223agz4vvbff13xd1p7xa5swnhcrmh1779mswl1rfznrkys";
name = "plasma-sdk-5.11.3.tar.xz";
};
};
plasma-tests = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plasma-tests-5.11.2.tar.xz";
sha256 = "06k1cmmbyp4rslhmj6b1ngq6pg0hv9hmc3yi135vjgppj5x523mm";
name = "plasma-tests-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plasma-tests-5.11.3.tar.xz";
sha256 = "0ac2i66f3mywvkf7041sg3hsa97f69y5aibpk0fz41q9zi5jwzv3";
name = "plasma-tests-5.11.3.tar.xz";
};
};
plasma-vault = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plasma-vault-5.11.2.tar.xz";
sha256 = "1lxp40lmb03aicw9lz742i1lrigkki76yy7p5h9gnb4djzv5h0m6";
name = "plasma-vault-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plasma-vault-5.11.3.tar.xz";
sha256 = "12y2331lpp7i3fl6nbm78n6qh7hd7vmrvc94jkzwx5pbql6nx2ia";
name = "plasma-vault-5.11.3.tar.xz";
};
};
plasma-workspace = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-5.11.2.tar.xz";
sha256 = "12i7raf4qqinr3wd4kzz96pkng19c7mdjqz28m8jwb3c1gdlps2w";
name = "plasma-workspace-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plasma-workspace-5.11.3.tar.xz";
sha256 = "0skn3mg90ghx3bmlj7snbhap9z2fq0hab0gfi4pv80ggyl5jf9sp";
name = "plasma-workspace-5.11.3.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-wallpapers-5.11.2.tar.xz";
sha256 = "01a4cz7d15mrb96yhfvck61vbqdnw208mgssrllrmcfdn7hwalv1";
name = "plasma-workspace-wallpapers-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plasma-workspace-wallpapers-5.11.3.tar.xz";
sha256 = "1xbfghhb6bjlqs2fk3z8k3q0lfirqmyqyxym2w8k69im2fscg0rl";
name = "plasma-workspace-wallpapers-5.11.3.tar.xz";
};
};
plymouth-kcm = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/plymouth-kcm-5.11.2.tar.xz";
sha256 = "1dig5msins4grby4lvrrby0adjci8yplq1nw52xq571qvvcixjf4";
name = "plymouth-kcm-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/plymouth-kcm-5.11.3.tar.xz";
sha256 = "1sbxwvi402lcnzxalgr85srh8vd4wy26gav7q23qbhd5axh26f06";
name = "plymouth-kcm-5.11.3.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.11.2";
version = "1-5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/polkit-kde-agent-1-5.11.2.tar.xz";
sha256 = "0qbr8c3fn6yp6ixfcfg4190q2wdj1xlm6791nn23bynd0nrxmxb3";
name = "polkit-kde-agent-1-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/polkit-kde-agent-1-5.11.3.tar.xz";
sha256 = "088ch67syimxqlda0nczrrj1hb7ynsrwdcb0bq1pcndp57p71vzl";
name = "polkit-kde-agent-1-5.11.3.tar.xz";
};
};
powerdevil = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/powerdevil-5.11.2.tar.xz";
sha256 = "10ah28rqdn8xhz578yhcnampbfq7vh89gm0jzjx9ryxiv6rch2cw";
name = "powerdevil-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/powerdevil-5.11.3.tar.xz";
sha256 = "1807x3vzq24vip7dnl87cd1hn368vqk7cbyhai492irf20j7hn82";
name = "powerdevil-5.11.3.tar.xz";
};
};
sddm-kcm = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/sddm-kcm-5.11.2.tar.xz";
sha256 = "159qwvzk7g4ygg2sdb6k84vq0k1yadrgwzgq6sfbfhffim1w6dr1";
name = "sddm-kcm-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/sddm-kcm-5.11.3.tar.xz";
sha256 = "1c9dm8819yaynq6cbzcg0j77cz0cf2cwrz9cfmr4w65ypl937va5";
name = "sddm-kcm-5.11.3.tar.xz";
};
};
systemsettings = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/systemsettings-5.11.2.tar.xz";
sha256 = "11gcrd1i28hifjysvnj97fcy619h660j4bgszj9lmr8w554j0cri";
name = "systemsettings-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/systemsettings-5.11.3.tar.xz";
sha256 = "1abza0qmdhfdlr2k53lc4ymr42ri1pfv0yyf9plxhra7f7f2ylf7";
name = "systemsettings-5.11.3.tar.xz";
};
};
user-manager = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/user-manager-5.11.2.tar.xz";
sha256 = "1pyyhhi276s8503q65n25rqwcddcbzy6l2vl844dnmmpd1m0gi4r";
name = "user-manager-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/user-manager-5.11.3.tar.xz";
sha256 = "0d2i3ndq9vwr2m39i6qdn18bg4c19rqhfy2a38lhm30g288wxfbr";
name = "user-manager-5.11.3.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.11.2";
version = "5.11.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.2/xdg-desktop-portal-kde-5.11.2.tar.xz";
sha256 = "0yjidwqk25c7grj42facqfl84ai7h4fin0zlf8y9jdksv26hskl0";
name = "xdg-desktop-portal-kde-5.11.2.tar.xz";
url = "${mirror}/stable/plasma/5.11.3/xdg-desktop-portal-kde-5.11.3.tar.xz";
sha256 = "01jcya7xyrn3d99raqvbzfwllihzdpyizx757f87pgg43dmbggwm";
name = "xdg-desktop-portal-kde-5.11.3.tar.xz";
};
};
}

1331
pkgs/development/beam-modules/hex-packages.nix
View File

File diff suppressed because it is too large Load Diff

10
pkgs/development/compilers/ccl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, gcc, glibc, m4, coreutils }:
{ stdenv, fetchsvn, fetchpatch, gcc, glibc, m4, coreutils }:
let
options = rec {
@ -39,12 +39,18 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256;
};
patches = fetchpatch {
name = "ccl-1.11-glibc-2.26.patch";
url = https://patch-diff.githubusercontent.com/raw/Clozure/ccl/pull/80.patch;
sha256 = "02v6287w0nppfpvkn9dyd5rvq2zkgd47ia9gs17hrww2hgzr6agd";
};
buildInputs = [ gcc glibc m4 ];
CCL_RUNTIME = cfg.runtime;
CCL_KERNEL = cfg.kernel;
patchPhase = ''
postPatch = ''
substituteInPlace lisp-kernel/${CCL_KERNEL}/Makefile \
--replace "svnversion" "echo ${revision}" \
--replace "/bin/rm" "${coreutils}/bin/rm" \

43
pkgs/development/compilers/elm/packages/elm-format.nix
View File

@ -1,37 +1,40 @@
{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary
, bytestring, containers, directory, edit-distance, fetchgit
, filemanip, filepath, HUnit, indents, mtl, optparse-applicative
, parsec, pretty, process, QuickCheck, quickcheck-io
, regex-applicative, split, stdenv, tasty, tasty-golden
, tasty-hunit, tasty-quickcheck, text, union-find, wl-pprint
{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary
, bytestring, Cabal, cmark, containers, directory, fetchgit
, filepath, free, HUnit, indents, json, mtl, optparse-applicative
, parsec, process, QuickCheck, quickcheck-io, split, stdenv, tasty
, tasty-golden, tasty-hunit, tasty-quickcheck, text
}:
mkDerivation {
pname = "elm-format";
version = "0.5.2";
version = "0.7.0";
src = fetchgit {
url = "http://github.com/avh4/elm-format";
sha256 = "0lman7h6wr75y90javcc4y1scvwgv125gqqaqvfrd5xrfmm43gg8";
rev = "e452ed9342620e7bb0bc822983b96411d57143ef";
sha256 = "1snl2lrrzdwgzi68agi3sdw84aslj04pzzxpm1mam9ic6dzhn3jf";
rev = "da4b415c6a2b7e77b7d9f00beca3e45230e603fb";
};
isLibrary = false;
doHaddock = false;
isLibrary = true;
isExecutable = true;
executableHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base binary bytestring
containers directory edit-distance filemanip filepath indents mtl
optparse-applicative parsec pretty process regex-applicative split
text
setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base binary bytestring containers
directory filepath free indents json mtl optparse-applicative
parsec process split text
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base binary bytestring
containers directory edit-distance filemanip filepath HUnit indents
mtl optparse-applicative parsec pretty process QuickCheck
quickcheck-io regex-applicative split tasty tasty-golden
tasty-hunit tasty-quickcheck text union-find wl-pprint
base cmark containers HUnit mtl parsec QuickCheck quickcheck-io
split tasty tasty-golden tasty-hunit tasty-quickcheck text
];
jailbreak = true;
postInstall = ''
ln -s $out/bin/elm-format-0.18 $out/bin/elm-format
'';
postPatch = ''
sed -i "s|desc <-.*||" ./Setup.hs
sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"da4b415c\\\\\"\"|" ./Setup.hs
'';
homepage = http://elm-lang.org;
description = "A source code formatter for Elm";
license = stdenv.lib.licenses.bsd3;

1
pkgs/development/compilers/gcc/6/default.nix
View File

@ -73,6 +73,7 @@ let version = "6.4.0";
++ optional langAda ../gnat-cflags.patch
++ optional langFortran ../gfortran-driving.patch
++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26
;
javaEcj = fetchurl {

33
pkgs/development/compilers/gcc/struct-ucontext-libjava.patch Normal file
View File

@ -0,0 +1,33 @@
--- a/libjava/include/x86_64-signal.h
+++ a/libjava/include/x86_64-signal.h
@@ -28,7 +28,7 @@
#define HANDLE_DIVIDE_OVERFLOW \
do \
{ \
- struct ucontext *_uc = (struct ucontext *)_p; \
+ ucontext_t *_uc = (ucontext_t *)_p; \
gregset_t &_gregs = _uc->uc_mcontext.gregs; \
unsigned char *_rip = (unsigned char *)_gregs[REG_RIP]; \
\
--- a/libjava/include/i386-signal.h
+++ a/libjava/include/i386-signal.h
@@ -29,7 +29,7 @@
#define HANDLE_DIVIDE_OVERFLOW \
do \
{ \
- struct ucontext *_uc = (struct ucontext *)_p; \
+ ucontext_t *_uc = (ucontext_t *)_p; \
gregset_t &_gregs = _uc->uc_mcontext.gregs; \
unsigned char *_eip = (unsigned char *)_gregs[REG_EIP]; \
\
--- a/libjava/include/s390-signal.h
+++ a/libjava/include/s390-signal.h
@@ -51,7 +51,7 @@
struct \
{ \
unsigned long int uc_flags; \
- struct ucontext *uc_link; \
+ ucontext_t *uc_link; \
stack_t uc_stack; \
mcontext_t uc_mcontext; \
unsigned long sigmask[2]; \

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

@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre
, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
{ stdenv, fetchgit, fetchurl, cmake, pkgconfig, boost, libunwind, libmemcached
, pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
, libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
patches = [
./flexible-array-members-gcc6.patch
(fetchurl {
url = https://github.com/facebook/hhvm/commit/b506902af2b7c53de6d6c92491c2086472292004.patch;
sha256 = "1br7diczqks6b1xjrdsac599fc62m9l17gcx7dvkc0qj54lq7ys4";
})
];
enableParallelBuilding = false; # occasional build problems;

3
pkgs/development/compilers/julia/0.6.nix
View File

@ -80,6 +80,9 @@ stdenv.mkDerivation rec {
mv test/$i.jl{,.off}
touch test/$i.jl
done
sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl
sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl
'';
buildInputs = [

6
pkgs/development/compilers/llvm/3.5/libc++/default.nix
View File

@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
'"${libcxxabi}/lib/libc++abi.dylib"'
'';
patches = [ ./darwin.patch ];
patches = [
./darwin.patch
# glibc 2.26 fix
./xlocale-glibc-2.26.patch
];
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

17
pkgs/development/compilers/llvm/3.5/libc++/xlocale-glibc-2.26.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/include/__locale b/include/__locale
index 3daa1f1..cb8e151 100644
--- a/include/__locale
+++ b/include/__locale
@@ -29,10 +29,10 @@
# if __ANDROID_API__ <= 20
# include <support/android/locale_bionic.h>
# endif
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|| defined(__sun__) || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
# include <xlocale.h>
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header

2
pkgs/development/compilers/llvm/3.7/libc++/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
patches = [
./darwin.patch
./r242056.patch
# glibc 2.26 fix
./xlocale-glibc-2.26.patch
];
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

17
pkgs/development/compilers/llvm/3.7/libc++/xlocale-glibc-2.26.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/include/__locale b/include/__locale
index 1989558..1e42905 100644
--- a/include/__locale
+++ b/include/__locale
@@ -34,10 +34,10 @@
# include <support/solaris/xlocale.h>
#elif defined(_NEWLIB_VERSION)
# include <support/newlib/xlocale.h>
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
# include <xlocale.h>
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header

5
pkgs/development/compilers/llvm/3.8/libc++/default.nix
View File

@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
'';
patches = lib.optional stdenv.isDarwin ./darwin.patch;
patches = [
# glibc 2.26 fix
../../3.9/libc++/xlocale-glibc-2.26.patch
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

5
pkgs/development/compilers/llvm/3.9/libc++/default.nix
View File

@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
'';
patches = lib.optional stdenv.isDarwin ./darwin.patch;
patches = [
# glibc 2.26 fix
./xlocale-glibc-2.26.patch
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

19
pkgs/development/compilers/llvm/3.9/libc++/xlocale-glibc-2.26.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/include/__locale b/include/__locale
index 7bc701d..ea75c86 100644
--- a/include/__locale
+++ b/include/__locale
@@ -34,12 +34,12 @@
# include <support/solaris/xlocale.h>
#elif defined(_NEWLIB_VERSION)
# include <support/newlib/xlocale.h>
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
# include <xlocale.h>
#elif defined(_LIBCPP_HAS_MUSL_LIBC)
# include <support/musl/xlocale.h>
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header

8
pkgs/development/compilers/llvm/4/libc++/default.nix
View File

@ -10,8 +10,12 @@ stdenv.mkDerivation rec {
export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
'';
# https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc
patches = [ ./pthread_mach_thread_np.patch ];
patches = [
# https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc
./pthread_mach_thread_np.patch
# glibc 2.26 fix
./xlocale-glibc-2.26.patch
];
prePatch = ''
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"

19
pkgs/development/compilers/llvm/4/libc++/xlocale-glibc-2.26.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/include/__locale b/include/__locale
index f4882de..29443b4 100644
--- a/include/__locale
+++ b/include/__locale
@@ -34,12 +34,12 @@
# include <support/solaris/xlocale.h>
#elif defined(_NEWLIB_VERSION)
# include <support/newlib/xlocale.h>
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
# include <xlocale.h>
#elif defined(_LIBCPP_HAS_MUSL_LIBC)
# include <support/musl/xlocale.h>
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header

3
pkgs/development/compilers/neko/default.nix
View File

@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
+ "c6d9c6d796200990b3b6a53a4dc716c9192398e6.patch";
sha256 = "1pq0qhhb9gbhc3zbgylwp0amhwsz0q0ggpj6v2xgv0hfy7d63rcd";
})
# Glibc 2.26 no longer has xlocale.h, patch backported from upstream commit
# e286c8f3301fa443255a3101d14b7392467051b8.
./xlocale-fix.patch
];
buildInputs =

59
pkgs/development/compilers/neko/xlocale-fix.patch Normal file
View File

@ -0,0 +1,59 @@
commit 31d3ac3d691b2a1b07991e67302fd52b0f409cac
Author: Andy Li <andy@onthewings.net>
Date: Thu Jul 13 13:23:33 2017 +0800
include xlocale.h only if it is available since it is removed in recent glibc
see: https://bugzilla.redhat.com/show_bug.cgi?id=1464244
(Backported from e286c8f3301fa443255a3101d14b7392467051b8)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8de1702..d64cab9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 2.8.7)
+include(CheckIncludeFile)
project(neko C)
set(CMAKE_OSX_ARCHITECTURES x86_64)
@@ -48,6 +49,8 @@ set(NEKO_VERSION_MAJOR 2)
set(NEKO_VERSION_MINOR 1)
set(NEKO_VERSION_PATCH 0)
+check_include_file(xlocale.h HAVE_XLOCALE_H)
+
configure_file (
"${CMAKE_SOURCE_DIR}/vm/neko.h.in"
"${CMAKE_BINARY_DIR}/neko.h"
diff --git a/libs/std/sys.c b/libs/std/sys.c
index 8003d41..ae0cfee 100644
--- a/libs/std/sys.c
+++ b/libs/std/sys.c
@@ -41,7 +41,11 @@
# include <sys/time.h>
# include <sys/times.h>
# include <sys/wait.h>
+#ifdef HAVE_XLOCALE_H
# include <xlocale.h>
+#else
+# include <locale.h>
+#endif
#endif
#ifdef NEKO_MAC
diff --git a/vm/neko.h.in b/vm/neko.h.in
index bb9ec1b..147ecce 100644
--- a/vm/neko.h.in
+++ b/vm/neko.h.in
@@ -88,6 +88,8 @@
# include <stdint.h>
#endif
+#cmakedefine HAVE_XLOCALE_H
+
#define NEKO_VERSION_MAJOR @NEKO_VERSION_MAJOR@
#define NEKO_VERSION_MINOR @NEKO_VERSION_MINOR@
#define NEKO_VERSION_PATCH @NEKO_VERSION_PATCH@

4
pkgs/development/compilers/ponyc/pony-stable.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pony-stable-${version}";
version = "0.0.1";
version = "0.1.1";
src = fetchFromGitHub {
owner = "ponylang";
repo = "pony-stable";
rev = version;
sha256 = "0q05135mnzzdwam7cnmxq34clqhmc83yp2gi63sx20c74rcw3p6v";
sha256 = "0v4039iijjv93m89s3dsikcbp1y0hml6g1agj44s6w2g4m8kiiw3";
};
buildInputs = [ ponyc ];

4
pkgs/development/compilers/purescript/psc-package/default.nix
View File

@ -4,13 +4,13 @@ with lib;
mkDerivation rec {
pname = "psc-package";
version = "0.2.0";
version = "0.2.4";
src = fetchFromGitHub {
owner = "purescript";
repo = pname;
rev = "v${version}";
sha256 = "0vid8vc8n8xj0qa4gnm1any9s18rdh7yn960vgix17r7a3bdndwb";
sha256 = "0m1vcxa5zs4sqnnwgmxkhw1isdlmirp12yimn5345vwfvlxkc8kp";
};
isLibrary = false;

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

@ -37,7 +37,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 9.11
# LTS Haskell 9.12
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -327,7 +327,7 @@ default-package-overrides:
- c2hs ==0.28.2
- Cabal ==1.24.2.0
- cabal-dependency-licenses ==0.2.0.0
- cabal-doctest ==1.0.2
- cabal-doctest ==1.0.3
- cabal-file-th ==0.2.4
- cabal-helper ==0.7.3.0
- cabal-rpm ==0.11.2
@ -363,7 +363,7 @@ default-package-overrides:
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
- check-email ==1.0.2
- checkers ==0.4.7
- checkers ==0.4.9.5
- chell ==0.4.0.1
- choice ==0.2.2
- chunked-data ==0.3.0
@ -678,7 +678,7 @@ default-package-overrides:
- fail ==4.9.0.0
- farmhash ==0.1.0.5
- fasta ==0.10.4.2
- fast-builder ==0.0.0.6
- fast-builder ==0.0.1.0
- fast-digits ==0.2.1.0
- fast-logger ==2.4.10
- fast-math ==1.0.2
@ -985,6 +985,7 @@ default-package-overrides:
- haskell-src ==1.0.2.0
- haskell-src-exts ==1.18.2
- haskell-src-exts-simple ==1.19.0.0
- haskell-src-exts-util ==0.2.1.2
- haskell-src-meta ==0.8.0.1
- haskell-tools-ast ==0.8.1.0
- haskell-tools-backend-ghc ==0.8.1.0
@ -996,11 +997,11 @@ default-package-overrides:
- haskell-tools-refactor ==0.8.1.0
- haskell-tools-rewrite ==0.8.1.0
- haskintex ==0.7.0.1
- hasmin ==0.3.3
- hasmin ==0.3.3.1
- hasql ==0.19.18.2
- hasql-migration ==0.1.3
- hasql-pool ==0.4.2.1
- hasql-transaction ==0.5.1
- hasql-pool ==0.4.3
- hasql-transaction ==0.5.2
- hastache ==0.6.1
- hasty-hamiltonian ==1.3.0
- HaTeX ==3.17.3.1
@ -1054,7 +1055,7 @@ default-package-overrides:
- hjsonschema ==1.6.3
- hlibgit2 ==0.18.0.16
- hlibsass ==0.1.6.1
- hlint ==2.0.9
- hlint ==2.0.10
- hmatrix ==0.18.0.0
- hmatrix-gsl ==0.18.0.1
- hmatrix-gsl-stats ==0.4.1.7
@ -1154,7 +1155,7 @@ default-package-overrides:
- http-types ==0.9.1
- human-readable-duration ==0.2.0.3
- HUnit ==1.5.0.0
- HUnit-approx ==1.1
- HUnit-approx ==1.1.1.1
- hunit-dejafu ==0.6.0.0
- hvect ==0.4.0.0
- hw-balancedparens ==0.1.0.2
@ -1199,7 +1200,7 @@ default-package-overrides:
- imm ==1.2.0.0
- immortal ==0.2.2.1
- include-file ==0.1.0.3
- incremental-parser ==0.2.5.1
- incremental-parser ==0.2.5.2
- indentation-core ==0.0.0.1
- indentation-parsec ==0.0.0.1
- indents ==0.4.0.0
@ -1265,7 +1266,7 @@ default-package-overrides:
- json-schema ==0.7.4.1
- json-stream ==0.4.1.5
- JuicyPixels ==3.2.8.3
- JuicyPixels-extra ==0.2.1
- JuicyPixels-extra ==0.2.2
- JuicyPixels-scale-dct ==0.1.1.2
- jvm ==0.2.2
- jvm-streaming ==0.2
@ -1284,7 +1285,7 @@ default-package-overrides:
- kraken ==0.0.3
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==0.4.4
- lackey ==0.4.5
- lame ==0.1.1
- language-c ==0.6.1
- language-c-quote ==0.12.1
@ -1372,7 +1373,7 @@ default-package-overrides:
- machines-io ==0.2.0.13
- machines-process ==0.2.0.8
- magic ==1.1
- magicbane ==0.1.1
- magicbane ==0.1.2
- mainland-pretty ==0.6.1
- makefile ==1.0.0.4
- managed ==1.0.5
@ -1468,9 +1469,9 @@ default-package-overrides:
- monoid-extras ==0.4.2
- monoid-subclasses ==0.4.4
- monoid-transformer ==0.0.3
- mono-traversable ==1.0.2.1
- mono-traversable ==1.0.4.0
- mono-traversable-instances ==0.1.0.0
- morte ==1.6.10
- morte ==1.6.11
- mountpoints ==1.0.2
- mstate ==0.2.7
- mtl ==2.2.1
@ -1566,7 +1567,7 @@ default-package-overrides:
- Only ==0.1
- oo-prototypes ==0.1.0.0
- opaleye ==0.5.4.0
- opaleye-trans ==0.3.6
- opaleye-trans ==0.3.7
- OpenAL ==1.7.0.4
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.1
@ -1584,7 +1585,7 @@ default-package-overrides:
- optparse-applicative ==0.13.2.0
- optparse-generic ==1.2.2
- optparse-helper ==0.2.1.1
- optparse-simple ==0.0.3
- optparse-simple ==0.0.4
- optparse-text ==0.1.1.0
- osdkeys ==0.0
- overloaded-records ==0.4.2.0
@ -1689,14 +1690,14 @@ default-package-overrides:
- posix-realtime ==0.0.0.4
- postgresql-binary ==0.12.1
- postgresql-libpq ==0.9.3.1
- postgresql-schema ==0.1.11
- postgresql-schema ==0.1.13
- postgresql-simple ==0.5.3.0
- postgresql-simple-migration ==0.1.11.0
- postgresql-simple-opts ==0.2.0.2
- postgresql-simple-queue ==0.5.1.1
- postgresql-simple-url ==0.2.0.0
- postgresql-transactional ==1.1.1
- postgresql-typed ==0.5.1
- postgresql-typed ==0.5.2
- post-mess-age ==0.2.1.0
- pqueue ==1.3.2.3
- prednote ==0.36.0.4
@ -1784,7 +1785,7 @@ default-package-overrides:
- rank-product ==0.2.0.1
- Rasterific ==0.7.2.1
- rasterific-svg ==0.3.3
- ratel ==0.3.6
- ratel ==0.3.7
- ratel-wai ==0.2.0
- rattletrap ==2.5.0
- rawfilepath ==0.2.4
@ -2138,7 +2139,7 @@ default-package-overrides:
- terminal-progress-bar ==0.1.1.1
- terminal-size ==0.3.2.1
- terminfo ==0.4.1.0
- test-fixture ==0.5.0.2
- test-fixture ==0.5.1.0
- test-framework ==0.8.1.1
- test-framework-hunit ==0.3.0.2
- test-framework-quickcheck2 ==0.3.0.4
@ -2274,7 +2275,7 @@ default-package-overrides:
- unit-constraint ==0.0.0
- units ==2.4
- units-defs ==2.0.1.1
- units-parser ==0.1.0.1
- units-parser ==0.1.1
- universe ==1.0
- universe-base ==1.0.2.1
- universe-instances-base ==1.0
@ -2449,12 +2450,12 @@ default-package-overrides:
- xml-types ==0.3.6
- xmonad ==0.13
- xmonad-contrib ==0.13
- xmonad-extras ==0.13.1
- xmonad-extras ==0.13.2
- xss-sanitize ==0.3.5.7
- xturtle ==0.2.0.0
- yackage ==0.8.1
- yahoo-finance-api ==0.2.0.2
- yaml ==0.8.23.3
- yaml ==0.8.24
- Yampa ==0.10.6.2
- YampaSynth ==0.2
- yesod ==1.4.5

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