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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-04-11 07:50:23 +02:00
commit 230c67f43b
126 changed files with 2440 additions and 3491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/systems/examples.nix
View File

@ -44,14 +44,6 @@ rec {
platform = platforms.aarch64-multiplatform;
};
armv5te-android-prebuilt = rec {
config = "armv5tel-unknown-linux-androideabi";
sdkVer = "21";
ndkVer = "18b";
platform = platforms.armv5te-android;
useAndroidPrebuilt = true;
};
armv7a-android-prebuilt = rec {
config = "armv7a-unknown-linux-androideabi";
sdkVer = "24";

10
lib/systems/platforms.nix
View File

@ -253,16 +253,6 @@ rec {
kernelTarget = "zImage";
};
# https://developer.android.com/ndk/guides/abis#armeabi
armv5te-android = {
name = "armeabi";
gcc = {
arch = "armv5te";
float = "soft";
float-abi = "soft";
};
};
# https://developer.android.com/ndk/guides/abis#v7a
armv7a-android = {
name = "armeabi-v7a";

20
maintainers/maintainer-list.nix
View File

@ -1234,6 +1234,11 @@
github = "disassembler";
name = "Samuel Leathers";
};
disserman = {
email = "disserman@gmail.com";
github = "divi255";
name = "Sergei S.";
};
dizfer = {
email = "david@izquierdofernandez.com";
github = "dizfer";
@ -1618,6 +1623,11 @@
github = "FireyFly";
name = "Jonas Höglund";
};
flexw = {
email = "felix.weilbach@t-online.de";
github = "FlexW";
name = "Felix Weilbach";
};
flokli = {
email = "flokli@flokli.de";
github = "flokli";
@ -5262,6 +5272,11 @@
github = "xnwdd";
name = "Guillermo NWDD";
};
xrelkd = {
email = "46590321+xrelkd@users.noreply.github.com";
github = "xrelkd";
name = "xrelkd";
};
xurei = {
email = "olivier.bourdoux@gmail.com";
github = "xurei";
@ -5441,4 +5456,9 @@
github = "shazow";
name = "Andrey Petrov";
};
freezeboy = {
email = "freezeboy@users.noreply.github.com";
github = "freezeboy";
name = "freezeboy";
};
}

35
nixos/doc/manual/release-notes/rl-1903.xml
View File

@ -31,33 +31,22 @@
</para>
<note>
<para>
<varname>services.xserver.desktopManager.pantheon</varname> default
enables lightdm as a display manager and using Pantheon's greeter.
By default, <varname>services.xserver.desktopManager.pantheon</varname>
enables LightDM as a display manager, as pantheon's screen locking
implementation relies on it.
</para>
<para>
This is because of limitations with the screenlocking implementation,
whereas the screenlocker would be non-functional without it.
</para>
<para>
Because of that it is recommended to retain this precaution, however if
you'd like to change this set:
</para>
<itemizedlist>
<listitem>
<para>
<option>services.xserver.displayManager.lightdm.enable</option>
</para>
</listitem>
<listitem>
<para>
<option>services.xserver.displayManager.lightdm.greeters.pantheon.enable</option>
</para>
</listitem>
</itemizedlist>
<para>
to <literal>false</literal> and enable your preferred display manager.
Because of that it is recommended to leave LightDM enabled. If you'd like
to disable it anyway, set
<option>services.xserver.displayManager.lightdm.enable</option> to
<literal>false</literal> and enable your preferred display manager.
</para>
</note>
<para>
Also note that Pantheon's LightDM greeter is not enabled by default,
because it has numerous issues in NixOS and isn't optimal for use here
yet.
</para>
</listitem>
<listitem>
<para>

51
nixos/doc/manual/release-notes/rl-1909.xml
View File

@ -65,6 +65,23 @@
</para>
<itemizedlist>
<listitem>
<para>
Buildbot no longer supports Python 2, as support was dropped upstream in
version 2.0.0. Configurations may need to be modified to make them
compatible with Python 3.
</para>
</listitem>
<listitem>
<para>
PostgreSQL now uses
<filename class="directory">/run/postgresql</filename> as its socket
directory instead of <filename class="directory">/tmp</filename>. So
if you run an application like eg. Nextcloud, where you need to use
the Unix socket path as the database host name, you need to change it
accordingly.
</para>
</listitem>
<listitem>
<para>
The directory where Prometheus will store its metric data is now
@ -84,37 +101,13 @@
<option>services.prometheus.stateDir</option> at the same time.
</para>
</listitem>
</itemizedlist>
</section>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-19.09-incompatibilities">
<title>Backward Incompatibilities</title>
<para>
When upgrading from a previous release, please be aware of the following
incompatible changes:
</para>
<itemizedlist>
<listitem>
<para>
Buildbot no longer supports Python 2, as support was dropped upstream in
version 2.0.0. Configurations may need to be modified to make them
compatible with Python 3.
</para>
</listitem>
<listitem>
<para>
PostgreSQL now uses
<filename class="directory">/run/postgresql</filename> as its socket
directory instead of <filename class="directory">/tmp</filename>. So
if you run an application like eg. Nextcloud, where you need to use
the Unix socket path as the database host name, you need to change it
accordingly.
The options <option>services.prometheus.alertmanager.user</option> and
<option>services.prometheus.alertmanager.group</option> have been removed
because the alertmanager service is now using systemd's <link
xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html">
DynamicUser mechanism</link> which obviates these options.
</para>
</listitem>
<listitem>

2
nixos/modules/rename.nix
View File

@ -45,6 +45,8 @@ with lib;
(mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")
(mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.")
(mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.")
(mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
(mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])
(mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])

11
nixos/modules/services/hardware/triggerhappy.nix
View File

@ -57,6 +57,15 @@ in
'';
};
user = mkOption {
type = types.str;
default = "nobody";
example = "root";
description = ''
User account under which <command>triggerhappy</command> runs.
'';
};
bindings = mkOption {
type = types.listOf (types.submodule bindingCfg);
default = [];
@ -96,7 +105,7 @@ in
after = [ "local-fs.target" ];
description = "Global hotkey daemon";
serviceConfig = {
ExecStart = "${pkgs.triggerhappy}/bin/thd --user nobody --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
ExecStart = "${pkgs.triggerhappy}/bin/thd ${optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
};
};

44
nixos/modules/services/mail/roundcube.nix
View File

@ -141,27 +141,31 @@ in
systemd.services.roundcube-setup = let
pgSuperUser = config.services.postgresql.superUser;
in {
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
path = [ config.services.postgresql.package ];
script = ''
mkdir -p /var/lib/roundcube
if [ ! -f /var/lib/roundcube/db-created ]; then
if [ "${cfg.database.host}" = "localhost" ]; then
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
in mkMerge [
(mkIf (cfg.database.host == "localhost") {
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
path = [ config.services.postgresql.package ];
})
{
wantedBy = [ "multi-user.target" ];
script = ''
mkdir -p /var/lib/roundcube
if [ ! -f /var/lib/roundcube/db-created ]; then
if [ "${cfg.database.host}" = "localhost" ]; then
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
fi
PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
-f ${cfg.package}/SQL/postgres.initial.sql \
-h ${cfg.database.host} ${cfg.database.dbname}
touch /var/lib/roundcube/db-created
fi
PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
-f ${cfg.package}/SQL/postgres.initial.sql \
-h ${cfg.database.host} ${cfg.database.dbname}
touch /var/lib/roundcube/db-created
fi
${pkgs.php}/bin/php ${cfg.package}/bin/update.sh
'';
serviceConfig.Type = "oneshot";
};
${pkgs.php}/bin/php ${cfg.package}/bin/update.sh
'';
serviceConfig.Type = "oneshot";
}
];
};
}

28
nixos/modules/services/monitoring/prometheus/alertmanager.nix
View File

@ -40,22 +40,6 @@ in {
'';
};
user = mkOption {
type = types.str;
default = "nobody";
description = ''
User name under which Alertmanager shall be run.
'';
};
group = mkOption {
type = types.str;
default = "nogroup";
description = ''
Group under which Alertmanager shall be run.
'';
};
configuration = mkOption {
type = types.nullOr types.attrs;
default = null;
@ -151,17 +135,13 @@ in {
systemd.services.alertmanager = {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
script = ''
${cfg.package}/bin/alertmanager \
${concatStringsSep " \\\n " cmdlineArgs}
'';
serviceConfig = {
User = cfg.user;
Group = cfg.group;
Restart = "always";
PrivateTmp = true;
DynamicUser = true;
WorkingDirectory = "/tmp";
ExecStart = "${cfg.package}/bin/alertmanager" +
optionalString (length cmdlineArgs != 0) (" \\\n " +
concatStringsSep " \\\n " cmdlineArgs);
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
};

8
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -73,8 +73,14 @@ in
# Ensure lightdm is used when Pantheon is enabled
# Without it screen locking will be nonfunctional because of the use of lightlocker
warnings = optional (config.services.xserver.displayManager.lightdm.enable != true)
''
Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
'';
services.xserver.displayManager.lightdm.enable = mkDefault true;
services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true;
# If not set manually Pantheon session cannot be started
# Known issue of https://github.com/NixOS/nixpkgs/pull/43992

7
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
View File

@ -33,6 +33,13 @@ in
config = mkIf (ldmcfg.enable && cfg.enable) {
warnings = [
''
The Pantheon greeter is suboptimal in NixOS and can possibly put you in
a situation where you cannot start a session when switching desktopManagers.
''
];
services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
services.xserver.displayManager.lightdm.greeter = mkDefault {

1
nixos/tests/nginx.nix
View File

@ -28,6 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.nginx.virtualHosts."0.my.test" = {
extraConfig = ''
access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;
location /favicon.ico { allow all; access_log off; log_not_found off; }
'';
};
};

6
pkgs/applications/altcoins/ethabi.nix
View File

@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec {
name = "ethabi-${version}";
version = "4.1.0";
version = "7.0.0";
src = fetchFromGitHub {
owner = "paritytech";
repo = "ethabi";
rev = "v${version}";
sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p";
sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4";
};
cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz";
cargoSha256 = "0ckj5s5fr7xdqpnn4m9zwa1w71g6wwqqvax6f4xkijxdcx83n6c2";
cargoBuildFlags = ["--features cli"];

4
pkgs/applications/altcoins/go-ethereum.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "go-ethereum-${version}";
version = "1.8.22";
version = "1.8.26";
goPackagePath = "github.com/ethereum/go-ethereum";
# Fix for usb-related segmentation faults on darwin
@ -16,7 +16,7 @@ buildGoPackage rec {
owner = "ethereum";
repo = "go-ethereum";
rev = "v${version}";
sha256 = "0ag9qxrf7n0qkccaf6v4jaysivpxvsy5zfzar3mcm65223pqy375";
sha256 = "0i7shrwix5j8l5i0ap5pzhninwyk2kvm1pax27pnnjlpam8577i4";
};
meta = with stdenv.lib; {

10
pkgs/applications/audio/gnome-podcasts/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3
{ stdenv, fetchurl, fetchpatch, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3
, glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
# TODO: build from git for easier updates
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "0g2rk3w251fp5jwbxs5ya1adv8nsgdqjy1vmfg8qqab6qyndhbrc";
};
patches = [
# podcasts-data would fail to build because it errors on warnings
(fetchpatch {
url = "https://gitlab.gnome.org/World/podcasts/commit/7dc1b25ee7fc59a188312d31b1fa00c3110ae63e.patch";
sha256 = "03ibbh1snk1391vnni529agqs14lzg5g0axjgpf3gn8dwwh1yvd5";
})
];
# src = fetchFromGitLab {
# domain = "gitlab.gnome.org";
# owner = "World";

16
pkgs/applications/audio/mixxx/default.nix
View File

@ -1,33 +1,33 @@
{ stdenv, fetchFromGitHub, makeWrapper, chromaprint, fetchpatch
, fftw, flac, faad2, glibcLocales, mp4v2
, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
, opusfile
, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
, taglib, upower, vampSDK
, libGLU, libxcb, lilv, lv2, opusfile
, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK
}:
stdenv.mkDerivation rec {
name = "mixxx-${version}";
version = "2.1.5";
version = "2.2.0";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = "release-${version}";
sha256 = "0h14pwglz03sdmgzviypv1qa1xfjclrnhyqaq5nd60j47h4z39dr";
sha256 = "1rp2nyhz2j695k5kk0m94x30akwrlr9jgs0n4pi4snnvjpwmbfp9";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
libusb1 libvorbis opusfile pkgconfig portaudio portmidi protobuf qt4
rubberband scons sqlite taglib upower vampSDK
libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
qtx11extras rubberband scons sqlite taglib upower vampSDK
];
sconsFlags = [
"build=release"
"qtdir=${qt4}"
"qtdir=${qtbase}"
"faad=1"
"opus=1"
];

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

@ -10,14 +10,14 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
version = "1.1.0.237.g378f6f25-11";
version = "1.0.96.181.gf6bc1b6b-12";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
rev = "34";
rev = "30";
deps = [
@ -71,7 +71,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
sha512 = "beddfa8f5de9998e8d1dca32295d03bdf41ec2c23eca82fcf56e5bae7b8fb84c036627b02ea458623a72a01ba09ef83cc50acdd06f2810bd444aae450d4861e6";
sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56";
};
buildInputs = [ squashfsTools makeWrapper ];

40
pkgs/applications/audio/vocal/default.nix
View File

@ -1,41 +1,59 @@
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk
, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
{ stdenv
, fetchFromGitHub
, cmake
, ninja
, pkgconfig
, pantheon
, gtk3
, glib
, libxml2
, webkitgtk
, clutter-gtk
, clutter-gst
, libunity
, libnotify
, sqlite
, gst_all_1
, libsoup
, json-glib
, libgee
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "vocal";
version = "2.3.0";
name = "${pname}-${version}";
version = "2.4.0";
src = fetchFromGitHub {
owner = "needle-and-thread";
repo = pname;
rev = version;
sha256 = "1wkkyai14in4yk3q4qq23wk3l49px2xi8z819y3glna236qsq6qp";
sha256 = "09g9692rckdwh1i5krqgfwdx4p67b1q5834cnxahxzpq4p08rf5w";
};
nativeBuildInputs = [
cmake
gobject-introspection
libxml2
ninja
pkgconfig
pantheon.vala
pkgconfig
wrapGAppsHook
];
buildInputs = with gst_all_1; [
clutter-gst
clutter-gtk
pantheon.elementary-icon-theme
gnome3.libgee
pantheon.granite
glib
gst-plugins-base
gst-plugins-good
gstreamer
gtk3
json-glib
libgee
libnotify
libunity
pantheon.elementary-icon-theme
pantheon.granite
sqlite
webkitgtk
];

1
pkgs/applications/graphics/drawpile/default.nix
View File

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
downloadPage = https://drawpile.net/download/;
license = licenses.gpl3;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.unix;
};
}

8
pkgs/applications/graphics/gimp/default.nix
View File

@ -8,12 +8,12 @@
let
inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec {
name = "gimp-${version}";
version = "2.10.8";
pname = "gimp";
version = "2.10.10";
src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
sha256 = "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq";
url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j";
};
nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];

4
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -13,12 +13,12 @@ let
inherit (python2.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
version = "8.0.14";
version = "8.0.15";
name = "${pname}-${version}";
src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
sha256 = "0mz615drx18h0frc6fq9nknqbpq7lr0xlsfmxd5irw2jz629lj76";
sha256 = "0ca93azasya5xiw6j2map8drmxf445qqydpvrb512kjfqdiv67x6";
};
patches = [

41
pkgs/applications/misc/plank/default.nix
View File

@ -1,36 +1,49 @@
{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus
, wrapGAppsHook, autoreconfHook, gobject-introspection }:
, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
, wrapGAppsHook, autoreconfHook, pantheon }:
stdenv.mkDerivation rec {
pname = "plank";
version = "0.11.4";
name = "${pname}-${version}";
src = fetchurl {
url = "https://launchpad.net/${pname}/1.0/${version}/+download/${name}.tar.xz";
url = "https://launchpad.net/${pname}/1.0/${version}/+download/${pname}-${version}.tar.xz";
sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8";
};
nativeBuildInputs = [
pkgconfig
autoreconfHook
gnome3.gnome-common
intltool
libxml2 # xmllint
pkgconfig
vala
wrapGAppsHook
gobject-introspection
autoreconfHook
];
buildInputs = [ vala atk cairo glib gnome-menus
gtk3 gnome3.libgee libwnck3 libX11 libXfixes
libXi pango gnome3.gnome-common bamf gdk_pixbuf
libdbusmenu-gtk3 gnome3.dconf ];
buildInputs = [
atk
bamf
cairo
gdk_pixbuf
glib
gnome-menus
gnome3.dconf
gtk3
libX11
libXfixes
libXi
libdbusmenu-gtk3
libgee
libwnck3
pango
];
# fix paths
makeFlags = [
"INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
"INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/"
"INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
];
# Make plank's application launcher hidden in Pantheon
@ -46,6 +59,6 @@ stdenv.mkDerivation rec {
homepage = https://launchpad.net/plank;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ davidak ];
maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;
};
}

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

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "brig-${version}";
version = "0.3.0";
version = "0.4.1";
rev = "v${version}";
goPackagePath = "github.com/sahib/brig";
@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "sahib";
repo = "brig";
inherit rev;
sha256 = "01hpb6cvq8cw21ka74jllggkv5pavc0sbl1207x32gzxslw3gsvy";
sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600";
};
meta = with stdenv.lib; {

1
pkgs/applications/networking/browsers/arora/default.nix
View File

@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.phreedom ];
description = "A cross-platform Qt4 Webkit browser";
homepage = https://github.com/Arora/arora;
license = with licenses; [ gpl2 gpl3 ];
};
}

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -100,11 +100,11 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "32.0.0.156";
version = "32.0.0.171";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "0mf2p3qk82s2nwz1x8g92434wpdqgnd9jj8w88z4qksa9qhbbfh7";
sha256 = "1rqf1kidpf2jqf20dw3hscrapdpm2j751742i6xnvj9mp66nczyg";
stripRoot = false;
};

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "32.0.0.156";
version = "32.0.0.171";
src = fetchurl {
url =
@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"0h16vdar4p8zj6w57ihll71xjr9sy7hdiq4qwvvqndah5c4ym8xl"
"0dl2kxsn4wh3243qkwyq13ikbmz6ljg95a1v02cylz36kpfl51iv"
else
"06l59zid6n4b606254r937cvk95pyymlczadh4cpl6l4xncspdy6"
"1v9imcyml55qlvp0cibi5r5kl0rcivzvmnqgw8ph3xjm1yrxw3fr"
else
if arch == "x86_64" then
"0b3qssn1fgm2v715l6nksqmwly7j9asgqh9yqjhpp7jsb84bvzk4"
"1f3nl4qkws16q2yw940vvb0zmmwxks1blm4ida65hlda6f9zfq3h"
else
"03qdwrlvs4090s9b9fn2l6g3wsbi6q81jf59s1s5gh7qhi4i0lhy";
"0df9nbxyn4wl4ap333mgnnmy994xj7i5hz07sw83pszlz3pjkc0m";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -50,7 +50,7 @@
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "32.0.0.156";
version = "32.0.0.171";
src = fetchurl {
url =
@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"0fzs2x8yxpykkza1r3yn17hmrdz51c7qigbm5qifvw59q9zl15i9"
"0z4fkqbq1s63lpzfkyxllwx2wpizbabr4zim1dn7n59ld75vjxq8"
else
"11733155aznijwhnc5wv0v6wmw9g1akbqwl07kx3lam571s8aywr";
"0nvgcdmgvgbj6axrh0yzkk437bxwsaxl0mvfkcyyz1hxnq51dvvg";
};
nativeBuildInputs = [ unzip ];

2
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -62,7 +62,7 @@ let unwrapped = stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/pidgin \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
meta = with stdenv.lib; {

4
pkgs/applications/networking/owncloud-client/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
version = "2.5.3.11470";
version = "2.5.4.11654";
src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n";
sha256 = "0gsnry0786crbnpgg3f1vcqw6mwbz6svhm6mw3767qi4lb33jm31";
};
nativeBuildInputs = [ pkgconfig cmake ];

3
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -9,7 +9,6 @@
, pcsclite ? null
, systemd ? null
, buildServer ? true
, optimize ? true
}:
stdenv.mkDerivation rec {
@ -58,7 +57,7 @@ stdenv.mkDerivation rec {
++ optional (cups != null) "-DWITH_CUPS=ON"
++ optional (pcsclite != null) "-DWITH_PCSC=ON"
++ optional buildServer "-DWITH_SERVER=ON"
++ optional (optimize && stdenv.isx86_64) "-DWITH_SSE2=ON";
++ optional (stdenv.isx86_64) "-DWITH_SSE2=ON";
meta = with lib; {
description = "A Remote Desktop Protocol Client";

4
pkgs/applications/networking/resilio-sync/default.nix
View File

@ -9,12 +9,12 @@ let
in stdenv.mkDerivation rec {
name = "resilio-sync-${version}";
version = "2.6.3";
version = "2.6.2";
src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
"x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz";
"x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2";
"i686-linux" = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h";
}.${stdenv.hostPlatform.system};
};

57
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -1,19 +1,17 @@
{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
, withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
}:
assert withGtk -> !withQt && gtk3 != null;
assert withQt -> !withGtk && qt5 != null;
assert withQt -> qt5 != null;
with stdenv.lib;
let
version = "2.6.6";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
version = "3.0.1";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
name = "wireshark-${variant}-${version}";
@ -21,11 +19,10 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0qz8a1ays63712pq1v7nnw7c57zlqkcifq7himfv5nsv0zm36ya8";
sha256 = "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6";
};
cmakeFlags = [
"-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}"
"-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
"-DENABLE_QT5=${if withQt then "ON" else "OFF"}"
"-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
@ -33,13 +30,12 @@ in stdenv.mkDerivation {
nativeBuildInputs = [
bison cmake extra-cmake-modules flex pkgconfig
] ++ optional withGtk wrapGAppsHook;
];
buildInputs = [
gettext pcre perl libpcap lua5 libssh openssl libgcrypt
libgpgerror gnutls geoip c-ares python glib zlib makeWrapper
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ]
++ optionals stdenv.isLinux [ libcap libnl ]
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
@ -60,32 +56,29 @@ in stdenv.mkDerivation {
export LD_LIBRARY_PATH="$PWD/run"
'';
postInstall = if stdenv.isDarwin then ''
${optionalString withQt ''
mkdir -p $out/Applications
mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
postInstall = ''
# to remove "cycle detected in the references"
mkdir -p $dev/lib/wireshark
mv $out/lib/wireshark/cmake $dev/lib/wireshark
'' + (if stdenv.isDarwin && withQt then ''
mkdir -p $out/Applications
mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do
install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib
install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib
install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib
done
for f in $(find $out/Applications/Wireshark.app/Contents/PlugIns -name "*.so"); do
for dylib in $(otool -L $f | awk '/^\t*lib/ {print $1}'); do
install_name_tool -change "$dylib" "$out/lib/$dylib" "$f"
done
done
wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
--set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
''}
'' else optionalString (withQt || withGtk) ''
${optionalString withGtk ''
install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop
''}
${optionalString withQt ''
install -Dm644 -t $out/share/applications ../wireshark.desktop
wrapProgram $out/bin/wireshark \
'' else optionalString withQt ''
install -Dm644 -t $out/share/applications ../wireshark.desktop
wrapProgram $out/bin/wireshark \
--set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
''}
substituteInPlace $out/share/applications/*.desktop \
--replace "Exec=wireshark" "Exec=$out/bin/wireshark"
--replace "Exec=wireshark" "Exec=$out/bin/wireshark"
install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
@ -98,7 +91,7 @@ in stdenv.mkDerivation {
cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
cp ../wsutil/*.h $dev/include/wsutil/
cp ../wiretap/*.h $dev/include/wiretap
'';
'');
enableParallelBuilding = true;

22
pkgs/applications/office/scribus/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake, imagemagick }:
, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
let
icon = fetchurl {
@ -8,27 +8,35 @@ let
sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
};
pythonEnv = python2.withPackages(ps: [ps.tkinter]);
pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
in stdenv.mkDerivation rec {
name = "scribus-1.4.7";
pname = "scribus";
version = "1.4.8";
src = fetchurl {
url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz";
sha256 = "1v2ziq3k0yjz35nk5plcbc1jpi53p9v1cq1z3spch9lwlns3bls2";
url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = with xorg;
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
[ freetype lcms libtiff libxml2 libart_lgpl qt4
pythonEnv cups fontconfig
libjpeg zlib libpng podofo aspell cairo
libjpeg zlib libpng podofo hunspell cairo
boost # for internal 2geom library
libXaw libXext libX11 libXtst libXi libXinerama
libpthreadstubs libXau libXdmcp
imagemagick # To build the icon
];
postPatch = ''
substituteInPlace scribus/util_ghostscript.cpp \
--replace 'QString gsName("gs");' \
'QString gsName("${ghostscript}/bin/gs");'
'';
postInstall = ''
for i in 16 24 48 64 96 128 256 512; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps

181
pkgs/applications/office/zotero/default.nix
View File

@ -1,67 +1,140 @@
{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }:
let
version = "5.0.60";
meta = with stdenv.lib; {
homepage = https://www.zotero.org;
description = "Collect, organize, cite, and share your research sources";
license = licenses.agpl3;
platforms = platforms.linux;
};
zoteroSrc = stdenv.mkDerivation rec {
inherit version;
name = "zotero-${version}-pkg";
{ stdenv, fetchurl, wrapGAppsHook, makeDesktopItem
, atk
, cairo
, curl
, cups
, dbus-glib
, dbus
, fontconfig
, freetype
, gdk_pixbuf
, glib
, glibc
, gtk3
, libX11
, libXScrnSaver
, libxcb
, libXcomposite
, libXcursor
, libXdamage
, libXext
, libXfixes
, libXi
, libXinerama
, libXrender
, libXt
, libnotify
, gnome3
, libGLU_combined
, nspr
, nss
, pango
, coreutils
, gnused
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
name = "zotero-${version}";
version = "5.0.60";
src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "0753xk95shhxma4dvdxrj2q6y81z8lianxg7jnab9m17fb67jy2d";
};
buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
phases = [ "unpackPhase" "installPhase" "fixupPhase"];
installPhase = ''
mkdir -p $out/data
cp -r * $out/data
mkdir $out/bin
ln -s $out/data/zotero $out/bin/zotero
phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
dontStrip = true;
dontPatchELF = true;
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc
atk
cairo
curl
cups
dbus-glib
dbus
fontconfig
freetype
gdk_pixbuf
glib
glibc
gtk3
libX11
libXScrnSaver
libXcomposite
libXcursor
libxcb
libXdamage
libXext
libXfixes
libXi
libXinerama
libXrender
libXt
libnotify
libGLU_combined
nspr
nss
pango
] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
stdenv.cc.cc
];
patchPhase = ''
sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js
'';
};
fhsEnv = buildFHSUserEnv {
name = "zotero-fhs-env";
targetPkgs = pkgs: with pkgs; with xorg; [
gtk3 dbus-glib glib
libXt nss
libX11
];
};
desktopItem = makeDesktopItem rec {
name = "zotero-${version}";
exec = "zotero -url %U";
icon = "zotero";
type = "Application";
comment = meta.description;
desktopName = "Zotero";
genericName = "Reference Management";
categories = "Office;Database;";
startupNotify = "true";
mimeType = "text/plain";
};
desktopItem = makeDesktopItem rec {
name = "zotero-${version}";
exec = "zotero -url %U";
icon = "zotero";
type = "Application";
comment = meta.description;
desktopName = "Zotero";
genericName = "Reference Management";
categories = "Office;Database;";
startupNotify = "true";
};
installPhase =
''
mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
cp -r * "$prefix/usr/lib/zotero-bin-${version}"
mkdir -p "$out/bin"
ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
in runCommand "zotero-${version}" { inherit meta; } ''
mkdir -p $out/bin $out/share/applications
cat >$out/bin/zotero <<EOF
#!${bash}/bin/bash
${fhsEnv}/bin/zotero-fhs-env ${zoteroSrc}/bin/zotero
EOF
chmod +x $out/bin/zotero
# install desktop file and icons.
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications/
for size in 16 32 48 256; do
install -Dm444 chrome/icons/default/default$size.png \
$out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
done
cp ${desktopItem}/share/applications/* $out/share/applications/
for executable in \
zotero-bin plugin-container \
updater minidump-analyzer
do
if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
"$out/usr/lib/zotero-bin-${version}/$executable"
fi
done
find . -executable -type f -exec \
patchelf --set-rpath "$libPath" \
"$out/usr/lib/zotero-bin-${version}/{}" \;
'';
for size in 16 32 48 256; do
install -Dm444 ${zoteroSrc}/data/chrome/icons/default/default$size.png \
$out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
done
''
meta = with stdenv.lib; {
homepage = https://www.zotero.org;
description = "Collect, organize, cite, and share your research sources";
license = licenses.agpl3;
platforms = platforms.linux;
};
}

10
pkgs/applications/science/astronomy/gildas/default.nix
View File

@ -7,16 +7,16 @@ let
in
stdenv.mkDerivation rec {
srcVersion = "mar19b";
version = "20190301_b";
srcVersion = "apr19a";
version = "20190401_a";
name = "gildas-${version}";
src = fetchurl {
# For each new release, the upstream developers of Gildas move the
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
sha256 = "c3722863e7f3043e2d6e675557421c2eb0978fd21148386440d0139664d19f99";
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
sha256 = "0yb8dv41qsr5w2yci62phk6mrxbjlfxl4nnj7zndlyym2i5ni89c";
};
enableParallelBuilding = true;

2
pkgs/applications/version-management/redmine/4.x/Gemfile
View File

@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0"
gem "rails", "5.2.2"
gem "rails", "5.2.2.1"
gem "rouge", "~> 3.3.0"
gem "request_store", "1.0.5"
gem "mini_mime", "~> 1.0.1"

86
pkgs/applications/version-management/redmine/4.x/Gemfile.lock
View File

@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.2)
actionpack (= 5.2.2)
actioncable (5.2.2.1)
actionpack (= 5.2.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
actionmailer (5.2.2.1)
actionpack (= 5.2.2.1)
actionview (= 5.2.2.1)
activejob (= 5.2.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.2)
actionview (= 5.2.2)
activesupport (= 5.2.2)
actionpack (5.2.2.1)
actionview (= 5.2.2.1)
activesupport (= 5.2.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
@ -21,26 +21,26 @@ GEM
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
actionview (5.2.2)
activesupport (= 5.2.2)
actionview (5.2.2.1)
activesupport (= 5.2.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.2)
activesupport (= 5.2.2)
activejob (5.2.2.1)
activesupport (= 5.2.2.1)
globalid (>= 0.3.6)
activemodel (5.2.2)
activesupport (= 5.2.2)
activerecord (5.2.2)
activemodel (= 5.2.2)
activesupport (= 5.2.2)
activemodel (5.2.2.1)
activesupport (= 5.2.2.1)
activerecord (5.2.2.1)
activemodel (= 5.2.2.1)
activesupport (= 5.2.2.1)
arel (>= 9.0)
activestorage (5.2.2)
actionpack (= 5.2.2)
activerecord (= 5.2.2)
activestorage (5.2.2.1)
actionpack (= 5.2.2.1)
activerecord (= 5.2.2.1)
marcel (~> 0.3.1)
activesupport (5.2.2)
activesupport (5.2.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@ -58,11 +58,11 @@ GEM
xpath (>= 2.0, < 4.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
concurrent-ruby (1.1.4)
concurrent-ruby (1.1.5)
crass (1.0.4)
css_parser (1.7.0)
addressable
csv (3.0.4)
csv (3.0.6)
docile (1.1.5)
erubi (1.8.0)
ffi (1.10.0)
@ -89,38 +89,38 @@ GEM
mysql2 (0.5.2)
net-ldap (0.16.1)
nio4r (2.3.1)
nokogiri (1.10.1)
nokogiri (1.10.2)
mini_portile2 (~> 2.4.0)
pg (1.1.4)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.6)
puma (3.12.1)
rack (2.0.7)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.2)
actioncable (= 5.2.2)
actionmailer (= 5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
activemodel (= 5.2.2)
activerecord (= 5.2.2)
activestorage (= 5.2.2)
activesupport (= 5.2.2)
rails (5.2.2.1)
actioncable (= 5.2.2.1)
actionmailer (= 5.2.2.1)
actionpack (= 5.2.2.1)
actionview (= 5.2.2.1)
activejob (= 5.2.2.1)
activemodel (= 5.2.2.1)
activerecord (= 5.2.2.1)
activestorage (= 5.2.2.1)
activesupport (= 5.2.2.1)
bundler (>= 1.3.0)
railties (= 5.2.2)
railties (= 5.2.2.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.2)
actionpack (= 5.2.2)
activesupport (= 5.2.2)
railties (5.2.2.1)
actionpack (= 5.2.2.1)
activesupport (= 5.2.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@ -165,7 +165,7 @@ GEM
websocket-extensions (0.1.3)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.18)
yard (0.9.19)
PLATFORMS
ruby
@ -186,7 +186,7 @@ DEPENDENCIES
pg (~> 1.1.4)
puma (~> 3.7)
rack-openid
rails (= 5.2.2)
rails (= 5.2.2.1)
rails-dom-testing
rbpdf (~> 1.19.6)
redcarpet (~> 3.4.0)

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
version = "4.0.2";
version = "4.0.3";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@ -15,7 +15,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${name}.tar.gz";
sha256 = "0v00f6m7si0ca0bmh6h7mx8yz1pl4zql2c8abavya57j97mi8182";
sha256 = "1wyfl08sq71n4c2hc0fv1dfblykq5i3mbqyjdswk26md8dcmw8ac";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];

68
pkgs/applications/version-management/redmine/4.x/gemset.nix
View File

@ -3,28 +3,28 @@
dependencies = ["actionpack" "nio4r" "websocket-driver"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x";
sha256 = "1x5fxhsr2mxq5r6258s48xsn7ld081d3qaavppvj7yp7w9vqn871";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n";
sha256 = "10n2v2al68rsq5ghrdp7cpycsc1q0m19fcd8cd5i528n30nl23iw";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws";
sha256 = "1lxqzxa728dqg42yw0q4hqkaawqagiw1k0392an2ghjfgb16pafx";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
actionpack-xml_parser = {
dependencies = ["actionpack" "railties"];
@ -39,55 +39,55 @@
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z";
sha256 = "0832vlx37rly8ryfgi01b20mld8b3bv9cg62n5wax4zpzgn6jdxb";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir";
sha256 = "1zma452lc3qp4a7r10zbdmsci0kv9a3gnk4da2apbdrc8fib5mr3";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
activemodel = {
dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi";
sha256 = "1idmvqvpgri34k31s44pjb88rc3jad3yxra7fd1kpidpnv5f3v65";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y";
sha256 = "1c5cz9v7ggpqjxf0fqs1xhy1pb9m34cp31pxarhs9aqb71qjl98v";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
activestorage = {
dependencies = ["actionpack" "activerecord" "marcel"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31";
sha256 = "155xpbzrz0kr0argx0vsh5prvadd2h1g1m61kdiabvfy2iygc02n";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz";
sha256 = "161bp4p01v1a1lvszrhd1a02zf9x1p1l1yhw79a3rix1kvzkkdqb";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
addressable = {
dependencies = ["public_suffix"];
@ -135,10 +135,10 @@
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
version = "1.1.4";
version = "1.1.5";
};
crass = {
source = {
@ -160,10 +160,10 @@
csv = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "19m22vlxddva301z2izvg06hldlc37nyzhin3kjjfcnlbb8imj33";
sha256 = "1zvchwfkdkljnslqakagbnw76vs01xwpjrynrawfanzn376c6bcd";
type = "gem";
};
version = "3.0.4";
version = "3.0.6";
};
docile = {
source = {
@ -334,10 +334,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184";
sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
type = "gem";
};
version = "1.10.1";
version = "1.10.2";
};
pg = {
source = {
@ -358,18 +358,18 @@
puma = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq";
sha256 = "1pkrbvak6rlf147qpd4zss031qrwwh53g8s6017037iwg0436kv3";
type = "gem";
};
version = "3.12.0";
version = "3.12.1";
};
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
type = "gem";
};
version = "2.0.6";
version = "2.0.7";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
@ -393,10 +393,10 @@
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr";
sha256 = "1jxmwrykwgbn116hhmi7h75hcsdifhj89wk12m7ch2f3mn1lrmp9";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@ -420,10 +420,10 @@
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l";
sha256 = "0al6mvh2jvr3n7cxkx0yvhgiiarby6gxc93vl5xg1yxkvx27qzd6";
type = "gem";
};
version = "5.2.2";
version = "5.2.2.1";
};
rake = {
source = {
@ -614,9 +614,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f";
sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
type = "gem";
};
version = "0.9.18";
version = "0.9.19";
};
}

2
pkgs/applications/version-management/redmine/Gemfile
View File

@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem "bundler", ">= 1.5.0", "< 2.0.0"
gem "rails", "4.2.11"
gem "rails", "4.2.11.1"
gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
if RUBY_VERSION < "2.1"
gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")

66
pkgs/applications/version-management/redmine/Gemfile.lock
View File

@ -1,38 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
actionmailer (4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.11)
actionview (= 4.2.11)
activesupport (= 4.2.11)
actionpack (4.2.11.1)
actionview (= 4.2.11.1)
activesupport (= 4.2.11.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-xml_parser (1.0.2)
actionpack (>= 4.0.0, < 5)
actionview (4.2.11)
activesupport (= 4.2.11)
actionview (4.2.11.1)
activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.11)
activesupport (= 4.2.11)
activejob (4.2.11.1)
activesupport (= 4.2.11.1)
globalid (>= 0.3.0)
activemodel (4.2.11)
activesupport (= 4.2.11)
activemodel (4.2.11.1)
activesupport (= 4.2.11.1)
builder (~> 3.1)
activerecord (4.2.11)
activemodel (= 4.2.11)
activesupport (= 4.2.11)
activerecord (4.2.11.1)
activemodel (= 4.2.11.1)
activesupport (= 4.2.11.1)
arel (~> 6.0)
activesupport (4.2.11)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
@ -51,7 +51,7 @@ GEM
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.1.4)
concurrent-ruby (1.1.5)
crass (1.0.4)
css_parser (1.7.0)
addressable
@ -73,7 +73,7 @@ GEM
metaclass (0.0.4)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
@ -95,16 +95,16 @@ GEM
ruby-openid (>= 2.1.8)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.11)
actionmailer (= 4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
activemodel (= 4.2.11)
activerecord (= 4.2.11)
activesupport (= 4.2.11)
rails (4.2.11.1)
actionmailer (= 4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
activemodel (= 4.2.11.1)
activerecord (= 4.2.11.1)
activesupport (= 4.2.11.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.11)
railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@ -114,9 +114,9 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (4.2.11)
actionpack (= 4.2.11)
activesupport (= 4.2.11)
railties (4.2.11.1)
actionpack (= 4.2.11.1)
activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.2)
@ -161,7 +161,7 @@ GEM
websocket (1.2.8)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.18)
yard (0.9.19)
PLATFORMS
ruby
@ -184,7 +184,7 @@ DEPENDENCIES
pg (~> 0.18.1)
protected_attributes
rack-openid
rails (= 4.2.11)
rails (= 4.2.11.1)
rails-dom-testing
rails-html-sanitizer (>= 1.0.3)
rbpdf (~> 1.19.6)

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
version = "3.4.9";
version = "3.4.10";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@ -15,7 +15,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${name}.tar.gz";
sha256 = "1f7sgyka21cjkvmdqkkwrx1hn0b38yq4b7283vw858fccp0l2vy2";
sha256 = "08clfg7wgp4wnajawdn7qgrv7r8lk8d8haqkl7iz77ygdi3mpyrh";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];

48
pkgs/applications/version-management/redmine/gemset.nix
View File

@ -3,19 +3,19 @@
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zkklsh7ymhvdm5p9fr5ycd39d5caassag8yq0dga9cbk7fps74m";
sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy";
type = "gem";
};
version = "4.2.11";
version = "4.2.11.1";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13xkil3y7gjj0m4ky14asi4m08x69wwv63wfn0h95wli4x8h8w7r";
sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh";
type = "gem";
};
version = "4.2.11";
version = "4.2.11.1";
};
actionpack-xml_parser = {
dependencies = ["actionpack"];
@ -30,46 +30,46 @@
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09vwq0xgxxhssxxh8fa7l2pv6a56smw3v6gvb9l1mycmf8vprd4b";
sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p";
type = "gem";
};
version = "4.2.11";
version = "4.2.11.1";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12yqs22f4lz20nw6djsrkhii3p3nfpd51nw0lhvnczx0q8kl0nyk";
sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj";
type = "gem";
};
version = "4.2.11";
version = "4.2.11.1";
};
activemodel = {
dependencies = ["activesupport" "builder"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11aqvabf5c1pgb404f5bqp1i7mxkyhzmwk6y8zm5w6rf4nq095mq";
sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33";
type = "gem";
};
version = "4.2.11";
version = "4.2.11.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sw0m19cnasbr4cabvc302hjddc3s6fja3fr0gbj9h2n8b3633i5";
sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p";
type = "gem";
};
version = "4.2.11";
version = "4.2.11.1";
};
activesupport = {
dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4";
sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
type = "gem";
};
version = "4.2.11";
version = "4.2.11.1";
};
addressable = {
dependencies = ["public_suffix"];
@ -125,10 +125,10 @@
concurrent-ruby = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
version = "1.1.4";
version = "1.1.5";
};
crass = {
source = {
@ -243,10 +243,10 @@
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
version = "3.2018.0812";
version = "3.2019.0331";
};
mimemagic = {
source = {
@ -377,10 +377,10 @@
dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rhp1l5klw8alqnzji2p4w01x7ygsfnzc7mf87ncr2jlizmgy4nx";
sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml";
type = "gem";
};
version = "4.2.11";
version = "4.2.11.1";
};
rails-deprecated_sanitizer = {
dependencies = ["activesupport"];
@ -413,10 +413,10 @@
dependencies = ["actionpack" "activesupport" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09x32zkxs0vfi4y0bjrqd61821kx2azwhdxvk2ygqj4yvxfh11i1";
sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m";
type = "gem";
};
version = "4.2.11";
version = "4.2.11.1";
};
rake = {
source = {
@ -607,9 +607,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f";
sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
type = "gem";
};
version = "0.9.18";
version = "0.9.19";
};
}

4
pkgs/applications/virtualization/containerd/default.nix
View File

@ -4,13 +4,13 @@ with lib;
buildGoPackage rec {
name = "containerd-${version}";
version = "1.2.5";
version = "1.2.6";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0";
sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
};
goPackagePath = "github.com/containerd/containerd";

13
pkgs/build-support/writers/default.nix
View File

@ -178,13 +178,20 @@ rec {
writeJSBin = name:
writeJS "/bin/${name}";
awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" ''
awk -f
{sub(/^[ \t]+/,"");idx=0}
/\{/{ctx++;idx=1}
/\}/{ctx--}
{id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0}
'';
writeNginxConfig = name: text: pkgs.runCommand name {
inherit text;
passAsFile = [ "text" ];
} /* sh */ ''
cp "$textPath" $out
${pkgs.nginx-config-formatter}/bin/nginxfmt $out
${pkgs.gnused}/bin/sed -i '/^$/d' $out
# nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16
${pkgs.gawk}/bin/awk -f ${awkFormatNginx} "$textPath" | ${pkgs.gnused}/bin/sed '/^\s*$/d' > $out
${pkgs.gixy}/bin/gixy $out
'';

1
pkgs/desktops/deepin/default.nix
View File

@ -43,6 +43,7 @@ let
qcef = callPackage ./qcef { };
qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
qt5integration = callPackage ./qt5integration { };
udisks2-qt5 = callPackage ./udisks2-qt5 { };
};

41
pkgs/desktops/deepin/udisks2-qt5/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "udisks2-qt5";
version = "0.0.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1gk4jmq7mrzk181r6man2rz1iyzkfasz7053a30h4nn24mq8ikig";
};
nativeBuildInputs = [
deepin.setupHook
qmake
];
buildInputs = [
qtbase
];
postPatch = ''
searchHardCodedPaths
'';
postFixup = ''
searchHardCodedPaths $out
'';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {
description = "UDisks2 D-Bus interfaces binding for Qt5";
homepage = https://github.com/linuxdeepin/udisks2-qt5;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

4
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "files";
version = "4.1.6";
version = "4.1.7";
name = "elementary-${pname}-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1c17d5lvpzyqd7mmzyfms80am46s566xr1r7b27rgv9w7vpzpgm0";
sha256 = "1fz7zawqkb9fa2vy36hg1wz1sxzgm307hp5kckb7icarqfrx0gih";
};
passthru = {

4
pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-bluetooth";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "13jm2idjsgqkvdz1dxgl2wwx7bsqahppf6cnpl0pmz167wahg5zp";
sha256 = "0rp9wa0yilc3wgwnybc6cryxphja7imixn45zhj475a4nb3afd0q";
};
passthru = {

4
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
version = "2.1.6";
version = "2.1.7";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0pw21bnc79shiynmg7h9bs1x1v011lh07ypn22j73yhmxp6wiypd";
sha256 = "1icz1is576d2w5a6wc06bnkg2vbsj5g6mz0b6ikzyjddr6j743ql";
};
passthru = {

4
pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "101a39v8fssc7s56cpi60zsggvw66y9gaxwjvawds928cll0yiy9";
sha256 = "0frml591r82j7hf1zlccgv8pzk3w10x470f9nzvdgdjpz0r776k2";
};
passthru = {

104
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
View File

@ -18,19 +18,28 @@ let
"x86_64-unknown-linux-gnu" = {
double = "linux-x86_64";
};
"armv5tel-unknown-linux-androideabi" = {
arch = "arm";
triple = "arm-linux-androideabi";
gccVer = "4.8";
"i686-unknown-linux-android" = {
triple = "i686-linux-android";
arch = "x86";
toolchain = "x86";
gccVer = "4.9";
};
"x86_64-unknown-linux-android" = {
triple = "x86_64-linux-android";
arch = "x86_64";
toolchain = "x86_64";
gccVer = "4.9";
};
"armv7a-unknown-linux-androideabi" = {
arch = "arm";
triple = "arm-linux-androideabi";
toolchain = "arm-linux-androideabi";
gccVer = "4.9";
};
"aarch64-unknown-linux-android" = {
arch = "arm64";
triple = "aarch64-linux-android";
toolchain = "aarch64-linux-android";
gccVer = "4.9";
};
}.${config} or
@ -38,49 +47,49 @@ let
hostInfo = ndkInfoFun stdenv.hostPlatform;
targetInfo = ndkInfoFun stdenv.targetPlatform;
prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
in
rec {
# Misc tools
binaries = let
ndkBinDir =
"${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin";
ndkGCCLibDir =
"${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/lib/gcc/${targetInfo.triple}/4.9.x";
binaries = runCommand "ndk-gcc-binutils" {
isClang = true; # clang based cc, but bintools ld
nativeBuildInputs = [ makeWrapper ];
propgatedBuildInputs = [ androidndk ];
} ''
mkdir -p $out/bin
in runCommand "ndk-gcc-binutils" {
isGNU = true; # for cc-wrapper
nativeBuildInputs = [ makeWrapper ];
propgatedBuildInputs = [ androidndk ];
} ''
mkdir -p $out/bin
for prog in ${ndkBinDir}/${targetInfo.triple}-*; do
prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//')
cat > $out/bin/${stdenv.targetPlatform.config}-$prog_suffix <<EOF
#! ${stdenv.shell} -e
$prog "\$@"
EOF
chmod +x $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
done
# llvm toolchain
for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/bin/*; do
ln -s $prog $out/bin/$(basename $prog)
ln -s $prog $out/bin/${prefix}$(basename $prog)
done
ln -s $out/bin/${stdenv.targetPlatform.config}-ld $out/bin/ld
ln -s ${ndkGCCLibDir} $out/lib
'';
# bintools toolchain
for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin/*; do
prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//')
ln -s $prog $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
done
# shitty googly wrappers
rm -f $out/bin/${stdenv.targetPlatform.config}-gcc $out/bin/${stdenv.targetPlatform.config}-g++
'';
binutils = wrapBintoolsWith {
bintools = binaries;
libc = targetAndroidndkPkgs.libraries;
extraBuildCommands = ''
echo "--build-id" >> $out/nix-support/libc-ldflags
'';
};
gcc = wrapCCWith {
clang = wrapCCWith {
cc = binaries;
bintools = binutils;
libc = targetAndroidndkPkgs.libraries;
extraBuildCommands = ''
echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags
echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags
echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags
''
+ lib.optionalString stdenv.targetPlatform.isAarch32 (let
p = stdenv.targetPlatform.platform.gcc or {}
@ -98,17 +107,10 @@ rec {
sed -E -i \
$out/bin/${stdenv.targetPlatform.config}-cc \
$out/bin/${stdenv.targetPlatform.config}-c++ \
$out/bin/${stdenv.targetPlatform.config}-gcc \
$out/bin/${stdenv.targetPlatform.config}-g++ \
-e '130i extraBefore+=(-Wl,--fix-cortex-a8)' \
-e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|'
'')
# GCC 4.9 is the first relase with "-fstack-protector"
+ lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
sed -E \
-i $out/nix-support/add-hardening.sh \
-e 's|(-fstack-protector)-strong|\1|g'
'';
$out/bin/${stdenv.targetPlatform.config}-clang \
$out/bin/${stdenv.targetPlatform.config}-clang++ \
-e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|'
'');
};
# Bionic lib C and other libraries.
@ -116,17 +118,11 @@ rec {
# We use androidndk from the previous stage, else we waste time or get cycles
# cross-compiling packages to wrap incorrectly wrap binaries we don't include
# anyways.
libraries =
let
includePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include";
asmIncludePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}";
libPath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/";
in
runCommand "bionic-prebuilt" {} ''
mkdir -p $out
cp -r ${includePath} $out/include
chmod +w $out/include
cp -r ${asmIncludePath}/* $out/include
ln -s ${libPath} $out/lib
'';
libraries = runCommand "bionic-prebuilt" {} ''
mkdir -p $out
cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include
chmod +w $out/include
cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include
ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib
'';
}

1
pkgs/development/compilers/aspectj/default.nix
View File

@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
homepage = http://www.eclipse.org/aspectj/;
description = "A seamless aspect-oriented extension to the Java programming language";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.epl10;
};
}

1
pkgs/development/interpreters/clisp/default.nix
View File

@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.unix;
# problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
license = stdenv.lib.licenses.gpl2;
};
}

50
pkgs/development/libraries/argp-standalone/default.nix
View File

@ -1,5 +1,24 @@
{ stdenv, fetchurl, fetchpatch }:
let
patch-argp-fmtstream = fetchpatch {
name = "patch-argp-fmtstream.h";
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h";
sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8";
};
patch-throw-in-funcdef = fetchpatch {
name = "argp-standalone-1.3-throw-in-funcdef.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-throw-in-funcdef.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca";
sha256 = "0b2b4l1jkvmnffl22jcn4ydzxy2i7fnmmnfim12f0yg5pb8fs43c";
};
patch-shared = fetchpatch {
name = "argp-standalone-1.3-shared.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-shared.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca";
sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw";
};
in
stdenv.mkDerivation rec {
name = "argp-standalone-1.3";
@ -8,24 +27,19 @@ stdenv.mkDerivation rec {
sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be";
};
patches = [
(if stdenv.hostPlatform.isDarwin then
fetchpatch {
name = "patch-argp-fmtstream.h";
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h";
sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8";
}
else null)
];
patches =
stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ]
++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ];
patchFlags = "-p0";
patchFlags = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "-p0";
postInstall =
''
mkdir -p $out/lib $out/include
cp libargp.a $out/lib
cp argp.h $out/include
'';
preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'";
postInstall = ''
mkdir -p $out/lib $out/include
cp libargp.a $out/lib
cp argp.h $out/include
'';
doCheck = true;
@ -34,8 +48,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://www.lysator.liu.se/~nisse/misc/";
description = "Standalone version of arguments parsing functions from GLIBC";
platforms = platforms.darwin;
platforms = with platforms; darwin ++ [ "x86_64-linux" ];
maintainers = with maintainers; [ amar1729 ];
license = stdenv.lib.licenses.gpl2;
license = licenses.gpl2;
};
}

4
pkgs/development/libraries/c-blosc/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "c-blosc-${version}";
version = "1.14.4";
version = "1.16.2";
src = fetchFromGitHub {
owner = "Blosc";
repo = "c-blosc";
rev = "v${version}";
sha256 = "195w96gl75mkxxqq6qjsmb2s1lq8z95qlc71fr5a7sckslcwglh0";
sha256 = "19wb699rb5bn6h9qhw1m18m2w77lws7r50vxpgrvggnl27mvm3xc";
};
buildInputs = [ cmake ];

4
pkgs/development/libraries/ffmpeg/4.nix
View File

@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchpatch
# Darwin frameworks
, Cocoa, CoreMedia
, Cocoa, CoreMedia, VideoToolbox
, ...
}@args:
@ -8,5 +8,5 @@ callPackage ./generic.nix (args // rec {
version = "${branch}";
branch = "4.1.2";
sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0";
darwinFrameworks = [ Cocoa CoreMedia ];
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
})

43
pkgs/development/libraries/gegl/4.0.nix
View File

@ -1,20 +1,45 @@
{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
, librsvg, pango, gtk, bzip2, json-glib, gettext, autoreconfHook, libraw
, gexiv2, libwebp, gnome3, libintl }:
let
version = "0.4.12";
in stdenv.mkDerivation rec {
name = "gegl-${version}";
stdenv.mkDerivation rec {
pname = "gegl";
version = "0.4.14";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
sha256 = "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9";
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "00crhngwi07f5b9x77kx5p7p4cl6l5g6glpz9rqv7pfqk62xa0ac";
};
patches = stdenv.lib.optionals stdenv.isDarwin [
# Make the Darwin patches below apply cleanly
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/141a7aa76cd36143f624f06b1c43d2483945653c.patch;
sha256 = "0ijv9ra6723jn60krjwzbc6l9qr08h76bsz9xgddvfgsgr1nnpbi";
})
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/b3ff0df080d133bbdb394c3db40d4f9d2980a8a6.patch;
sha256 = "0im0rqk8mz9vi7qqx06vj4wm5hjwv1544jwdaaywlcrs9g266hl0";
})
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/fe756be6f0c776a45201a61f67d3e5e42f6398de.patch;
sha256 = "0h3rqwfsph2gisbwvc2v5a9r5b0djcxlm790xpi6yfndj42b0v2b";
})
# Fix build on Darwin
# https://gitlab.gnome.org/GNOME/gegl/merge_requests/28
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/ac331b5c0e3d940b64bb811b0f54e86c7d312917.patch;
sha256 = "1yj9jh8q9cbr1szrxhdapknk4nfhbkbc1njv50ifrj7vyfislj34";
})
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/d05eb01170728f45f561ca937708a293e29e02d9.patch;
sha256 = "0gwz12sm8kkmzyxsiq0sl30cabs5q0ckj743yrzimspkhrvc1ya2";
})
];
enableParallelBuilding = true;
doCheck = true;
@ -26,7 +51,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc
nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ];
nativeBuildInputs = [ pkgconfig gettext which autoreconfHook libintl ];
meta = with stdenv.lib; {
description = "Graph-based image processing framework";

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libnfs-${version}";
version = "3.0.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "sahlberg";
repo = "libnfs";
rev = "libnfs-${version}";
sha256 = "115p55y2cbs92z5lmcnjx1v29lwinpgq4sha9v1kq1vd8674h404";
sha256 = "0i27wd4zvhjz7620q043p4d4mkx8zv2yz9adm1byin47dynahyda";
};
nativeBuildInputs = [ autoreconfHook ];

43
pkgs/development/libraries/libow/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }:
stdenv.mkDerivation rec {
version = "3.2p1";
name = "libow-${version}";
src = fetchFromGitHub {
owner = "owfs";
repo = "owfs";
rev = "v${version}";
sha256 = "17jhhvlqzndf7q3xnb8bjf4j0j905c420cbxabwpz8xac3z62vb8";
};
nativeBuildInputs = [ autoconf automake pkgconfig ];
meta = with stdenv.lib; {
description = "1-Wire File System full library";
homepage = http://owfs.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ disserman ];
platforms = platforms.unix;
};
buildInputs = [ libtool ];
preConfigure = "./bootstrap";
configureFlags = [
"--disable-owtcl"
"--disable-owphp"
"--disable-owpython"
"--disable-zero"
"--disable-owshell"
"--disable-owhttpd"
"--disable-owftpd"
"--disable-owserver"
"--disable-owperl"
"--disable-owtcl"
"--disable-owtap"
"--disable-owmon"
"--disable-owexternal"
];
}

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

@ -37,5 +37,5 @@ let
in {
physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na";
physfs = generic "3.0.1" "1wgj2zqpnfbnyyi1i7bq5pshcc9n5cvwlpzp8im67nb8662ryyxp";
physfs = generic "3.0.2" "0qzqz4r88gvd8m7sh2z5hvqcr0jfr4wb2f77c19xycyn0rigfk9h";
}

2
pkgs/development/libraries/readline/6.3.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patches =
[ ./link-against-ncurses.patch
./no-arch_only-6.3.patch
]
] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch
++
(let
patch = nr: sha256:

16
pkgs/development/libraries/readline/android.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git histlib.h histlib.h
index c938a10..925ab72 100644
--- histlib.h
+++ histlib.h
@@ -51,9 +51,9 @@
#endif
#ifndef member
-# ifndef strchr
+# if !defined (strchr) && !defined (__STDC__)
extern char *strchr ();
-# endif
+# endif /* !strchr && !__STDC__ */
#define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0)
#endif

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

@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
name = "simgear-${version}";
version = "2018.2.2";
shortVersion = "2018.2";
version = "2018.3.1";
shortVersion = "2018.3";
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5";
sha256 = "0sm0v8v1sw5xzkzhf0gzh6fwx93hd62h5lm9s9hgci40x7480i99";
};
buildInputs = [ plib freeglut xorgproto libX11 libXext libXi

13
pkgs/development/libraries/tk/generic.nix
View File

@ -1,4 +1,6 @@
{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }:
{ stdenv, lib, src, pkgconfig, tcl, libXft, fontconfig, patches ? []
, enableAqua ? stdenv.isDarwin, darwin
, ... }:
stdenv.mkDerivation {
name = "tk-${tcl.version}";
@ -21,15 +23,14 @@ stdenv.mkDerivation {
configureFlags = [
"--with-tcl=${tcl}/lib"
];
] ++ stdenv.lib.optional enableAqua "--enable-aqua";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ]
++ stdenv.lib.optional stdenv.isDarwin fontconfig;
propagatedBuildInputs = [ tcl libXft ];
NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null;
buildInputs = lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [
Cocoa cf-private
]);
doCheck = false; # fails. can't find itself

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

@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
version = "2.24.0";
version = "2.24.1";
meta = {
description = "Web content rendering engine, GTK+ port";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif";
sha256 = "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk";
};
patches = optionals stdenv.isDarwin [

11
pkgs/development/ocaml-modules/faraday/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, buildDunePackage, alcotest }:
{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigstringaf }:
buildDunePackage rec {
pname = "faraday";
version = "0.5.0";
version = "0.7.0";
minimumOCamlVersion = "4.02";
@ -10,16 +10,17 @@ buildDunePackage rec {
owner = "inhabitedtype";
repo = pname;
rev = version;
sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n";
sha256 = "0z6ikwlqad91iac0q5z88p3wzq5k15y86ckzmhdq1aqwrcm14bq2";
};
buildInputs = [ alcotest ];
propagatedBuildInputs = [ bigstringaf ];
doCheck = true;
meta = {
description = "Serialization library built for speed and memory efficiency";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}

4
pkgs/development/ocaml-modules/farfadet/default.nix
View File

@ -8,11 +8,11 @@ else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-farfadet-${version}";
version = "0.2";
version = "0.3";
src = fetchurl {
url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz";
sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr";
sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j";
};
buildInputs = [ ocaml findlib ocamlbuild topkg ];

4
pkgs/development/python-modules/WazeRouteCalculator/default.nix
View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "WazeRouteCalculator";
version = "0.7.2";
version = "0.9";
src = fetchPypi {
inherit pname version;
sha256 = "09fe1bfb32291a658ba9baffe3fe176693f41362d74caba60fb04be01b447fa1";
sha256 = "1kwr7r1cn9xxvf9asxqhsy4swx4v6hsgw5cr5wmn71qg11k1i5cx";
};
propagatedBuildInputs = [ requests ];

13
pkgs/development/python-modules/cntk/default.nix
View File

@ -10,9 +10,10 @@
}:
buildPythonPackage rec {
inherit (pkgs.cntk) name version src meta;
inherit (pkgs.cntk) name version src;
buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ];
nativeBuildInputs = [ pkgs.swig pkgs.openmpi ];
buildInputs = [ pkgs.cntk pkgs.openmpi ];
propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ];
CNTK_LIB_PATH = "${pkgs.cntk}/lib";
@ -35,4 +36,12 @@ buildPythonPackage rec {
cd $NIX_BUILD_TOP
${python.interpreter} -c "import cntk"
'';
meta = {
inherit (pkgs.cntk.meta) homepage description license maintainers;
# broken in CNTK 2.4 starting with python-3.7
# ("ImportError: cannot import name 'GenericMeta' from 'typing'")
broken = stdenv.lib.versionAtLeast python.version "3.7";
};
}

4
pkgs/development/python-modules/django/2_1.nix
View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
version = "2.1.7";
version = "2.1.8";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963";
sha256 = "1r1y3d3gz5v1kyfs77dxbcm5my27q8dpcmj821b6yl8x22281cpk";
};
patches = stdenv.lib.optionals withGdal [

8
pkgs/development/python-modules/h5py/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchPypi, isPy27, python, buildPythonPackage
, numpy, hdf5, cython, six, pkgconfig, unittest2
, numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch
, mpi4py ? null, openssh }:
assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
@ -18,6 +18,12 @@ in buildPythonPackage rec {
sha256 = "9d41ca62daf36d6b6515ab8765e4c8c4388ee18e2a665701fef2b41563821002";
};
patches = [ ( fetchpatch {
# Skip a test that probes an already fixed bug in HDF5 (upstream patch)
url = "https://github.com/h5py/h5py/commit/141eafa531c6c09a06efe6a694251a1eea84908d.patch";
sha256 = "0lmdn0gznr7gadx7qkxybl945fvwk6r0cc4lg3ylpf8ril1975h8";
})];
configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi";
postConfigure = ''

10
pkgs/development/python-modules/nixpkgs/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv
, buildPythonPackage
, fetchpatch
, fetchPypi
, pbr
, pythonix
@ -16,6 +17,15 @@ buildPythonPackage rec {
sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
};
patches = [
# Patch should be dropped once https://github.com/t184256/nixpkgs-python-importer/pull/7
# is merged and in a release
(fetchpatch {
url = "https://github.com/adisbladis/nixpkgs-python-importer/commit/749e05f1.patch";
sha256 = "1a72phazpqf6vf3hl3m84z9i5n6h1xpa53bqxnpsff6agxxhd21b";
})
];
buildInputs = [ pbr ];
propagatedBuildInputs = [ pythonix ];

4
pkgs/development/python-modules/pymediainfo/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pymediainfo";
version = "3.0";
version = "3.1";
src = fetchPypi {
inherit pname version;
sha256 = "e76cc5525c3fc5cba61073e12365dc06f303b261d8f923aaa6eac09bf8fab245";
sha256 = "00awypv2nbn44cc38q7w747gx1xhj33cygzzl56jn5jd3hdlldn7";
};
postPatch = ''

5
pkgs/development/python-modules/pythonix/default.nix
View File

@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "pythonix";
version = "0.1.4";
version = "0.1.6";
format = "other";
src = fetchFromGitHub {
owner = "Mic92";
repo = "pythonix";
rev = "v${version}";
sha256 = "1q1fagfwzvmcm1n3a0liay7m5krazmhw9l001m90rrz2x7vrsqwk";
sha256 = "1qzcrpn333hsgn6fj1m1s3cvaf0ny8qpygamcrazqv57xmwyr8h5";
};
disabled = !isPy3k;
@ -24,6 +24,5 @@ buildPythonPackage rec {
'';
maintainers = [ maintainers.mic92 ];
license = licenses.mit;
broken = true;
};
}

4
pkgs/development/python-modules/pyupdate/default.nix
View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pyupdate";
version = "1.3.5";
version = "1.3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1qxbakhsgmdc5aakhkadr26dlhi0lma7170b245sragn170fqjxf";
sha256 = "151dxqvdpik4jy84sq6fhjyrq2qq5l70dccgxdbxxf9qyjxpywfl";
};
propagatedBuildInputs = [ requests ];

4
pkgs/development/python-modules/uproot-methods/default.nix
View File

@ -6,12 +6,12 @@
}:
buildPythonPackage rec {
version = "0.4.3";
version = "0.4.4";
pname = "uproot-methods";
src = fetchPypi {
inherit pname version;
sha256 = "f90d91a613a875ebdf214f0f6f3fd0f8beea9125fc35e54f334d6104fe47c87d";
sha256 = "004q7lywhhdvsmds88cfpjvkj89nf8n9d4gyrbvvj3x0gw7iiljq";
};
propagatedBuildInputs = [ numpy awkward ];

21
pkgs/development/python-modules/xxhash/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
version = "1.3.0";
pname = "xxhash";
src = fetchPypi {
inherit pname version;
sha256 = "1rhrqrlq4n3vgqd1fv1dcc5ga5dzy9qbd40p8rsqqhh5klxg48gy";
};
meta = with stdenv.lib; {
homepage = https://github.com/ifduyue/python-xxhash;
description = "Python Binding for xxHash https://pypi.org/project/xxhash/";
license = licenses.bsd2;
maintainers = [ maintainers.teh ];
};
}

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

@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, future, gevent, msgpack-python, pyzmq }:
buildPythonPackage rec {
pname = "zerorpc";
version = "0.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "14d0nmprs0nm17d8kg2f7qalsi8x7c4damsccqgncylj7mpnk9hh";
};
propagatedBuildInputs = [ future gevent msgpack-python pyzmq ];
doCheck = false; # pypi version doesn't include tests
meta = with lib; {
description = "An easy to use, intuitive, and cross-language RPC";
homepage = "https://www.zerorpc.io";
license = licenses.mit;
maintainers = with maintainers; [ xeji ];
};
}

7
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -436,6 +436,13 @@ in
buildInputs = [ taglib ];
};
thrift = attrs: {
# See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125
# Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd.
buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0")
"--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\"";
};
timfel-krb5-auth = attrs: {
buildInputs = [ kerberos ];
};

48
pkgs/development/tools/cask/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ stdenv, fetchurl, python, emacsPackagesNg }:
stdenv.mkDerivation rec {
name = "cask-${version}";
version = "0.8.4";
src = fetchurl {
url = "https://github.com/cask/cask/archive/v${version}.tar.gz";
sha256 = "02f8bb20b33b23fb11e7d2a1d282519dfdb8b3090b9672448b8c2c2cacd3e478";
};
doCheck = true;
buildInputs = with emacsPackagesNg; [
s f dash ansi ecukes servant ert-runner el-mock
noflet ert-async shell-split-string git package-build
];
buildPhase = ''
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/templates
mkdir -p $out/share/emacs/site-lisp/cask/bin
install -Dm644 *.el *.elc $out/share/emacs/site-lisp/cask
install -Dm755 bin/cask $out/share/emacs/site-lisp/cask/bin
install -Dm644 templates/* $out/templates/
touch $out/.no-upgrade
ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
'';
meta = with stdenv.lib; {
description = "Project management for Emacs";
longDescription = ''
Cask is a project management tool for Emacs that helps automate the
package development cycle; development, dependencies, testing, building,
packaging and more.
Cask can also be used to manage dependencies for your local Emacs configuration.
'';
homepage = https://cask.readthedocs.io/en/latest/index.html;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.flexw ];
};
nativeBuildInputs = [ emacsPackagesNg.emacs python ];
}

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

@ -2,16 +2,16 @@
, makeWrapper, nix-prefetch-scripts }:
buildGoPackage rec {
name = "dep2nix-${version}";
version = "0.0.2";
pname = "dep2nix";
version = "unstable-2019-04-02";
goPackagePath = "github.com/nixcloud/dep2nix";
src = fetchFromGitHub {
owner = "nixcloud";
repo = "dep2nix";
rev = version;
sha256 = "17csgnd6imr1l0gpirsvr5qg7z0mpzxj211p2nwqilrvbp8zj7vg";
repo = pname;
rev = "830684f920333b8ff0946d6b807e8be642eec3ef";
sha256 = "17sjxhzhmz4893x3x054anp4xvqd1px15nv3fj2m7i6r0vbgpm0j";
};
nativeBuildInputs = [

19
pkgs/development/tools/pyre/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ocamlPackages, writeScript
, dune, python3, rsync, buck, watchman }:
, dune, python3, rsync, buck, watchman, sqlite }:
let
# Manually set version - the setup script requires
# hg and git + keeping the .git directory around.
pyre-version = "0.0.20"; # also change typeshed revision below with $pyre-src/.typeshed-version
pyre-version = "0.0.22"; # also change typeshed revision below with $pyre-src/.typeshed-version
pyre-src = fetchFromGitHub {
owner = "facebook";
repo = "pyre-check";
rev = "v${pyre-version}";
sha256 = "1alkhdhvmigdhxvvarh0lr5s3b1s6q4arykip2dqb62vs8064s17";
sha256 = "057vy6zmgwsi0ag9n4m6sszhahmfk2s1ywm36nyfs7w4d0wnk92s";
};
versionFile = writeScript "version.ml" ''
cat > "./version.ml" <<EOF
@ -41,6 +41,8 @@ let
ppxlib
dune
ounit
base64
sqlite.dev
# python36Packages.python36Full # TODO
];
@ -115,7 +117,16 @@ in python3.pkgs.buildPythonApplication rec {
buildInputs = [ pyre-bin ];
nativeBuildInputs = [ rsync ]; # only required for build-pypi-package.sh
propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ];
propagatedBuildInputs = with python3.pkgs; [
docutils
typeshed
click-log
ipython
sqlalchemy
munch
xxhash
ujson
];
buildPhase = ''
bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed}
cp -r build/dist dist

22
pkgs/development/tools/rust/cargo-xbuild/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
name = "cargo-xbuild-${version}";
version = "0.5.7";
src = fetchFromGitHub {
owner = "rust-osdev";
repo = "cargo-xbuild";
rev = "v${version}";
sha256 = "11hjyf16m4ri4c912jsdmqq88xcrys119135nz48y5p7b4yp0s7a";
};
cargoSha256 = "077qiqm470iqcgxqjzbmzxikxd5862vyg788hacli4yzpvyaq9r9";
meta = with stdenv.lib; {
description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
homepage = https://github.com/rust-osdev/cargo-xbuild;
license = with licenses; [ mit asl20 ];
platforms = platforms.all;
};
}

4
pkgs/development/web/now-cli/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
name = "now-cli-${version}";
version = "14.0.3";
version = "15.0.3";
# TODO: switch to building from source, if possible
src = fetchurl {
url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
sha256 = "0nnwaj3iik8anx7xd5mzbrgq5g5ng8gqmhxyyfgkmawsg34bk6nj";
sha256 = "db9e0ca18513bc407c59945deaa64006acf03dd6007879f0594a38b56153a7c2";
};
sourceRoot = ".";

1
pkgs/games/atanks/default.nix
View File

@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
homepage = http://atanks.sourceforge.net/;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl2;
};
}

8
pkgs/games/flightgear/default.nix
View File

@ -6,14 +6,14 @@
}:
let
version = "2018.2.2";
shortVersion = "2018.2";
version = "2018.3.1";
shortVersion = "2018.3";
data = stdenv.mkDerivation rec {
name = "flightgear-base-${version}";
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
sha256 = "c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4";
sha256 = "1h69ifj84l4k0f497ybk51xj3bprzw4xvwrwzzj708zhkjk78fmh";
};
phases = [ "installPhase" ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
sha256 = "61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147";
sha256 = "0h56npn00b6fd38cf5cha82nnglxmhd12b7h2rn3gjymwhviyjix";
};
# Of all the files in the source and data archives, there doesn't seem to be

4
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -51,7 +51,7 @@ let
AR = "${stdenv'.cc.targetPrefix or ""}ar";
CC = "${stdenv'.cc.targetPrefix or ""}cc";
CPP = if (stdenv'.cc.isClang or false) then "clang-cpp" else "cpp";
CPP = "${stdenv'.cc.targetPrefix or ""}cpp";
CXX = "${stdenv'.cc.targetPrefix or ""}c++";
LD = "${stdenv'.cc.targetPrefix or ""}ld";
STRIP = "${stdenv'.cc.targetPrefix or ""}strip";
@ -65,6 +65,8 @@ let
platforms = platforms.unix;
license = licenses.bsd2;
};
} // lib.optionalAttrs stdenv'.isDarwin {
MKRELRO = "no";
} // lib.optionalAttrs (stdenv'.cc.isClang or false) {
HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc));
} // lib.optionalAttrs (stdenv'.cc.isGNU or false) {

8
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -22,10 +22,10 @@ rec {
beta = stable;
stable_418 = generic {
version = "418.43";
sha256_64bit = "0zrjd8wfc8cknfwiyy3llsnn1mympfxxszz7gzakncp3vs1jrghq";
settingsSha256 = "1rzxxn7nrhwndl2lgjakxi0rblfkqjyl1n70fl7rcs6g75mi1qsq";
persistencedSha256 = "14m4x5r0yc23sg4xx523ccfpxsr6dgm2n3xy9zdibl1cpzz50ikc";
version = "418.56";
sha256_64bit = "1cg7927g5ml1rwgpydlrjzr55gza5dfkqkch29bbarpzd7dh0mf4";
settingsSha256 = "1dai4dh6g3arkgicbjwhfr948i1xc13a7s0xcgalan0pn5zd56z6";
persistencedSha256 = "1r13jjpqg9ri5mw633k01dq2ivblc8nrbsnh7709v1xibaydwnhn";
};
# Last one supporting x86

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "nvme-cli-${version}";
version = "1.8";
version = "1.8.1";
src = fetchFromGitHub {
owner = "linux-nvme";
repo = "nvme-cli";
rev = "v${version}";
sha256 = "0k4qnxm9sgr4bqhg7c3g870f3jpawm5yp0vp0p031a9qgnzmklb9";
sha256 = "0agnxfcwgnnimmxrdpg4lmiqc5ai9b4amk8krriw01lflxi3xzn0";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];

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

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "v4l-utils-${version}";
version = "1.16.2";
version = "1.16.5";
src = fetchurl {
url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
sha256 = "0iwfdp4ghzd6l9qg5545032vwmqy2rnhk0xf1g9mad67l74hhckc";
sha256 = "06yz34ncrpxshs9w2nqz62xj4wm7hni1fvjnvjhifl1q20jj907d";
};
outputs = [ "out" "dev" ];

24
pkgs/servers/demoit/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv
, buildGoPackage
, fetchFromGitHub
}:
buildGoPackage rec {
pname = "demoit";
version = "unstable-2019-03-29";
goPackagePath = "github.com/dgageot/demoit";
src = fetchFromGitHub {
owner = "dgageot";
repo = "demoit";
rev = "ec70fbdf5a5e92fa1c06d8f039f7d388e0237ba2";
sha256 = "01584cxlnrc928sw7ldmi0sm7gixmwnawy3c5hd79rqkw8r0gbk0";
};
meta = with stdenv.lib; {
description = "Live coding demos without Context Switching";
homepage = https://github.com/dgageot/demoit;
license = licenses.asl20;
maintainers = [ maintainers.freezeboy ];
};
}

7
pkgs/servers/monitoring/prometheus/alertmanager.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "alertmanager-${version}";
version = "0.15.3";
version = "0.16.2";
rev = "v${version}";
goPackagePath = "github.com/prometheus/alertmanager";
@ -11,12 +11,9 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "alertmanager";
sha256 = "037wwfadb9rp1592v8bkqcsy9ym4gbhkg3pz6a6fzirg65d29aia";
sha256 = "0zjyr9964qxv5fsb17qhmxa1v4z0c7va60n05p9w6j2ah4dmcd8q";
};
# Tests exist, but seem to clash with the firewall.
doCheck = false;
buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
-ldflags=
-X ${t}.Version=${version}

13
pkgs/servers/nosql/influxdb/default.nix
View File

@ -1,14 +1,14 @@
{ lib, buildGoPackage, fetchFromGitHub, }:
buildGoPackage rec {
name = "influxdb-${version}";
version = "1.6.3";
pname = "influxdb";
version = "1.7.5";
src = fetchFromGitHub {
owner = "influxdata";
repo = "influxdb";
repo = pname;
rev = "v${version}";
sha256 = "0xf16liapllk8qnw0vsy1ja4if1xlazwwaa4p0r5j7bny5lxm7zy";
sha256 = "0gwivazjvxw6fflf2637qn0crq564fjzhncsl3agph5ciqyv48gx";
};
buildFlagsArray = [ ''-ldflags=
@ -19,13 +19,12 @@ buildGoPackage rec {
excludedPackages = "test";
# Generated with dep2nix (for 1.6.3) / nix2go (for 1.4.1).
goDeps = ./. + "/deps-${version}.nix";
goDeps = ./deps.nix;
meta = with lib; {
description = "An open-source distributed time series database";
license = licenses.mit;
homepage = https://influxdb.com/;
homepage = https://influxdata.com/;
maintainers = with maintainers; [ offline zimbatm ];
};
}

227
pkgs/servers/nosql/influxdb/deps-1.4.1.nix
View File

@ -1,227 +0,0 @@
[
{
goPackagePath = "collectd.org";
fetch = {
type = "git";
url = "https://github.com/collectd/go-collectd";
rev = "e84e8af5356e7f47485bbc95c96da6dd7984a67e";
sha256 = "0cfxg8iz7bdy3d74cqjns7x7lyrma5lkrqqpqk79a2gk0g2bhmnd";
};
}
{
goPackagePath = "github.com/bmizerany/pat";
fetch = {
type = "git";
url = "https://github.com/bmizerany/pat";
rev = "c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c";
sha256 = "02ayddkp2b22rixw5jldw3kb6762zzkg5zhxwcv9v9yp0x39qw6r";
};
}
{
goPackagePath = "github.com/boltdb/bolt";
fetch = {
type = "git";
url = "https://github.com/boltdb/bolt";
rev = "4b1ebc1869ad66568b313d0dc410e2be72670dda";
sha256 = "1narpch9fc2f4yj8asb981gyq7b3z6p41xb635xh2k75yv5g024w";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
};
}
{
goPackagePath = "github.com/cespare/xxhash";
fetch = {
type = "git";
url = "https://github.com/cespare/xxhash";
rev = "1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b";
sha256 = "1h7dym9fmk7rwrrc26lcwi7wmf4y4rxgg7byivg55yia9wlhy00m";
};
}
{
goPackagePath = "github.com/dgrijalva/jwt-go";
fetch = {
type = "git";
url = "https://github.com/dgrijalva/jwt-go";
rev = "24c63f56522a87ec5339cc3567883f1039378fdb";
sha256 = "1xjb3cj9qa66dk6sfrlggfm4a66qirqrp4qds90xzjj5sx51j4zk";
};
}
{
goPackagePath = "github.com/dgryski/go-bits";
fetch = {
type = "git";
url = "https://github.com/dgryski/go-bits";
rev = "2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef";
sha256 = "08mxwa4c77dgpvz2ygwd0pc929qxwff95y680mjjgbvj8yifiag2";
};
}
{
goPackagePath = "github.com/dgryski/go-bitstream";
fetch = {
type = "git";
url = "https://github.com/dgryski/go-bitstream";
rev = "7d46cd22db7004f0cceb6f7975824b560cf0e486";
sha256 = "1k9l16y7l2mkfvnp2ydv9cqly8179wqd20am4zy0q77qcsawkksx";
};
}
{
goPackagePath = "github.com/gogo/protobuf";
fetch = {
type = "git";
url = "https://github.com/gogo/protobuf";
rev = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9";
sha256 = "0h9vkfy3ydz0d6x72853yg49r9k54cgjnlv6a7v12gzqw47p941i";
};
}
{
goPackagePath = "github.com/golang/snappy";
fetch = {
type = "git";
url = "https://github.com/golang/snappy";
rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
};
}
{
goPackagePath = "github.com/influxdata/influxql";
fetch = {
type = "git";
url = "https://github.com/influxdata/influxql";
rev = "3921ab7858b6af8443fe0bef06b52608be72852c";
sha256 = "182ja5a9njlklavh5hzf7p06913pznp7j3chkrp0qwxj3jxysi2d";
};
}
{
goPackagePath = "github.com/influxdata/usage-client";
fetch = {
type = "git";
url = "https://github.com/influxdata/usage-client";
rev = "6d3895376368aa52a3a81d2a16e90f0f52371967";
sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
};
}
{
goPackagePath = "github.com/influxdata/yamux";
fetch = {
type = "git";
url = "https://github.com/influxdata/yamux";
rev = "1f58ded512de5feabbe30b60c7d33a7a896c5f16";
sha256 = "08y1lgcyyaa8zrg24ck64b5dfassgb2pp1fb9x5lw9q16fb170bx";
};
}
{
goPackagePath = "github.com/influxdata/yarpc";
fetch = {
type = "git";
url = "https://github.com/influxdata/yarpc";
rev = "036268cdec22b7074cd6d50cc6d7315c667063c7";
sha256 = "12xxwr451ya5h7kv7lg6lnwk04xazyxzv2g7bcgx9zifafxlhpxf";
};
}
{
goPackagePath = "github.com/jwilder/encoding";
fetch = {
type = "git";
url = "https://github.com/jwilder/encoding";
rev = "27894731927e49b0a9023f00312be26733744815";
sha256 = "0g4sdc5wj50js2hhrdcb7iik3wpd87gc0ivy4gwn49m8nxlpl7w3";
};
}
{
goPackagePath = "github.com/peterh/liner";
fetch = {
type = "git";
url = "https://github.com/peterh/liner";
rev = "88609521dc4b6c858fd4c98b628147da928ce4ac";
sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k";
};
}
{
goPackagePath = "github.com/philhofer/fwd";
fetch = {
type = "git";
url = "https://github.com/philhofer/fwd";
rev = "1612a298117663d7bc9a760ae20d383413859798";
sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl";
};
}
{
goPackagePath = "github.com/retailnext/hllpp";
fetch = {
type = "git";
url = "https://github.com/retailnext/hllpp";
rev = "38a7bb71b483e855d35010808143beaf05b67f9d";
sha256 = "0zpq5yjqprzdw9ll6g9sqp8nzwkhjh4ngzhx5mxahmpajgnzz7a8";
};
}
{
goPackagePath = "github.com/tinylib/msgp";
fetch = {
type = "git";
url = "https://github.com/tinylib/msgp";
rev = "ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20";
sha256 = "1j3sqsmq8v40dp1qcv2dsy3aq3yl088hpd4fnrrnnl53g3a18p4d";
};
}
{
goPackagePath = "github.com/uber-go/atomic";
fetch = {
type = "git";
url = "https://github.com/uber-go/atomic";
rev = "74ca5ec650841aee9f289dce76e928313a37cbc6";
sha256 = "14a4k5z4p2iig6sf7as5ps1frdyzcr67b9bff0by4z1vg4nrxi7h";
};
}
{
goPackagePath = "github.com/uber-go/zap";
fetch = {
type = "git";
url = "https://github.com/uber-go/zap";
rev = "fbae0281ffd546fa6d1959fec6075ac5da7fb577";
sha256 = "0ys6cb2h3r0vbly36v8zqkqsfc5y7fjsw2qmvx5fvjh35ih4w738";
};
}
{
goPackagePath = "github.com/xlab/treeprint";
fetch = {
type = "git";
url = "https://github.com/xlab/treeprint";
rev = "06dfc6fa17cdde904617990a0c2d89e3e332dbb3";
sha256 = "04v2glr8wsgs8gr5qbcxyqn9s6569lmgqb7rcs6bkmdnr79xpwl5";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd";
sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "1e2299c37cc91a509f1b12369872d27be0ce98a6";
sha256 = "1nh8v330pcwgk3h6nvfi12rlydl16v9ajv4s1giyx8wnfq8h6fm1";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34";
sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1";
};
}
]

444
pkgs/servers/nosql/influxdb/deps-1.6.3.nix
View File

@ -1,444 +0,0 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "collectd.org";
fetch = {
type = "git";
url = "https://github.com/collectd/go-collectd";
rev = "2ce144541b8903101fb8f1483cc0497a68798122";
sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
};
}
{
goPackagePath = "github.com/RoaringBitmap/roaring";
fetch = {
type = "git";
url = "https://github.com/RoaringBitmap/roaring";
rev = "d6540aab65a17321470b1661bfc52da1823871e9";
sha256 = "1lsrz7j55blalpp95vgz214b35sjf8nfmrw3fxybdl4xipk2ssdj";
};
}
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
};
}
{
goPackagePath = "github.com/bmizerany/pat";
fetch = {
type = "git";
url = "https://github.com/bmizerany/pat";
rev = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00";
sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp";
};
}
{
goPackagePath = "github.com/boltdb/bolt";
fetch = {
type = "git";
url = "https://github.com/boltdb/bolt";
rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
};
}
{
goPackagePath = "github.com/cespare/xxhash";
fetch = {
type = "git";
url = "https://github.com/cespare/xxhash";
rev = "5c37fe3735342a2e0d01c87a907579987c8936cc";
sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "346938d642f2ec3594ed81d874461961cd0faa76";
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
};
}
{
goPackagePath = "github.com/dgrijalva/jwt-go";
fetch = {
type = "git";
url = "https://github.com/dgrijalva/jwt-go";
rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
};
}
{
goPackagePath = "github.com/dgryski/go-bitstream";
fetch = {
type = "git";
url = "https://github.com/dgryski/go-bitstream";
rev = "9f22ccc24718d9643ac427c8c897ae1a01575783";
sha256 = "0x3hbsrn7qafhhjz6lgyc1pd1p5kgkrkbccvsr6yygkl785h5lhn";
};
}
{
goPackagePath = "github.com/glycerine/go-unsnap-stream";
fetch = {
type = "git";
url = "https://github.com/glycerine/go-unsnap-stream";
rev = "62a9a9eb44fd8932157b1a8ace2149eff5971af6";
sha256 = "1ray7p4q3vv5zn9w5xs7m9kjh68b2ck98nh25mxhfiwl9jxkabrc";
};
}
{
goPackagePath = "github.com/gogo/protobuf";
fetch = {
type = "git";
url = "https://github.com/gogo/protobuf";
rev = "1adfc126b41513cc696b209667c8656ea7aac67c";
sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "925541529c1fa6821df4e44ce2723319eb2be768";
sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
};
}
{
goPackagePath = "github.com/golang/snappy";
fetch = {
type = "git";
url = "https://github.com/golang/snappy";
rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
};
}
{
goPackagePath = "github.com/google/go-cmp";
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "3af367b6b30c263d47e8895973edcca9a49cf029";
sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
};
}
{
goPackagePath = "github.com/influxdata/influxql";
fetch = {
type = "git";
url = "https://github.com/influxdata/influxql";
rev = "a7267bff5327e316e54c54342b0bc9598753e3d5";
sha256 = "0mqc9xki5l9yfbb0dqjb417cmv3pca1bj71m90dkshladr2wlcg3";
};
}
{
goPackagePath = "github.com/influxdata/usage-client";
fetch = {
type = "git";
url = "https://github.com/influxdata/usage-client";
rev = "6d3895376368aa52a3a81d2a16e90f0f52371967";
sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
};
}
{
goPackagePath = "github.com/influxdata/yamux";
fetch = {
type = "git";
url = "https://github.com/influxdata/yamux";
rev = "1f58ded512de5feabbe30b60c7d33a7a896c5f16";
sha256 = "08y1lgcyyaa8zrg24ck64b5dfassgb2pp1fb9x5lw9q16fb170bx";
};
}
{
goPackagePath = "github.com/influxdata/yarpc";
fetch = {
type = "git";
url = "https://github.com/influxdata/yarpc";
rev = "f0da2db138cad2fb425541938fc28dd5a5bc6918";
sha256 = "1g71flc8s8xas7vmaiwv0425paii1akc7jsdqsgxkhyfxx2gvib0";
};
}
{
goPackagePath = "github.com/jsternberg/zap-logfmt";
fetch = {
type = "git";
url = "https://github.com/jsternberg/zap-logfmt";
rev = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6";
sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx";
};
}
{
goPackagePath = "github.com/jwilder/encoding";
fetch = {
type = "git";
url = "https://github.com/jwilder/encoding";
rev = "b4e1701a28efcc637d9afcca7d38e495fe909a09";
sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg";
};
}
{
goPackagePath = "github.com/klauspost/compress";
fetch = {
type = "git";
url = "https://github.com/klauspost/compress";
rev = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf";
sha256 = "00h2lpqcyc3pg2xk3q4a9cgyv0vkn15bx0hb725j5zbkr9vah23x";
};
}
{
goPackagePath = "github.com/klauspost/cpuid";
fetch = {
type = "git";
url = "https://github.com/klauspost/cpuid";
rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da";
sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4";
};
}
{
goPackagePath = "github.com/klauspost/crc32";
fetch = {
type = "git";
url = "https://github.com/klauspost/crc32";
rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
};
}
{
goPackagePath = "github.com/klauspost/pgzip";
fetch = {
type = "git";
url = "https://github.com/klauspost/pgzip";
rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506";
sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
};
}
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
type = "git";
url = "https://github.com/matttproud/golang_protobuf_extensions";
rev = "3247c84500bff8d9fb6d579d800f20b3e091582c";
sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d";
};
}
{
goPackagePath = "github.com/mschoch/smat";
fetch = {
type = "git";
url = "https://github.com/mschoch/smat";
rev = "90eadee771aeab36e8bf796039b8c261bebebe4f";
sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
};
}
{
goPackagePath = "github.com/opentracing/opentracing-go";
fetch = {
type = "git";
url = "https://github.com/opentracing/opentracing-go";
rev = "328fceb7548c744337cd010914152b74eaf4c4ab";
sha256 = "1w6s42n9glqwif6awyiapr7sh1wjvkxan41qhc1yi555byyw200k";
};
}
{
goPackagePath = "github.com/paulbellamy/ratecounter";
fetch = {
type = "git";
url = "https://github.com/paulbellamy/ratecounter";
rev = "524851a93235ac051e3540563ed7909357fe24ab";
sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9";
};
}
{
goPackagePath = "github.com/peterh/liner";
fetch = {
type = "git";
url = "https://github.com/peterh/liner";
rev = "6106ee4fe3e8435f18cd10e34557e5e50f0e792a";
sha256 = "178s1amw5r60lywgmh24pd2ljim0b05fdfsm4c8px22fkycmn1qr";
};
}
{
goPackagePath = "github.com/philhofer/fwd";
fetch = {
type = "git";
url = "https://github.com/philhofer/fwd";
rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
};
}
{
goPackagePath = "github.com/prometheus/client_golang";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_golang";
rev = "661e31bf844dfca9aeba15f27ea8aa0d485ad212";
sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn";
};
}
{
goPackagePath = "github.com/prometheus/client_model";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
};
}
{
goPackagePath = "github.com/prometheus/common";
fetch = {
type = "git";
url = "https://github.com/prometheus/common";
rev = "e4aa40a9169a88835b849a6efb71e05dc04b88f0";
sha256 = "0m1n616d694jca0qjwjn5ci7scfgm2jpi94dhi356arm9lhda4jc";
};
}
{
goPackagePath = "github.com/prometheus/procfs";
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
rev = "54d17b57dd7d4a3aa092476596b3f8a933bde349";
sha256 = "1b5218hi6k9i637k6xc7ynpll577zbnrhjm9jr2iczy3j0rr4rvr";
};
}
{
goPackagePath = "github.com/retailnext/hllpp";
fetch = {
type = "git";
url = "https://github.com/retailnext/hllpp";
rev = "101a6d2f8b52abfc409ac188958e7e7be0116331";
sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3";
};
}
{
goPackagePath = "github.com/tinylib/msgp";
fetch = {
type = "git";
url = "https://github.com/tinylib/msgp";
rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
};
}
{
goPackagePath = "github.com/willf/bitset";
fetch = {
type = "git";
url = "https://github.com/willf/bitset";
rev = "d860f346b89450988a379d7d705e83c58d1ea227";
sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0";
};
}
{
goPackagePath = "github.com/xlab/treeprint";
fetch = {
type = "git";
url = "https://github.com/xlab/treeprint";
rev = "f3a15cfd24bf976c724324cb6846a8b54b88b639";
sha256 = "0fgbdyk2mfj5vh8902sga33w5gw7q0f1if4nqx631ca33fd6pfbn";
};
}
{
goPackagePath = "go.uber.org/atomic";
fetch = {
type = "git";
url = "https://github.com/uber-go/atomic";
rev = "8474b86a5a6f79c443ce4b2992817ff32cf208b8";
sha256 = "166shnjw8rvjvksymi2gqw1ygsbxlq15xb10j2dx5rwy4y4asq8x";
};
}
{
goPackagePath = "go.uber.org/multierr";
fetch = {
type = "git";
url = "https://github.com/uber-go/multierr";
rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a";
sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
};
}
{
goPackagePath = "go.uber.org/zap";
fetch = {
type = "git";
url = "https://github.com/uber-go/zap";
rev = "35aad584952c3e7020db7b839f6b102de6271f89";
sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c3a3ad6d03f7a915c0f7e194b7152974bb73d287";
sha256 = "0x18275g5xlaw55bpx8hdna66d2hpbcw6hs0pxf1kmvfds6gzn6n";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "92b859f39abd2d91a854c9f9c4621b2f5054a92d";
sha256 = "1nzbay48k53pxa1sh102v571k6pa57540p0bzcil4qgan47yxba6";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "d8e400bc7db4870d786864138af681469693d18c";
sha256 = "08d23f9gjarp63dw0wj54nlqh3x2lqnchzkw8n5d7ik3wy7qy4yf";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "golang.org/x/time";
fetch = {
type = "git";
url = "https://go.googlesource.com/time";
rev = "26559e0f760e39c24d730d3224364aef164ee23f";
sha256 = "00fx6m59cjbi7y0ri4a57q1zs6r310xbg5yqns5kfm2cax0dkmnf";
};
}
]

840
pkgs/servers/nosql/influxdb/deps.nix generated Normal file
View File

@ -0,0 +1,840 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "collectd.org";
fetch = {
type = "git";
url = "https://github.com/collectd/go-collectd";
rev = "2ce144541b8903101fb8f1483cc0497a68798122";
sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
};
}
{
goPackagePath = "github.com/Masterminds/semver";
fetch = {
type = "git";
url = "https://github.com/Masterminds/semver";
rev = "c7af12943936e8c39859482e61f0574c2fd7fc75";
sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj";
};
}
{
goPackagePath = "github.com/RoaringBitmap/roaring";
fetch = {
type = "git";
url = "https://github.com/RoaringBitmap/roaring";
rev = "3d677d3262197ee558b85029301eb69b8239f91a";
sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9";
};
}
{
goPackagePath = "github.com/alecthomas/kingpin";
fetch = {
type = "git";
url = "https://github.com/alecthomas/kingpin";
rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
};
}
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
type = "git";
url = "https://github.com/alecthomas/template";
rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
};
}
{
goPackagePath = "github.com/alecthomas/units";
fetch = {
type = "git";
url = "https://github.com/alecthomas/units";
rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}
{
goPackagePath = "github.com/apache/arrow";
fetch = {
type = "git";
url = "https://github.com/apache/arrow";
rev = "f5df77359953ed06e1dce47edffc03340e2ff3ea";
sha256 = "12lygmhrchpf46jzyf0gnbfq3bf9ha68iajbnzflqf6k78jf6dj7";
};
}
{
goPackagePath = "github.com/apex/log";
fetch = {
type = "git";
url = "https://github.com/apex/log";
rev = "941dea75d3ebfbdd905a5d8b7b232965c5e5c684";
sha256 = "0cavvljwrxhxpsf6wdfncswamsqvpkah2pmnm6g94iq6l16lkbix";
};
}
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "dd947f47decb37a7c3bee72501bfc790701ab5ad";
sha256 = "1l4lxxlw0x2lkkr2m78p67ncr7dbv9a5ij8ahwa8hqm2sv0zsc5d";
};
}
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
};
}
{
goPackagePath = "github.com/blakesmith/ar";
fetch = {
type = "git";
url = "https://github.com/blakesmith/ar";
rev = "8bd4349a67f2533b078dbc524689d15dba0f4659";
sha256 = "1rdbn3v9vv3cs6indgrf9agydcbaspyc21fi0mpxlksva1sci99j";
};
}
{
goPackagePath = "github.com/bmizerany/pat";
fetch = {
type = "git";
url = "https://github.com/bmizerany/pat";
rev = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00";
sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp";
};
}
{
goPackagePath = "github.com/boltdb/bolt";
fetch = {
type = "git";
url = "https://github.com/boltdb/bolt";
rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
};
}
{
goPackagePath = "github.com/c-bata/go-prompt";
fetch = {
type = "git";
url = "https://github.com/c-bata/go-prompt";
rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0";
sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj";
};
}
{
goPackagePath = "github.com/caarlos0/ctrlc";
fetch = {
type = "git";
url = "https://github.com/caarlos0/ctrlc";
rev = "70dc48d5d792f20f684a8f1d29bbac298f4b2ef4";
sha256 = "1xqlagjzwvfls17vn5zlmw58g4ha60hvpjpj7nbd9mn87yd2h22j";
};
}
{
goPackagePath = "github.com/campoy/unique";
fetch = {
type = "git";
url = "https://github.com/campoy/unique";
rev = "88950e537e7e644cd746a3102037b5d2b723e9f5";
sha256 = "1cf0mfdxx68ak8i3x5z50nhr29ivpssg2sg73krdpxs2qjzwji90";
};
}
{
goPackagePath = "github.com/cespare/xxhash";
fetch = {
type = "git";
url = "https://github.com/cespare/xxhash";
rev = "5c37fe3735342a2e0d01c87a907579987c8936cc";
sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "346938d642f2ec3594ed81d874461961cd0faa76";
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
};
}
{
goPackagePath = "github.com/dgrijalva/jwt-go";
fetch = {
type = "git";
url = "https://github.com/dgrijalva/jwt-go";
rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
};
}
{
goPackagePath = "github.com/dgryski/go-bitstream";
fetch = {
type = "git";
url = "https://github.com/dgryski/go-bitstream";
rev = "3522498ce2c8ea06df73e55df58edfbfb33cfdd6";
sha256 = "1lr0qjdddxdiwfs530saglk4q5395i4n3w8h8k5j8nsjj8k3na7f";
};
}
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
};
}
{
goPackagePath = "github.com/glycerine/go-unsnap-stream";
fetch = {
type = "git";
url = "https://github.com/glycerine/go-unsnap-stream";
rev = "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126";
sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n";
};
}
{
goPackagePath = "github.com/go-ini/ini";
fetch = {
type = "git";
url = "https://github.com/go-ini/ini";
rev = "7b294651033cd7d9e7f0d9ffa1b75ed1e198e737";
sha256 = "0y6qzla90zd6dhs04vclrg46rwlsy9zlqi0y6y2k1pdxn2cbblhb";
};
}
{
goPackagePath = "github.com/go-sql-driver/mysql";
fetch = {
type = "git";
url = "https://github.com/go-sql-driver/mysql";
rev = "d523deb1b23d913de5bdada721a6071e71283618";
sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n";
};
}
{
goPackagePath = "github.com/gogo/protobuf";
fetch = {
type = "git";
url = "https://github.com/gogo/protobuf";
rev = "636bf0302bc95575d69441b25a2603156ffdddf1";
sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
};
}
{
goPackagePath = "github.com/golang/snappy";
fetch = {
type = "git";
url = "https://github.com/golang/snappy";
rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
};
}
{
goPackagePath = "github.com/google/go-cmp";
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "3af367b6b30c263d47e8895973edcca9a49cf029";
sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
};
}
{
goPackagePath = "github.com/google/go-github";
fetch = {
type = "git";
url = "https://github.com/google/go-github";
rev = "dd29b543e14c33e6373773f2c5ea008b29aeac95";
sha256 = "0sk67d9zdn420h2g4l3wib28zqr3ihbg6dj382cwmns7yska58lp";
};
}
{
goPackagePath = "github.com/google/go-querystring";
fetch = {
type = "git";
url = "https://github.com/google/go-querystring";
rev = "44c6ddd0a2342c386950e880b658017258da92fc";
sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
};
}
{
goPackagePath = "github.com/goreleaser/goreleaser";
fetch = {
type = "git";
url = "https://github.com/goreleaser/goreleaser";
rev = "f99940ff5397b099bf606cf1323c00c63afcd153";
sha256 = "1mh4j0vdyxhr7fmwva59p0wrsrk318c2fbgzf1vqbgs8iwibs739";
};
}
{
goPackagePath = "github.com/goreleaser/nfpm";
fetch = {
type = "git";
url = "https://github.com/goreleaser/nfpm";
rev = "de75d679901371e3ed0c0a606e160539d5a4b45e";
sha256 = "1dbw458xndgj9k5dvffrqkz7cq6rcmflvsvzd8adsg24a3mk3qgy";
};
}
{
goPackagePath = "github.com/imdario/mergo";
fetch = {
type = "git";
url = "https://github.com/imdario/mergo";
rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4";
sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7";
};
}
{
goPackagePath = "github.com/influxdata/flux";
fetch = {
type = "git";
url = "https://github.com/influxdata/flux";
rev = "8c9d0ad49204d3bbb171e96d872cf663ee7f1b4d";
sha256 = "0yamrzqjs6giwqq0ljf2dscarqw6851cw3iya8cya0x5plyd810c";
};
}
{
goPackagePath = "github.com/influxdata/influxql";
fetch = {
type = "git";
url = "https://github.com/influxdata/influxql";
rev = "c661ab7db8ad858626cc7a2114e786f4e7463564";
sha256 = "1j73aj312laqmi20fbinx0aal82ncpqbj5dgs41br0j7fkvi6873";
};
}
{
goPackagePath = "github.com/influxdata/line-protocol";
fetch = {
type = "git";
url = "https://github.com/influxdata/line-protocol";
rev = "32c6aa80de5eb09d190ad284a8214a531c6bce57";
sha256 = "0wvd6lplbvmz2lznvy4zz3fmxiqc43cgr4vppp1xi38j1iwq0349";
};
}
{
goPackagePath = "github.com/influxdata/platform";
fetch = {
type = "git";
url = "https://github.com/influxdata/platform";
rev = "0f79e4ea3248354c789cba274542e0a8e55971db";
sha256 = "16d9g7vgy30zahhj066kz7akahvpknq3ljk2fzvczjsm59ih8rjk";
};
}
{
goPackagePath = "github.com/influxdata/roaring";
fetch = {
type = "git";
url = "https://github.com/influxdata/roaring";
rev = "fc520f41fab6dcece280e8d4853d87a09a67f9e0";
sha256 = "0jr9r5q4s5bz4kbqndrlm5aikls4kqbl955qbsh6bpbmxdsamcsr";
};
}
{
goPackagePath = "github.com/influxdata/tdigest";
fetch = {
type = "git";
url = "https://github.com/influxdata/tdigest";
rev = "a7d76c6f093a59b94a01c6c2b8429122d444a8cc";
sha256 = "02jxrb2d1n6zflwa7jhgid5344l6zj4gxg4kis20v7xa6iqrj1ni";
};
}
{
goPackagePath = "github.com/influxdata/usage-client";
fetch = {
type = "git";
url = "https://github.com/influxdata/usage-client";
rev = "6d3895376368aa52a3a81d2a16e90f0f52371967";
sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
};
}
{
goPackagePath = "github.com/jmespath/go-jmespath";
fetch = {
type = "git";
url = "https://github.com/jmespath/go-jmespath";
rev = "0b12d6b5";
sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
};
}
{
goPackagePath = "github.com/jsternberg/zap-logfmt";
fetch = {
type = "git";
url = "https://github.com/jsternberg/zap-logfmt";
rev = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6";
sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx";
};
}
{
goPackagePath = "github.com/jwilder/encoding";
fetch = {
type = "git";
url = "https://github.com/jwilder/encoding";
rev = "b4e1701a28efcc637d9afcca7d38e495fe909a09";
sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg";
};
}
{
goPackagePath = "github.com/kevinburke/go-bindata";
fetch = {
type = "git";
url = "https://github.com/kevinburke/go-bindata";
rev = "06af60a4461b70d84a2b173d92f9f425d78baf55";
sha256 = "0k9bpx6vqsr53bzj7k78rjalybpwbs86zdks6v7jqkwsrx4j7a07";
};
}
{
goPackagePath = "github.com/kisielk/gotool";
fetch = {
type = "git";
url = "https://github.com/kisielk/gotool";
rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
};
}
{
goPackagePath = "github.com/klauspost/compress";
fetch = {
type = "git";
url = "https://github.com/klauspost/compress";
rev = "b939724e787a27c0005cabe3f78e7ed7987ac74f";
sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s";
};
}
{
goPackagePath = "github.com/klauspost/cpuid";
fetch = {
type = "git";
url = "https://github.com/klauspost/cpuid";
rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da";
sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4";
};
}
{
goPackagePath = "github.com/klauspost/crc32";
fetch = {
type = "git";
url = "https://github.com/klauspost/crc32";
rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
};
}
{
goPackagePath = "github.com/klauspost/pgzip";
fetch = {
type = "git";
url = "https://github.com/klauspost/pgzip";
rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506";
sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s";
};
}
{
goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79";
sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
};
}
{
goPackagePath = "github.com/mattn/go-tty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-tty";
rev = "13ff1204f104d52c3f7645ec027ecbcf9026429e";
sha256 = "1c9vzrq7r5skq0cz9alkix9n1cp6h7wybdwrg0f1vzvxj26qr7yq";
};
}
{
goPackagePath = "github.com/mattn/go-zglob";
fetch = {
type = "git";
url = "https://github.com/mattn/go-zglob";
rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1";
sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz";
};
}
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
type = "git";
url = "https://github.com/matttproud/golang_protobuf_extensions";
rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
};
}
{
goPackagePath = "github.com/mna/pigeon";
fetch = {
type = "git";
url = "https://github.com/mna/pigeon";
rev = "9df264905d4734c0133161d8c67828ff522b154a";
sha256 = "120m90lig5984wd2k7x2fclx5vb64lxmx4j3065pp0q1fqjif87z";
};
}
{
goPackagePath = "github.com/mschoch/smat";
fetch = {
type = "git";
url = "https://github.com/mschoch/smat";
rev = "90eadee771aeab36e8bf796039b8c261bebebe4f";
sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
};
}
{
goPackagePath = "github.com/opentracing/opentracing-go";
fetch = {
type = "git";
url = "https://github.com/opentracing/opentracing-go";
rev = "bd9c3193394760d98b2fa6ebb2291f0cd1d06a7d";
sha256 = "11ad6yhi1fi7ybg6jj18kw5pl12zhvvcrkjqbz6rspawb5qrlq1g";
};
}
{
goPackagePath = "github.com/paulbellamy/ratecounter";
fetch = {
type = "git";
url = "https://github.com/paulbellamy/ratecounter";
rev = "524851a93235ac051e3540563ed7909357fe24ab";
sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9";
};
}
{
goPackagePath = "github.com/peterh/liner";
fetch = {
type = "git";
url = "https://github.com/peterh/liner";
rev = "8c1271fcf47f341a9e6771872262870e1ad7650c";
sha256 = "15swk6y173sdav3gzxk0rj2z17khsyc8wljk6gk3w4fq9wnziggd";
};
}
{
goPackagePath = "github.com/philhofer/fwd";
fetch = {
type = "git";
url = "https://github.com/philhofer/fwd";
rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
{
goPackagePath = "github.com/pkg/term";
fetch = {
type = "git";
url = "https://github.com/pkg/term";
rev = "bffc007b7fd5a70e20e28f5b7649bb84671ef436";
sha256 = "0c9xnx7dyw7j890nm9av5fjpqjb129z7vbg3lw554vwnckc84x54";
};
}
{
goPackagePath = "github.com/prometheus/client_golang";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_golang";
rev = "661e31bf844dfca9aeba15f27ea8aa0d485ad212";
sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn";
};
}
{
goPackagePath = "github.com/prometheus/client_model";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f";
sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
};
}
{
goPackagePath = "github.com/prometheus/common";
fetch = {
type = "git";
url = "https://github.com/prometheus/common";
rev = "7600349dcfe1abd18d72d3a1770870d9800a7801";
sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
};
}
{
goPackagePath = "github.com/prometheus/procfs";
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a";
sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f";
};
}
{
goPackagePath = "github.com/retailnext/hllpp";
fetch = {
type = "git";
url = "https://github.com/retailnext/hllpp";
rev = "101a6d2f8b52abfc409ac188958e7e7be0116331";
sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3";
};
}
{
goPackagePath = "github.com/satori/go.uuid";
fetch = {
type = "git";
url = "https://github.com/satori/go.uuid";
rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
};
}
{
goPackagePath = "github.com/segmentio/kafka-go";
fetch = {
type = "git";
url = "https://github.com/segmentio/kafka-go";
rev = "c6db9435477f3cb658e2dd0fa93e02118c870251";
sha256 = "17zdj0i429a0wmwj8rm4j0hmxsv8kbql67s5iv78hac6rcys7bj2";
};
}
{
goPackagePath = "github.com/spf13/cast";
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
rev = "8c9545af88b134710ab1cd196795e7f2388358d7";
sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
};
}
{
goPackagePath = "github.com/tinylib/msgp";
fetch = {
type = "git";
url = "https://github.com/tinylib/msgp";
rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
};
}
{
goPackagePath = "github.com/willf/bitset";
fetch = {
type = "git";
url = "https://github.com/willf/bitset";
rev = "d860f346b89450988a379d7d705e83c58d1ea227";
sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0";
};
}
{
goPackagePath = "github.com/xlab/treeprint";
fetch = {
type = "git";
url = "https://github.com/xlab/treeprint";
rev = "d6fb6747feb6e7cfdc44682a024bddf87ef07ec2";
sha256 = "1ln6p8va53sxrhyy0gfanskzzc30c55l6nk1f0bin91jlr2mxn4n";
};
}
{
goPackagePath = "go.uber.org/atomic";
fetch = {
type = "git";
url = "https://github.com/uber-go/atomic";
rev = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289";
sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6";
};
}
{
goPackagePath = "go.uber.org/multierr";
fetch = {
type = "git";
url = "https://github.com/uber-go/multierr";
rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a";
sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
};
}
{
goPackagePath = "go.uber.org/zap";
fetch = {
type = "git";
url = "https://github.com/uber-go/zap";
rev = "4d45f9617f7d90f7a663ff21c7a4321dbe78098b";
sha256 = "0fpgcbqv8inx70jmnrv0zay7mjj8rwwcvd3ivqwy1wmrmkm8jjmj";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9";
sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
};
}
{
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "c57b0facaced709681d9f90397429b9430a74754";
sha256 = "044rx9vkkwpp7d23gdk3k4yb7k28kcy34y83pjb1gwndhhh019w1";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "golang.org/x/time";
fetch = {
type = "git";
url = "https://go.googlesource.com/time";
rev = "fbb02b2291d28baffd63558aa44b4b56f178d650";
sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
};
}
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "45ff765b4815d34d8b80220fd05c79063b185ce1";
sha256 = "0pirpy0xcks294zd629x6p5yxwcpz1xbxbg6hy5xpxqq2v24nxqr";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06";
sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7";
};
}
{
goPackagePath = "google.golang.org/genproto";
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
rev = "fedd2861243fd1a8152376292b921b394c7bef7e";
sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp";
};
}
{
goPackagePath = "google.golang.org/grpc";
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8";
sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
};
}
{
goPackagePath = "honnef.co/go/tools";
fetch = {
type = "git";
url = "https://github.com/dominikh/go-tools";
rev = "d73ab98e7c39fdcf9ba65062e43d34310f198353";
sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7";
};
}
]

27
pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch Normal file
View File

@ -0,0 +1,27 @@
From c1832eabb99cec47f1714f696275285e1e28da34 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 2 Apr 2019 16:20:50 +0200
Subject: [PATCH] Don't resolve symlinks when trying to find INSTALL_PATH
Nix specific patch. This behavior breaks roundcube setups where plugins
are in a store path with symlinks to the actual source.
---
bin/update.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/update.sh b/bin/update.sh
index 08e3bb5..b2ad498 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -19,7 +19,7 @@
+-----------------------------------------------------------------------+
*/
-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
+define('INSTALL_PATH', __DIR__ . '/../' );
require_once INSTALL_PATH . 'program/include/clisetup.php';
--
2.19.2

23
pkgs/servers/roundcube/default.nix
View File

@ -1,14 +1,21 @@
{ lib, stdenv, fetchzip, buildEnv, roundcube, roundcubePlugins }:
let
{ lib, fetchurl, stdenv, buildEnv, roundcube, roundcubePlugins }:
stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.3.8";
in
fetchzip rec {
name= "roundcube-${version}";
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "1lhwr13bglm8rqgamnb480b07wpqhw9bskjj2xxb0x8kdjly29ks";
src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "018djad7ygfl9c9f2l2j42qkg31ml3hs2f01f0dk361zckwk77n4";
};
extraPostFetch = ''
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
dontBuild = true;
installPhase = ''
mkdir $out
cp -r * $out/
ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
rm -rf $out/installer
'';

6
pkgs/shells/powershell/default.nix
View File

@ -4,8 +4,8 @@
let platformString = if stdenv.isDarwin then "osx"
else if stdenv.isLinux then "linux"
else throw "unsupported platform";
platformSha = if stdenv.isDarwin then "1zm5q25ny2x6wvdqfrc380467zq0nbrzh2rzldwdkdpkb6wbvpj8"
else if stdenv.isLinux then "021ag632jcn7f1vpddann04xifgsq3wrx93hzbvq7cngg8y16r3y"
platformSha = if stdenv.isDarwin then "1jcrrgybcyq9kwyqxshsfm5fy3sa77h3795xx3rvrs8k434nl1yb"
else if stdenv.isLinux then "1hlis827wmnjcy4h8va50093pmnqdhkbnbimmkymzmcvmkbmi9nx"
else throw "unsupported platform";
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
else if stdenv.isLinux then "LD_LIBRARY_PATH"
@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx"
in
stdenv.mkDerivation rec {
name = "powershell-${version}";
version = "6.1.2";
version = "6.2.0";
src = fetchzip {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";

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