mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
Merge remote-tracking branch 'official/master' into firefox_27
This commit is contained in:
James Cook
commit
6e6351a376
|
|
@ -12,7 +12,10 @@ rec {
|
|||
# Filter out Subversion and CVS directories.
|
||||
(type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
|
||||
# Filter out backup files.
|
||||
(lib.hasSuffix "~" baseName)
|
||||
lib.hasSuffix "~" baseName ||
|
||||
# Filter out generates files.
|
||||
lib.hasSuffix ".o" baseName ||
|
||||
lib.hasSuffix ".so" baseName
|
||||
);
|
||||
in src: builtins.filterSource filter src;
|
||||
|
||||
|
|
|
|||
|
|
@ -252,6 +252,17 @@ let
|
|||
mv -f $1.tmp $1
|
||||
'';
|
||||
|
||||
idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
|
||||
let
|
||||
id = builtins.toString (builtins.getAttr idAttr (builtins.getAttr name set));
|
||||
exists = builtins.hasAttr id acc;
|
||||
newAcc = acc // (builtins.listToAttrs [ { name = id; value = true; } ]);
|
||||
in if dup then args else if exists
|
||||
then builtins.trace "Duplicate ${idAttr} ${id}" { dup = true; acc = null; }
|
||||
else { dup = false; acc = newAcc; }
|
||||
) { dup = false; acc = {}; } (builtins.attrNames set)).dup;
|
||||
uidsAreUnique = idsAreUnique cfg.extraUsers "uid";
|
||||
gidsAreUnique = idsAreUnique cfg.extraGroups "gid";
|
||||
in
|
||||
|
||||
{
|
||||
|
|
@ -282,6 +293,14 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
users.enforceIdUniqueness = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to require that no two users/groups share the same uid/gid.
|
||||
'';
|
||||
};
|
||||
|
||||
users.extraUsers = mkOption {
|
||||
default = {};
|
||||
type = types.loaOf types.optionSet;
|
||||
|
|
@ -432,6 +451,8 @@ in
|
|||
# for backwards compatibility
|
||||
system.activationScripts.groups = stringAfter [ "users" ] "";
|
||||
|
||||
assertions = [ { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); message = "uids and gids must be unique!"; } ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@
|
|||
openldap = 99;
|
||||
memcached = 100;
|
||||
cgminer = 101;
|
||||
munin = 102;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid.
|
||||
|
||||
|
|
@ -199,6 +200,7 @@
|
|||
haproxy = 92;
|
||||
openldap = 93;
|
||||
connman = 94;
|
||||
munin = 95;
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing uid.
|
||||
|
||||
|
|
|
|||
|
|
@ -173,10 +173,12 @@ in
|
|||
name = "munin";
|
||||
description = "Munin monitoring user";
|
||||
group = "munin";
|
||||
uid = config.ids.uids.munin;
|
||||
}];
|
||||
|
||||
users.extraGroups = [{
|
||||
name = "munin";
|
||||
gid = config.ids.gids.munin;
|
||||
}];
|
||||
|
||||
}) (mkIf nodeCfg.enable {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ in
|
|||
# Note: the order in which desktop manager modules are imported here
|
||||
# determines the default: later modules (if enabled) are preferred.
|
||||
# E.g., if KDE is enabled, it supersedes xterm.
|
||||
imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ];
|
||||
imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./gnome3.nix ];
|
||||
|
||||
options = {
|
||||
|
||||
|
|
|
|||
58
nixos/modules/services/x11/desktop-managers/gnome3.nix
Normal file
58
nixos/modules/services/x11/desktop-managers/gnome3.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.desktopManager.gnome3;
|
||||
gnome3 = pkgs.gnome3;
|
||||
in {
|
||||
|
||||
options = {
|
||||
|
||||
services.xserver.desktopManager.gnome3.enable = mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = "Enable Gnome 3 desktop manager.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
# Enable helpful DBus services.
|
||||
security.polkit.enable = true;
|
||||
services.udisks2.enable = true;
|
||||
networking.networkmanager.enable = true;
|
||||
services.upower.enable = config.powerManagement.enable;
|
||||
|
||||
fonts.extraFonts = [ pkgs.dejavu_fonts ];
|
||||
|
||||
services.xserver.desktopManager.session = singleton
|
||||
{ name = "gnome3";
|
||||
start = ''
|
||||
# Set GTK_DATA_PREFIX so that GTK+ can find the themes
|
||||
export GTK_DATA_PREFIX=${config.system.path}
|
||||
|
||||
# find theme engines
|
||||
export GTK_PATH=${config.system.path}/lib/gtk-3.0:{config.system.path}/lib/gtk-2.0
|
||||
|
||||
export XDG_MENU_PREFIX=gnome
|
||||
|
||||
${gnome3.gnome_session}/bin/gnome-session&
|
||||
waitPID=$!
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages =
|
||||
[ gnome3.evince
|
||||
gnome3.eog
|
||||
pkgs.ibus
|
||||
gnome3.gnome_shell
|
||||
gnome3.gnome_settings_daemon
|
||||
gnome3.gnome_terminal
|
||||
gnome3.gnome_icon_theme
|
||||
gnome3.gnome_themes_standard
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -29,7 +29,7 @@ in
|
|||
start =
|
||||
''
|
||||
# Set GTK_PATH so that GTK+ can find the theme engines.
|
||||
export GTK_PATH=${config.system.path}/lib/gtk-2.0
|
||||
export GTK_PATH="${config.system.path}/lib/gtk-2.0:${config.system.path}/lib/gtk-3.0"
|
||||
|
||||
# Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
|
||||
export GTK_DATA_PREFIX=${config.system.path}
|
||||
|
|
|
|||
|
|
@ -387,7 +387,7 @@ in
|
|||
# When building a regular system configuration, override whatever
|
||||
# video driver the host uses.
|
||||
services.xserver.videoDriver = mkVMOverride null;
|
||||
services.xserver.videoDrivers = mkVMOverride [ "vesa" ];
|
||||
services.mesa.videoDrivers = mkVMOverride [ "vesa" ];
|
||||
services.xserver.defaultDepth = mkVMOverride 0;
|
||||
services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ];
|
||||
services.xserver.monitorSection =
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
|
|||
serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";
|
||||
};
|
||||
|
||||
services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
|
||||
services.mesa.videoDrivers = mkOverride 50 [ "virtualbox" ];
|
||||
|
||||
services.xserver.config =
|
||||
''
|
||||
|
|
|
|||
|
|
@ -20,7 +20,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1nb8ljrbrp1zga083g3b633xi3izxxm4jipw1qgial1x16mqc0hz";
|
||||
};
|
||||
|
||||
patches = [ ./lightdm-gtk-greeter.patch ];
|
||||
patches = [
|
||||
./lightdm-gtk-greeter.patch
|
||||
(fetchurl { # CVE-2014-0979, https://bugs.launchpad.net/lightdm-gtk-greeter/+bug/1266449
|
||||
url = "https://launchpadlibrarian.net/161796033/07_fix-NULL-username.patch";
|
||||
sha256 = "1sqkhsz1z10k6vlmlrqrfx452lznv30885fmnzc73p2zxdlw9q1a";
|
||||
})
|
||||
];
|
||||
patchFlags = "-p1";
|
||||
|
||||
buildInputs = [ pkgconfig lightdm intltool ]
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ let
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "netbeans-7.2";
|
||||
name = "netbeans-7.4";
|
||||
src = fetchurl {
|
||||
url = http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-ml.zip;
|
||||
sha256 = "18ya1w291hdnc35vb12yqnai82wmqm7351wn82fax12kzha5fmci";
|
||||
url = http://download.netbeans.org/netbeans/7.4/final/zip/netbeans-7.4-201310111528.zip;
|
||||
sha256 = "0nrnghnsdix5cmp86xi1gmvarhjk2k8mlbld3dfa9impm8gpv6mx";
|
||||
};
|
||||
buildCommand = ''
|
||||
# Unpack and copy the stuff
|
||||
|
|
@ -25,7 +25,9 @@ stdenv.mkDerivation {
|
|||
# Create a wrapper capable of starting it
|
||||
mkdir -p $out/bin
|
||||
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
|
||||
--prefix PATH : ${jdk}/bin:${which}/bin
|
||||
--prefix PATH : ${jdk}/bin:${which}/bin \
|
||||
--prefix JAVA_HOME : ${jdk}/lib/openjdk \
|
||||
--add-flags "--jdkhome ${jdk}/lib/openjdk"
|
||||
|
||||
# Create desktop item, so we can pick it from the KDE/GNOME menu
|
||||
mkdir -p $out/share/applications
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ new file mode 100644
|
|||
index 0000000..a2f9918
|
||||
--- /dev/null
|
||||
+++ b/runtime/syntax/nix.vim
|
||||
@@ -0,0 +1,40 @@
|
||||
@@ -0,0 +1,42 @@
|
||||
+" Vim syntax file
|
||||
+" Language: nix
|
||||
+" Maintainer: Marc Weber <marco-oweber@gmx.de>
|
||||
|
|
@ -46,8 +46,8 @@ index 0000000..a2f9918
|
|||
+ \ __readFile __toXML __toFile __filterSource __attrNames __getAttr __hasAttr __isAttrs __listToAttrs __isList
|
||||
+ \ __head __tail __add __sub __lessThan __substring __stringLength
|
||||
+
|
||||
+syn match nixAttr "\w\+\ze\s*="
|
||||
+syn match nixFuncArg "\zs\w\+\ze\s*:"
|
||||
+syn match nixAttr "[a-zA-Z0-9-_]\+\ze\s*="
|
||||
+syn match nixFuncArg "\zs[a-zA-Z0-9-_]\+\ze\s*:"
|
||||
+syn region nixStringParam start=+\${+ end=+}+
|
||||
+syn region nixMultiLineComment start=+/\*+ skip=+\\"+ end=+\*/+
|
||||
+syn match nixEndOfLineComment "#.*$"
|
||||
|
|
@ -66,3 +66,5 @@ index 0000000..a2f9918
|
|||
+hi def link nixEndOfLineComment Comment
|
||||
+hi def link nixAttr Identifier
|
||||
+hi def link nixFuncArg Identifier
|
||||
+
|
||||
+let b:current_syntax = "nix"
|
||||
|
|
|
|||
|
|
@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
|
|||
description = "The GNU Image Manipulation Program";
|
||||
homepage = http://www.gimp.org/;
|
||||
license = "GPL";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, freetype
|
||||
, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
|
||||
, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gimp-2.6.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
|
||||
sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig gtk freetype fontconfig
|
||||
libart_lgpl libtiff libjpeg libpng libexif zlib perl
|
||||
perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22
|
||||
];
|
||||
|
||||
passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
|
||||
|
||||
configureFlags = [ "--disable-print" ];
|
||||
|
||||
# "screenshot" needs this.
|
||||
NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib";
|
||||
|
||||
meta = {
|
||||
description = "The GNU Image Manipulation Program";
|
||||
homepage = http://www.gimp.org/;
|
||||
license = "GPL";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "hadoop-2.0.2-alpha";
|
||||
name = "hadoop-2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz";
|
||||
sha256 = "1r7ailmqhny3pl5nb8bcblnhckszy6hb9n58kwa3s4b8qfk87gkb";
|
||||
sha256 = "0r0kx8arsrvmcfy0693hpv4cz3i0razvk1xa3yhlf3ybb80a8106";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchurl, pkgconfig, intltool, gtk, json_glib, curl }:
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "transmission-remote-gtk-1.0.1";
|
||||
name = "transmission-remote-gtk-1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://transmission-remote-gtk.googlecode.com/files/${name}.tar.gz";
|
||||
sha256 = "b1ae032dd52b2d7975656913e4fe39e7f74d29ef8138292d8b82318ff9afed6f";
|
||||
sha256 = "1jbh2pm4i740cmzqd2r7zxnqqipvv2v2ndmnmk53nqrxcbgc4nlz";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig intltool gtk json_glib curl ];
|
||||
buildInputs = [ pkgconfig intltool gtk3 json_glib curl ];
|
||||
|
||||
meta = {
|
||||
description = "GTK remote control for the Transmission BitTorrent client";
|
||||
|
|
|
|||
|
|
@ -17,13 +17,14 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin $out/share/man/man1
|
||||
mkdir -pv $out/bin $out/share/man/man1 $out/share/mr
|
||||
cp -v mr $out/bin
|
||||
cp -v webcheckout $out/bin
|
||||
cp -v mr.1 $out/share/man/man1
|
||||
cp -v webcheckout.1 $out/share/man/man1
|
||||
cp -v lib/* $out/share/mr
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
description = "Multiple Repository management tool";
|
||||
longDescription = ''The mr(1) command can checkout, update, or perform other actions on a
|
||||
|
|
@ -53,4 +54,3 @@ stdenv.mkDerivation rec {
|
|||
maintainers = [ stdenv.lib.maintainers.antono ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
28
pkgs/applications/version-management/vcsh/default.nix
Normal file
28
pkgs/applications/version-management/vcsh/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{stdenv, fetchgit}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rev = "75c4c554eefbefb714fabd356933858edbce3b1e";
|
||||
version = "1.20131229";
|
||||
name = "vcsh-${version}_${rev}";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/RichiH/vcsh";
|
||||
sha256 = "0rc82a8vnnk9q6q88z9s10873gqgdpppbpwy2yw8a7hydqrpn0hs";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp vcsh $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Version Control System for $HOME";
|
||||
homepage = https://github.com/RichiH/vcsh;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,7 +10,13 @@
|
|||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
let version = "0.8.10"; in
|
||||
let version = "0.8.10";
|
||||
patch_CVE = fetchurl {
|
||||
url = "http://git.savannah.gnu.org/cgit/gnash.git/patch/?id=bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527";
|
||||
sha256 = "1g7ymbq9vxi0mwcgs2dpyd2sf30gaam7blza0ywiwj32f5wk62v1";
|
||||
name = "CVE-2012-1175.patch";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnash-${version}";
|
||||
|
|
@ -21,6 +27,8 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patchPhase = ''
|
||||
patch -p1 < ${patch_CVE}
|
||||
|
||||
# Add all libs to `macros/libslist', a list of library search paths.
|
||||
for lib in ${lib.concatStringsSep " "
|
||||
(map (lib: "\"${lib}\"/lib")
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
|
|||
./Setup build ${self.buildTarget}
|
||||
|
||||
export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
|
||||
test -n "$noHaddock" || ./Setup haddock
|
||||
test -n "$noHaddock" || ./Setup haddock --html --hoogle
|
||||
|
||||
eval "$postBuild"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
eval "$preInstall"
|
||||
eval "$preInstall"
|
||||
export LOGNAME=root
|
||||
|
||||
${checkinstall}/sbin/checkinstall --nodoc -y -D \
|
||||
|
|
@ -59,6 +59,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
|||
--requires="${concatStringsSep "," debRequires}" \
|
||||
--provides="${concatStringsSep "," debProvides}" \
|
||||
${optionalString (src ? version) "--pkgversion=$(echo ${src.version} | tr _ -)"} \
|
||||
''${debMaintainer:+--maintainer="'$debMaintainer'"} \
|
||||
$checkInstallFlags \
|
||||
make install
|
||||
|
||||
mkdir -p $out/debs
|
||||
|
|
@ -79,7 +81,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
|||
echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
|
||||
done
|
||||
|
||||
eval "$postInstall"
|
||||
eval "$postInstall"
|
||||
''; # */
|
||||
|
||||
meta = (if args ? meta then args.meta else {}) // {
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ stdenv.mkDerivation (
|
|||
|
||||
prePhases = ["initPhase"] ++ prePhases;
|
||||
|
||||
buildInputs = buildInputs ++ [ args.makeCoverageAnalysisReport ];
|
||||
buildInputs = buildInputs ++ stdenv.lib.optional doCoverageAnalysis args.makeCoverageAnalysisReport;
|
||||
|
||||
lcovFilter = ["/nix/store/*"] ++ lcovFilter;
|
||||
|
||||
|
|
|
|||
25
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
Normal file
25
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, libcanberra
|
||||
, libxml2, polkit, libxslt, libgtop, libsoup, colord, pulseaudio, fontconfig }:
|
||||
|
||||
# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
|
||||
# TODO: colord_gtk
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-control-center-3.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-control-center/3.10/${name}.tar.xz";
|
||||
sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn";
|
||||
};
|
||||
|
||||
buildInputs = with gnome3;
|
||||
[ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
|
||||
libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
|
||||
gnome_online_accounts libsoup colord pulseaudio fontconfig ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
|
||||
, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit
|
||||
, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
|
||||
, docbook_xsl_ns, docbook_xsl, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = with gnome3; [
|
||||
dbus libgcrypt pam python gtk3 gconf libgnome_keyring
|
||||
pango gcr gdk_pixbuf atk p11_kit
|
||||
pango gcr gdk_pixbuf atk p11_kit makeWrapper
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ glib libtasn1 libxslt ];
|
||||
|
|
@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
|
|||
"--with-pkcs11-modules=$$out/lib/pkcs11/"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/gnome-keyring" \
|
||||
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share"
|
||||
wrapProgram "$out/bin/gnome-keyring-daemon" \
|
||||
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop
|
||||
lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather
|
||||
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
|
||||
libtool docbook_xsl docbook_xsl_ns makeWrapper ];
|
||||
libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns
|
||||
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit
|
||||
, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
|
||||
, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
|
||||
, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
|
||||
|
||||
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-shell-3.10.2.1";
|
||||
|
|
@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = with gnome3;
|
||||
[ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice
|
||||
libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf
|
||||
libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg
|
||||
clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
|
||||
libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
|
||||
libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
|
||||
|
|
@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram "$out/bin/gnome-shell" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \
|
||||
--set GDK_PIXBUF_MODULE_FILE ${gnome_themes_standard}/lib/gdk-pixbuf/loaders.cache \
|
||||
--prefix XDG_DATA_DIRS : "${gnome-menus}:/share:${ibus}/share:${gnome_settings_daemon}/share:${gdm}/share:${glib}/share:${gnome_themes_standard}/share:${mutter}/share:${gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gtk}/share:$out/share"
|
||||
wrapProgram "$out/libexec/gnome-shell-calendar-server" \
|
||||
--prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
|
||||
, gnome_doc_utils, intltool, libX11, which, gconf, libuuid
|
||||
, desktop_file_utils, itstool, ncurses }:
|
||||
, desktop_file_utils, itstool, ncurses, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
|
|
@ -15,10 +15,16 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte
|
||||
gnome3.dconf gnome3.gconf itstool ncurses ];
|
||||
gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/libexec/gnome-terminal-server" \
|
||||
--prefix XDG_DATA_DIRS : "${gnome3.gsettings_desktop_schemas}/share:$out/share"
|
||||
'';
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
|
||||
|
||||
preConfigure = ''
|
||||
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > loaders.cache
|
||||
export GDK_PIXBUF_MODULE_FILE=`readlink -e loaders.cache`
|
||||
mkdir -p $out/lib/gdk-pixbuf/
|
||||
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/gdk-pixbuf/loaders.cache
|
||||
export GDK_PIXBUF_MODULE_FILE=`readlink -e $out/lib/gdk-pixbuf/loaders.cache`
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ rec {
|
|||
|
||||
gjs = callPackage ./core/gjs { };
|
||||
|
||||
gnome_control_center = callPackage ./core/gnome-control-center { };
|
||||
|
||||
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
|
||||
|
||||
gnome-menus = callPackage ./core/gnome-menus { };
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, gtk, gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
p_name = "gtk-xfce-engine";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||
|
||||
#TODO: gtk3
|
||||
buildInputs = [ pkgconfig intltool gtk ];
|
||||
buildInputs = [ pkgconfig intltool gtk gtk3 ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xfce.org/;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
|
|||
mv compiler-rt-${version} $sourceRoot/projects/compiler-rt
|
||||
'';
|
||||
|
||||
buildInputs = [ perl groff cmake libxml2 python libffi ncurses ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
|
||||
buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
|
||||
|
||||
propagatedBuildInputs = [ ncurses zlib ];
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,12 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
# See <http://svn.boost.org/trac/boost/ticket/4688>.
|
||||
patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ./boost-149-cstdint.patch ] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch );
|
||||
patches = [
|
||||
./CVE-2013-0252.patch # https://svn.boost.org/trac/boost/ticket/7743
|
||||
./boost_filesystem_post_1_49_0.patch
|
||||
./time_utc.patch
|
||||
./boost-149-cstdint.patch
|
||||
] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch );
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
48
pkgs/development/libraries/boost/CVE-2013-0252.patch
Normal file
48
pkgs/development/libraries/boost/CVE-2013-0252.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
Index: /boost/locale/utf.hpp
|
||||
===================================================================
|
||||
--- /boost/locale/utf.hpp (revision 78304)
|
||||
+++ /boost/locale/utf.hpp (revision 81590)
|
||||
@@ -220,4 +220,6 @@
|
||||
return incomplete;
|
||||
tmp = *p++;
|
||||
+ if (!is_trail(tmp))
|
||||
+ return illegal;
|
||||
c = (c << 6) | ( tmp & 0x3F);
|
||||
case 2:
|
||||
@@ -225,4 +227,6 @@
|
||||
return incomplete;
|
||||
tmp = *p++;
|
||||
+ if (!is_trail(tmp))
|
||||
+ return illegal;
|
||||
c = (c << 6) | ( tmp & 0x3F);
|
||||
case 1:
|
||||
@@ -230,4 +234,6 @@
|
||||
return incomplete;
|
||||
tmp = *p++;
|
||||
+ if (!is_trail(tmp))
|
||||
+ return illegal;
|
||||
c = (c << 6) | ( tmp & 0x3F);
|
||||
}
|
||||
Index: /libs/locale/test/test_codepage_converter.cpp
|
||||
===================================================================
|
||||
--- /libs/locale/test/test_codepage_converter.cpp (revision 73786)
|
||||
+++ /libs/locale/test/test_codepage_converter.cpp (revision 81590)
|
||||
@@ -140,4 +140,18 @@
|
||||
TEST_TO("\xf8\x90\x80\x80\x80",illegal); // 400 0000
|
||||
TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal); // 7fff ffff
|
||||
+
|
||||
+ std::cout << "-- Invalid trail" << std::endl;
|
||||
+ TEST_TO("\xC2\x7F",illegal);
|
||||
+ TEST_TO("\xdf\x7F",illegal);
|
||||
+ TEST_TO("\xe0\x7F\x80",illegal);
|
||||
+ TEST_TO("\xef\xbf\x7F",illegal);
|
||||
+ TEST_TO("\xe0\x7F\x80",illegal);
|
||||
+ TEST_TO("\xef\xbf\x7F",illegal);
|
||||
+ TEST_TO("\xf0\x7F\x80\x80",illegal);
|
||||
+ TEST_TO("\xf4\x7f\xbf\xbf",illegal);
|
||||
+ TEST_TO("\xf0\x90\x7F\x80",illegal);
|
||||
+ TEST_TO("\xf4\x8f\x7F\xbf",illegal);
|
||||
+ TEST_TO("\xf0\x90\x80\x7F",illegal);
|
||||
+ TEST_TO("\xf4\x8f\xbf\x7F",illegal);
|
||||
|
||||
std::cout << "-- Invalid length" << std::endl;
|
||||
|
|
@ -1,27 +1,29 @@
|
|||
{ stdenv, fetchurl, mesa, libX11, libXext }:
|
||||
{ stdenv, fetchurl, mesa, libX11 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glfw-2.7.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/glfw/glfw-2.7.9.tar.bz2;
|
||||
url = "mirror://sourceforge/glfw/${name}.tar.bz2";
|
||||
sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i";
|
||||
};
|
||||
|
||||
buildInputs = [ mesa libX11 libXext ];
|
||||
buildInputs = [ mesa libX11 ];
|
||||
|
||||
buildPhase = ''
|
||||
make x11
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
make x11-install PREFIX=$out
|
||||
'';
|
||||
'';
|
||||
|
||||
installPhase = ":";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
|
||||
homepage = http://glfw.sourceforge.net/;
|
||||
license = "zlib/libpng"; # http://www.opensource.org/licenses/zlib-license.php
|
||||
homepage = "http://glfw.sourceforge.net/";
|
||||
license = licenses.zlib;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
22
pkgs/development/libraries/glfw/3.x.nix
Normal file
22
pkgs/development/libraries/glfw/3.x.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glfw-3.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/glfw/${name}.tar.bz2";
|
||||
sha256 = "1h7g16ncgkl38w19x4dvnn17k9j0kqfvbb9whw9qc71lkq5xf2ag";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ cmake mesa libXrandr libXi libXxf86vm libXfixes x11 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
|
||||
homepage = "http://glfw.sourceforge.net/";
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ marcweber ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle
|
||||
, guileBindings, guile, pkgconfig }:
|
||||
, guileBindings, guile, pkgconfig, perl }:
|
||||
|
||||
assert guileBindings -> guile != null;
|
||||
|
||||
|
|
@ -12,7 +12,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1lkys703z4yxfgzarmgas5ccvn6m254w9wvm7s8v0zkj81z7m9nz";
|
||||
};
|
||||
|
||||
patches = [(fetchurl {
|
||||
url = "http://anonscm.debian.org/viewvc/pkg-gnutls/packages/gnutls26/trunk/"
|
||||
+ "debian/patches/21_sanitycheck.diff?revision=1777&view=co";
|
||||
sha256 = "0k18a7q6irmgjzp647bd18zccjpsr82n2s9arpamnkakgnny4ks9";
|
||||
name = "CVE-2013-2116.patch";
|
||||
})];
|
||||
|
||||
configurePhase = ''
|
||||
patchShebangs .
|
||||
|
||||
./configure --prefix="$out" \
|
||||
--disable-dependency-tracking --enable-fast-install \
|
||||
--with-lzo --with-libtasn1-prefix="${libtasn1}" \
|
||||
|
|
@ -22,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
else ""}
|
||||
'';
|
||||
|
||||
buildInputs = [ zlib lzo libtasn1 pkgconfig ]
|
||||
buildInputs = [ zlib lzo libtasn1 pkgconfig perl ]
|
||||
++ stdenv.lib.optional guileBindings guile;
|
||||
|
||||
propagatedBuildInputs = [ nettle ];
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
|
|||
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
name = "gnutls-3.2.4";
|
||||
name = "gnutls-3.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
|
||||
sha256 = "0zl4h37g51xyaalv3qp2hvn1m6z7xzfw4yvpvi6mby4x5sqrrp8i";
|
||||
sha256 = "1g1w93d66sz51977zbqd56641r501a1djcwhykbjm8alhyz1564h";
|
||||
};
|
||||
|
||||
# Note: GMP is a dependency of Nettle, whose public headers include
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
|
|||
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
name = "gnutls-3.1.12";
|
||||
name = "gnutls-3.1.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz";
|
||||
sha256 = "1h8j3xi2jad2dclybgqffb5264hdqrxpsx99irs03yy9np6iw5l8";
|
||||
sha256 = "1a8pzc29sn1kmbqvldljf4kmbz60pdk931dirk5jdd0qpf8fzd5x";
|
||||
};
|
||||
|
||||
# Note: GMP is a dependency of Nettle, whose public headers include
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, deepseq, primitive, vector }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hybrid-vectors";
|
||||
version = "0.1";
|
||||
sha256 = "0a5ry6xmkr0zjz0kp7qbm7kdz5yr9842gy116902djppmdn5dq05";
|
||||
buildDepends = [ deepseq primitive vector ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/hybrid-vectors";
|
||||
description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
16
pkgs/development/libraries/haskell/ixdopp/default.nix
Normal file
16
pkgs/development/libraries/haskell/ixdopp/default.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ cabal, preprocessorTools, syb }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "ixdopp";
|
||||
version = "0.1.3";
|
||||
sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ preprocessorTools ];
|
||||
meta = {
|
||||
homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
|
||||
description = "Expands a Haskell program using ixdo notation into a Haskell program using the indexed monad bind operator (>>>=)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lens";
|
||||
version = "4.0";
|
||||
sha256 = "1mrpbwnj1k2my71lm0ajxsx5r44sz372gfxn78vz4182yv3bmla1";
|
||||
version = "4.0.1";
|
||||
sha256 = "1dm4gdpyd7kndf3zaikjqa1gkc7y7wzfnyhhk3xyhjxa5hn5rj75";
|
||||
buildDepends = [
|
||||
aeson bifunctors comonad constraints contravariant distributive
|
||||
exceptions filepath hashable mtl parallel primitive profunctors
|
||||
|
|
@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
|
|||
binary doctest filepath HUnit lens simpleReflect testFramework
|
||||
testFrameworkHunit
|
||||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/linear/";
|
||||
description = "Linear Algebra";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, mtl, parsec, syb }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "preprocessor-tools";
|
||||
version = "0.1.3";
|
||||
sha256 = "0jz85v93zpv6cwvad18wr12nsikmv4n20gn37zli2h34zi543i9v";
|
||||
buildDepends = [ mtl parsec syb ];
|
||||
meta = {
|
||||
homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
|
||||
description = "Extending Haskell's syntax using a custom preprocessor";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, mtl, parsec, syb }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "preprocessor-tools";
|
||||
version = "1.0.1";
|
||||
sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9";
|
||||
buildDepends = [ mtl parsec syb ];
|
||||
meta = {
|
||||
homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
|
||||
description = "Extending Haskell's syntax using a custom preprocessor";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
{ cabal, blazeHtml, blazeMarkup, filepath, hastache, httpTypes, mtl
|
||||
, scotty, text, wai, warp
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "scotty-hastache";
|
||||
version = "0.2.0";
|
||||
sha256 = "105cxlasj4sl4ddzg8ms6k95078q10zcm2c86jcn76s0jmv95669";
|
||||
buildDepends = [
|
||||
blazeHtml blazeMarkup filepath hastache httpTypes mtl scotty text
|
||||
wai warp
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/scotty-web/scotty-hastache";
|
||||
description = "Easy Mustache templating support for Scotty";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/snap-blaze/default.nix
Normal file
14
pkgs/development/libraries/haskell/snap-blaze/default.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, blazeHtml, snapCore }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "snap-blaze";
|
||||
version = "0.2.1.2";
|
||||
sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh";
|
||||
buildDepends = [ blazeHtml snapCore ];
|
||||
meta = {
|
||||
homepage = "http://github.com/jaspervdj/snap-blaze";
|
||||
description = "blaze-html integration for Snap";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
31
pkgs/development/libraries/haskell/sparse/default.nix
Normal file
31
pkgs/development/libraries/haskell/sparse/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ cabal, contravariant, deepseq, doctest, filepath, hlint
|
||||
, hybridVectors, lens, linear, mtl, primitive, QuickCheck
|
||||
, semigroups, simpleReflect, testFramework
|
||||
, testFrameworkQuickcheck2, testFrameworkTh, transformers, vector
|
||||
, vectorAlgorithms
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "sparse";
|
||||
version = "0.9";
|
||||
sha256 = "0v0z7kjgmcdx9ajlhr9pc1i3qqghd60s02xnlmj4hcxby8k0r8mc";
|
||||
buildDepends = [
|
||||
contravariant deepseq hybridVectors lens primitive transformers
|
||||
vector vectorAlgorithms
|
||||
];
|
||||
testDepends = [
|
||||
deepseq doctest filepath hlint hybridVectors lens linear mtl
|
||||
QuickCheck semigroups simpleReflect testFramework
|
||||
testFrameworkQuickcheck2 testFrameworkTh transformers vector
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -i -e 's|vector-algorithms >=.*|vector-algorithms|' -e 's|QuickCheck.*,|QuickCheck,|' sparse.cabal
|
||||
'';
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/sparse";
|
||||
description = "A playground of sparse linear algebra primitives using Morton ordering";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
17
pkgs/development/libraries/haskell/sqlite-simple/default.nix
Normal file
17
pkgs/development/libraries/haskell/sqlite-simple/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ cabal, base16Bytestring, directSqlite, HUnit, text, time
|
||||
, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "sqlite-simple";
|
||||
version = "0.4.4.0";
|
||||
sha256 = "09vgy3hji0bjb3bwxwkwhmgf50q442dqr3d86g5l5s3xiw3hca0r";
|
||||
buildDepends = [ directSqlite text time transformers ];
|
||||
testDepends = [ base16Bytestring directSqlite HUnit text time ];
|
||||
meta = {
|
||||
homepage = "http://github.com/nurpax/sqlite-simple";
|
||||
description = "Mid-Level SQLite client library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, filepath, httpTypes, mtl, text, wai }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-middleware-static";
|
||||
version = "0.4.0.2";
|
||||
sha256 = "0nw54h8baphjdwsd118g9j5w4g2mnb2hrny0n4ih4jlqlcqam3lf";
|
||||
buildDepends = [ filepath httpTypes mtl text wai ];
|
||||
meta = {
|
||||
homepage = "https://github.com/scotty-web/scotty";
|
||||
description = "WAI middleware that intercepts requests to static files";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb";
|
||||
};
|
||||
|
||||
patches = [(fetchurl {
|
||||
url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.patch";
|
||||
sha256 = "0c1a0prlpq5nn7zgs7cqvw9xnmhkkc8l0mpsip86k1lafircqhzh";
|
||||
name = "CVE-2013-0211.patch";
|
||||
})];
|
||||
|
||||
buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++
|
||||
stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
|
||||
|
||||
|
|
|
|||
39
pkgs/os-specific/linux/guvcview/default.nix
Normal file
39
pkgs/os-specific/linux/guvcview/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ stdenv, fetchgit, intltool, autoreconfHook, gettext, pkgconfig
|
||||
, gtk3, portaudio, libpng, SDL, ffmpeg, udev, libusb1, libv4l, alsaLib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.7.2";
|
||||
rev = "ab84b0b1ed358f0504e1218a0ef792a02b307af8";
|
||||
name = "guvcview-${version}_${rev}";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "git://git.code.sf.net/p/guvcview/git-master";
|
||||
sha256 = "08cpbxq3dh2mlsgzk5dj3vfrgap4q281n9h6xzpbsvyifcj1a9n1";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ SDL
|
||||
alsaLib
|
||||
autoreconfHook
|
||||
ffmpeg
|
||||
gtk3
|
||||
intltool
|
||||
libusb1
|
||||
libv4l
|
||||
pkgconfig
|
||||
portaudio
|
||||
udev
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap.sh
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A simple interface for devices supported by the linux UVC driver";
|
||||
homepage = http://guvcview.sourceforge.net;
|
||||
maintainers = [ stdenv.lib.maintainers.coconnor ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "3.13.1";
|
||||
version = "3.13.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
|
||||
sha256 = "0gkikbz676h79rv0aaihl90mw7fqhjx3rkhcqrmzggjb54048jvq";
|
||||
sha256 = "1bvxcdzjff514zwk18b9dfkhhk12fjjbb4a1saynqnisdn7b78dl";
|
||||
};
|
||||
|
||||
features.iwlwifi = true;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "socat-2.0.0-b6";
|
||||
name = "socat-2.0.0-b7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
|
||||
sha256 = "03n70v7ygsl4ji7rwvyv8f70d3q32jnas26j29amkf3fm4agnhvz";
|
||||
sha256 = "0h6k9ccrnziw03j0if7myrd28vcc97nwz1bifmbrkp5jkpk69ygk";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
30
pkgs/tools/security/steghide/default.nix
Normal file
30
pkgs/tools/security/steghide/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];
|
||||
version = "0.5.1";
|
||||
name = "steghide-${version}";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://steghide.sourceforge.net/;
|
||||
description = "Steghide is a steganography program that is able to hide data in various kinds of image- and audio-files.";
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;
|
||||
sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./patches/steghide-0.5.1-gcc34.patch
|
||||
./patches/steghide-0.5.1-gcc4.patch
|
||||
./patches/steghide-0.5.1-gcc43.patch
|
||||
];
|
||||
|
||||
# AM_CXXFLAGS needed for automake
|
||||
preConfigure = ''
|
||||
export AM_CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
'';
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
--- steghide-0.5.1.old/src/Makefile.am
|
||||
+++ steghide-0.5.1.new/src/Makefile.am 2004-07-16 19:01:39.673947633 +0200
|
||||
@@ -33,5 +33,5 @@
|
||||
WavPCMSampleValue.cc error.cc main.cc msg.cc SMDConstructionHeuristic.cc
|
||||
LIBS = @LIBINTL@ @LIBS@
|
||||
localedir = $(datadir)/locale
|
||||
-LIBTOOL = $(SHELL) libtool
|
||||
+LIBTOOL = $(SHELL) libtool --tag=CXX
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
--- steghide-0.5.1.old/src/AuSampleValues.cc
|
||||
+++ steghide-0.5.1.new/src/AuSampleValues.cc 2004-07-16 18:59:18.934578427 +0200
|
||||
@@ -17,21 +17,21 @@
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
*/
|
||||
-
|
||||
+#include "common.h"
|
||||
#include "AuSampleValues.h"
|
||||
|
||||
// AuMuLawSampleValue
|
||||
-const BYTE AuMuLawSampleValue::MinValue = 0 ;
|
||||
-const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
|
||||
+template<> const BYTE AuMuLawSampleValue::MinValue = 0 ;
|
||||
+template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
|
||||
|
||||
// AuPCM8SampleValue
|
||||
-const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
|
||||
-const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
|
||||
+template<> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
|
||||
+template<> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
|
||||
|
||||
// AuPCM16SampleValue
|
||||
-const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
|
||||
-const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
|
||||
+template<> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
|
||||
+template<> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
|
||||
|
||||
// AuPCM32SampleValue
|
||||
-const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
|
||||
-const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
|
||||
+template<> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
|
||||
+template<> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
diff -Naur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h
|
||||
--- steghide-0.5.1-orig/src/AuData.h 2003-09-28 09:30:29.000000000 -0600
|
||||
+++ steghide-0.5.1/src/AuData.h 2007-05-11 22:04:56.000000000 -0600
|
||||
@@ -26,22 +26,30 @@
|
||||
|
||||
// AuMuLawAudioData
|
||||
typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;
|
||||
+template<>
|
||||
inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
|
||||
+template<>
|
||||
inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
|
||||
|
||||
// AuPCM8AudioData
|
||||
typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;
|
||||
+template<>
|
||||
inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
|
||||
+template<>
|
||||
inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
|
||||
|
||||
// AuPCM16AudioData
|
||||
typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;
|
||||
+template<>
|
||||
inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
|
||||
+template<>
|
||||
inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
|
||||
|
||||
// AuPCM32AudioData
|
||||
typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;
|
||||
+template<>
|
||||
inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
|
||||
+template<>
|
||||
inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
|
||||
|
||||
#endif // ndef SH_AUDATA_H
|
||||
diff -Naur steghide-0.5.1-orig/src/MHashPP.cc steghide-0.5.1/src/MHashPP.cc
|
||||
--- steghide-0.5.1-orig/src/MHashPP.cc 2003-10-05 04:17:50.000000000 -0600
|
||||
+++ steghide-0.5.1/src/MHashPP.cc 2007-05-11 22:07:01.000000000 -0600
|
||||
@@ -120,7 +120,7 @@
|
||||
|
||||
std::string MHashPP::getAlgorithmName (hashid id)
|
||||
{
|
||||
- char *name = mhash_get_hash_name (id) ;
|
||||
+ char *name = (char *) mhash_get_hash_name (id) ;
|
||||
std::string retval ;
|
||||
if (name == NULL) {
|
||||
retval = std::string ("<algorithm not found>") ;
|
||||
349
pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch
Normal file
349
pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch
Normal file
|
|
@ -0,0 +1,349 @@
|
|||
--- steghide-0.5.1.old/configure.in 2003-10-15 09:48:52.000000000 +0200
|
||||
+++ steghide-0.5.1.new/configure.in 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -7,27 +7,26 @@
|
||||
dnl checks for programs.
|
||||
AC_PROG_CXX
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_AWK
|
||||
AC_PROG_LN_S
|
||||
+AC_CXX_COMPILE_STDCXX_0X
|
||||
|
||||
dnl GNU gettext
|
||||
AC_CHECK_FUNCS(strchr)
|
||||
AM_GNU_GETTEXT
|
||||
AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes)
|
||||
|
||||
dnl check if debugging support is requested
|
||||
-AC_MSG_CHECKING([wether to enable debugging])
|
||||
+AC_MSG_CHECKING([whether to enable debugging])
|
||||
AC_ARG_ENABLE(debug,[ --enable-debug enable debugging],
|
||||
if test "$enableval" = yes ;
|
||||
then
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE(DEBUG,1,[enable code used only for debugging])
|
||||
- CXXFLAGS="-O2 -Wall -g"
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
- CXXFLAGS="-O2 -Wall"
|
||||
fi
|
||||
,
|
||||
AC_MSG_RESULT([no])
|
||||
CXXFLAGS="-O2 -Wall"
|
||||
)
|
||||
@@ -213,7 +212,18 @@
|
||||
echo "libmhash can be downloaded from http://mhash.sourceforge.net/.";
|
||||
echo "**********";
|
||||
AC_MSG_ERROR([[libmhash not found]])
|
||||
fi
|
||||
|
||||
+dnl Should we add std=c++0x?
|
||||
+
|
||||
+if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes;
|
||||
+then
|
||||
+ CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra"
|
||||
+else
|
||||
+ CXXFLAGS="${CXXFLAGS} -Wall -Wextra"
|
||||
+fi
|
||||
+
|
||||
+AC_SUBST(CXXFLAGS)
|
||||
+
|
||||
dnl create Makefiles
|
||||
AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile])
|
||||
--- steghide-0.5.1.old/m4/ac_cxx_compile_stdcxx_0x.m4 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ steghide-0.5.1.new/m4/ac_cxx_compile_stdcxx_0x.m4 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -0,0 +1,107 @@
|
||||
+# ===========================================================================
|
||||
+# http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
|
||||
+# ===========================================================================
|
||||
+#
|
||||
+# SYNOPSIS
|
||||
+#
|
||||
+# AC_CXX_COMPILE_STDCXX_0X
|
||||
+#
|
||||
+# DESCRIPTION
|
||||
+#
|
||||
+# Check for baseline language coverage in the compiler for the C++0x
|
||||
+# standard.
|
||||
+#
|
||||
+# LAST MODIFICATION
|
||||
+#
|
||||
+# 2008-04-17
|
||||
+#
|
||||
+# COPYLEFT
|
||||
+#
|
||||
+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
|
||||
+#
|
||||
+# Copying and distribution of this file, with or without modification, are
|
||||
+# permitted in any medium without royalty provided the copyright notice
|
||||
+# and this notice are preserved.
|
||||
+
|
||||
+AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
|
||||
+ AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
|
||||
+ ac_cv_cxx_compile_cxx0x_native,
|
||||
+ [AC_LANG_SAVE
|
||||
+ AC_LANG_CPLUSPLUS
|
||||
+ AC_TRY_COMPILE([
|
||||
+ template <typename T>
|
||||
+ struct check
|
||||
+ {
|
||||
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
|
||||
+ };
|
||||
+
|
||||
+ typedef check<check<bool>> right_angle_brackets;
|
||||
+
|
||||
+ int a;
|
||||
+ decltype(a) b;
|
||||
+
|
||||
+ typedef check<int> check_type;
|
||||
+ check_type c;
|
||||
+ check_type&& cr = c;],,
|
||||
+ ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
|
||||
+ AC_LANG_RESTORE
|
||||
+ ])
|
||||
+
|
||||
+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
|
||||
+ ac_cv_cxx_compile_cxx0x_cxx,
|
||||
+ [AC_LANG_SAVE
|
||||
+ AC_LANG_CPLUSPLUS
|
||||
+ ac_save_CXXFLAGS="$CXXFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS -std=c++0x"
|
||||
+ AC_TRY_COMPILE([
|
||||
+ template <typename T>
|
||||
+ struct check
|
||||
+ {
|
||||
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
|
||||
+ };
|
||||
+
|
||||
+ typedef check<check<bool>> right_angle_brackets;
|
||||
+
|
||||
+ int a;
|
||||
+ decltype(a) b;
|
||||
+
|
||||
+ typedef check<int> check_type;
|
||||
+ check_type c;
|
||||
+ check_type&& cr = c;],,
|
||||
+ ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
|
||||
+ CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
+ AC_LANG_RESTORE
|
||||
+ ])
|
||||
+
|
||||
+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
|
||||
+ ac_cv_cxx_compile_cxx0x_gxx,
|
||||
+ [AC_LANG_SAVE
|
||||
+ AC_LANG_CPLUSPLUS
|
||||
+ ac_save_CXXFLAGS="$CXXFLAGS"
|
||||
+ CXXFLAGS="$CXXFLAGS -std=gnu++0x"
|
||||
+ AC_TRY_COMPILE([
|
||||
+ template <typename T>
|
||||
+ struct check
|
||||
+ {
|
||||
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
|
||||
+ };
|
||||
+
|
||||
+ typedef check<check<bool>> right_angle_brackets;
|
||||
+
|
||||
+ int a;
|
||||
+ decltype(a) b;
|
||||
+
|
||||
+ typedef check<int> check_type;
|
||||
+ check_type c;
|
||||
+ check_type&& cr = c;],,
|
||||
+ ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
|
||||
+ CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
+ AC_LANG_RESTORE
|
||||
+ ])
|
||||
+
|
||||
+ if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
|
||||
+ test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
|
||||
+ test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
|
||||
+ AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
|
||||
+ fi
|
||||
+])
|
||||
--- steghide-0.5.1.old/src/Arguments.cc 2003-10-11 23:25:04.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/Arguments.cc 2008-05-09 19:04:44.000000000 +0200
|
||||
@@ -26,10 +26,12 @@
|
||||
#include "Terminal.h"
|
||||
#include "common.h"
|
||||
#include "error.h"
|
||||
#include "msg.h"
|
||||
|
||||
+float Arguments::Default_Goal = 100.0 ;
|
||||
+
|
||||
// the global Arguments object
|
||||
Arguments Args ;
|
||||
|
||||
Arguments::Arguments (int argc, char* argv[])
|
||||
{
|
||||
--- steghide-0.5.1.old/src/Arguments.h 2003-10-11 23:23:57.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/Arguments.h 2008-05-09 19:04:44.000000000 +0200
|
||||
@@ -98,11 +98,11 @@
|
||||
static const bool Default_EmbedEmbFn = true ;
|
||||
static const bool Default_Force = false ;
|
||||
static const VERBOSITY Default_Verbosity = NORMAL ;
|
||||
static const unsigned long Default_Radius = 0 ; // there is no default radius for all file formats
|
||||
static const unsigned int Max_Algorithm = 3 ;
|
||||
- static const float Default_Goal = 100.0 ;
|
||||
+ static float Default_Goal ;
|
||||
static const DEBUGCOMMAND Default_DebugCommand = NONE ;
|
||||
static const bool Default_Check = false ;
|
||||
static const unsigned int Default_DebugLevel = 0 ;
|
||||
static const unsigned int Default_GmlGraphRecDepth = 0 ;
|
||||
static const unsigned int Default_GmlStartVertex = 0 ;
|
||||
--- steghide-0.5.1.old/src/EncryptionMode.h 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/EncryptionMode.h 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -69,11 +69,11 @@
|
||||
static const unsigned int NumValues = 8 ;
|
||||
IRep Value ;
|
||||
|
||||
typedef struct struct_Translation {
|
||||
IRep irep ;
|
||||
- char* srep ;
|
||||
+ const char* srep ;
|
||||
} Translation ;
|
||||
static const Translation Translations[] ;
|
||||
} ;
|
||||
|
||||
#endif // ndef SH_ENCMODE_H
|
||||
--- steghide-0.5.1.old/src/Graph.cc 2003-10-11 23:54:26.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/Graph.cc 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -20,10 +20,12 @@
|
||||
|
||||
#include <ctime>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
+#include <algorithm>
|
||||
+#include <climits>
|
||||
|
||||
#include "BitString.h"
|
||||
#include "CvrStgFile.h"
|
||||
#include "Edge.h"
|
||||
#include "Graph.h"
|
||||
--- steghide-0.5.1.old/src/Matching.cc 2003-10-11 23:54:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/Matching.cc 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -16,10 +16,11 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <algorithm>
|
||||
#include "Edge.h"
|
||||
#include "Graph.h"
|
||||
#include "Matching.h"
|
||||
#include "ProgressOutput.h"
|
||||
#include "common.h"
|
||||
--- steghide-0.5.1.old/src/ProgressOutput.cc 2003-10-11 11:20:51.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/ProgressOutput.cc 2008-05-09 19:04:44.000000000 +0200
|
||||
@@ -21,10 +21,12 @@
|
||||
#include <cmath>
|
||||
|
||||
#include "ProgressOutput.h"
|
||||
#include "common.h"
|
||||
|
||||
+float ProgressOutput::NoAvgWeight = 1.0 ;
|
||||
+
|
||||
ProgressOutput::ProgressOutput ()
|
||||
: Message("__nomessage__")
|
||||
{
|
||||
LastUpdate = time(NULL) - 1 ; // -1 to ensure that message is written first time
|
||||
}
|
||||
--- steghide-0.5.1.old/src/ProgressOutput.h 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/ProgressOutput.h 2008-05-09 19:04:44.000000000 +0200
|
||||
@@ -60,13 +60,13 @@
|
||||
/**
|
||||
* update the output appending rate, [average edge weight], "done" and a newline
|
||||
* \param rate the rate of matched vertices
|
||||
* \param avgweight the average edge weight (is not printed if not given)
|
||||
**/
|
||||
- void done (float rate, float avgweight = NoAvgWeight) const ;
|
||||
+ void done (float rate, float avgweight = 1.0) const ;
|
||||
|
||||
- static const float NoAvgWeight = -1.0 ;
|
||||
+ static float NoAvgWeight ;
|
||||
|
||||
protected:
|
||||
std::string vcompose (const char *msgfmt, va_list ap) const ;
|
||||
|
||||
private:
|
||||
--- steghide-0.5.1.old/src/SMDConstructionHeuristic.cc 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/SMDConstructionHeuristic.cc 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -16,10 +16,12 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
*/
|
||||
|
||||
+#include <algorithm>
|
||||
+
|
||||
#include "Edge.h"
|
||||
#include "Graph.h"
|
||||
#include "Matching.h"
|
||||
#include "SMDConstructionHeuristic.h"
|
||||
#include "Vertex.h"
|
||||
--- steghide-0.5.1.old/src/WavFile.cc 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/WavFile.cc 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -19,10 +19,11 @@
|
||||
*/
|
||||
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
+#include <algorithm>
|
||||
|
||||
#include "CvrStgFile.h"
|
||||
#include "DFSAPHeuristic.h"
|
||||
#include "SampleValueAdjacencyList.h"
|
||||
#include "SMDConstructionHeuristic.h"
|
||||
--- steghide-0.5.1.old/src/wrapper_hash_map.h 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/wrapper_hash_map.h 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -25,17 +25,21 @@
|
||||
|
||||
#ifdef __GNUC__
|
||||
# if __GNUC__ < 3
|
||||
# include <hash_map.h>
|
||||
namespace sgi { using ::hash ; using ::hash_map ; } ;
|
||||
-# else
|
||||
+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
|
||||
# include <ext/hash_map>
|
||||
-# if __GNUC_MINOR__ == 0
|
||||
+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0
|
||||
namespace sgi = std ; // GCC 3.0
|
||||
# else
|
||||
namespace sgi = __gnu_cxx ; // GCC 3.1 and later
|
||||
# endif
|
||||
+# else
|
||||
+# include <unordered_map>
|
||||
+# define hash_map unordered_map
|
||||
+ namespace sgi = std ;
|
||||
# endif
|
||||
#else
|
||||
namespace sgi = std ;
|
||||
#endif
|
||||
|
||||
--- steghide-0.5.1.old/src/wrapper_hash_set.h 2003-09-28 17:30:30.000000000 +0200
|
||||
+++ steghide-0.5.1.new/src/wrapper_hash_set.h 2008-05-09 19:04:46.000000000 +0200
|
||||
@@ -26,17 +26,21 @@
|
||||
|
||||
#ifdef __GNUC__
|
||||
# if __GNUC__ < 3
|
||||
# include <hash_set.h>
|
||||
namespace sgi { using ::hash ; using ::hash_set ; } ;
|
||||
-# else
|
||||
+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
|
||||
# include <ext/hash_set>
|
||||
-# if __GNUC_MINOR__ == 0
|
||||
+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0
|
||||
namespace sgi = std ; // GCC 3.0
|
||||
# else
|
||||
namespace sgi = ::__gnu_cxx ; // GCC 3.1 and later
|
||||
# endif
|
||||
+# else
|
||||
+# include <unordered_set>
|
||||
+# define hash_set unordered_set
|
||||
+ namespace sgi = std ;
|
||||
# endif
|
||||
#else
|
||||
namespace sgi = std ;
|
||||
#endif
|
||||
|
||||
20
pkgs/tools/system/fakechroot/default.nix
Normal file
20
pkgs/tools/system/fakechroot/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fakechroot-${version}";
|
||||
version = "2.17.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dex4er/fakechroot/archive/${version}.tar.gz";
|
||||
md5 = "e614f62972efa4654fc780ae7e4affad";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/dex4er/fakechroot;
|
||||
description = "Give a fake chroot environment through LD_PRELOAD";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [offline];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -899,6 +899,8 @@ let
|
|||
|
||||
fakeroot = callPackage ../tools/system/fakeroot { };
|
||||
|
||||
fakechroot = callPackage ../tools/system/fakechroot { };
|
||||
|
||||
fcitx = callPackage ../tools/inputmethods/fcitx { };
|
||||
|
||||
fcron = callPackage ../tools/system/fcron { };
|
||||
|
|
@ -2016,6 +2018,8 @@ let
|
|||
|
||||
vboot_reference = callPackage ../tools/system/vboot_reference { };
|
||||
|
||||
vcsh = callPackage ../applications/version-management/vcsh { };
|
||||
|
||||
verilog = callPackage ../applications/science/electronics/verilog {};
|
||||
|
||||
vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
|
||||
|
|
@ -4176,7 +4180,9 @@ let
|
|||
|
||||
glew = callPackage ../development/libraries/glew { };
|
||||
|
||||
glfw = callPackage ../development/libraries/glfw { };
|
||||
glfw = glfw3;
|
||||
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
|
||||
glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
|
||||
|
||||
glibc = callPackage ../development/libraries/glibc/2.18 {
|
||||
kernelHeaders = linuxHeaders;
|
||||
|
|
@ -4323,7 +4329,8 @@ let
|
|||
|
||||
gnu-efi = callPackage ../development/libraries/gnu-efi { };
|
||||
|
||||
gnutls = callPackage ../development/libraries/gnutls {
|
||||
gnutls = gnutls32;
|
||||
gnutls31 = callPackage ../development/libraries/gnutls {
|
||||
guileBindings = config.gnutls.guile or true;
|
||||
};
|
||||
|
||||
|
|
@ -5641,6 +5648,8 @@ let
|
|||
|
||||
stlink = callPackage ../development/tools/misc/stlink { };
|
||||
|
||||
steghide = callPackage ../tools/security/steghide {};
|
||||
|
||||
stepmania = callPackage ../games/stepmania {};
|
||||
|
||||
stlport = callPackage ../development/libraries/stlport { };
|
||||
|
|
@ -7928,11 +7937,6 @@ let
|
|||
|
||||
get_iplayer = callPackage ../applications/misc/get_iplayer {};
|
||||
|
||||
gimp_2_6 = callPackage ../applications/graphics/gimp {
|
||||
inherit (gnome) libart_lgpl;
|
||||
libpng = libpng12;
|
||||
};
|
||||
|
||||
gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
|
||||
inherit (gnome) libart_lgpl;
|
||||
webkit = null;
|
||||
|
|
@ -8093,6 +8097,8 @@ let
|
|||
|
||||
gv = callPackage ../applications/misc/gv { };
|
||||
|
||||
guvcview = callPackage ../os-specific/linux/guvcview { };
|
||||
|
||||
hello = callPackage ../applications/misc/hello/ex-2 { };
|
||||
|
||||
herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
|
||||
|
|
|
|||
|
|
@ -1449,6 +1449,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {};
|
||||
|
||||
hybridVectors = callPackage ../development/libraries/haskell/hybrid-vectors {};
|
||||
|
||||
iCalendar = callPackage ../development/libraries/haskell/iCalendar {};
|
||||
|
||||
idna = callPackage ../development/libraries/haskell/idna {};
|
||||
|
|
@ -1489,6 +1491,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
ivor = callPackage ../development/libraries/haskell/ivor {};
|
||||
|
||||
ixdopp = callPackage ../development/libraries/haskell/ixdopp {
|
||||
preprocessorTools = self.preprocessorTools_0_1_3;
|
||||
};
|
||||
|
||||
ixShapable = callPackage ../development/libraries/haskell/ix-shapable {};
|
||||
|
||||
JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {};
|
||||
|
|
@ -1535,7 +1541,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
|
||||
|
||||
lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
|
||||
lens_4_0 = callPackage ../development/libraries/haskell/lens/4.0.nix {};
|
||||
lens_4_0_1 = callPackage ../development/libraries/haskell/lens/4.0.1.nix {
|
||||
aeson = self.aeson_0_7_0_0;
|
||||
};
|
||||
lens = self.lens_3_10_2;
|
||||
|
||||
lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
|
||||
|
|
@ -1558,7 +1566,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
|
||||
|
||||
linear = callPackage ../development/libraries/haskell/linear {};
|
||||
linear = callPackage ../development/libraries/haskell/linear {
|
||||
lens = self.lens_4_0_1;
|
||||
};
|
||||
|
||||
List = callPackage ../development/libraries/haskell/List {};
|
||||
|
||||
|
|
@ -1909,6 +1919,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
pqueue = callPackage ../development/libraries/haskell/pqueue {};
|
||||
|
||||
preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {};
|
||||
|
||||
preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {};
|
||||
|
||||
preprocessorTools = self.preprocessorTools_1_0_1;
|
||||
|
||||
prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
|
||||
|
||||
prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
|
||||
|
|
@ -2080,6 +2096,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
scotty = callPackage ../development/libraries/haskell/scotty {};
|
||||
|
||||
scottyHastache = callPackage ../development/libraries/haskell/scotty-hastache {};
|
||||
|
||||
securemem = callPackage ../development/libraries/haskell/securemem {};
|
||||
|
||||
sendfile = callPackage ../development/libraries/haskell/sendfile {};
|
||||
|
|
@ -2112,6 +2130,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {};
|
||||
|
||||
snapBlaze = callPackage ../development/libraries/haskell/snap-blaze/default.nix {};
|
||||
|
||||
snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
|
||||
|
||||
snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {};
|
||||
|
|
@ -2122,6 +2142,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
socks = callPackage ../development/libraries/haskell/socks {};
|
||||
|
||||
sparse = callPackage ../development/libraries/haskell/sparse {
|
||||
lens = self.lens_4_0_1;
|
||||
linear = self.linear.override { lens = self.lens_4_0_1; };
|
||||
};
|
||||
|
||||
srcloc = callPackage ../development/libraries/haskell/srcloc {};
|
||||
|
||||
stateref = callPackage ../development/libraries/haskell/stateref {};
|
||||
|
|
@ -2214,6 +2239,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {};
|
||||
split = self.split_0_2_2;
|
||||
|
||||
sqliteSimple = callPackage ../development/libraries/haskell/sqlite-simple/default.nix {};
|
||||
|
||||
stbImage = callPackage ../development/libraries/haskell/stb-image {};
|
||||
|
||||
stm_2_1_1_2 = callPackage ../development/libraries/haskell/stm/2.1.1.2.nix {};
|
||||
|
|
@ -2349,7 +2376,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
timeCompat = callPackage ../development/libraries/haskell/time-compat {};
|
||||
|
||||
tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
|
||||
tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
|
||||
tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.2.2.nix {};
|
||||
tls = self.tls_1_2_2;
|
||||
|
||||
tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
|
||||
|
|
@ -2478,6 +2505,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
|
|||
|
||||
waiLogger = callPackage ../development/libraries/haskell/wai-logger {};
|
||||
|
||||
waiMiddlewareStatic = callPackage ../development/libraries/haskell/wai-middleware-static {};
|
||||
|
||||
waiTest = callPackage ../development/libraries/haskell/wai-test {};
|
||||
|
||||
warp = callPackage ../development/libraries/haskell/warp {};
|
||||
|
|
|
|||
|
|
@ -1054,7 +1054,7 @@
|
|||
deps = [
|
||||
self.by-version."graceful-fs"."2.0.1"
|
||||
self.by-version."mout"."0.6.0"
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
self.by-version."osenv"."0.0.3"
|
||||
];
|
||||
peerDependencies = [
|
||||
|
|
@ -1077,7 +1077,7 @@
|
|||
deps = [
|
||||
self.by-version."graceful-fs"."2.0.1"
|
||||
self.by-version."mout"."0.6.0"
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
self.by-version."osenv"."0.0.3"
|
||||
];
|
||||
peerDependencies = [
|
||||
|
|
@ -1898,7 +1898,7 @@
|
|||
];
|
||||
passthru.names = [ "cli" ];
|
||||
};
|
||||
by-spec."cli-color"."~0.2.2" =
|
||||
by-spec."cli-color"."*" =
|
||||
self.by-version."cli-color"."0.2.3";
|
||||
by-version."cli-color"."0.2.3" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-cli-color-0.2.3";
|
||||
|
|
@ -1919,6 +1919,30 @@
|
|||
];
|
||||
passthru.names = [ "cli-color" ];
|
||||
};
|
||||
by-spec."cli-color"."~0.2.2" =
|
||||
self.by-version."cli-color"."0.2.3";
|
||||
by-spec."cli-color"."~0.2.3" =
|
||||
self.by-version."cli-color"."0.2.3";
|
||||
by-spec."cli-log"."~0.0.8" =
|
||||
self.by-version."cli-log"."0.0.8";
|
||||
by-version."cli-log"."0.0.8" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-cli-log-0.0.8";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/cli-log/-/cli-log-0.0.8.tgz";
|
||||
name = "cli-log-0.0.8.tgz";
|
||||
sha1 = "af738d7f5fcda8aab21bd4dbcd904ee5137c1ad0";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."cli-log" or []);
|
||||
deps = [
|
||||
self.by-version."cli-color"."0.2.3"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "cli-log" ];
|
||||
};
|
||||
by-spec."cliff"."0.1.8" =
|
||||
self.by-version."cliff"."0.1.8";
|
||||
by-version."cliff"."0.1.8" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -2267,25 +2291,6 @@
|
|||
];
|
||||
passthru.names = [ "combined-stream" ];
|
||||
};
|
||||
by-spec."commander"."*" =
|
||||
self.by-version."commander"."2.1.0";
|
||||
by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-commander-2.1.0";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
|
||||
name = "commander-2.1.0.tgz";
|
||||
sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."commander" or []);
|
||||
deps = [
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "commander" ];
|
||||
};
|
||||
by-spec."commander"."0.6.1" =
|
||||
self.by-version."commander"."0.6.1";
|
||||
by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -2305,6 +2310,26 @@
|
|||
];
|
||||
passthru.names = [ "commander" ];
|
||||
};
|
||||
by-spec."commander"."1.3.1" =
|
||||
self.by-version."commander"."1.3.1";
|
||||
by-version."commander"."1.3.1" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-commander-1.3.1";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
|
||||
name = "commander-1.3.1.tgz";
|
||||
sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."commander" or []);
|
||||
deps = [
|
||||
self.by-version."keypress"."0.1.0"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "commander" ];
|
||||
};
|
||||
by-spec."commander"."1.3.2" =
|
||||
self.by-version."commander"."1.3.2";
|
||||
by-version."commander"."1.3.2" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -2348,6 +2373,23 @@
|
|||
self.by-version."commander"."2.0.0";
|
||||
by-spec."commander"."2.1.0" =
|
||||
self.by-version."commander"."2.1.0";
|
||||
by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-commander-2.1.0";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
|
||||
name = "commander-2.1.0.tgz";
|
||||
sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."commander" or []);
|
||||
deps = [
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "commander" ];
|
||||
};
|
||||
by-spec."commander"."~0.6.1" =
|
||||
self.by-version."commander"."0.6.1";
|
||||
by-spec."config"."0.4.15" =
|
||||
|
|
@ -2910,6 +2952,26 @@
|
|||
];
|
||||
passthru.names = [ "cookies" ];
|
||||
};
|
||||
by-spec."copy-paste"."~0.1.0" =
|
||||
self.by-version."copy-paste"."0.1.0";
|
||||
by-version."copy-paste"."0.1.0" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-copy-paste-0.1.0";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.1.0.tgz";
|
||||
name = "copy-paste-0.1.0.tgz";
|
||||
sha1 = "d748638a4eccfa83af064eeb4bfc625cb300d28c";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."copy-paste" or []);
|
||||
deps = [
|
||||
self.by-version."execSync"."1.0.1-pre"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "copy-paste" ];
|
||||
};
|
||||
by-spec."core-util-is"."~1.0.0" =
|
||||
self.by-version."core-util-is"."1.0.1";
|
||||
by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -4257,6 +4319,26 @@
|
|||
];
|
||||
passthru.names = [ "everyauth" ];
|
||||
};
|
||||
by-spec."execSync"."~1.0.0" =
|
||||
self.by-version."execSync"."1.0.1-pre";
|
||||
by-version."execSync"."1.0.1-pre" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-execSync-1.0.1-pre";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/execSync/-/execSync-1.0.1-pre.tgz";
|
||||
name = "execSync-1.0.1-pre.tgz";
|
||||
sha1 = "8fa8deb748eecdafe61feea49921bb9b7a410d1e";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."execSync" or []);
|
||||
deps = [
|
||||
self.by-version."temp"."0.5.1"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "execSync" ];
|
||||
};
|
||||
by-spec."exit"."~0.1.1" =
|
||||
self.by-version."exit"."0.1.2";
|
||||
by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -4856,7 +4938,7 @@
|
|||
self.by-version."forever-monitor"."1.2.3"
|
||||
self.by-version."nconf"."0.6.9"
|
||||
self.by-version."nssocket"."0.5.1"
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
self.by-version."pkginfo"."0.3.0"
|
||||
self.by-version."timespan"."2.3.0"
|
||||
self.by-version."watch"."0.8.0"
|
||||
|
|
@ -5413,6 +5495,60 @@
|
|||
];
|
||||
passthru.names = [ "getobject" ];
|
||||
};
|
||||
by-spec."gh"."*" =
|
||||
self.by-version."gh"."1.8.2";
|
||||
by-version."gh"."1.8.2" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "gh-1.8.2";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/gh/-/gh-1.8.2.tgz";
|
||||
name = "gh-1.8.2.tgz";
|
||||
sha1 = "01ae9e23a617a9c08e8196078dd7b5a8b79b0156";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."gh" or []);
|
||||
deps = [
|
||||
self.by-version."async"."0.2.10"
|
||||
self.by-version."cli-color"."0.2.3"
|
||||
self.by-version."cli-log"."0.0.8"
|
||||
self.by-version."copy-paste"."0.1.0"
|
||||
self.by-version."moment"."2.4.0"
|
||||
self.by-version."handlebars"."1.0.11"
|
||||
self.by-version."github"."0.1.13"
|
||||
self.by-version."inquirer"."0.3.5"
|
||||
self.by-version."wordwrap"."0.0.2"
|
||||
self.by-version."nopt"."2.1.2"
|
||||
self.by-version."open"."0.0.4"
|
||||
self.by-version."truncate"."1.0.2"
|
||||
self.by-version."update-notifier"."0.1.7"
|
||||
self.by-version."userhome"."0.1.0"
|
||||
self.by-version."which"."1.0.5"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "gh" ];
|
||||
};
|
||||
"gh" = self.by-version."gh"."1.8.2";
|
||||
by-spec."github"."~0.1.12" =
|
||||
self.by-version."github"."0.1.13";
|
||||
by-version."github"."0.1.13" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-github-0.1.13";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/github/-/github-0.1.13.tgz";
|
||||
name = "github-0.1.13.tgz";
|
||||
sha1 = "90567238d0eb54f7c58ad3a6a2bea0fa495c94fb";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."github" or []);
|
||||
deps = [
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "github" ];
|
||||
};
|
||||
by-spec."github-flavored-markdown".">= 0.0.1" =
|
||||
self.by-version."github-flavored-markdown"."1.0.1";
|
||||
by-version."github-flavored-markdown"."1.0.1" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -5880,7 +6016,7 @@
|
|||
buildInputs =
|
||||
(self.nativeDeps."grunt-karma" or []);
|
||||
deps = [
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
];
|
||||
peerDependencies = [
|
||||
self.by-version."grunt"."0.4.2"
|
||||
|
|
@ -5979,6 +6115,27 @@
|
|||
passthru.names = [ "gzippo" ];
|
||||
};
|
||||
"gzippo" = self.by-version."gzippo"."0.2.0";
|
||||
by-spec."handlebars"."1.0.11" =
|
||||
self.by-version."handlebars"."1.0.11";
|
||||
by-version."handlebars"."1.0.11" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "handlebars-1.0.11";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/handlebars/-/handlebars-1.0.11.tgz";
|
||||
name = "handlebars-1.0.11.tgz";
|
||||
sha1 = "28b8af8b1f3658ef377e621e0d6b07078fc450a9";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."handlebars" or []);
|
||||
deps = [
|
||||
self.by-version."optimist"."0.3.7"
|
||||
self.by-version."uglify-js"."1.2.6"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "handlebars" ];
|
||||
};
|
||||
by-spec."handlebars"."1.0.x" =
|
||||
self.by-version."handlebars"."1.0.12";
|
||||
by-version."handlebars"."1.0.12" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -6418,7 +6575,7 @@
|
|||
(self.nativeDeps."http-proxy" or []);
|
||||
deps = [
|
||||
self.by-version."colors"."0.6.2"
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
self.by-version."pkginfo"."0.3.0"
|
||||
self.by-version."utile"."0.2.1"
|
||||
];
|
||||
|
|
@ -6545,7 +6702,7 @@
|
|||
deps = [
|
||||
self.by-version."coffee-script-redux"."2.0.0-beta4"
|
||||
self.by-version."istanbul"."0.2.4"
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
self.by-version."escodegen"."1.1.0"
|
||||
self.by-version."mkdirp"."0.3.5"
|
||||
self.by-version."which"."1.0.5"
|
||||
|
|
@ -6717,6 +6874,8 @@
|
|||
};
|
||||
by-spec."inquirer"."~0.3.1" =
|
||||
self.by-version."inquirer"."0.3.5";
|
||||
by-spec."inquirer"."~0.3.4" =
|
||||
self.by-version."inquirer"."0.3.5";
|
||||
by-spec."inquirer"."~0.4.0" =
|
||||
self.by-version."inquirer"."0.4.0";
|
||||
by-version."inquirer"."0.4.0" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -7391,7 +7550,7 @@
|
|||
self.by-version."glob"."3.2.8"
|
||||
self.by-version."minimatch"."0.2.14"
|
||||
self.by-version."http-proxy"."0.10.4"
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
self.by-version."coffee-script"."1.6.3"
|
||||
self.by-version."rimraf"."2.2.6"
|
||||
self.by-version."q"."0.9.7"
|
||||
|
|
@ -8951,14 +9110,14 @@
|
|||
passthru.names = [ "moment" ];
|
||||
};
|
||||
by-spec."mongodb"."*" =
|
||||
self.by-version."mongodb"."1.4.0-rc5";
|
||||
by-version."mongodb"."1.4.0-rc5" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-mongodb-1.4.0-rc5";
|
||||
self.by-version."mongodb"."1.4.0-rc6";
|
||||
by-version."mongodb"."1.4.0-rc6" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-mongodb-1.4.0-rc6";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc5.tgz";
|
||||
name = "mongodb-1.4.0-rc5.tgz";
|
||||
sha1 = "4be74a98df5f2f0e1eba6d868498d710f4c264ae";
|
||||
url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc6.tgz";
|
||||
name = "mongodb-1.4.0-rc6.tgz";
|
||||
sha1 = "dd2f6a03d9e9da019d6aa5da66c4d5de7993aedd";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
|
|
@ -8971,7 +9130,7 @@
|
|||
];
|
||||
passthru.names = [ "mongodb" ];
|
||||
};
|
||||
"mongodb" = self.by-version."mongodb"."1.4.0-rc5";
|
||||
"mongodb" = self.by-version."mongodb"."1.4.0-rc6";
|
||||
by-spec."mongodb"."1.2.14" =
|
||||
self.by-version."mongodb"."1.2.14";
|
||||
by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -9720,7 +9879,7 @@
|
|||
self.by-version."dox"."0.4.4"
|
||||
self.by-version."jade"."0.35.0"
|
||||
self.by-version."node-uuid"."1.4.1"
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
self.by-version."request"."2.27.0"
|
||||
self.by-version."semver"."2.1.0"
|
||||
self.by-version."sprintf"."0.1.3"
|
||||
|
|
@ -10027,7 +10186,7 @@
|
|||
deps = [
|
||||
self.by-version."mailcomposer"."0.2.8"
|
||||
self.by-version."simplesmtp"."0.3.20"
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
|
|
@ -10643,6 +10802,8 @@
|
|||
};
|
||||
by-spec."open"."~0.0.3" =
|
||||
self.by-version."open"."0.0.4";
|
||||
by-spec."open"."~0.0.4" =
|
||||
self.by-version."open"."0.0.4";
|
||||
by-spec."opener"."~1.3.0" =
|
||||
self.by-version."opener"."1.3.0";
|
||||
by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -10682,14 +10843,14 @@
|
|||
passthru.names = [ "openid" ];
|
||||
};
|
||||
by-spec."optimist"."*" =
|
||||
self.by-version."optimist"."0.6.0";
|
||||
by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-optimist-0.6.0";
|
||||
self.by-version."optimist"."0.6.1";
|
||||
by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-optimist-0.6.1";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
|
||||
name = "optimist-0.6.0.tgz";
|
||||
sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
|
||||
url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
|
||||
name = "optimist-0.6.1.tgz";
|
||||
sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
|
|
@ -10702,7 +10863,7 @@
|
|||
];
|
||||
passthru.names = [ "optimist" ];
|
||||
};
|
||||
"optimist" = self.by-version."optimist"."0.6.0";
|
||||
"optimist" = self.by-version."optimist"."0.6.1";
|
||||
by-spec."optimist"."0.2" =
|
||||
self.by-version."optimist"."0.2.8";
|
||||
by-version."optimist"."0.2.8" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -10745,8 +10906,27 @@
|
|||
};
|
||||
by-spec."optimist"."0.6.0" =
|
||||
self.by-version."optimist"."0.6.0";
|
||||
by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-optimist-0.6.0";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
|
||||
name = "optimist-0.6.0.tgz";
|
||||
sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."optimist" or []);
|
||||
deps = [
|
||||
self.by-version."wordwrap"."0.0.2"
|
||||
self.by-version."minimist"."0.0.5"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "optimist" ];
|
||||
};
|
||||
by-spec."optimist"."0.6.x" =
|
||||
self.by-version."optimist"."0.6.0";
|
||||
self.by-version."optimist"."0.6.1";
|
||||
by-spec."optimist"."~0.3" =
|
||||
self.by-version."optimist"."0.3.7";
|
||||
by-spec."optimist"."~0.3.4" =
|
||||
|
|
@ -10754,7 +10934,7 @@
|
|||
by-spec."optimist"."~0.3.5" =
|
||||
self.by-version."optimist"."0.3.7";
|
||||
by-spec."optimist"."~0.6.0" =
|
||||
self.by-version."optimist"."0.6.0";
|
||||
self.by-version."optimist"."0.6.1";
|
||||
by-spec."options".">=0.0.5" =
|
||||
self.by-version."options"."0.0.5";
|
||||
by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -12937,26 +13117,7 @@
|
|||
];
|
||||
passthru.names = [ "send" ];
|
||||
};
|
||||
by-spec."sequence"."*" =
|
||||
self.by-version."sequence"."3.0.0";
|
||||
by-version."sequence"."3.0.0" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-sequence-3.0.0";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/sequence/-/sequence-3.0.0.tgz";
|
||||
name = "sequence-3.0.0.tgz";
|
||||
sha1 = "5957d3e03c70e270b2009a8c8bdaa97338a6e170";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."sequence" or []);
|
||||
deps = [
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "sequence" ];
|
||||
};
|
||||
by-spec."sequence"."2.x" =
|
||||
by-spec."sequence"."2.2.1" =
|
||||
self.by-version."sequence"."2.2.1";
|
||||
by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-sequence-2.2.1";
|
||||
|
|
@ -12975,6 +13136,8 @@
|
|||
];
|
||||
passthru.names = [ "sequence" ];
|
||||
};
|
||||
by-spec."sequence"."2.x" =
|
||||
self.by-version."sequence"."2.2.1";
|
||||
by-spec."sha"."~1.2.1" =
|
||||
self.by-version."sha"."1.2.3";
|
||||
by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -13577,14 +13740,14 @@
|
|||
passthru.names = [ "stack-trace" ];
|
||||
};
|
||||
by-spec."statsd"."*" =
|
||||
self.by-version."statsd"."0.7.0";
|
||||
by-version."statsd"."0.7.0" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "statsd-0.7.0";
|
||||
self.by-version."statsd"."0.7.1";
|
||||
by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "statsd-0.7.1";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/statsd/-/statsd-0.7.0.tgz";
|
||||
name = "statsd-0.7.0.tgz";
|
||||
sha1 = "13354345392c50a30221d3ab524bffcdda90272e";
|
||||
url = "http://registry.npmjs.org/statsd/-/statsd-0.7.1.tgz";
|
||||
name = "statsd-0.7.1.tgz";
|
||||
sha1 = "b3a5124948ea5558e59eb26536ccfdedb9ba2a70";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
|
|
@ -13592,13 +13755,13 @@
|
|||
deps = [
|
||||
self.by-version."node-syslog"."1.1.7"
|
||||
self.by-version."hashring"."1.0.1"
|
||||
self.by-version."winser"."0.0.11"
|
||||
self.by-version."winser"."0.1.6"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "statsd" ];
|
||||
};
|
||||
"statsd" = self.by-version."statsd"."0.7.0";
|
||||
"statsd" = self.by-version."statsd"."0.7.1";
|
||||
by-spec."stream-combiner"."~0.0.2" =
|
||||
self.by-version."stream-combiner"."0.0.4";
|
||||
by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -14077,6 +14240,26 @@
|
|||
"temp" = self.by-version."temp"."0.6.0";
|
||||
by-spec."temp"."0.6.0" =
|
||||
self.by-version."temp"."0.6.0";
|
||||
by-spec."temp"."~0.5.1" =
|
||||
self.by-version."temp"."0.5.1";
|
||||
by-version."temp"."0.5.1" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-temp-0.5.1";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz";
|
||||
name = "temp-0.5.1.tgz";
|
||||
sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."temp" or []);
|
||||
deps = [
|
||||
self.by-version."rimraf"."2.1.4"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "temp" ];
|
||||
};
|
||||
by-spec."temp"."~0.6.0" =
|
||||
self.by-version."temp"."0.6.0";
|
||||
by-spec."tempfile"."~0.1.2" =
|
||||
|
|
@ -14276,7 +14459,7 @@
|
|||
self.by-version."longjohn"."0.2.2"
|
||||
self.by-version."moment"."2.4.0"
|
||||
self.by-version."node-appc"."0.2.0"
|
||||
self.by-version."optimist"."0.6.0"
|
||||
self.by-version."optimist"."0.6.1"
|
||||
self.by-version."request"."2.27.0"
|
||||
self.by-version."semver"."2.2.1"
|
||||
self.by-version."sprintf"."0.1.3"
|
||||
|
|
@ -14540,7 +14723,26 @@
|
|||
self.by-version."async"."0.2.10"
|
||||
self.by-version."source-map"."0.1.31"
|
||||
self.by-version."optimist"."0.3.7"
|
||||
self.by-version."uglify-to-browserify"."1.0.1"
|
||||
self.by-version."uglify-to-browserify"."1.0.2"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "uglify-js" ];
|
||||
};
|
||||
by-spec."uglify-js"."~1.2" =
|
||||
self.by-version."uglify-js"."1.2.6";
|
||||
by-version."uglify-js"."1.2.6" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "uglify-js-1.2.6";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.6.tgz";
|
||||
name = "uglify-js-1.2.6.tgz";
|
||||
sha1 = "d354b2d3c1cf10ebc18fa78c11a28bdd9ce1580d";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."uglify-js" or []);
|
||||
deps = [
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
|
|
@ -14608,21 +14810,21 @@
|
|||
self.by-version."async"."0.2.10"
|
||||
self.by-version."source-map"."0.1.31"
|
||||
self.by-version."optimist"."0.3.7"
|
||||
self.by-version."uglify-to-browserify"."1.0.1"
|
||||
self.by-version."uglify-to-browserify"."1.0.2"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "uglify-js" ];
|
||||
};
|
||||
by-spec."uglify-to-browserify"."~1.0.0" =
|
||||
self.by-version."uglify-to-browserify"."1.0.1";
|
||||
by-version."uglify-to-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-uglify-to-browserify-1.0.1";
|
||||
self.by-version."uglify-to-browserify"."1.0.2";
|
||||
by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-uglify-to-browserify-1.0.2";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.1.tgz";
|
||||
name = "uglify-to-browserify-1.0.1.tgz";
|
||||
sha1 = "0e9ada5d4ca358a59a00bb33c8061e2f40ef97d2";
|
||||
url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
|
||||
name = "uglify-to-browserify-1.0.2.tgz";
|
||||
sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
|
|
@ -14885,6 +15087,25 @@
|
|||
];
|
||||
passthru.names = [ "useragent" ];
|
||||
};
|
||||
by-spec."userhome"."~0.1.0" =
|
||||
self.by-version."userhome"."0.1.0";
|
||||
by-version."userhome"."0.1.0" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "node-userhome-0.1.0";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/userhome/-/userhome-0.1.0.tgz";
|
||||
name = "userhome-0.1.0.tgz";
|
||||
sha1 = "bd2067d90b3f7ac6c026d87612c579d88fb89f86";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."userhome" or []);
|
||||
deps = [
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
passthru.names = [ "userhome" ];
|
||||
};
|
||||
by-spec."util"."0.10.2" =
|
||||
self.by-version."util"."0.10.2";
|
||||
by-version."util"."0.10.2" = lib.makeOverridable self.buildNodePackage {
|
||||
|
|
@ -15359,22 +15580,22 @@
|
|||
self.by-version."which"."1.0.5";
|
||||
by-spec."which"."~1.0.5" =
|
||||
self.by-version."which"."1.0.5";
|
||||
by-spec."winser"."=0.0.11" =
|
||||
self.by-version."winser"."0.0.11";
|
||||
by-version."winser"."0.0.11" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "winser-0.0.11";
|
||||
by-spec."winser"."=0.1.6" =
|
||||
self.by-version."winser"."0.1.6";
|
||||
by-version."winser"."0.1.6" = lib.makeOverridable self.buildNodePackage {
|
||||
name = "winser-0.1.6";
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = "http://registry.npmjs.org/winser/-/winser-0.0.11.tgz";
|
||||
name = "winser-0.0.11.tgz";
|
||||
sha1 = "38474086a89ac72f90f9c6762e23375d12046c7c";
|
||||
url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
|
||||
name = "winser-0.1.6.tgz";
|
||||
sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
|
||||
})
|
||||
];
|
||||
buildInputs =
|
||||
(self.nativeDeps."winser" or []);
|
||||
deps = [
|
||||
self.by-version."sequence"."3.0.0"
|
||||
self.by-version."commander"."2.1.0"
|
||||
self.by-version."sequence"."2.2.1"
|
||||
self.by-version."commander"."1.3.1"
|
||||
];
|
||||
peerDependencies = [
|
||||
];
|
||||
|
|
|
|||
|
|
@ -115,4 +115,5 @@
|
|||
, "bower2nix"
|
||||
, "fetch-bower"
|
||||
, { "titanium": "3.2.0" }
|
||||
, "gh"
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in a new issue