mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
Merge branch 'master.upstream' into staging.upstream
This commit is contained in:
commit
a106080623
|
@ -236,6 +236,7 @@
|
|||
sprock = "Roger Mason <rmason@mun.ca>";
|
||||
spwhitt = "Spencer Whitt <sw@swhitt.me>";
|
||||
stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
|
||||
szczyp = "Szczyp <qb@szczyp.com>";
|
||||
sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
|
||||
tailhook = "Paul Colomiets <paul@colomiets.name>";
|
||||
taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
|
||||
|
|
|
@ -160,6 +160,17 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
snmpConf = mkOption {
|
||||
type = types.lines;
|
||||
default = ''
|
||||
Address @LOCAL
|
||||
'';
|
||||
description = ''
|
||||
The contents of <filename>/etc/cups/snmp.conf</filename>. See "man
|
||||
cups-snmp.conf" for a complete description.
|
||||
'';
|
||||
};
|
||||
|
||||
drivers = mkOption {
|
||||
type = types.listOf types.path;
|
||||
example = literalExample "[ pkgs.splix ]";
|
||||
|
@ -199,6 +210,7 @@ in
|
|||
environment.etc."cups/cups-files.conf".text = cfg.cupsFilesConf;
|
||||
environment.etc."cups/cupsd.conf".text = cfg.cupsdConf;
|
||||
environment.etc."cups/cups-browsed.conf".text = cfg.browsedConf;
|
||||
environment.etc."cups/snmp.conf".text = cfg.snmpConf;
|
||||
|
||||
services.dbus.packages = [ cups ];
|
||||
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
assert alsaSupport -> alsaLib != null;
|
||||
assert jackSupport -> libjack2 != null;
|
||||
|
||||
let version = "1.0.7"; in
|
||||
let version = "1.0.8"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "fmit-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "14dzrrxjskhqamhfqhzp6napvc1vyjxcc0v8id1iqzsfdn86xqm9";
|
||||
sha256 = "04s7xcgmi5g58lirr48vf203n1jwdxf981x1p6ysbax24qwhs2kd";
|
||||
rev = "v${version}";
|
||||
repo = "fmit";
|
||||
owner = "gillesdegottex";
|
||||
|
@ -22,10 +22,6 @@ stdenv.mkDerivation {
|
|||
++ stdenv.lib.optional alsaSupport [ alsaLib ]
|
||||
++ stdenv.lib.optional jackSupport [ libjack2 ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
mkdir build
|
||||
cd build
|
||||
|
|
29
pkgs/data/fonts/gohufont/default.nix
Normal file
29
pkgs/data/fonts/gohufont/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gohufont-2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://font.gohu.org/gohufont-2.0.tar.gz";
|
||||
sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s";
|
||||
};
|
||||
|
||||
buildInputs = [ mkfontdir mkfontscale ];
|
||||
|
||||
installPhase = ''
|
||||
fontDir="$out/share/fonts/misc"
|
||||
mkdir -p "$fontDir"
|
||||
mv *.pcf.gz "$fontDir"
|
||||
cd "$fontDir"
|
||||
mkfontdir
|
||||
mkfontscale
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A monospace bitmap font well suited for programming and terminal use";
|
||||
homepage = http://font.gohu.org/;
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ epitrochoid ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
28
pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
Normal file
28
pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
Normal file
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
|
||||
, itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core
|
||||
, dbus, intltool, libwnck3, hicolor_icon_theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "accerciser-3.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz";
|
||||
sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
|
||||
python3Packages.pygobject3 python3Packages.ipythonLight
|
||||
at_spi2_core dbus intltool libwnck3 hicolor_icon_theme
|
||||
];
|
||||
|
||||
wrapPrefixVariables = [ "PYTHONPATH" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Accerciser;
|
||||
description = "Interactive Python accessibility explorer";
|
||||
maintainers = gnome3.maintainers;
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
27
pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
Normal file
27
pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
|
||||
, intltool, evolution_data_server, sqlite, libxml2, libsoup
|
||||
, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-calendar-${gnome3.version}.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-calendar/${gnome3.version}/${name}.tar.xz";
|
||||
sha256 = "0vqwps86whf8jgq7q4hdrbnmlaxppgrfa3j7n6ddpqzkb3gf2c5m";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
|
||||
sqlite libxml2 libsoup glib
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Calendar;
|
||||
description = "Simple and beautiful calendar application for GNOME";
|
||||
maintainers = gnome3.maintainers;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -0,0 +1,20 @@
|
|||
{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-getting-started-docs-${gnome3.version}.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.version}/${name}.tar.xz";
|
||||
sha256 = "07wz35r6p9nvlshwcyjvhjnzbaw3bzadlhwz51c8nky7m7pdgmyy";
|
||||
};
|
||||
|
||||
buildInputs = [ intltool itstool libxml2 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://live.gnome.org/DocumentationProject;
|
||||
description = "Help a new user get started in GNOME";
|
||||
maintainers = gnome3.maintainers;
|
||||
license = licenses.cc-by-sa-30;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
27
pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
Normal file
27
pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
|
||||
, libgtop, intltool, itstool, libxml2, hicolor_icon_theme
|
||||
, nmap, inetutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-nettool-3.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz";
|
||||
sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
|
||||
hicolor_icon_theme
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ nmap inetutils ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://projects.gnome.org/gnome-network;
|
||||
description = "A collection of networking tools";
|
||||
maintainers = gnome3.maintainers;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
|
||||
, spidermonkey_24, pango, readline, glib }:
|
||||
, spidermonkey_24, pango, readline, glib, libxml2 }:
|
||||
|
||||
let
|
||||
majorVersion = "1.43";
|
||||
|
@ -12,10 +12,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2";
|
||||
};
|
||||
|
||||
buildInputs = [ gobjectIntrospection pkgconfig gtk3 glib pango readline ];
|
||||
buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ];
|
||||
|
||||
propagatedBuildInputs = [ spidermonkey_24 ];
|
||||
|
||||
postInstall = ''
|
||||
sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
maintainers = gnome3.maintainers;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
|
||||
, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
|
||||
, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
|
||||
, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
|
||||
, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yelp-${gnome3.version}.1";
|
||||
|
@ -18,13 +19,8 @@ stdenv.mkDerivation rec {
|
|||
libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
|
||||
librsvg gdk_pixbuf gnome3.adwaita-icon-theme
|
||||
hicolor_icon_theme gnome3.adwaita-icon-theme
|
||||
gnome3.gsettings_desktop_schemas ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/yelp" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
gnome3.gsettings_desktop_schemas wrapGAppsHook
|
||||
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Yelp;
|
||||
|
|
|
@ -31,7 +31,8 @@ let
|
|||
gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
|
||||
gnome-clocks gnome-music gnome-tweak-tool gnome-photos
|
||||
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
|
||||
gnome-maps gnome-characters
|
||||
gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
|
||||
gnome-getting-started-docs
|
||||
];
|
||||
|
||||
gamesPackages = with gnome3; [ swell-foop lightsoff iagno
|
||||
|
@ -248,6 +249,8 @@ let
|
|||
|
||||
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
|
||||
|
||||
accerciser = callPackage ./apps/accerciser { };
|
||||
|
||||
bijiben = callPackage ./apps/bijiben {
|
||||
webkitgtk = webkitgtk24x;
|
||||
};
|
||||
|
@ -269,18 +272,24 @@ let
|
|||
spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
|
||||
};
|
||||
|
||||
gnome-calendar = callPackage ./apps/gnome-calendar { };
|
||||
|
||||
gnome-characters = callPackage ./apps/gnome-characters { };
|
||||
|
||||
gnome-clocks = callPackage ./apps/gnome-clocks { };
|
||||
|
||||
gnome-documents = callPackage ./apps/gnome-documents { };
|
||||
|
||||
gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { };
|
||||
|
||||
gnome-logs = callPackage ./apps/gnome-logs { };
|
||||
|
||||
gnome-maps = callPackage ./apps/gnome-maps { };
|
||||
|
||||
gnome-music = callPackage ./apps/gnome-music { };
|
||||
|
||||
gnome-nettool = callPackage ./apps/gnome-nettool { };
|
||||
|
||||
gnome-photos = callPackage ./apps/gnome-photos {
|
||||
gegl = gegl_0_3;
|
||||
};
|
||||
|
@ -302,6 +311,10 @@ let
|
|||
|
||||
anjuta = callPackage ./devtools/anjuta { };
|
||||
|
||||
devhelp = callPackage ./devtools/devhelp {
|
||||
webkitgtk = webkitgtk24x;
|
||||
};
|
||||
|
||||
gdl = callPackage ./devtools/gdl { };
|
||||
|
||||
gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
|
||||
|
|
23
pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
Normal file
23
pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
|
||||
, webkitgtk, intltool, hicolor_icon_theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "devhelp-${gnome3.version}.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/devhelp/${gnome3.version}/${name}.tar.xz";
|
||||
sha256 = "0i8kyh86hzwxs8dm047ivghl2b92vigdxa3x4pk4ha0whpk38g37";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig gtk3 wrapGAppsHook webkitgtk intltool hicolor_icon_theme
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://live.gnome.org/devhelp;
|
||||
description = "API documentation browser for GNOME";
|
||||
maintainers = gnome3.maintainers;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -39,7 +39,7 @@
|
|||
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
|
||||
, preConfigure ? "", postConfigure ? ""
|
||||
, preBuild ? "", postBuild ? ""
|
||||
, preInstall ? "", postInstall ? ""
|
||||
, installPhase ? "", preInstall ? "", postInstall ? ""
|
||||
, checkPhase ? "", preCheck ? "", postCheck ? ""
|
||||
, preFixup ? "", postFixup ? ""
|
||||
, coreSetup ? false # Use only core packages to build Setup.hs.
|
||||
|
@ -307,6 +307,7 @@ stdenv.mkDerivation ({
|
|||
// optionalAttrs (preCheck != "") { inherit preCheck; }
|
||||
// optionalAttrs (postCheck != "") { inherit postCheck; }
|
||||
// optionalAttrs (preInstall != "") { inherit preInstall; }
|
||||
// optionalAttrs (installPhase != "") { inherit installPhase; }
|
||||
// optionalAttrs (postInstall != "") { inherit postInstall; }
|
||||
// optionalAttrs (preFixup != "") { inherit preFixup; }
|
||||
// optionalAttrs (postFixup != "") { inherit postFixup; }
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, pkgconfig, nix, git }: let
|
||||
version = "4.1.0";
|
||||
version = "4.1.2";
|
||||
in stdenv.mkDerivation {
|
||||
name = "nix-exec-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
|
||||
|
||||
sha256 = "16hssxv6fwi5a6bz7dlvhjjr3ymiqrvq0xfd38gwhn9qhvynv2ak";
|
||||
sha256 = "03dphdkf33zi2wm92wghfvadghljh6q1a9zdj9rcbx2jh7fp3k8y";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig nix git ];
|
||||
|
|
|
@ -17,7 +17,7 @@ let
|
|||
baseName="OpenSceneGraph";
|
||||
version="3.2.1";
|
||||
name="${baseName}-${version}";
|
||||
url="http://www.openscenegraph.org/downloads/developer_releases/${name}.zip";
|
||||
url="http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
|
||||
hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
|
||||
};
|
||||
in
|
||||
|
|
32
pkgs/development/libraries/rote/default.nix
Normal file
32
pkgs/development/libraries/rote/default.nix
Normal file
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, fetchurl, ncurses }:
|
||||
|
||||
let version = "0.2.8"; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rote-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky";
|
||||
url = "mirror://sourceforge/rote/${name}.tar.gz";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit version;
|
||||
description = "Our Own Terminal Emulation Library";
|
||||
longDescription = ''
|
||||
ROTE is a simple C library for VT102 terminal emulation. It allows the
|
||||
programmer to set up virtual 'screens' and send them data. The virtual
|
||||
screens will emulate the behavior of a VT102 terminal, interpreting
|
||||
escape sequences, control characters and such. The library supports
|
||||
ncurses as well so that you may render the virtual screen to the real
|
||||
screen when you need to.
|
||||
'';
|
||||
homepage = http://rote.sourceforge.net/;
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ nckx ];
|
||||
};
|
||||
}
|
22
pkgs/development/python-modules/pyatspi/default.nix
Normal file
22
pkgs/development/python-modules/pyatspi/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, fetchurl, pkgconfig, python3, python3Packages, at_spi2_core }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.16.0";
|
||||
name = "pyatspi-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/pyatspi/2.16/${name}.tar.xz";
|
||||
sha256 = "185lwgv9bk1fc6vw2xypznzr7p8fhp84ggnrb706zwgalmy8aym6";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig python3 python3Packages.pygobject3 at_spi2_core
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python 3 bindings for at-spi";
|
||||
homepage = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ jgeerds ];
|
||||
};
|
||||
}
|
2
pkgs/development/tools/rhc/Gemfile
Normal file
2
pkgs/development/tools/rhc/Gemfile
Normal file
|
@ -0,0 +1,2 @@
|
|||
source 'https://rubygems.org'
|
||||
gem 'rhc'
|
35
pkgs/development/tools/rhc/Gemfile.lock
Normal file
35
pkgs/development/tools/rhc/Gemfile.lock
Normal file
|
@ -0,0 +1,35 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
archive-tar-minitar (0.5.2)
|
||||
commander (4.2.1)
|
||||
highline (~> 1.6.11)
|
||||
highline (1.6.21)
|
||||
httpclient (2.6.0.1)
|
||||
net-scp (1.2.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.9.2)
|
||||
net-ssh-gateway (1.2.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh-multi (1.2.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh-gateway (>= 1.2.0)
|
||||
open4 (1.3.4)
|
||||
rhc (1.36.4)
|
||||
archive-tar-minitar
|
||||
commander (>= 4.0, < 4.3.0)
|
||||
highline (~> 1.6.11)
|
||||
httpclient (>= 2.4.0)
|
||||
net-scp (>= 1.1.2)
|
||||
net-ssh (>= 2.0.11, < 2.9.3)
|
||||
net-ssh-multi (>= 1.2.0)
|
||||
open4
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
rhc
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.5
|
17
pkgs/development/tools/rhc/default.nix
Normal file
17
pkgs/development/tools/rhc/default.nix
Normal file
|
@ -0,0 +1,17 @@
|
|||
{ lib, bundlerEnv, ruby }:
|
||||
|
||||
bundlerEnv {
|
||||
name = "rhc-1.36.4";
|
||||
|
||||
inherit ruby;
|
||||
gemfile = ./Gemfile;
|
||||
lockfile = ./Gemfile.lock;
|
||||
gemset = ./gemset.nix;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/openshift/rhc;
|
||||
description = "OpenShift client tools";
|
||||
license = licenses.asl20;
|
||||
maintaners = maintainers.szczyp;
|
||||
};
|
||||
}
|
95
pkgs/development/tools/rhc/gemset.nix
Normal file
95
pkgs/development/tools/rhc/gemset.nix
Normal file
|
@ -0,0 +1,95 @@
|
|||
{
|
||||
"archive-tar-minitar" = {
|
||||
version = "0.5.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig";
|
||||
};
|
||||
};
|
||||
"commander" = {
|
||||
version = "4.2.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc";
|
||||
};
|
||||
dependencies = [
|
||||
"highline"
|
||||
];
|
||||
};
|
||||
"highline" = {
|
||||
version = "1.6.21";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
|
||||
};
|
||||
};
|
||||
"httpclient" = {
|
||||
version = "2.6.0.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l";
|
||||
};
|
||||
};
|
||||
"net-scp" = {
|
||||
version = "1.2.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
|
||||
};
|
||||
dependencies = [
|
||||
"net-ssh"
|
||||
];
|
||||
};
|
||||
"net-ssh" = {
|
||||
version = "2.9.2";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
|
||||
};
|
||||
};
|
||||
"net-ssh-gateway" = {
|
||||
version = "1.2.0";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy";
|
||||
};
|
||||
dependencies = [
|
||||
"net-ssh"
|
||||
];
|
||||
};
|
||||
"net-ssh-multi" = {
|
||||
version = "1.2.1";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71";
|
||||
};
|
||||
dependencies = [
|
||||
"net-ssh"
|
||||
"net-ssh-gateway"
|
||||
];
|
||||
};
|
||||
"open4" = {
|
||||
version = "1.3.4";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1";
|
||||
};
|
||||
};
|
||||
"rhc" = {
|
||||
version = "1.36.4";
|
||||
source = {
|
||||
type = "gem";
|
||||
sha256 = "1dkg39x3y3sxq71md5c8akq4y7ynjwcdy8ysm6d1k9b2rj0s5wdb";
|
||||
};
|
||||
dependencies = [
|
||||
"archive-tar-minitar"
|
||||
"commander"
|
||||
"highline"
|
||||
"httpclient"
|
||||
"net-scp"
|
||||
"net-ssh"
|
||||
"net-ssh-multi"
|
||||
"open4"
|
||||
];
|
||||
};
|
||||
}
|
|
@ -1,26 +1,23 @@
|
|||
{ stdenv, fetchurl, iptables, libnfnetlink }:
|
||||
{ stdenv, fetchurl, iptables, pkgconfig }:
|
||||
|
||||
assert stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "miniupnpd-1.9.20150430";
|
||||
name = "miniupnpd-1.9.20150721";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
|
||||
sha256 = "0ajqs3lf2cgq5fm1v79fa23sbb623i89sqnx7d9cnqbqq5py1k71";
|
||||
name = "miniupnpd-1.9.20150430.tar.gz";
|
||||
sha256 = "0w2422wfcir333qd300swkdvmksdfdllspplnz8vbv13a1724h4k";
|
||||
name = "${name}.tar.gz";
|
||||
};
|
||||
|
||||
buildInputs = [ iptables libnfnetlink ];
|
||||
buildInputs = [ iptables ];
|
||||
nativeBuildInputs= [ pkgconfig ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-DIPTABLES_143";
|
||||
|
||||
NIX_CFLAGS_LINK = "-liptc -lnfnetlink";
|
||||
NIX_CFLAGS_LINK = "-liptc";
|
||||
|
||||
makefile = "Makefile.linux";
|
||||
|
||||
makeFlags = "LIBS=";
|
||||
|
||||
buildFlags = "miniupnpd genuuid";
|
||||
|
||||
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite
|
||||
, pkgconfig }:
|
||||
|
||||
let version = "4.1.4"; in
|
||||
let version = "4.1.5"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "eid-mw-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0v0p0kdjscvf4bn14dyny399k1bfsz8v7n8v16lv0q0xs5nwqnky";
|
||||
sha256 = "0m2awjfj2vs3aahy1ygrxi7mx12bhr1a621kiiszzai38crpgwbj";
|
||||
rev = "v${version}";
|
||||
repo = "eid-mw";
|
||||
owner = "Fedict";
|
||||
|
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
|||
substituteInPlace $out/bin/eid-nssdb \
|
||||
--replace "modutil" "${nssTools}/bin/modutil"
|
||||
|
||||
# Only provides a useless "about-eid-mw.desktop" that segfaults:
|
||||
# Only provides a useless "about-eid-mw.desktop" that segfaults anyway:
|
||||
rm -rf $out/share/applications $out/bin/about-eid-mw
|
||||
'';
|
||||
|
||||
|
@ -55,6 +55,6 @@ stdenv.mkDerivation {
|
|||
and remove all ~/.pki and/or /etc/pki directories no longer needed.
|
||||
'';
|
||||
maintainers = with maintainers; [ nckx ];
|
||||
platforms = with platforms; linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2743,6 +2743,8 @@ let
|
|||
|
||||
pwnat = callPackage ../tools/networking/pwnat { };
|
||||
|
||||
pyatspi = callPackage ../development/python-modules/pyatspi { };
|
||||
|
||||
pycangjie = callPackage ../development/python-modules/pycangjie { };
|
||||
|
||||
pydb = callPackage ../development/tools/pydb { };
|
||||
|
@ -5743,6 +5745,8 @@ let
|
|||
|
||||
remake = callPackage ../development/tools/build-managers/remake { };
|
||||
|
||||
rhc = callPackage ../development/tools/rhc { };
|
||||
|
||||
rman = callPackage ../development/tools/misc/rman { };
|
||||
|
||||
rr = callPackage ../development/tools/analysis/rr { };
|
||||
|
@ -8043,6 +8047,8 @@ let
|
|||
|
||||
rocksdb = callPackage ../development/libraries/rocksdb { };
|
||||
|
||||
rote = callPackage ../development/libraries/rote { };
|
||||
|
||||
rubberband = callPackage ../development/libraries/rubberband {
|
||||
inherit (vamp) vampSDK;
|
||||
};
|
||||
|
@ -10491,6 +10497,8 @@ let
|
|||
|
||||
geolite-legacy = callPackage ../data/misc/geolite-legacy { };
|
||||
|
||||
gohufont = callPackage ../data/fonts/gohufont { };
|
||||
|
||||
gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
|
||||
|
||||
inherit (gnome3) gsettings_desktop_schemas;
|
||||
|
|
|
@ -827,14 +827,13 @@ let self = _self // overrides;
|
|||
|
||||
idris-mode = melpaBuild rec {
|
||||
pname = "idris-mode";
|
||||
version = "0.9.15";
|
||||
version = "0.9.18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "idris-hackers";
|
||||
repo = "idris-mode";
|
||||
rev = version;
|
||||
sha256 = "00pkgk1zxan89i8alsa2dpa9ls7imqk5zb1kbjwzrlbr0gk4smdb";
|
||||
sha256 = "11dw2ydlqhqx569wrp56w11rhgvm6mb6mzq2cwsv2vfyjvvawyxg";
|
||||
};
|
||||
packageRequires = [ flycheck ];
|
||||
meta = { license = gpl3Plus; };
|
||||
};
|
||||
|
||||
|
|
|
@ -4780,10 +4780,10 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
|
||||
Gtk2 = buildPerlPackage rec {
|
||||
name = "Gtk2-1.2495";
|
||||
name = "Gtk2-1.2496";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
|
||||
sha256 = "1mpxkcy8j7r95z4g4xx6ggbgzaxj4zl0szz54y1k120z95rcgg3a";
|
||||
sha256 = "1avn77m5hrdyy4k5sqgf870nsmykf6zlcn1haj8arjjl9yaxwic6";
|
||||
};
|
||||
buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Pango pkgs.gtk2 ];
|
||||
meta = {
|
||||
|
|
|
@ -12352,6 +12352,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
seaborn= buildPythonPackage rec {
|
||||
name = "seaborn-0.6.0";
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/s/seaborn/${name}.tar.gz";
|
||||
md5 = "bc518f1f45dadb9deb2bb57ca3af3cad";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ pandas matplotlib ];
|
||||
|
||||
meta = {
|
||||
description = "statisitical data visualization";
|
||||
homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
|
||||
license = "BSD";
|
||||
};
|
||||
};
|
||||
|
||||
selenium = buildPythonPackage rec {
|
||||
name = "selenium-2.44.0";
|
||||
src = pkgs.fetchurl {
|
||||
|
|
Loading…
Reference in a new issue