diff --git a/doc/language-support.xml b/doc/language-support.xml index 5e49121e695..67949808ec0 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -108,7 +108,7 @@ a preConfigure hook to generate a configuration file used by Makefile.PL: -{buildPerlPackage, fetchurl, db}: +{ buildPerlPackage, fetchurl, db }: buildPerlPackage rec { name = "BerkeleyDB-0.36"; @@ -191,45 +191,424 @@ you need it. -
Python +
Python + + + Currently supported interpreters are python26, python27, + python32, python33, python34 + and pypy. + + + + python is an alias of python27 and python3 is an alias of python34. + + + + python26 and python27 do not include modules that require + external dependencies (to reduce dependency bloat). Following modules need to be added as + buildInput explicitly: + + + + python.modules.bsddb + python.modules.curses + python.modules.curses_panel + python.modules.crypt + python.modules.gdbm + python.modules.sqlite3 + python.modules.tkinter + python.modules.readline + + +For convenience python27Full and python26Full +are provided with all modules included. Python packages that - use setuptools, - which many Python packages do nowadays, can be built very simply using - the buildPythonPackage function. This function is - implemented - in pkgs/development/python-modules/generic/default.nix - and works similarly to buildPerlPackage. (See - for details.) + use setuptools or distutils, + can be built using the buildPythonPackage function as documented below. - Python packages that use buildPythonPackage are - defined - in pkgs/top-level/python-packages.nix. - Most of them are simple. For example: - - -twisted = buildPythonPackage { - name = "twisted-8.1.0"; - - src = fetchurl { - url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; - sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; - }; - - propagatedBuildInputs = [ pkgs.ZopeInterface ]; - - meta = { - homepage = http://twistedmatrix.com/; - description = "Twisted, an event-driven networking engine written in Python"; - license = "MIT"; - }; -}; - + All packages depending on any Python interpreter get appended $out/${python.libPrefix}/site-packages + to $PYTHONPATH if such directory exists. + + + Useful attributes on interpreters packages: + + + + libPrefix + + Name of the folder in ${python}/lib/ for corresponding interpreter. + + + + + interpreter + + Alias for ${python}/bin/${executable}. + + + + + buildEnv + + Function to build python interpreter environments with extra packages bundled together. + See for usage and documentation. + + + + + sitePackages + + Alias for lib/${libPrefix}/site-packages. + + + + + executable + + Name of the interpreter executable, ie python3.4. + + + + +
<varname>buildPythonPackage</varname> function + + + The function is implemented in + pkgs/development/python-modules/generic/default.nix. + Example usage: + + + twisted = buildPythonPackage { + name = "twisted-8.1.0"; + + src = pkgs.fetchurl { + url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; + sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; + }; + + propagatedBuildInputs = [ self.ZopeInterface ]; + + meta = { + homepage = http://twistedmatrix.com/; + description = "Twisted, an event-driven networking engine written in Python"; + license = stdenv.lib.licenses.mit; + }; + }; + + + Most of Python packages that use buildPythonPackage are defined + in pkgs/top-level/python-packages.nix + and generated for each python interpreter separately into attribute sets python26Packages, + python27Packages, python32Packages, python33Packages, + python34Packages and pypyPackages. + + + + buildPythonPackage mainly does four things: + + + + In the configurePhase, it patches + setup.py to always include setuptools before + distutils for monkeypatching machinery to take place. + + + + In the buildPhase, it calls + ${python.interpreter} setup.py build ... + + + + In the installPhase, it calls + ${python.interpreter} setup.py install ... + + + + In the postFixup phase, wrapPythonPrograms + bash function is called to wrap all programs in $out/bin/* + directory to include $PYTHONPATH and $PATH + environment variables. + + + + + By default doCheck = true is set and tests are run with + ${python.interpreter} setup.py test command in checkPhase. + + propagatedBuildInputs packages are propagated to user environment. + + + By default meta.platforms is set to the same value + as the interpreter unless overriden otherwise. + + + + + <varname>buildPythonPackage</varname> parameters + (all parameters from <varname>mkDerivation</varname> function are still supported) + + + + namePrefix + + Prepended text to ${name} parameter. + Defaults to "python3.3-" for Python 3.3, etc. Set it to + "" + if you're packaging an application or a command line tool. + + + + + disabled + + If true, package is not build for + particular python interpreter version. Grep around + pkgs/top-level/python-packages.nix + for examples. + + + + + setupPyInstallFlags + + List of flags passed to setup.py install command. + + + + + setupPyBuildFlags + + List of flags passed to setup.py build command. + + + + + pythonPath + + List of packages to be added into $PYTHONPATH. + Packages in pythonPath are not propagated into user environment + (contrary to propagatedBuildInputs). + + + + + preShellHook + + Hook to execute commands before shellHook. + + + + + postShellHook + + Hook to execute commands after shellHook. + + + + + distutilsExtraCfg + + Extra lines passed to [easy_install] section of + distutils.cfg (acts as global setup.cfg + configuration). + + + + + +
+ +
<function>python.buildEnv</function> function + + Create Python envorinments using low-level pkgs.buildEnv function. Example default.nix: + + + {}; + + python.buildEnv.override { + extraLibs = [ pkgs.pythonPackages.pyramid ]; + ignoreCollisions = true; + } + ]]> + + + Running nix-build will create + /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env + with wrapped binaries in bin/. + + + + + <function>python.buildEnv</function> arguments + + + + extraLibs + + List of packages installed inside the environment. + + + + + postBuild + + Shell command executed after the build of environment. + + + + + ignoreCollisions + + Ignore file collisions inside the environment (default is false). + + + +
+ +
Tools + +Packages inside nixpkgs are written by hand. However many tools +exist in community to help save time. No tool is prefered at the moment. + + + + + + python2nix + by Vladimir Kirillov + + + + pypi2nix + by Rok Garbas + + + + pypi2nix + by Jaka Hudoklin + + + + +
+ +
Development + + + To develop Python packages bulidPythonPackage has + additional logic inside shellPhase to run + ${python.interpreter} setup.py develop for the package. + + + + Given a default.nix: + + + {}; + + buildPythonPackage { + name = "myproject"; + + buildInputs = with pkgs.pythonPackages; [ pyramid ]; + + src = ./.; + } + ]]> + + + Running nix-shell with no arguments should give you + the environment in which the package would be build with + nix-build. + + + + Shortcut to setup environments with C headers/libraries and python packages: + + $ nix-shell -p pythonPackages.pyramid zlib libjpeg git + + + + Note: there is a boolean value lib.inNixShell set to + true if nix-shell is invoked. + + +
+ +
FAQ + + + + + How to solve circular dependencies? + + If you have packages A and B that + depend on each other, when packaging B override package + A not to depend on B as input + (and also the other way around). + + + + + install_data / data_files problems resulting into error: could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': Permission denied + + + Known bug in setuptools install_data does not respect --prefix. Example of + such package using the feature is pkgs/tools/X11/xpra/default.nix. As workaround + install it as an extra preInstall step: + + ${python.interpreter} setup.py install_data --install-dir=$out --root=$out +sed -i '/ = data_files/d' setup.py + + + + + Rationale of non-existent global site-packages + + There is no need to have global site-packages in Nix. Each package has isolated + dependency tree and installing any python package will only populate $PATH + inside user environment. See to create self-contained + interpreter with a set of packages. + + + + + +
+ + +
Contributing guidelines + + Following rules are desired to be respected: + + + + + + Make sure package builds for all python interpreters. Use disabled argument to + buildPythonPackage to set unsupported interpreters. + + + + If tests need to be disabled for a package, make sure you leave a comment about reasoning. + + + + Packages in pkgs/top-level/python-packages.nix + are sorted quasi-alphabetically to avoid merge conflicts. + + + + +
+
diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 8c6266b2672..00fa7567c07 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1120,12 +1120,9 @@ echo @foo@ Python Adds the - lib/python2.5/site-packages subdirectory of + lib/${python.libPrefix}/site-packages subdirectory of each build input to the PYTHONPATH environment - variable. - - This should be generalised: the Python version - shouldn’t be hard-coded. + variable. diff --git a/lib/lists.nix b/lib/lists.nix index 566ee89c95b..d57c4893daa 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -223,4 +223,14 @@ rec { crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; + # Remove duplicate elements from the list + unique = list: + if list == [] then + [] + else + let + x = head list; + xs = unique (drop 1 list); + in [x] ++ remove x xs; + } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d0e156ea177..fe58405eb10 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -61,6 +61,7 @@ exlevan = "Alexey Levan "; falsifian = "James Cook "; flosse = "Markus Kohlhase "; + fluffynukeit = "Daniel Austin "; fpletz = "Franz Pletz "; ftrvxmtrx = "Siarhei Zirukin "; funfunctor = "Edward O'Callaghan "; @@ -80,6 +81,7 @@ jcumming = "Jack Cummings "; jgeerds = "Jascha Geerds "; jirkamarsik = "Jirka Marsik "; + joachifm = "Joachim Fasting "; joamaki = "Jussi Maki "; joelteon = "Joel Taylor "; jwiegley = "John Wiegley "; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 3001214f90f..b723a91e4f3 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -45,6 +45,9 @@ with lib; # Add support for cow filesystems and their utilities boot.supportedFilesystems = [ "zfs" "btrfs" ]; + # Configure host id for ZFS to work + networking.hostId = "8425e349"; + # Allow the user to log in as root without a password. users.extraUsers.root.initialHashedPassword = ""; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index e8f100d6498..9abc1b4cc1b 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -476,6 +476,14 @@ EOF EOF } + # Generate a random 32-bit value to use as the host id + open my $rnd, "<", "/dev/urandom" or die $!; + read $rnd, $hostIdBin, 4; + close $rnd; + + # Convert the 32-bit value to a hex string + my $hostIdHex = unpack("H*", $hostIdBin); + write_file($fn, <${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv + for alternative resolvers (e.g., if you are concerned about logging + and/or server location). + ''; + }; + + tcpOnly = mkOption { + default = false; + type = types.bool; + description = '' + Force sending encrypted DNS queries to the upstream resolver + over TCP instead of UDP (on port 443). + Enabling this option may help circumvent filtering, but should + not be used otherwise. + ''; + }; + + }; + + }; + + ##### implementation + + config = mkIf cfg.enable { + + ### AppArmor profile + + security.apparmor.profiles = mkIf apparmorEnabled [ + (pkgs.writeText "apparmor-dnscrypt-proxy" '' + + ${dnscrypt-proxy}/sbin/dnscrypt-proxy { + capability ipc_lock, + capability net_bind_service, + capability net_admin, + capability sys_chroot, + capability setgid, + capability setuid, + + /dev/null rw, + /dev/urandom r, + + ${pkgs.glibc}/lib/*.so mr, + ${pkgs.tzdata}/share/zoneinfo/** r, + + ${dnscrypt-proxy}/share/dnscrypt-proxy/** r, + ${pkgs.gcc.gcc}/lib/libssp.so.* mr, + ${pkgs.libsodium}/lib/libsodium.so.* mr, + } + '') + ]; + + ### User + + users.extraUsers = singleton { + inherit uid; + name = "dnscrypt-proxy"; + description = "dnscrypt-proxy daemon user"; + }; + + ### Service definition + + systemd.services.dnscrypt-proxy = { + description = "dnscrypt-proxy daemon"; + after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service"; + requires = mkIf apparmorEnabled [ "apparmor.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + ExecStart = "${dnscrypt-proxy}/sbin/dnscrypt-proxy ${toString daemonArgs}"; + }; + }; + + }; +} diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 68aac3d30de..51e1679ce4d 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -187,6 +187,12 @@ let # Clean up after added ruleset ip46tables -D INPUT -j nixos-fw 2>/dev/null || true + ${optionalString (kernelHasRPFilter && cfg.checkReversePath) '' + if ! ip46tables -D PREROUTING -t raw -m rpfilter --invert -j DROP; then + echo "<2>failed to stop rpfilter support" >&2 + fi + ''} + ${cfg.extraStopCommands} ''; diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index a519857d6a0..989ee4d91af 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -79,7 +79,7 @@ in { description = "MiniDLNA Server"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" "local-fs.target" ]; preStart = '' diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 1f0729c1b71..5adfb8f0f96 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -98,6 +98,9 @@ let # Authorization: is the user allowed access? "authz_user" "authz_groupfile" "authz_host" + # For compatibility with old configurations, the new module mod_access_compat is provided. + (if version24 then "access_compat" else "") + # Other modules. "ext_filter" "include" "log_config" "env" "mime_magic" "cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif" diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 5caef2068c2..071eb8ee874 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -122,6 +122,9 @@ for o in $(cat /proc/cmdline); do esac done +# Set hostid before modules are loaded. +# This is needed by the spl/zfs modules. +@setHostId@ # Load the required kernel modules. mkdir -p /lib @@ -398,7 +401,7 @@ echo /sbin/modprobe > /proc/sys/kernel/modprobe # Start stage 2. `switch_root' deletes all files in the ramfs on the # current root. Note that $stage2Init might be an absolute symlink, # in which case "-e" won't work because we're not in the chroot yet. -if ! test -e "$targetRoot/$stage2Init" -o -L "$targetRoot/$stage2Init"; then +if ! test -e "$targetRoot/$stage2Init" -o ! -L "$targetRoot/$stage2Init"; then echo "stage 2 init script ($targetRoot/$stage2Init) not found" fail fi diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 755125db866..cf211404649 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -190,6 +190,15 @@ let fsInfo = let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ]; in pkgs.writeText "initrd-fsinfo" (concatStringsSep "\n" (concatMap f fileSystems)); + + setHostId = optionalString (config.networking.hostId != null) '' + hi="${config.networking.hostId}" + ${if pkgs.stdenv.isBigEndian then '' + echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > /etc/hostid + '' else '' + echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > /etc/hostid + ''} + ''; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index eb72bfba33c..ab5942b7945 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -1,11 +1,10 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: # # todo: # - crontab for scrubs, etc # - zfs tunables -# - /etc/zfs/zpool.cache handling - +with utils; with lib; let @@ -31,6 +30,20 @@ let zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot"; + datasetToPool = x: elemAt (splitString "/" x) 0; + + fsToPool = fs: datasetToPool fs.device; + + zfsFilesystems = filter (x: x.fsType == "zfs") (attrValues config.fileSystems); + + isRoot = fs: fs.neededForBoot || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]; + + allPools = unique ((map fsToPool zfsFilesystems) ++ cfgZfs.extraPools); + + rootPools = unique (map fsToPool (filter isRoot zfsFilesystems)); + + dataPools = unique (filter (pool: !(elem pool rootPools)) allPools); + in { @@ -38,28 +51,73 @@ in ###### interface options = { - boot.spl.hostid = mkOption { - default = ""; - example = "0xdeadbeef"; - description = '' - ZFS uses a system's hostid to determine if a storage pool (zpool) is - native to this system, and should thus be imported automatically. - Unfortunately, this hostid can change under linux from boot to boot (by - changing network adapters, for instance). Specify a unique 32 bit hostid in - hex here for zfs to prevent getting a random hostid between boots and having to - manually import pools. - ''; - }; + boot.zfs = { + useGit = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Use the git version of the SPL and ZFS packages. + Note that these are unreleased versions, with less testing, and therefore + may be more unstable. + ''; + }; - boot.zfs.useGit = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - Use the git version of the SPL and ZFS packages. - Note that these are unreleased versions, with less testing, and therefore - may be more unstable. - ''; + extraPools = mkOption { + type = types.listOf types.str; + default = []; + example = [ "tank" "data" ]; + description = '' + Name or GUID of extra ZFS pools that you wish to import during boot. + + Usually this is not necessary. Instead, you should set the mountpoint property + of ZFS filesystems to legacy and add the ZFS filesystems to + NixOS's option, which makes NixOS automatically + import the associated pool. + + However, in some cases (e.g. if you have many filesystems) it may be preferable + to exclusively use ZFS commands to manage filesystems. If so, since NixOS/systemd + will not be managing those filesystems, you will need to specify the ZFS pool here + so that NixOS automatically imports it on every boot. + ''; + }; + + forceImportRoot = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Forcibly import the ZFS root pool(s) during early boot. + + This is enabled by default for backwards compatibility purposes, but it is highly + recommended to disable this option, as it bypasses some of the safeguards ZFS uses + to protect your ZFS pools. + + If you set this option to false and NixOS subsequently fails to + boot because it cannot import the root pool, you should boot with the + zfs_force=1 option as a kernel parameter (e.g. by manually + editing the kernel params in grub during boot). You should only need to do this + once. + ''; + }; + + forceImportAll = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Forcibly import all ZFS pool(s). + + This is enabled by default for backwards compatibility purposes, but it is highly + recommended to disable this option, as it bypasses some of the safeguards ZFS uses + to protect your ZFS pools. + + If you set this option to false and NixOS subsequently fails to + import your non-root ZFS pool(s), you should manually import each pool with + "zpool import -f <pool-name>", and then reboot. You should only need to do + this once. + ''; + }; }; services.zfs.autoSnapshot = { @@ -124,12 +182,20 @@ in config = mkMerge [ (mkIf enableZfs { + assertions = [ + { + assertion = config.networking.hostId != null; + message = "ZFS requires config.networking.hostId to be set"; + } + { + assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot; + message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot"; + } + ]; + boot = { kernelModules = [ "spl" "zfs" ] ; extraModulePackages = [ splPkg zfsPkg ]; - extraModprobeConfig = mkIf (cfgSpl.hostid != "") '' - options spl spl_hostid=${cfgSpl.hostid} - ''; }; boot.initrd = mkIf inInitrd { @@ -142,50 +208,84 @@ in cp -pdv ${zfsPkg}/lib/lib*.so* $out/lib cp -pdv ${pkgs.zlib}/lib/lib*.so* $out/lib ''; - postDeviceCommands = - '' - zpool import -f -a - ''; + postDeviceCommands = concatStringsSep "\n" (['' + ZFS_FORCE="${optionalString cfgZfs.forceImportRoot "-f"}" + + for o in $(cat /proc/cmdline); do + case $o in + zfs_force|zfs_force=1) + ZFS_FORCE="-f" + ;; + esac + done + ''] ++ (map (pool: '' + echo "importing root ZFS pool \"${pool}\"..." + zpool import -N $ZFS_FORCE "${pool}" + '') rootPools)); }; boot.loader.grub = mkIf inInitrd { zfsSupport = true; }; - systemd.services."zpool-import" = { - description = "Import zpools"; - after = [ "systemd-udev-settle.service" ]; - wantedBy = [ "local-fs.target" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${zfsPkg}/sbin/zpool import -f -a"; - }; - restartIfChanged = false; - }; - - systemd.services."zfs-mount" = { - description = "Mount ZFS Volumes"; - after = [ "zpool-import.service" ]; - wantedBy = [ "local-fs.target" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${zfsPkg}/sbin/zfs mount -a"; - ExecStop = "${zfsPkg}/sbin/zfs umount -a"; - }; - restartIfChanged = false; - }; + environment.etc."zfs/zed.d".source = "${zfsPkg}/etc/zfs/zed.d/*"; system.fsPackages = [ zfsPkg ]; # XXX: needed? zfs doesn't have (need) a fsck environment.systemPackages = [ zfsPkg ]; services.udev.packages = [ zfsPkg ]; # to hook zvol naming, etc. + systemd.packages = [ zfsPkg ]; + + systemd.services = let + getPoolFilesystems = pool: + filter (x: x.fsType == "zfs" && (fsToPool x) == pool) (attrValues config.fileSystems); + + getPoolMounts = pool: + let + mountPoint = fs: escapeSystemdPath fs.mountPoint; + in + map (x: "${mountPoint x}.mount") (getPoolFilesystems pool); + + createImportService = pool: + nameValuePair "zfs-import-${pool}" { + description = "Import ZFS pool \"${pool}\""; + requires = [ "systemd-udev-settle.service" ]; + after = [ "systemd-udev-settle.service" "systemd-modules-load.service" ]; + wantedBy = (getPoolMounts pool) ++ [ "local-fs.target" ]; + before = (getPoolMounts pool) ++ [ "local-fs.target" ]; + unitConfig = { + DefaultDependencies = "no"; + }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + zpool_cmd="${zfsPkg}/sbin/zpool" + ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" + ''; + }; + in listToAttrs (map createImportService dataPools) // { + "zfs-mount" = { after = [ "systemd-modules-load.service" ]; }; + "zfs-share" = { after = [ "systemd-modules-load.service" ]; }; + "zed" = { after = [ "systemd-modules-load.service" ]; }; + }; + + systemd.targets."zfs-import" = + let + services = map (pool: "zfs-import-${pool}.service") dataPools; + in + { + requires = services; + after = services; + }; + + systemd.targets."zfs".wantedBy = [ "multi-user.target" ]; }) (mkIf enableAutoSnapshots { systemd.services."zfs-snapshot-frequent" = { description = "ZFS auto-snapshotting every 15 mins"; - after = [ "zpool-import.service" ]; + after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; ExecStart = "${zfsAutoSnap} frequent ${toString cfgSnapshots.frequent}"; @@ -196,7 +296,7 @@ in systemd.services."zfs-snapshot-hourly" = { description = "ZFS auto-snapshotting every hour"; - after = [ "zpool-import.service" ]; + after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; ExecStart = "${zfsAutoSnap} hourly ${toString cfgSnapshots.hourly}"; @@ -207,7 +307,7 @@ in systemd.services."zfs-snapshot-daily" = { description = "ZFS auto-snapshotting every day"; - after = [ "zpool-import.service" ]; + after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; ExecStart = "${zfsAutoSnap} daily ${toString cfgSnapshots.daily}"; @@ -218,7 +318,7 @@ in systemd.services."zfs-snapshot-weekly" = { description = "ZFS auto-snapshotting every week"; - after = [ "zpool-import.service" ]; + after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; ExecStart = "${zfsAutoSnap} weekly ${toString cfgSnapshots.weekly}"; @@ -229,7 +329,7 @@ in systemd.services."zfs-snapshot-monthly" = { description = "ZFS auto-snapshotting every month"; - after = [ "zpool-import.service" ]; + after = [ "zfs-import.target" ]; serviceConfig = { Type = "oneshot"; ExecStart = "${zfsAutoSnap} monthly ${toString cfgSnapshots.monthly}"; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 22b52f77b14..9579eaa77d0 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -189,6 +189,10 @@ let }; + hexChars = stringToCharacters "0123456789abcdef"; + + isHexString = s: all (c: elem c hexChars) (stringToCharacters (toLower s)); + in { @@ -205,6 +209,20 @@ in ''; }; + networking.hostId = mkOption { + default = null; + example = "4e98920d"; + type = types.nullOr types.str; + description = '' + The 32-bit host ID of the machine, formatted as 8 hexadecimal characters. + + You should try to make this ID unique among your machines. You can + generate a random 32-bit ID using the following command: + + head -c4 /dev/urandom | od -A none -t x4 + ''; + }; + networking.enableIPv6 = mkOption { default = true; description = '' @@ -513,10 +531,15 @@ in config = { assertions = - flip map interfaces (i: { + (flip map interfaces (i: { assertion = i.subnetMask == null; message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead."; - }); + })) ++ [ + { + assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId); + message = "Invalid value given to the networking.hostId option."; + } + ]; boot.kernelModules = [ ] ++ optional cfg.enableIPv6 "ipv6" @@ -872,14 +895,29 @@ in # clear it if it's not configured in the NixOS configuration, # since it may have been set by dhcpcd in the meantime. system.activationScripts.hostname = - optionalString (config.networking.hostName != "") '' - hostname "${config.networking.hostName}" + optionalString (cfg.hostName != "") '' + hostname "${cfg.hostName}" ''; system.activationScripts.domain = - optionalString (config.networking.domain != "") '' - domainname "${config.networking.domain}" + optionalString (cfg.domain != "") '' + domainname "${cfg.domain}" ''; + environment.etc = mkIf (cfg.hostId != null) + [ + { + target = "hostid"; + source = pkgs.runCommand "gen-hostid" {} '' + hi="${cfg.hostId}" + ${if pkgs.stdenv.isBigEndian then '' + echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out + '' else '' + echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out + ''} + ''; + } + ]; + services.udev.extraRules = '' KERNEL=="tun", TAG+="systemd" diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix new file mode 100644 index 00000000000..10d3a6575fb --- /dev/null +++ b/nixos/modules/virtualisation/lxc.nix @@ -0,0 +1,75 @@ +# LXC Configuration + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.virtualisation.lxc; + +in + +{ + ###### interface + + options.virtualisation.lxc = { + enable = + mkOption { + type = types.bool; + default = false; + description = + '' + This enables Linux Containers (LXC), which provides tools + for creating and managing system or application containers + on Linux. + ''; + }; + + systemConfig = + mkOption { + type = types.lines; + default = ""; + description = + '' + This is the system-wide LXC config. See lxc.system.conf(5). + ''; + }; + + defaultConfig = + mkOption { + type = types.lines; + default = ""; + description = + '' + Default config (default.conf) for new containers, i.e. for + network config. See lxc.container.conf(5). + ''; + }; + + usernetConfig = + mkOption { + type = types.lines; + default = ""; + description = + '' + This is the config file for managing unprivileged user network + administration access in LXC. See lxc-user-net(5). + ''; + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.lxc ]; + + environment.etc."lxc/lxc.conf".text = cfg.systemConfig; + environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig; + environment.etc."lxc/default.conf".text = cfg.defaultConfig; + + }; + +} diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix new file mode 100644 index 00000000000..141e7097405 --- /dev/null +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -0,0 +1,93 @@ +{ config, lib, pkgs, pkgs_i686, ... }: + +with lib; + +let + + prl-tools = config.boot.kernelPackages.prl-tools; + +in + +{ + + options = { + hardware.parallels = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + This enables Parallel Tools for Linux guests, along with provided + video, mouse and other hardware drivers. + ''; + }; + + }; + + }; + + config = mkIf config.hardware.parallels.enable { + + services.xserver = { + drivers = singleton + { name = "prlvideo"; modules = [ prl-tools ]; libPath = [ prl-tools ]; }; + + screenSection = '' + Option "NoMTRR" + ''; + + config = '' + Section "InputClass" + Identifier "prlmouse" + MatchIsPointer "on" + MatchTag "prlmouse" + Driver "prlmouse" + EndSection + ''; + }; + + hardware.opengl.package = prl-tools; + hardware.opengl.package32 = pkgs_i686.linuxPackages.prl-tools.override { libsOnly = true; kernel = null; }; + + services.udev.packages = [ prl-tools ]; + + environment.systemPackages = [ prl-tools ]; + + boot.extraModulePackages = [ prl-tools ]; + + boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" "acpi_memhotplug" ]; + + services.ntp.enable = false; + + systemd.services.prltoolsd = { + description = "Parallels Tools' service"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${prl-tools}/bin/prltoolsd -f"; + PIDFile = "/var/run/prltoolsd.pid"; + }; + }; + + systemd.services.prlfsmountd = { + description = "Parallels Shared Folders Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = rec { + ExecStart = "${prl-tools}/sbin/prlfsmountd ${PIDFile}"; + ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /media"; + ExecStopPost = "${prl-tools}/sbin/prlfsmountd -u"; + PIDFile = "/run/prlfsmountd.pid"; + }; + }; + + systemd.services.prlshprint = { + description = "Parallels Shared Printer Tool"; + wantedBy = [ "multi-user.target" ]; + bindsTo = [ "cupsd.service" ]; + serviceConfig = { + Type = "forking"; + ExecStart = "${prl-tools}/bin/prlshprint"; + }; + }; + + }; +} diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix new file mode 100644 index 00000000000..24613d4dd96 --- /dev/null +++ b/pkgs/applications/audio/caudec/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }: + +let + version = "1.7.5"; +in + +stdenv.mkDerivation rec { + name = "caudec-${version}"; + + src = fetchurl { + url = "http://caudec.net/downloads/caudec-${version}.tar.gz"; + sha256 = "5d1f5ab3286bb748bd29cbf45df2ad2faf5ed86070f90deccf71c60be832f3d5"; + }; + + preBuild = '' + patchShebangs ./install.sh + ''; + + buildInputs = [ bash makeWrapper ]; + + installPhase = '' + ./install.sh --prefix=$out/bin + ''; + + postFixup = '' + for executable in $(cd $out/bin && ls); do + wrapProgram $out/bin/$executable \ + --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac}/bin" + done + ''; + + meta = with stdenv.lib; { + homepage = http://caudec.net/; + description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; + license = licenses.gpl3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ _1126 ]; + }; +} diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index bab6cdcf33f..96d43d77c89 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0wz2bc0x0h989schwzqjj6sx9hvzxkw4jrkflwhyrzjini1pvkxz"; + sha256 = "0lixrxv0wds3p50kmy9k166qhavdjkhlxs432s248hk43k7n6c1h"; }; buildInputs = [ diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix new file mode 100644 index 00000000000..4e569fc68a5 --- /dev/null +++ b/pkgs/applications/editors/bluefish/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2 +, enchant, gucharmap, python +}: + +stdenv.mkDerivation rec { + name = "bluefish-2.2.6"; + + src = fetchurl { + url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; + sha256 = "05j2mv6s2llf2pxknddhk8fzbghr7yff58xhkxy2icky64n8khjl"; + }; + + buildInputs = [intltool pkgconfig gtk libxml2 + enchant gucharmap python]; + + meta = with stdenv.lib; { + description = "A powerful editor targeted towards programmers and webdevelopers"; + homepage = http://bluefish.openoffice.nl/; + license = licenses.gpl3Plus; + maintainer = [maintainers.vbgl]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/pkgs/applications/editors/jedit/build.xml.patch new file mode 100644 index 00000000000..2dabaaaed0c --- /dev/null +++ b/pkgs/applications/editors/jedit/build.xml.patch @@ -0,0 +1,252 @@ +--- a/build.xml 2013-07-28 18:03:55.000000000 +0100 ++++ b/build.xml 2014-11-12 21:54:48.443482074 +0000 +@@ -42,16 +42,6 @@ + + +- +- +- +- +- +- + + +@@ -89,51 +79,8 @@ + value="true"/> + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + ++ depends="init"> + + +@@ -238,37 +185,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + + + + + +@@ -611,7 +503,7 @@ + + + ++ depends="init"> + + +@@ -655,7 +547,7 @@ + + + ++ depends="init,setup,unpack-docbook-xsl"> + + + +@@ -679,7 +571,7 @@ + + + ++ depends="init,setup,unpack-docbook-xsl"> + + + +@@ -703,7 +595,7 @@ + + + ++ depends="init,setup,unpack-docbook-xsl"> + + + +@@ -838,7 +730,7 @@ + + + ++ depends="init,setup,unpack-docbook-xsl"> + + +@@ -1143,7 +1035,7 @@ + + + ++ depends="init"> + + + + + + +@@ -1271,7 +1163,7 @@ + + + + + + + ++ depends="init,setup"> + + +@@ -1567,7 +1459,7 @@ + + + + + + + + + diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 8a57f650fb4..0e11c577fc8 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -1,32 +1,47 @@ -{ stdenv, fetchurl, ant, jdk }: +{stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging}: -let version = "4.4.2"; in +let + version = "5.1.0"; + bsh = fetchurl { + url = http://www.beanshell.org/bsh-2.0b4.jar; + sha256 = "1di7hj2yms1m3wa8k70jpw0wzfnrgibpqnvdk33ahfaqi03mqfci"; + }; + bcpg = fetchurl { + url = http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar; + sha256 = "16xhmwks4l65m5x150nd23y5lyppha9sa5fj65rzhxw66gbli82d"; + }; + jsr305 = fetchurl { + url = http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar; + sha256 = "0s74pv8qjc42c7q8nbc0c3b1hgx0bmk3b8vbk1z80p4bbgx56zqy"; + }; +in stdenv.mkDerivation { name = "jedit-${version}"; - src = fetchurl { url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2"; - sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb"; + sha256 = "015rn4339mp4wrd901x56nr42wfcy429pg54n835c6n34b2jjdc6"; }; - buildInputs = [ ant jdk ]; + buildInputs = [ ant jdk commonsBsf commonsLogging ]; - sourceRoot = "jEdit"; + # This patch removes from the build process: + # - the automatic download of dependencies (see configurePhase); + # - the tests + patches = [ ./build.xml.patch ]; + + configurePhase = '' + mkdir -p lib/ant-contrib/ lib/scripting lib/compile lib/default-plugins + cp ${ant}/lib/ant/lib/ant-contrib-*.jar lib/ant-contrib/ + cp ${bsh} ${bcpg} lib/scripting/ + cp ${jsr305} lib/compile/ + ''; buildPhase = "ant build"; installPhase = '' mkdir -p $out/share/jEdit - cp build/jedit.jar $out/share/jEdit - mkdir -p $out/share/jEdit/modes - cp -r modes/* $out/share/jEdit/modes - mkdir -p $out/share/jEdit/icons - cp -r icons/* $out/share/jEdit/icons - mkdir -p $out/share/jEdit/macros - cp -r macros/* $out/share/jEdit/macros - mkdir -p $out/share/jEdit/doc - cp -r doc/* $out/share/jEdit/doc + cp -r build/jedit.jar doc icons keymaps macros modes startup $out/share/jEdit sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop mkdir -p $out/share/applications @@ -44,9 +59,11 @@ stdenv.mkDerivation { chmod +x $out/bin/jedit ''; - meta = { + meta = with stdenv.lib; { description = "Mature programmer's text editor (Java based)"; homepage = http://www.jedit.org; - license = "GPL"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 710ceb7d31f..572bce7a2f5 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -139,7 +139,7 @@ composableDerivation { nlsSupport = config.vim.nls or false; tclSupport = config.vim.tcl or false; multibyteSupport = config.vim.multibyte or false; - cscopeSupport = config.vim.cscope or false; + cscopeSupport = config.vim.cscope or true; netbeansSupport = config.netbeans or true; # eg envim is using it # by default, compile with darwin support if we're compiling on darwin, but diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 808984ad664..c886cf3c270 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { HOME=$TMPDIR ''; + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; + doCheck = true; enableParallelBuilding = true; @@ -45,5 +47,6 @@ stdenv.mkDerivation rec { homepage = "http://www.bitcoin.org/"; maintainers = [ maintainers.roconnor ]; license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 2928317bbc7..9cda2d93d7a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.9.0"; + name = "calibre-2.10.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0g6vhah736ps88maw3ggn7pcvnmani2mp8b29ksasv0683q7lldw"; + sha256 = "06nya8r3bfkgfjsl83fl6l6g3ccw3mpmn3kih4i51gpcgma3aa6b"; }; inherit python; diff --git a/pkgs/applications/misc/keybase-node-client/default.nix b/pkgs/applications/misc/keybase-node-client/default.nix new file mode 100644 index 00000000000..bacd8d46fd5 --- /dev/null +++ b/pkgs/applications/misc/keybase-node-client/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, makeWrapper, callPackage, gnupg, utillinux }: + +with stdenv.lib; + +let + nodePackages = callPackage (import ) { + neededNatives = [] ++ optional (stdenv.isLinux) utillinux; + self = nodePackages; + generated = ./package.nix; + }; + +in nodePackages.buildNodePackage rec { + name = "keybase-node-client-${version}"; + version = "0.7.0"; + + src = [(fetchurl { + url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz"; + sha256 = "0n73v4f61rq2dvy2yd3s4l8qvvjzp3ncqj70llm4i6cvbp9kym1v"; + })]; + + deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); + buildInputs = [ makeWrapper gnupg ]; + + postInstall = '' + wrapProgram "$out/bin/keybase" --set NODE_PATH "$out/lib/node_modules/keybase/node_modules/" + ''; + + passthru.names = ["keybase"]; + + meta = { + description = "CLI for keybase.io written in/for Node.js"; + license = licenses.mit; + homepage = https://keybase.io/docs/command_line; + maintainers = with maintainers; [manveru]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/keybase-node-client/package.nix b/pkgs/applications/misc/keybase-node-client/package.nix new file mode 100644 index 00000000000..85d10ad0ba4 --- /dev/null +++ b/pkgs/applications/misc/keybase-node-client/package.nix @@ -0,0 +1,2518 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."CSSselect"."~0.4.0" = + self.by-version."CSSselect"."0.4.1"; + by-version."CSSselect"."0.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-CSSselect-0.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; + name = "CSSselect-0.4.1.tgz"; + sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; + }) + ]; + buildInputs = + (self.nativeDeps."CSSselect" or []); + deps = [ + self.by-version."CSSwhat"."0.4.7" + self.by-version."domutils"."1.4.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "CSSselect" ]; + }; + by-spec."CSSwhat"."0.4" = + self.by-version."CSSwhat"."0.4.7"; + by-version."CSSwhat"."0.4.7" = lib.makeOverridable self.buildNodePackage { + name = "node-CSSwhat-0.4.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; + name = "CSSwhat-0.4.7.tgz"; + sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; + }) + ]; + buildInputs = + (self.nativeDeps."CSSwhat" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "CSSwhat" ]; + }; + by-spec."argparse"."0.1.15" = + self.by-version."argparse"."0.1.15"; + by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { + name = "node-argparse-0.1.15"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; + name = "argparse-0.1.15.tgz"; + sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; + }) + ]; + buildInputs = + (self.nativeDeps."argparse" or []); + deps = [ + self.by-version."underscore"."1.4.4" + self.by-version."underscore.string"."2.3.3" + ]; + peerDependencies = [ + ]; + passthru.names = [ "argparse" ]; + }; + "argparse" = self.by-version."argparse"."0.1.15"; + by-spec."asn1"."0.1.11" = + self.by-version."asn1"."0.1.11"; + by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "node-asn1-0.1.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }) + ]; + buildInputs = + (self.nativeDeps."asn1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "asn1" ]; + }; + by-spec."assert-plus"."0.1.2" = + self.by-version."assert-plus"."0.1.2"; + by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-assert-plus-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + name = "assert-plus-0.1.2.tgz"; + sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + }) + ]; + buildInputs = + (self.nativeDeps."assert-plus" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "assert-plus" ]; + }; + by-spec."async"."0.2.x" = + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.2.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; + by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.9.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; + name = "async-0.9.0.tgz"; + sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + by-spec."aws-sign2"."~0.5.0" = + self.by-version."aws-sign2"."0.5.0"; + by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-aws-sign2-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }) + ]; + buildInputs = + (self.nativeDeps."aws-sign2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "aws-sign2" ]; + }; + by-spec."bitcoyne".">=0.0.6" = + self.by-version."bitcoyne"."0.0.6"; + by-version."bitcoyne"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-bitcoyne-0.0.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bitcoyne/-/bitcoyne-0.0.6.tgz"; + name = "bitcoyne-0.0.6.tgz"; + sha1 = "a309d1afe7554f2b380782428cd6f67a82183d2f"; + }) + ]; + buildInputs = + (self.nativeDeps."bitcoyne" or []); + deps = [ + self.by-version."iced-error"."0.0.9" + self.by-version."iced-runtime"."1.0.1" + self.by-version."kbpgp"."1.0.5" + self.by-version."pgp-utils"."0.0.27" + ]; + peerDependencies = [ + ]; + passthru.names = [ "bitcoyne" ]; + }; + "bitcoyne" = self.by-version."bitcoyne"."0.0.6"; + by-spec."bn"."^1.0.0" = + self.by-version."bn"."1.0.1"; + by-version."bn"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-bn-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bn/-/bn-1.0.1.tgz"; + name = "bn-1.0.1.tgz"; + sha1 = "a153825e6b1eb2c2db7726149b047a07ce0a3bb3"; + }) + ]; + buildInputs = + (self.nativeDeps."bn" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "bn" ]; + }; + by-spec."bn"."^1.0.1" = + self.by-version."bn"."1.0.1"; + "bn" = self.by-version."bn"."1.0.1"; + by-spec."boom"."0.4.x" = + self.by-version."boom"."0.4.2"; + by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-boom-0.4.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }) + ]; + buildInputs = + (self.nativeDeps."boom" or []); + deps = [ + self.by-version."hoek"."0.9.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "boom" ]; + }; + by-spec."cheerio"."0.13.0" = + self.by-version."cheerio"."0.13.0"; + by-version."cheerio"."0.13.0" = lib.makeOverridable self.buildNodePackage { + name = "node-cheerio-0.13.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.0.tgz"; + name = "cheerio-0.13.0.tgz"; + sha1 = "44f5112044e0e0148300dd16bf8bbd7755ce65f1"; + }) + ]; + buildInputs = + (self.nativeDeps."cheerio" or []); + deps = [ + self.by-version."htmlparser2"."3.4.0" + self.by-version."underscore"."1.4.4" + self.by-version."entities"."0.5.0" + self.by-version."CSSselect"."0.4.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cheerio" ]; + }; + "cheerio" = self.by-version."cheerio"."0.13.0"; + by-spec."cli"."0.4.x" = + self.by-version."cli"."0.4.5"; + by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-cli-0.4.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; + name = "cli-0.4.5.tgz"; + sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; + }) + ]; + buildInputs = + (self.nativeDeps."cli" or []); + deps = [ + self.by-version."glob"."4.0.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cli" ]; + }; + by-spec."cliff"."0.1.x" = + self.by-version."cliff"."0.1.9"; + by-version."cliff"."0.1.9" = lib.makeOverridable self.buildNodePackage { + name = "node-cliff-0.1.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz"; + name = "cliff-0.1.9.tgz"; + sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; + }) + ]; + buildInputs = + (self.nativeDeps."cliff" or []); + deps = [ + self.by-version."colors"."0.6.2" + self.by-version."eyes"."0.1.8" + self.by-version."winston"."0.8.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cliff" ]; + }; + by-spec."codesign"."0.0.9" = + self.by-version."codesign"."0.0.9"; + by-version."codesign"."0.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-codesign-0.0.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/codesign/-/codesign-0.0.9.tgz"; + name = "codesign-0.0.9.tgz"; + sha1 = "2da6b703f1d1cf2a76e8b1d48f44fa922e21b55f"; + }) + ]; + buildInputs = + (self.nativeDeps."codesign" or []); + deps = [ + self.by-version."argparse"."0.1.15" + self.by-version."iced-error"."0.0.9" + self.by-version."iced-logger"."0.0.5" + self.by-version."glob-to-regexp"."0.0.1" + self.by-version."tablify"."0.1.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "codesign" ]; + }; + "codesign" = self.by-version."codesign"."0.0.9"; + by-spec."colors"."0.6.2" = + self.by-version."colors"."0.6.2"; + by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage { + name = "node-colors-0.6.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + name = "colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }) + ]; + buildInputs = + (self.nativeDeps."colors" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "colors" ]; + }; + "colors" = self.by-version."colors"."0.6.2"; + by-spec."colors"."0.6.x" = + self.by-version."colors"."0.6.2"; + by-spec."colors"."0.x.x" = + self.by-version."colors"."0.6.2"; + by-spec."colors".">=0.6.2" = + self.by-version."colors"."0.6.2"; + by-spec."colors"."~0.6.2" = + self.by-version."colors"."0.6.2"; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.5"; + by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-combined-stream-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; + name = "combined-stream-0.0.5.tgz"; + sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; + }) + ]; + buildInputs = + (self.nativeDeps."combined-stream" or []); + deps = [ + self.by-version."delayed-stream"."0.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "combined-stream" ]; + }; + by-spec."commander".">= 0.5.2" = + self.by-version."commander"."2.3.0"; + by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-commander-2.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; + name = "commander-2.3.0.tgz"; + sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; + }) + ]; + buildInputs = + (self.nativeDeps."commander" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "commander" ]; + }; + 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."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 { + name = "node-core-util-is-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; + name = "core-util-is-1.0.1.tgz"; + sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; + }) + ]; + buildInputs = + (self.nativeDeps."core-util-is" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "core-util-is" ]; + }; + by-spec."cryptiles"."0.2.x" = + self.by-version."cryptiles"."0.2.2"; + by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-cryptiles-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }) + ]; + buildInputs = + (self.nativeDeps."cryptiles" or []); + deps = [ + self.by-version."boom"."0.4.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cryptiles" ]; + }; + by-spec."ctype"."0.5.2" = + self.by-version."ctype"."0.5.2"; + by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-ctype-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + name = "ctype-0.5.2.tgz"; + sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + }) + ]; + buildInputs = + (self.nativeDeps."ctype" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ctype" ]; + }; + by-spec."cycle"."1.0.x" = + self.by-version."cycle"."1.0.3"; + by-version."cycle"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-cycle-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + name = "cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }) + ]; + buildInputs = + (self.nativeDeps."cycle" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "cycle" ]; + }; + by-spec."deep-equal"."0.2.1" = + self.by-version."deep-equal"."0.2.1"; + by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-deep-equal-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; + name = "deep-equal-0.2.1.tgz"; + sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-equal" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "deep-equal" ]; + }; + "deep-equal" = self.by-version."deep-equal"."0.2.1"; + by-spec."deep-equal".">=0.2.1" = + self.by-version."deep-equal"."0.2.1"; + by-spec."deep-equal"."~0.2.1" = + self.by-version."deep-equal"."0.2.1"; + by-spec."delayed-stream"."0.0.5" = + self.by-version."delayed-stream"."0.0.5"; + by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-delayed-stream-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }) + ]; + buildInputs = + (self.nativeDeps."delayed-stream" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "delayed-stream" ]; + }; + by-spec."docco"."~0.6.2" = + self.by-version."docco"."0.6.3"; + by-version."docco"."0.6.3" = lib.makeOverridable self.buildNodePackage { + name = "docco-0.6.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/docco/-/docco-0.6.3.tgz"; + name = "docco-0.6.3.tgz"; + sha1 = "c47b5823d79563d6fc3abd49f3de48986e5522ee"; + }) + ]; + buildInputs = + (self.nativeDeps."docco" or []); + deps = [ + self.by-version."commander"."2.3.0" + self.by-version."marked"."0.3.2" + self.by-version."fs-extra"."0.12.0" + self.by-version."underscore"."1.7.0" + self.by-version."highlight.js"."8.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "docco" ]; + }; + by-spec."domelementtype"."1" = + self.by-version."domelementtype"."1.1.1"; + by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-domelementtype-1.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.1.tgz"; + name = "domelementtype-1.1.1.tgz"; + sha1 = "7887acbda7614bb0a3dbe1b5e394f77a8ed297cf"; + }) + ]; + buildInputs = + (self.nativeDeps."domelementtype" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "domelementtype" ]; + }; + by-spec."domhandler"."2.2" = + self.by-version."domhandler"."2.2.0"; + by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-domhandler-2.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.0.tgz"; + name = "domhandler-2.2.0.tgz"; + sha1 = "ac9febfa988034b43f78ba056ebf7bd373416476"; + }) + ]; + buildInputs = + (self.nativeDeps."domhandler" or []); + deps = [ + self.by-version."domelementtype"."1.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "domhandler" ]; + }; + by-spec."domutils"."1.3" = + self.by-version."domutils"."1.3.0"; + by-version."domutils"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-domutils-1.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz"; + name = "domutils-1.3.0.tgz"; + sha1 = "9ad4d59b5af6ca684c62fe6d768ef170e70df192"; + }) + ]; + buildInputs = + (self.nativeDeps."domutils" or []); + deps = [ + self.by-version."domelementtype"."1.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "domutils" ]; + }; + by-spec."domutils"."1.4" = + self.by-version."domutils"."1.4.3"; + by-version."domutils"."1.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-domutils-1.4.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; + name = "domutils-1.4.3.tgz"; + sha1 = "0865513796c6b306031850e175516baf80b72a6f"; + }) + ]; + buildInputs = + (self.nativeDeps."domutils" or []); + deps = [ + self.by-version."domelementtype"."1.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "domutils" ]; + }; + by-spec."entities"."0.x" = + self.by-version."entities"."0.5.0"; + by-version."entities"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-entities-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz"; + name = "entities-0.5.0.tgz"; + sha1 = "f611cb5ae221050e0012c66979503fd7ae19cc49"; + }) + ]; + buildInputs = + (self.nativeDeps."entities" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "entities" ]; + }; + by-spec."eyes"."0.1.x" = + self.by-version."eyes"."0.1.8"; + by-version."eyes"."0.1.8" = lib.makeOverridable self.buildNodePackage { + name = "node-eyes-0.1.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }) + ]; + buildInputs = + (self.nativeDeps."eyes" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "eyes" ]; + }; + by-spec."forever-agent"."~0.5.0" = + self.by-version."forever-agent"."0.5.2"; + by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-forever-agent-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + name = "forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }) + ]; + buildInputs = + (self.nativeDeps."forever-agent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "forever-agent" ]; + }; + by-spec."form-data"."~0.1.0" = + self.by-version."form-data"."0.1.4"; + by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-form-data-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + name = "form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }) + ]; + buildInputs = + (self.nativeDeps."form-data" or []); + deps = [ + self.by-version."combined-stream"."0.0.5" + self.by-version."mime"."1.2.11" + self.by-version."async"."0.9.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "form-data" ]; + }; + by-spec."framed-msgpack-rpc"."1.1.4" = + self.by-version."framed-msgpack-rpc"."1.1.4"; + by-version."framed-msgpack-rpc"."1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-framed-msgpack-rpc-1.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/framed-msgpack-rpc/-/framed-msgpack-rpc-1.1.4.tgz"; + name = "framed-msgpack-rpc-1.1.4.tgz"; + sha1 = "54bfc5fbdf0c7c1b7691f20ffb31ef955c185db2"; + }) + ]; + buildInputs = + (self.nativeDeps."framed-msgpack-rpc" or []); + deps = [ + self.by-version."iced-runtime"."1.0.1" + self.by-version."purepack"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "framed-msgpack-rpc" ]; + }; + "framed-msgpack-rpc" = self.by-version."framed-msgpack-rpc"."1.1.4"; + by-spec."fs-extra".">= 0.6.0" = + self.by-version."fs-extra"."0.12.0"; + by-version."fs-extra"."0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "node-fs-extra-0.12.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.12.0.tgz"; + name = "fs-extra-0.12.0.tgz"; + sha1 = "407cf6e11321e440d66f9486fba1cc9eb4c21868"; + }) + ]; + buildInputs = + (self.nativeDeps."fs-extra" or []); + deps = [ + self.by-version."ncp"."0.6.0" + self.by-version."mkdirp"."0.5.0" + self.by-version."jsonfile"."2.0.0" + self.by-version."rimraf"."2.2.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "fs-extra" ]; + }; + by-spec."glob".">= 3.1.4" = + self.by-version."glob"."4.0.6"; + by-version."glob"."4.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-glob-4.0.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; + name = "glob-4.0.6.tgz"; + sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; + }) + ]; + buildInputs = + (self.nativeDeps."glob" or []); + deps = [ + self.by-version."graceful-fs"."3.0.2" + self.by-version."inherits"."2.0.1" + self.by-version."minimatch"."1.0.0" + self.by-version."once"."1.3.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "glob" ]; + }; + by-spec."glob-to-regexp".">=0.0.1" = + self.by-version."glob-to-regexp"."0.0.1"; + by-version."glob-to-regexp"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-glob-to-regexp-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.0.1.tgz"; + name = "glob-to-regexp-0.0.1.tgz"; + sha1 = "2a5f79f2ed3233d4ee9ea7b6412547000c3f9d75"; + }) + ]; + buildInputs = + (self.nativeDeps."glob-to-regexp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "glob-to-regexp" ]; + }; + by-spec."gpg-wrapper"."0.0.47" = + self.by-version."gpg-wrapper"."0.0.47"; + by-version."gpg-wrapper"."0.0.47" = lib.makeOverridable self.buildNodePackage { + name = "node-gpg-wrapper-0.0.47"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-0.0.47.tgz"; + name = "gpg-wrapper-0.0.47.tgz"; + sha1 = "5de253269cb999e3e928a375971c7613bcb29d36"; + }) + ]; + buildInputs = + (self.nativeDeps."gpg-wrapper" or []); + deps = [ + self.by-version."iced-error"."0.0.9" + self.by-version."iced-runtime"."1.0.1" + self.by-version."iced-spawn"."0.0.10" + self.by-version."iced-utils"."0.1.21" + self.by-version."pgp-utils"."0.0.27" + ]; + peerDependencies = [ + ]; + passthru.names = [ "gpg-wrapper" ]; + }; + "gpg-wrapper" = self.by-version."gpg-wrapper"."0.0.47"; + by-spec."graceful-fs"."^3.0.2" = + self.by-version."graceful-fs"."3.0.2"; + by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-graceful-fs-3.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; + name = "graceful-fs-3.0.2.tgz"; + sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; + by-spec."hawk"."~1.0.0" = + self.by-version."hawk"."1.0.0"; + by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-hawk-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + name = "hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + }) + ]; + buildInputs = + (self.nativeDeps."hawk" or []); + deps = [ + self.by-version."hoek"."0.9.1" + self.by-version."boom"."0.4.2" + self.by-version."cryptiles"."0.2.2" + self.by-version."sntp"."0.2.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "hawk" ]; + }; + by-spec."highlight.js".">= 8.0.x" = + self.by-version."highlight.js"."8.2.0"; + by-version."highlight.js"."8.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-highlight.js-8.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.2.0.tgz"; + name = "highlight.js-8.2.0.tgz"; + sha1 = "31ac0ea5d20f88f562948e7e8eb5a62e9e8c5e43"; + }) + ]; + buildInputs = + (self.nativeDeps."highlight.js" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "highlight.js" ]; + }; + by-spec."hoek"."0.9.x" = + self.by-version."hoek"."0.9.1"; + by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-hoek-0.9.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }) + ]; + buildInputs = + (self.nativeDeps."hoek" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "hoek" ]; + }; + by-spec."htmlparser2"."~3.4.0" = + self.by-version."htmlparser2"."3.4.0"; + by-version."htmlparser2"."3.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-htmlparser2-3.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz"; + name = "htmlparser2-3.4.0.tgz"; + sha1 = "a1cd65f5823ad285e19d63b085ad722d0a51eae7"; + }) + ]; + buildInputs = + (self.nativeDeps."htmlparser2" or []); + deps = [ + self.by-version."domhandler"."2.2.0" + self.by-version."domutils"."1.3.0" + self.by-version."domelementtype"."1.1.1" + self.by-version."readable-stream"."1.1.13" + ]; + peerDependencies = [ + ]; + passthru.names = [ "htmlparser2" ]; + }; + by-spec."http-signature"."~0.10.0" = + self.by-version."http-signature"."0.10.0"; + by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-http-signature-0.10.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; + name = "http-signature-0.10.0.tgz"; + sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; + }) + ]; + buildInputs = + (self.nativeDeps."http-signature" or []); + deps = [ + self.by-version."assert-plus"."0.1.2" + self.by-version."asn1"."0.1.11" + self.by-version."ctype"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "http-signature" ]; + }; + by-spec."iced-coffee-script"."~1.7.1-c" = + self.by-version."iced-coffee-script"."1.7.1-g"; + by-version."iced-coffee-script"."1.7.1-g" = lib.makeOverridable self.buildNodePackage { + name = "iced-coffee-script-1.7.1-g"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-coffee-script/-/iced-coffee-script-1.7.1-g.tgz"; + name = "iced-coffee-script-1.7.1-g.tgz"; + sha1 = "41f9ccabe113bade608d519c10a41406a62c170b"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-coffee-script" or []); + deps = [ + self.by-version."docco"."0.6.3" + self.by-version."iced-runtime"."1.0.1" + self.by-version."mkdirp"."0.3.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-coffee-script" ]; + }; + "iced-coffee-script" = self.by-version."iced-coffee-script"."1.7.1-g"; + by-spec."iced-data-structures"."0.0.5" = + self.by-version."iced-data-structures"."0.0.5"; + by-version."iced-data-structures"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-data-structures-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-data-structures/-/iced-data-structures-0.0.5.tgz"; + name = "iced-data-structures-0.0.5.tgz"; + sha1 = "21de124f847fdeeb88f32cf232d3e3e600e05db4"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-data-structures" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-data-structures" ]; + }; + "iced-data-structures" = self.by-version."iced-data-structures"."0.0.5"; + by-spec."iced-db"."0.0.4" = + self.by-version."iced-db"."0.0.4"; + by-version."iced-db"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-db-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-db/-/iced-db-0.0.4.tgz"; + name = "iced-db-0.0.4.tgz"; + sha1 = "355bf9808998076013a0850ee33c6905dfb85a00"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-db" or []); + deps = [ + self.by-version."iced-error"."0.0.9" + self.by-version."iced-runtime"."1.0.1" + self.by-version."iced-utils"."0.1.21" + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-db" ]; + }; + "iced-db" = self.by-version."iced-db"."0.0.4"; + by-spec."iced-error"."0.0.9" = + self.by-version."iced-error"."0.0.9"; + by-version."iced-error"."0.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-error-0.0.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-error/-/iced-error-0.0.9.tgz"; + name = "iced-error-0.0.9.tgz"; + sha1 = "c7c3057614c0a187d96b3d18c6d520e6b872ed37"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-error" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-error" ]; + }; + "iced-error" = self.by-version."iced-error"."0.0.9"; + by-spec."iced-error".">=0.0.8" = + self.by-version."iced-error"."0.0.9"; + by-spec."iced-error".">=0.0.9" = + self.by-version."iced-error"."0.0.9"; + by-spec."iced-error"."~0.0.8" = + self.by-version."iced-error"."0.0.9"; + by-spec."iced-expect"."0.0.3" = + self.by-version."iced-expect"."0.0.3"; + by-version."iced-expect"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-expect-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-expect/-/iced-expect-0.0.3.tgz"; + name = "iced-expect-0.0.3.tgz"; + sha1 = "206f271f27b200b9b538e2c0ca66a70209be1238"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-expect" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-expect" ]; + }; + "iced-expect" = self.by-version."iced-expect"."0.0.3"; + by-spec."iced-lock"."^1.0.1" = + self.by-version."iced-lock"."1.0.1"; + by-version."iced-lock"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-lock-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-lock/-/iced-lock-1.0.1.tgz"; + name = "iced-lock-1.0.1.tgz"; + sha1 = "0914a61a4d3dec69db8f871ef40f95417fa38986"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-lock" or []); + deps = [ + self.by-version."iced-runtime"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-lock" ]; + }; + "iced-lock" = self.by-version."iced-lock"."1.0.1"; + by-spec."iced-logger"."0.0.5" = + self.by-version."iced-logger"."0.0.5"; + by-version."iced-logger"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-logger-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.5.tgz"; + name = "iced-logger-0.0.5.tgz"; + sha1 = "501852a410691cf7e9542598e04dfbfdadc51486"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-logger" or []); + deps = [ + self.by-version."colors"."0.6.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-logger" ]; + }; + "iced-logger" = self.by-version."iced-logger"."0.0.5"; + by-spec."iced-logger".">=0.0.3" = + self.by-version."iced-logger"."0.0.5"; + by-spec."iced-runtime".">=0.0.1" = + self.by-version."iced-runtime"."1.0.1"; + by-version."iced-runtime"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-runtime-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.1.tgz"; + name = "iced-runtime-1.0.1.tgz"; + sha1 = "b2a8f4544241408d076c581ffa97c67d32e3d49b"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-runtime" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-runtime" ]; + }; + "iced-runtime" = self.by-version."iced-runtime"."1.0.1"; + by-spec."iced-runtime".">=0.0.1 <2.0.0-0" = + self.by-version."iced-runtime"."1.0.1"; + by-spec."iced-runtime"."^1.0.0" = + self.by-version."iced-runtime"."1.0.1"; + by-spec."iced-runtime"."^1.0.1" = + self.by-version."iced-runtime"."1.0.1"; + by-spec."iced-spawn"."0.0.10" = + self.by-version."iced-spawn"."0.0.10"; + by-version."iced-spawn"."0.0.10" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-spawn-0.0.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-spawn/-/iced-spawn-0.0.10.tgz"; + name = "iced-spawn-0.0.10.tgz"; + sha1 = "bef06e4fd98b73a519e6781bc3a4bdf2e78054f4"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-spawn" or []); + deps = [ + self.by-version."iced-runtime"."1.0.1" + self.by-version."semver"."2.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-spawn" ]; + }; + "iced-spawn" = self.by-version."iced-spawn"."0.0.10"; + by-spec."iced-spawn".">=0.0.8" = + self.by-version."iced-spawn"."0.0.10"; + by-spec."iced-test".">=0.0.16" = + self.by-version."iced-test"."0.0.19"; + by-version."iced-test"."0.0.19" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-test-0.0.19"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.19.tgz"; + name = "iced-test-0.0.19.tgz"; + sha1 = "0aff4cfa5170a0ebf9d888695b233e68cf60c634"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-test" or []); + deps = [ + self.by-version."colors"."0.6.2" + self.by-version."deep-equal"."0.2.1" + self.by-version."iced-runtime"."1.0.1" + self.by-version."minimist"."1.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-test" ]; + }; + "iced-test" = self.by-version."iced-test"."0.0.19"; + by-spec."iced-utils"."0.1.20" = + self.by-version."iced-utils"."0.1.20"; + by-version."iced-utils"."0.1.20" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-utils-0.1.20"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.20.tgz"; + name = "iced-utils-0.1.20.tgz"; + sha1 = "923cbc3c080511cb6cc8e3ccde6609548d2db3e8"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-utils" or []); + deps = [ + self.by-version."iced-error"."0.0.9" + self.by-version."iced-runtime"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-utils" ]; + }; + "iced-utils" = self.by-version."iced-utils"."0.1.20"; + by-spec."iced-utils".">=0.1.11" = + self.by-version."iced-utils"."0.1.21"; + by-version."iced-utils"."0.1.21" = lib.makeOverridable self.buildNodePackage { + name = "node-iced-utils-0.1.21"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.21.tgz"; + name = "iced-utils-0.1.21.tgz"; + sha1 = "6f9fb61232c75f365340151794082a718ace436b"; + }) + ]; + buildInputs = + (self.nativeDeps."iced-utils" or []); + deps = [ + self.by-version."iced-error"."0.0.9" + self.by-version."iced-runtime"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "iced-utils" ]; + }; + by-spec."iced-utils".">=0.1.16" = + self.by-version."iced-utils"."0.1.21"; + by-spec."iced-utils".">=0.1.18" = + self.by-version."iced-utils"."0.1.21"; + by-spec."inherits"."2" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inherits-2.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }) + ]; + buildInputs = + (self.nativeDeps."inherits" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "inherits" ]; + }; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; + by-spec."ipv6"."~3.1.1" = + self.by-version."ipv6"."3.1.1"; + by-version."ipv6"."3.1.1" = lib.makeOverridable self.buildNodePackage { + name = "ipv6-3.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.1.tgz"; + name = "ipv6-3.1.1.tgz"; + sha1 = "46da0e260af36fd9beb41297c987b7c21a2d9e1c"; + }) + ]; + buildInputs = + (self.nativeDeps."ipv6" or []); + deps = [ + self.by-version."sprintf"."0.1.4" + self.by-version."cli"."0.4.5" + self.by-version."cliff"."0.1.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ipv6" ]; + }; + by-spec."isarray"."0.0.1" = + self.by-version."isarray"."0.0.1"; + by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-isarray-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }) + ]; + buildInputs = + (self.nativeDeps."isarray" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "isarray" ]; + }; + by-spec."json-stringify-safe"."~5.0.0" = + self.by-version."json-stringify-safe"."5.0.0"; + by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-json-stringify-safe-5.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; + sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + }) + ]; + buildInputs = + (self.nativeDeps."json-stringify-safe" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "json-stringify-safe" ]; + }; + by-spec."jsonfile"."^2.0.0" = + self.by-version."jsonfile"."2.0.0"; + by-version."jsonfile"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-jsonfile-2.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz"; + name = "jsonfile-2.0.0.tgz"; + sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonfile" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "jsonfile" ]; + }; + by-spec."kbpgp".">=1.0.2" = + self.by-version."kbpgp"."1.0.5"; + by-version."kbpgp"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-kbpgp-1.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/kbpgp/-/kbpgp-1.0.5.tgz"; + name = "kbpgp-1.0.5.tgz"; + sha1 = "5dea54ffbe648494bd4afcdadae1323e1de909fa"; + }) + ]; + buildInputs = + (self.nativeDeps."kbpgp" or []); + deps = [ + self.by-version."bn"."1.0.1" + self.by-version."deep-equal"."0.2.1" + self.by-version."iced-error"."0.0.9" + self.by-version."iced-runtime"."1.0.1" + self.by-version."keybase-compressjs"."1.0.1-c" + self.by-version."keybase-ecurve"."1.0.0" + self.by-version."pgp-utils"."0.0.27" + self.by-version."purepack"."1.0.1" + self.by-version."triplesec"."3.0.19" + ]; + peerDependencies = [ + ]; + passthru.names = [ "kbpgp" ]; + }; + "kbpgp" = self.by-version."kbpgp"."1.0.5"; + by-spec."kbpgp"."^1.0.2" = + self.by-version."kbpgp"."1.0.5"; + by-spec."keybase-compressjs"."^1.0.1-c" = + self.by-version."keybase-compressjs"."1.0.1-c"; + by-version."keybase-compressjs"."1.0.1-c" = lib.makeOverridable self.buildNodePackage { + name = "node-keybase-compressjs-1.0.1-c"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/keybase-compressjs/-/keybase-compressjs-1.0.1-c.tgz"; + name = "keybase-compressjs-1.0.1-c.tgz"; + sha1 = "dc664a7f5d95584a534622a260297532f3ce9f9f"; + }) + ]; + buildInputs = + (self.nativeDeps."keybase-compressjs" or []); + deps = [ + self.by-version."commander"."2.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "keybase-compressjs" ]; + }; + by-spec."keybase-ecurve"."^1.0.0" = + self.by-version."keybase-ecurve"."1.0.0"; + by-version."keybase-ecurve"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-keybase-ecurve-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/keybase-ecurve/-/keybase-ecurve-1.0.0.tgz"; + name = "keybase-ecurve-1.0.0.tgz"; + sha1 = "c6bc72adda4603fd3184fee7e99694ed8fd69ad2"; + }) + ]; + buildInputs = + (self.nativeDeps."keybase-ecurve" or []); + deps = [ + self.by-version."bn"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "keybase-ecurve" ]; + }; + by-spec."keybase-path"."0.0.15" = + self.by-version."keybase-path"."0.0.15"; + by-version."keybase-path"."0.0.15" = lib.makeOverridable self.buildNodePackage { + name = "node-keybase-path-0.0.15"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/keybase-path/-/keybase-path-0.0.15.tgz"; + name = "keybase-path-0.0.15.tgz"; + sha1 = "94b95448fc4edf73e096366279bd28a469d5f72f"; + }) + ]; + buildInputs = + (self.nativeDeps."keybase-path" or []); + deps = [ + self.by-version."iced-runtime"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "keybase-path" ]; + }; + "keybase-path" = self.by-version."keybase-path"."0.0.15"; + by-spec."keybase-proofs"."^1.1.3" = + self.by-version."keybase-proofs"."1.1.3"; + by-version."keybase-proofs"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-keybase-proofs-1.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-1.1.3.tgz"; + name = "keybase-proofs-1.1.3.tgz"; + sha1 = "f2a1a77c7e978a70480fb6ef4fb236f413f729da"; + }) + ]; + buildInputs = + (self.nativeDeps."keybase-proofs" or []); + deps = [ + self.by-version."iced-error"."0.0.9" + self.by-version."iced-lock"."1.0.1" + self.by-version."iced-runtime"."1.0.1" + self.by-version."pgp-utils"."0.0.27" + self.by-version."triplesec"."3.0.19" + ]; + peerDependencies = [ + ]; + passthru.names = [ "keybase-proofs" ]; + }; + "keybase-proofs" = self.by-version."keybase-proofs"."1.1.3"; + by-spec."libkeybase"."^0.0.6" = + self.by-version."libkeybase"."0.0.6"; + by-version."libkeybase"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-libkeybase-0.0.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/libkeybase/-/libkeybase-0.0.6.tgz"; + name = "libkeybase-0.0.6.tgz"; + sha1 = "03d19afe7ca48ca041d962f0885d373faca2e90e"; + }) + ]; + buildInputs = + (self.nativeDeps."libkeybase" or []); + deps = [ + self.by-version."iced-lock"."1.0.1" + self.by-version."iced-logger"."0.0.5" + self.by-version."iced-runtime"."1.0.1" + self.by-version."kbpgp"."1.0.5" + self.by-version."tweetnacl"."0.12.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "libkeybase" ]; + }; + "libkeybase" = self.by-version."libkeybase"."0.0.6"; + by-spec."lru-cache"."2" = + self.by-version."lru-cache"."2.5.0"; + by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-lru-cache-2.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; + name = "lru-cache-2.5.0.tgz"; + sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; + }) + ]; + buildInputs = + (self.nativeDeps."lru-cache" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lru-cache" ]; + }; + by-spec."marked".">= 0.2.7" = + self.by-version."marked"."0.3.2"; + by-version."marked"."0.3.2" = lib.makeOverridable self.buildNodePackage { + name = "marked-0.3.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/marked/-/marked-0.3.2.tgz"; + name = "marked-0.3.2.tgz"; + sha1 = "015db158864438f24a64bdd61a0428b418706d09"; + }) + ]; + buildInputs = + (self.nativeDeps."marked" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "marked" ]; + }; + by-spec."merkle-tree"."0.0.12" = + self.by-version."merkle-tree"."0.0.12"; + by-version."merkle-tree"."0.0.12" = lib.makeOverridable self.buildNodePackage { + name = "node-merkle-tree-0.0.12"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.12.tgz"; + name = "merkle-tree-0.0.12.tgz"; + sha1 = "c8d6f0e9489b828c1d02942b24514311bac5e30f"; + }) + ]; + buildInputs = + (self.nativeDeps."merkle-tree" or []); + deps = [ + self.by-version."deep-equal"."0.2.1" + self.by-version."iced-error"."0.0.9" + self.by-version."iced-runtime"."1.0.1" + self.by-version."iced-utils"."0.1.21" + ]; + peerDependencies = [ + ]; + passthru.names = [ "merkle-tree" ]; + }; + "merkle-tree" = self.by-version."merkle-tree"."0.0.12"; + by-spec."mime"."~1.2.11" = + self.by-version."mime"."1.2.11"; + by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-1.2.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }) + ]; + buildInputs = + (self.nativeDeps."mime" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; + by-spec."mime"."~1.2.9" = + self.by-version."mime"."1.2.11"; + by-spec."minimatch"."^1.0.0" = + self.by-version."minimatch"."1.0.0"; + by-version."minimatch"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-minimatch-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; + name = "minimatch-1.0.0.tgz"; + sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = [ + self.by-version."lru-cache"."2.5.0" + self.by-version."sigmund"."1.0.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; + by-spec."minimist"."0.0.8" = + self.by-version."minimist"."0.0.8"; + by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.0.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + name = "minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }) + ]; + buildInputs = + (self.nativeDeps."minimist" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimist" ]; + }; + by-spec."minimist".">=0.0.8" = + self.by-version."minimist"."1.1.0"; + by-version."minimist"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-1.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz"; + name = "minimist-1.1.0.tgz"; + sha1 = "cdf225e8898f840a258ded44fc91776770afdc93"; + }) + ]; + buildInputs = + (self.nativeDeps."minimist" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimist" ]; + }; + by-spec."minimist"."~0.0.1" = + self.by-version."minimist"."0.0.10"; + by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage { + name = "node-minimist-0.0.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + name = "minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }) + ]; + buildInputs = + (self.nativeDeps."minimist" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "minimist" ]; + }; + by-spec."mkdirp"."0.3.5" = + self.by-version."mkdirp"."0.3.5"; + by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "node-mkdirp-0.3.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; + "mkdirp" = self.by-version."mkdirp"."0.3.5"; + by-spec."mkdirp"."^0.5.0" = + self.by-version."mkdirp"."0.5.0"; + by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + name = "mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp" or []); + deps = [ + self.by-version."minimist"."0.0.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; + by-spec."mkdirp"."~0.3.5" = + self.by-version."mkdirp"."0.3.5"; + by-spec."more-entropy".">=0.0.7" = + self.by-version."more-entropy"."0.0.7"; + by-version."more-entropy"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "node-more-entropy-0.0.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz"; + name = "more-entropy-0.0.7.tgz"; + sha1 = "67bfc6f7a86f26fbc37aac83fd46d88c61d109b5"; + }) + ]; + buildInputs = + (self.nativeDeps."more-entropy" or []); + deps = [ + self.by-version."iced-runtime"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "more-entropy" ]; + }; + by-spec."mute-stream"."~0.0.4" = + self.by-version."mute-stream"."0.0.4"; + by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "node-mute-stream-0.0.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; + name = "mute-stream-0.0.4.tgz"; + sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; + }) + ]; + buildInputs = + (self.nativeDeps."mute-stream" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mute-stream" ]; + }; + by-spec."ncp"."^0.6.0" = + self.by-version."ncp"."0.6.0"; + by-version."ncp"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "ncp-0.6.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; + name = "ncp-0.6.0.tgz"; + sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d"; + }) + ]; + buildInputs = + (self.nativeDeps."ncp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ncp" ]; + }; + by-spec."network-byte-order"."~0.2.0" = + self.by-version."network-byte-order"."0.2.0"; + by-version."network-byte-order"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "node-network-byte-order-0.2.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/network-byte-order/-/network-byte-order-0.2.0.tgz"; + name = "network-byte-order-0.2.0.tgz"; + sha1 = "6ac11bf44bf610daeddbe90a09a5c817c6e0d2b3"; + }) + ]; + buildInputs = + (self.nativeDeps."network-byte-order" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "network-byte-order" ]; + }; + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.1"; + by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-node-uuid-1.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + name = "node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }) + ]; + buildInputs = + (self.nativeDeps."node-uuid" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-uuid" ]; + }; + by-spec."oauth-sign"."~0.3.0" = + self.by-version."oauth-sign"."0.3.0"; + by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-oauth-sign-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }) + ]; + buildInputs = + (self.nativeDeps."oauth-sign" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "oauth-sign" ]; + }; + by-spec."once"."^1.3.0" = + self.by-version."once"."1.3.1"; + by-version."once"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "node-once-1.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz"; + name = "once-1.3.1.tgz"; + sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f"; + }) + ]; + buildInputs = + (self.nativeDeps."once" or []); + deps = [ + self.by-version."wrappy"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "once" ]; + }; + by-spec."optimist"."0.6.1" = + 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.1.tgz"; + name = "optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }) + ]; + buildInputs = + (self.nativeDeps."optimist" or []); + deps = [ + self.by-version."wordwrap"."0.0.2" + self.by-version."minimist"."0.0.10" + ]; + peerDependencies = [ + ]; + passthru.names = [ "optimist" ]; + }; + "optimist" = self.by-version."optimist"."0.6.1"; + by-spec."pgp-utils".">=0.0.21" = + self.by-version."pgp-utils"."0.0.27"; + by-version."pgp-utils"."0.0.27" = lib.makeOverridable self.buildNodePackage { + name = "node-pgp-utils-0.0.27"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.27.tgz"; + name = "pgp-utils-0.0.27.tgz"; + sha1 = "3c9afdc0c5d0674bd78ed5009e2d0aec20be32b3"; + }) + ]; + buildInputs = + (self.nativeDeps."pgp-utils" or []); + deps = [ + self.by-version."iced-error"."0.0.9" + self.by-version."iced-runtime"."1.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "pgp-utils" ]; + }; + by-spec."pgp-utils".">=0.0.22" = + self.by-version."pgp-utils"."0.0.27"; + "pgp-utils" = self.by-version."pgp-utils"."0.0.27"; + by-spec."pgp-utils".">=0.0.25" = + self.by-version."pgp-utils"."0.0.27"; + by-spec."pkginfo"."0.3.x" = + self.by-version."pkginfo"."0.3.0"; + by-version."pkginfo"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-pkginfo-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + name = "pkginfo-0.3.0.tgz"; + sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + }) + ]; + buildInputs = + (self.nativeDeps."pkginfo" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "pkginfo" ]; + }; + by-spec."progress"."1.1.3" = + self.by-version."progress"."1.1.3"; + by-version."progress"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-progress-1.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/progress/-/progress-1.1.3.tgz"; + name = "progress-1.1.3.tgz"; + sha1 = "42f89c5fc3b6f0408a0bdd68993b174f96aababf"; + }) + ]; + buildInputs = + (self.nativeDeps."progress" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "progress" ]; + }; + "progress" = self.by-version."progress"."1.1.3"; + by-spec."progress"."~1.1.2" = + self.by-version."progress"."1.1.8"; + by-version."progress"."1.1.8" = lib.makeOverridable self.buildNodePackage { + name = "node-progress-1.1.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; + name = "progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + }) + ]; + buildInputs = + (self.nativeDeps."progress" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "progress" ]; + }; + by-spec."punycode".">=0.2.0" = + self.by-version."punycode"."1.3.1"; + by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "node-punycode-1.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"; + name = "punycode-1.3.1.tgz"; + sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e"; + }) + ]; + buildInputs = + (self.nativeDeps."punycode" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "punycode" ]; + }; + by-spec."purepack"."1.0.1" = + self.by-version."purepack"."1.0.1"; + by-version."purepack"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-purepack-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/purepack/-/purepack-1.0.1.tgz"; + name = "purepack-1.0.1.tgz"; + sha1 = "9592f35bc22279a777885d3de04acc3555994f68"; + }) + ]; + buildInputs = + (self.nativeDeps."purepack" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "purepack" ]; + }; + "purepack" = self.by-version."purepack"."1.0.1"; + by-spec."purepack".">=1" = + self.by-version."purepack"."1.0.1"; + by-spec."purepack".">=1.0.1" = + self.by-version."purepack"."1.0.1"; + by-spec."qs"."~0.6.0" = + self.by-version."qs"."0.6.6"; + by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { + name = "node-qs-0.6.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }) + ]; + buildInputs = + (self.nativeDeps."qs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; + by-spec."read"."~1.0.5" = + self.by-version."read"."1.0.5"; + by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-read-1.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; + name = "read-1.0.5.tgz"; + sha1 = "007a3d169478aa710a491727e453effb92e76203"; + }) + ]; + buildInputs = + (self.nativeDeps."read" or []); + deps = [ + self.by-version."mute-stream"."0.0.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "read" ]; + }; + "read" = self.by-version."read"."1.0.5"; + by-spec."readable-stream"."1.1" = + self.by-version."readable-stream"."1.1.13"; + by-version."readable-stream"."1.1.13" = lib.makeOverridable self.buildNodePackage { + name = "node-readable-stream-1.1.13"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; + name = "readable-stream-1.1.13.tgz"; + sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; + }) + ]; + buildInputs = + (self.nativeDeps."readable-stream" or []); + deps = [ + self.by-version."core-util-is"."1.0.1" + self.by-version."isarray"."0.0.1" + self.by-version."string_decoder"."0.10.31" + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "readable-stream" ]; + }; + by-spec."request"."2.30.0" = + self.by-version."request"."2.30.0"; + by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.30.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; + name = "request-2.30.0.tgz"; + sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = [ + self.by-version."qs"."0.6.6" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.2" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.9.15" + self.by-version."form-data"."0.1.4" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign2"."0.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; + "request" = self.by-version."request"."2.30.0"; + by-spec."rimraf"."^2.2.8" = + self.by-version."rimraf"."2.2.8"; + by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + name = "rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }) + ]; + buildInputs = + (self.nativeDeps."rimraf" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "rimraf" ]; + }; + by-spec."semver"."2.2.1" = + self.by-version."semver"."2.2.1"; + by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + name = "semver-2.2.1.tgz"; + sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; + }) + ]; + buildInputs = + (self.nativeDeps."semver" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "semver" ]; + }; + "semver" = self.by-version."semver"."2.2.1"; + by-spec."semver"."~2.2.1" = + self.by-version."semver"."2.2.1"; + by-spec."sigmund"."~1.0.0" = + self.by-version."sigmund"."1.0.0"; + by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-sigmund-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; + name = "sigmund-1.0.0.tgz"; + sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; + }) + ]; + buildInputs = + (self.nativeDeps."sigmund" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "sigmund" ]; + }; + by-spec."sntp"."0.2.x" = + self.by-version."sntp"."0.2.4"; + by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-sntp-0.2.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }) + ]; + buildInputs = + (self.nativeDeps."sntp" or []); + deps = [ + self.by-version."hoek"."0.9.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "sntp" ]; + }; + by-spec."socks5-client"."0.x" = + self.by-version."socks5-client"."0.3.6"; + by-version."socks5-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { + name = "node-socks5-client-0.3.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/socks5-client/-/socks5-client-0.3.6.tgz"; + name = "socks5-client-0.3.6.tgz"; + sha1 = "4205b5791f2df77cf07527222558fe4e46aca2f1"; + }) + ]; + buildInputs = + (self.nativeDeps."socks5-client" or []); + deps = [ + self.by-version."ipv6"."3.1.1" + self.by-version."network-byte-order"."0.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "socks5-client" ]; + }; + by-spec."socks5-client"."^0.3.6" = + self.by-version."socks5-client"."0.3.6"; + "socks5-client" = self.by-version."socks5-client"."0.3.6"; + by-spec."socks5-client"."~0.3.4" = + self.by-version."socks5-client"."0.3.6"; + by-spec."socks5-http-client"."^0.1.6" = + self.by-version."socks5-http-client"."0.1.6"; + by-version."socks5-http-client"."0.1.6" = lib.makeOverridable self.buildNodePackage { + name = "node-socks5-http-client-0.1.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/socks5-http-client/-/socks5-http-client-0.1.6.tgz"; + name = "socks5-http-client-0.1.6.tgz"; + sha1 = "a915ba75573787876e5d3756ee4a81d60cd4b69b"; + }) + ]; + buildInputs = + (self.nativeDeps."socks5-http-client" or []); + deps = [ + self.by-version."socks5-client"."0.3.6" + ]; + peerDependencies = [ + ]; + passthru.names = [ "socks5-http-client" ]; + }; + "socks5-http-client" = self.by-version."socks5-http-client"."0.1.6"; + by-spec."socks5-https-client"."^0.2.2" = + self.by-version."socks5-https-client"."0.2.2"; + by-version."socks5-https-client"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-socks5-https-client-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/socks5-https-client/-/socks5-https-client-0.2.2.tgz"; + name = "socks5-https-client-0.2.2.tgz"; + sha1 = "b855e950e97c4fa6bca72a108f00278d33ac91d1"; + }) + ]; + buildInputs = + (self.nativeDeps."socks5-https-client" or []); + deps = [ + self.by-version."socks5-client"."0.3.6" + self.by-version."starttls"."0.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "socks5-https-client" ]; + }; + "socks5-https-client" = self.by-version."socks5-https-client"."0.2.2"; + by-spec."sprintf"."0.1.x" = + self.by-version."sprintf"."0.1.4"; + by-version."sprintf"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-sprintf-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.4.tgz"; + name = "sprintf-0.1.4.tgz"; + sha1 = "6f870a8f4aae1c7fe53eee02b6ca31aa2d78863b"; + }) + ]; + buildInputs = + (self.nativeDeps."sprintf" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "sprintf" ]; + }; + by-spec."stack-trace"."0.0.x" = + self.by-version."stack-trace"."0.0.9"; + by-version."stack-trace"."0.0.9" = lib.makeOverridable self.buildNodePackage { + name = "node-stack-trace-0.0.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + name = "stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }) + ]; + buildInputs = + (self.nativeDeps."stack-trace" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "stack-trace" ]; + }; + by-spec."starttls"."0.x" = + self.by-version."starttls"."0.2.1"; + by-version."starttls"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "node-starttls-0.2.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz"; + name = "starttls-0.2.1.tgz"; + sha1 = "b98d3e5e778d46f199c843a64f889f0347c6d19a"; + }) + ]; + buildInputs = + (self.nativeDeps."starttls" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "starttls" ]; + }; + by-spec."string_decoder"."~0.10.x" = + self.by-version."string_decoder"."0.10.31"; + by-version."string_decoder"."0.10.31" = lib.makeOverridable self.buildNodePackage { + name = "node-string_decoder-0.10.31"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + name = "string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }) + ]; + buildInputs = + (self.nativeDeps."string_decoder" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "string_decoder" ]; + }; + by-spec."tablify"."0.1.5" = + self.by-version."tablify"."0.1.5"; + by-version."tablify"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "node-tablify-0.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tablify/-/tablify-0.1.5.tgz"; + name = "tablify-0.1.5.tgz"; + sha1 = "47160ce2918be291d63cecceddb5254dd72982c7"; + }) + ]; + buildInputs = + (self.nativeDeps."tablify" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tablify" ]; + }; + "tablify" = self.by-version."tablify"."0.1.5"; + by-spec."tablify".">=0.1.5" = + self.by-version."tablify"."0.1.5"; + by-spec."timeago"."0.1.0" = + self.by-version."timeago"."0.1.0"; + by-version."timeago"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-timeago-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/timeago/-/timeago-0.1.0.tgz"; + name = "timeago-0.1.0.tgz"; + sha1 = "21176a84d469be35ee431c5c48c0b6aba1f72464"; + }) + ]; + buildInputs = + (self.nativeDeps."timeago" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "timeago" ]; + }; + "timeago" = self.by-version."timeago"."0.1.0"; + by-spec."tough-cookie"."~0.9.15" = + self.by-version."tough-cookie"."0.9.15"; + by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage { + name = "node-tough-cookie-0.9.15"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; + name = "tough-cookie-0.9.15.tgz"; + sha1 = "75617ac347e3659052b0350131885829677399f6"; + }) + ]; + buildInputs = + (self.nativeDeps."tough-cookie" or []); + deps = [ + self.by-version."punycode"."1.3.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tough-cookie" ]; + }; + by-spec."triplesec".">=3.0.16" = + self.by-version."triplesec"."3.0.19"; + by-version."triplesec"."3.0.19" = lib.makeOverridable self.buildNodePackage { + name = "node-triplesec-3.0.19"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.19.tgz"; + name = "triplesec-3.0.19.tgz"; + sha1 = "1cf858ccfcc133a3e884ff7d37aedf3b306c32f9"; + }) + ]; + buildInputs = + (self.nativeDeps."triplesec" or []); + deps = [ + self.by-version."iced-error"."0.0.9" + self.by-version."iced-lock"."1.0.1" + self.by-version."iced-runtime"."1.0.1" + self.by-version."more-entropy"."0.0.7" + self.by-version."progress"."1.1.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "triplesec" ]; + }; + "triplesec" = self.by-version."triplesec"."3.0.19"; + by-spec."triplesec".">=3.0.19" = + self.by-version."triplesec"."3.0.19"; + by-spec."tunnel-agent"."~0.3.0" = + self.by-version."tunnel-agent"."0.3.0"; + by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-tunnel-agent-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + name = "tunnel-agent-0.3.0.tgz"; + sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; + }) + ]; + buildInputs = + (self.nativeDeps."tunnel-agent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tunnel-agent" ]; + }; + by-spec."tweetnacl"."^0.12.0" = + self.by-version."tweetnacl"."0.12.2"; + by-version."tweetnacl"."0.12.2" = lib.makeOverridable self.buildNodePackage { + name = "node-tweetnacl-0.12.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz"; + name = "tweetnacl-0.12.2.tgz"; + sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb"; + }) + ]; + buildInputs = + (self.nativeDeps."tweetnacl" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tweetnacl" ]; + }; + by-spec."underscore".">= 1.0.0" = + self.by-version."underscore"."1.7.0"; + by-version."underscore"."1.7.0" = lib.makeOverridable self.buildNodePackage { + name = "node-underscore-1.7.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; + name = "underscore-1.7.0.tgz"; + sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore" ]; + }; + by-spec."underscore"."~1.4" = + self.by-version."underscore"."1.4.4"; + by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { + name = "node-underscore-1.4.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + name = "underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore" ]; + }; + by-spec."underscore"."~1.4.3" = + self.by-version."underscore"."1.4.4"; + by-spec."underscore.string"."~2.3.1" = + self.by-version."underscore.string"."2.3.3"; + by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage { + name = "node-underscore.string-2.3.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + name = "underscore.string-2.3.3.tgz"; + sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore.string" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore.string" ]; + }; + by-spec."winston"."0.8.x" = + self.by-version."winston"."0.8.0"; + by-version."winston"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "node-winston-0.8.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; + name = "winston-0.8.0.tgz"; + sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; + }) + ]; + buildInputs = + (self.nativeDeps."winston" or []); + deps = [ + self.by-version."async"."0.2.10" + self.by-version."colors"."0.6.2" + self.by-version."cycle"."1.0.3" + self.by-version."eyes"."0.1.8" + self.by-version."pkginfo"."0.3.0" + self.by-version."stack-trace"."0.0.9" + ]; + peerDependencies = [ + ]; + passthru.names = [ "winston" ]; + }; + by-spec."wordwrap"."~0.0.2" = + self.by-version."wordwrap"."0.0.2"; + by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-wordwrap-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + name = "wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }) + ]; + buildInputs = + (self.nativeDeps."wordwrap" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "wordwrap" ]; + }; + by-spec."wrappy"."1" = + self.by-version."wrappy"."1.0.1"; + by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-wrappy-1.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; + name = "wrappy-1.0.1.tgz"; + sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; + }) + ]; + buildInputs = + (self.nativeDeps."wrappy" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "wrappy" ]; + }; +} diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 38606d79873..8f7fc3b0e26 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchFromGitHub, qt }: let - version = "1.07.98"; + version = "1.08.02"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; - src = fetchurl { - url = "mirror://sourceforge/bitcointrader/SRC/QtBitcoinTrader-${version}.tar.gz"; - sha256 = "1irz17q71fx64dfkmgajlyva7d1wifv4bxgb2iwz7d69rvhzaqzx"; + src = fetchFromGitHub { + owner = "JulyIGHOR"; + repo = "QtBitcoinTrader"; + rev = "452db3ee9447b8f9e7d63253f834b31394b23d92"; + sha256 = "1l2a021dy2j4sr4nmq7wn27r2zli9nigwbviqzain3nlyzq9fjpg"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qt ]; postUnpack = "sourceRoot=\${sourceRoot}/src"; @@ -23,11 +25,11 @@ stdenv.mkDerivation { QtBitcoinTrader_Desktop.pro ''; - meta = { - description = "Secure bitcoin trading client"; - homepage = http://qtopentrader.com; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; # arbitrary choice - maintainers = [ stdenv.lib.maintainers.emery ]; - }; -} \ No newline at end of file + meta = with stdenv.lib; + { description = "Secure bitcoin trading client"; + homepage = https://centrabit.com/; + license = licenses.lgpl3; + platforms = platforms.linux; # arbitrary choice + maintainers = [ maintainers.emery ]; + }; +} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 2a23d90f844..656a639b2c3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.411"; + version = "11.2.202.418"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "1983rj824bhzk48yhgminsiil778vwq0217hfrhbmymhrq3p7gzd"; + sha256 = "0c7iid6apab99axrhl509hycbc4yc55k8xrh0pvr005q5jlmx99n"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1bxp94s63i3136pjxgcm8106mqzaj4h096mkf7iq6ddkcvi0cxzn"; + sha256 = "17mpjvkvvb7wwmyvwz93w7q4lvjrpma1f9lcf83i927jqpzg8x73"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 3994563cf3e..7e32a26abf1 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, cmake, libpcap, libnet, zlib, curl, pcre, +{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre, openssl, ncurses, glib, gtk, atk, pango, flex, bison }: stdenv.mkDerivation rec { name = "ettercap-${version}"; - version = "0.8.0"; + version = "0.8.1"; - src = fetchurl { - url = "https://github.com/Ettercap/ettercap/archive/v${version}.tar.gz"; - sha256 = "1g69782wk2hag8h76jqy81szw5jhvqqnn3m4v0wjkbv9zjxy44w0"; + src = fetchFromGitHub { + owner = "Ettercap"; + repo = "ettercap"; + rev = "v${version}"; + sha256 = "017398fiqcl2x1bjfnz97y6j8v5n83gbsniy73vbx21kmhh5pacg"; }; buildInputs = [ @@ -16,7 +18,8 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - substituteInPlace CMakeLists.txt --replace /etc \$\{INSTALL_PREFIX\}/etc + substituteInPlace CMakeLists.txt --replace /etc \$\{INSTALL_PREFIX\}/etc \ + --replace /usr \$\{INSTALL_PREFIX\} ''; cmakeFlags = [ @@ -24,10 +27,11 @@ stdenv.mkDerivation rec { "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" ]; - meta = { + meta = with stdenv.lib; { description = "Comprehensive suite for man in the middle attacks"; homepage = http://ettercap.github.io/ettercap/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fbb57a65812..7ba69a9fc18 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { # Install git-subtree. pushd contrib/subtree make - make install install-doc + make install ${stdenv.lib.optionalString withManual "install-doc"} popd rm -rf contrib/subtree diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 50c42c5c9d4..5b1e2041e4a 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20141031"; - sha256 = "1rg8hz7g12k6h3vflm51l6gdi0wckmxwdq1213ykrbl8w8bvlkm8"; + version = "1.20141110"; + sha256 = "0675zcijfap757076r3j7js4iadnj1jbihmchf6ikzaanczmq1kg"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 96a3d2abfc6..c48d74249e1 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,25 +1,20 @@ -{ stdenv, fetchurl, gcc, unzip, curl }: +{ stdenv, fetchurl, unzip, curl }: stdenv.mkDerivation { - name = "dmd-2.064.2"; + name = "dmd-2.066.1"; src = fetchurl { - url = http://downloads.dlang.org/releases/2013/dmd.2.064.2.zip; - sha256 = "1i0jdybigffwyb7c43j0c4aayxx3b93zzqrjxyw6zgp06yhi06pm"; + url = http://downloads.dlang.org/releases/2014/dmd.2.066.1.zip; + sha256 = "1qifwgrl6h232zsnvcx3kmb5d0fsy7j9zv17r3b4vln7x5rvzc66"; }; - buildInputs = [ gcc unzip curl ]; + buildInputs = [ unzip curl ]; - configurePhase = ""; - patchPhase = '' - cp src/VERSION src/dmd/ - cp license.txt src/phobos/LICENSE_1_0.txt - ''; buildPhase = '' cd src/dmd make -f posix.mak INSTALL_DIR=$out export DMD=$PWD/dmd - cd ../druntime + cd ../druntime make -f posix.mak INSTALL_DIR=$out DMD=$DMD cd ../phobos make -f posix.mak INSTALL_DIR=$out DMD=$DMD @@ -28,25 +23,36 @@ stdenv.mkDerivation { installPhase = '' cd src/dmd - tee dmd.conf.default << EOF - [Environment] - DFLAGS=-I$out/import -L-L$out/lib - EOF + mkdir $out + mkdir $out/bin + cp dmd $out/bin + + cd ../druntime + mkdir $out/include + mkdir $out/include/d2 + cp -r import/* $out/include/d2 - make -f posix.mak INSTALL_DIR=$out install - export DMD=$PWD/dmd - cd ../druntime - make -f posix.mak INSTALL_DIR=$out install cd ../phobos - make -f posix.mak INSTALL_DIR=$out install - cd ../.. + mkdir $out/lib + ${let bits = if stdenv.is64bit then "64" else "32"; in + "cp generated/linux/release/${bits}/libphobos2.a $out/lib" + } + + cp -r std $out/include/d2 + cp -r etc $out/include/d2 + + cd $out/bin + tee dmd.conf << EOF + [Environment] + DFLAGS=-I$out/include/d2 -L-L$out/lib -L--no-warn-search-mismatch -L--export-dynamic + EOF ''; - meta = { + meta = with stdenv.lib; { description = "D language compiler"; homepage = http://dlang.org/; - license = "open source, see included files"; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.free; # parts under different licenses + platforms = platforms.unix; }; } + diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 57e339204bd..bcaf917b3c3 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -22,9 +22,15 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://www.mozart-oz.org/"; - description = "The Mozart Programming System combines ongoing research in programming language design and implementation, constraint logic programming, distributed computing, and human-computer interfaces. Mozart implements the Oz language and provides both expressive power and advanced functionality."; - + description = "Multiplatform implementation of the Oz programming language"; + longDescription = '' + The Mozart Programming System combines ongoing research in + programming language design and implementation, constraint logic + programming, distributed computing, and human-computer + interfaces. Mozart implements the Oz language and provides both + expressive power and advanced functionality. + ''; license = licenses.mit; - platforms = ["x86_64-linux"]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix index 621ace195bb..f70b8f448b4 100644 --- a/pkgs/development/compilers/rdmd/default.nix +++ b/pkgs/development/compilers/rdmd/default.nix @@ -1,29 +1,29 @@ -{ stdenv, fetchurl, writeText, lib, dmd }: +{stdenv, lib, fetchgit, dmd}: stdenv.mkDerivation { - name = "rdmd-2.064"; - - src = fetchurl { - url = https://raw2.github.com/D-Programming-Language/tools/2.064/rdmd.d; - sha256 = "0b1g3ng6bkanvg00r6xb4ycpbh9x8b9dw589av665azxbcraqrs1"; - name = "rdmd-src"; - }; + name = "rdmd-20141113"; buildInputs = [ dmd ]; - builder = writeText "drmd-builder.sh" '' - source $stdenv/setup - cp $src rdmd.d - dmd rdmd.d - mkdir -p $out/bin - cp rdmd $out/bin/ + src = fetchgit { + url = git://github.com/D-Programming-Language/tools.git; + rev = "f496c68ee4e776597bd7382aa47f05da698a69e"; + sha256 = "0vbhmz8nbh8ayml4vad0239kfg982vqfyqqrjv6wrlnjah97n5ms"; + }; + + buildPhase = '' + dmd rdmd.d ''; + installPhase = '' + mkdir -p $out/bin + cp rdmd $out/bin/ + ''; + meta = { description = "Wrapper for D language compiler"; homepage = http://dlang.org/rdmd.html; license = lib.licenses.boost; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 09418f5f2af..17c0bed7caa 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sbclBootstrap, clisp}: +{ stdenv, fetchurl, sbclBootstrap, clisp, which}: stdenv.mkDerivation rec { name = "sbcl-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0nmb9amygr5flzk2z9fa6wzwqknbgd2qrkybxkxkamvbdwyayvzr"; }; - buildInputs = [ ] + buildInputs = [ which ] ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap) ++ (stdenv.lib.optional stdenv.isLinux clisp) ; @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { sed -i src/code/target-load.lisp -e \ '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' + # Fix software version retrieval + sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp + # Fix the tests sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp diff --git a/pkgs/development/coq-modules/unimath/default.nix b/pkgs/development/coq-modules/unimath/default.nix new file mode 100644 index 00000000000..e16156dec53 --- /dev/null +++ b/pkgs/development/coq-modules/unimath/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchgit, coq}: + +stdenv.mkDerivation rec { + + name = "coq-unimath-${coq.coq-version}-${version}"; + version = "a2714eca"; + + src = fetchgit { + url = git://github.com/UniMath/UniMath.git; + rev = "a2714eca29444a595cd280ea961ec33d17712009"; + sha256 = "0brhbslx4sxl8m9nxjbdl91gi99vcrikykl6b00f4cx5ww43csln"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = https://github.com/UniMath/UniMath; + description = "UniMath aims to formalize a substantial body of mathematics using the univalent point of view."; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 66cd199373e..f2fcfc1ad77 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let - version = "2.0.1"; + version = "2.0.2"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "1iyz19c15yw0p5lgfbfh8arja2cy3apx5697cm671j4qzjkws32p"; + sha256 = "0vgvvj0qywx9a1ihc8nddc3fcw69dinf136spw4i7qz4bszbs9j5"; }; buildInputs = [ pkgconfig nix git ]; diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index 786622fe4cc..4c9bf13937c 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -95,11 +95,12 @@ let --set LIBRARY_PATH "${LIBRARY_PATH}" ''; - passthru = { + passthru = rec { inherit zlibSupport libPrefix; executable = "pypy"; isPypy = true; buildEnv = callPackage ../../python/wrapper.nix { python = self; }; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index bb6dea2a4a3..3894f401d4a 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -93,6 +93,7 @@ let libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 85970641daa..3201d7520d1 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -101,6 +101,7 @@ let libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 9222f9fc4e1..d3f5c6e1f13 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation { isPy32 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index f9616701829..1f91d1bbaf4 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation { isPy33 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index e585c6c148d..3cadfc2d22f 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation { isPy34 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 310b0d93542..8c26d1f89ef 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,38 +1,47 @@ -{ stdenv, fetchurl, cairo, file, pango, glib, gtk -, which, libtool, makeWrapper, libjpeg, libpng -, fontconfig, liberation_ttf, sqlite, openssl } : +{ stdenv, fetchurl, cairo, file, fontconfig, glib, gtk, freefont_ttf +, libjpeg, libpng, libtool, makeWrapper, openssl, pango, sqlite, which } : stdenv.mkDerivation rec { pname = "racket"; - version = "6.1"; + version = "6.1.1"; name = "${pname}-${version}"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "fde283bf5899bb9266ce721db44631c9bac4a4864a7c3211de413fd9503178c6"; + sha256 = "090269522d20e7a5ce85d2251a126745746ebf5e87554c05efe03f3b7173da75"; }; - # Various racket executables do run-time searches for these. - ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib:${openssl}/lib"; + # Various Racket executables do runtime searches for these. + ffiSharedLibs = "${cairo}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${libjpeg}/lib:" + + "${libpng}/lib:${openssl}/lib:${pango}/lib:${sqlite}/lib"; - buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ]; + buildInputs = [ file fontconfig freefont_ttf libtool makeWrapper sqlite which ]; preConfigure = '' export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH - # Chroot builds do not have access to /etc/fonts/fonts.conf, but the Racket bootstrap - # needs a working fontconfig, so here a simple standin is used. + # Chroot builds do not have access to /etc/fonts/fonts.conf, + # but the Racket bootstrap needs a working fontconfig, + # so here a simple temporary stand-in is used. mkdir chroot-fontconfig cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf sed -e 's@@@' -i chroot-fontconfig/fonts.conf - echo "${liberation_ttf}" >> chroot-fontconfig/fonts.conf + echo "${freefont_ttf}" >> chroot-fontconfig/fonts.conf echo "" >> chroot-fontconfig/fonts.conf + # remove extraneous directories from temporary fonts.conf + sed -e 's@@@g' \ + -e 's@fonts@@g' \ + -e 's@~/.fonts@@g' \ + -e 's@fontconfig@@g' \ + -e 's@~/.fontconfig@@g' \ + -i chroot-fontconfig/fonts.conf + export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf cd src sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure - sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure + sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure ''; configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]; @@ -41,25 +50,25 @@ stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}" ; + wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}"; done ''; meta = { - description = "Programming language derived from Scheme (formerly called PLT Scheme)"; + description = "A programmable programming language"; longDescription = '' - Racket (formerly called PLT Scheme) is a programming language derived - from Scheme. The Racket project has four primary components: the - implementation of Racket, a JIT compiler; DrRacket, the Racket program - development environment; the TeachScheme! outreach, an attempt to turn - Computing and Programming into "an indispensable part of the liberal - arts curriculum"; and PLaneT, Racket's web-based package - distribution system for user-contributed packages. + Racket is a full-spectrum programming language. It goes beyond + Lisp and Scheme with dialects that support objects, types, + laziness, and more. Racket enables programmers to link + components written in different dialects, and it empowers + programmers to create new, project-specific dialects. Racket's + libraries support applications from web servers and databases to + GUIs and charts. ''; homepage = http://racket-lang.org/; - license = stdenv.lib.licenses.lgpl2Plus; # and licenses of contained libraries - maintainers = [ stdenv.lib.maintainers.kkallio ]; + license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ kkallio henrytill ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 200bf034dc6..34a26e9da86 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: -stdenv.mkDerivation { - name = "clearsilver-0.10.3"; +stdenv.mkDerivation rec { + name = "clearsilver-0.10.5"; src = fetchurl { - url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz; - sha256 = "1lhbbf5rrqxb44y5clga7iifcfrh8sfjwpj4phnr3qabk92wdn3i"; + url = "http://www.clearsilver.net/downloads/${name}.tar.gz"; + sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; }; builder = ./builder.sh; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index c73e9594857..892e32777ea 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "cminpack-1.3.2"; +stdenv.mkDerivation rec { + name = "cminpack-1.3.4"; src = fetchurl { - url = http://devernay.free.fr/hacks/cminpack/cminpack-1.3.2.tar.gz; - sha256 = "09bqr44wqancbdsc39lvhdz7rci3hknmlrrrzv46skvwx6rgk9x0"; + url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz"; + sha256 = "1jh3ymxfcy3ykh6gnvds5bbkf38aminvjgc8halck356vkvpnl9v"; }; patchPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = http://devernay.free.fr/hacks/cminpack/cminpack.html; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; }; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index cadf9e3e9c2..9622ea5d0dc 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HDBC-odbc"; - version = "2.3.1.1"; - sha256 = "0zypgwy8yxzp69c2775gkzi8591b0l3wncn7vmq11l16ign95fc7"; + version = "2.4.0.0"; + sha256 = "0zjq5j095jyh0axmgnr59fwhh1nhipj6flz77z46kygagygrg2qz"; isLibrary = true; isExecutable = true; buildDepends = [ HDBC mtl time utf8String ]; diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 510ffd4acb9..05caf6975ac 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HFuse"; - version = "0.2.4.3"; - sha256 = "1daka673mx0gsnsa04pxani7n4wp93hflzxs3imzy4sgb30p7l01"; + version = "0.2.4.4"; + sha256 = "1wsrf9y90dk27da9pm9m11hnrxwrqwvq6c9799b91a91mc2lxslc"; isLibrary = true; isExecutable = true; extraLibraries = [ fuse ]; @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "HFuse is a binding for the Linux FUSE library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.stdenv.lib.platforms.linux; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix index 6fa5e7e9114..69915ccfeef 100644 --- a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix +++ b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "HandsomeSoup"; - version = "0.3.4"; - sha256 = "0xpimys8pb0kzqnfxxf04dbxfmcrry5pzgmagyydcrmafacg0vjb"; + version = "0.3.5"; + sha256 = "1d1zanlr1mdxjc69xvbxg5kn5bc08gd960j6lb1x3grhcgmj9krm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -15,7 +15,6 @@ cabal.mkDerivation (self: { ]; testDepends = [ hspec hxt ]; jailbreak = true; - doCheck = false; meta = { homepage = "https://github.com/egonSchiele/HandsomeSoup"; description = "Work with HTML more easily in HXT"; diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix index 484aacb91f0..badf97bee4a 100644 --- a/pkgs/development/libraries/haskell/ReadArgs/default.nix +++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ systemFilepath text ]; testDepends = [ hspec systemFilepath text ]; + jailbreak = true; meta = { homepage = "http://github.com/rampion/ReadArgs"; description = "Simple command line argument parsing"; diff --git a/pkgs/development/libraries/haskell/Unixutils/default.nix b/pkgs/development/libraries/haskell/Unixutils/default.nix index baabbbc6546..c776686509b 100644 --- a/pkgs/development/libraries/haskell/Unixutils/default.nix +++ b/pkgs/development/libraries/haskell/Unixutils/default.nix @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { sha256 = "1gp04mc6irycwazykl9kpyhkkryn3hbnpn08ih6cjbsm3p8yi8b4"; buildDepends = [ filepath pureMD5 regexTdfa zlib ]; meta = { - homepage = "http://src.seereason.com/haskell-unixutils"; + homepage = "https://github.com/seereason/haskell-unixutils"; description = "A crude interface between Haskell and Unix-like operating systems"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index c96fab45c19..ea1f896d78c 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "cabal-cargs"; - version = "0.7.3"; - sha256 = "10707nja5j9hbx5yj7pq8s9zgfx21n36r4xhs71g70g6hwpciqjb"; + version = "0.7.4"; + sha256 = "0dar64xk3bcccyaz2b9v1qc8y63vrm60vb54k8c4n1j6cqzcdp8h"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index 77afe64bd38..7416e001d1b 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cabal-lenses"; - version = "0.4"; - sha256 = "19ryd1qvsc301kdpk0zvw89aqhvk26ccbrgddm9j5m31mn62jl2d"; + version = "0.4.1"; + sha256 = "0gkd82g6q8ahrrfmnjzr4r9n5cgdmhpxkqvnsy50k043v0faa0cx"; buildDepends = [ Cabal lens unorderedContainers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/cairo/0.12.5.3.nix b/pkgs/development/libraries/haskell/cairo/0.12.5.3.nix deleted file mode 100644 index 5ff7b64d2ea..00000000000 --- a/pkgs/development/libraries/haskell/cairo/0.12.5.3.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String -, zlib -}: - -cabal.mkDerivation (self: { - pname = "cairo"; - version = "0.12.5.3"; - sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7"; - buildDepends = [ mtl utf8String ]; - buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ cairo libc pkgconfig zlib ]; - pkgconfigDepends = [ cairo ]; - meta = { - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Cairo library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cairo/0.13.0.4.nix b/pkgs/development/libraries/haskell/cairo/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/cairo/0.13.0.4.nix rename to pkgs/development/libraries/haskell/cairo/default.nix diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index e19cac2b2ec..304ba2d0cb0 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cgrep"; - version = "6.4.6"; - sha256 = "13plsh6411k273qllpkcrkakwxcdmw0p6arj0j3gdqa7bbxii99s"; + version = "6.4.7"; + sha256 = "1937dvd69igx41sp1ljpghwqz0ki436pv0xmwz6bq1vny0axwmp7"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix index 2d4db2cdc4d..f5523a5a2b5 100644 --- a/pkgs/development/libraries/haskell/colors/default.nix +++ b/pkgs/development/libraries/haskell/colors/default.nix @@ -4,13 +4,14 @@ cabal.mkDerivation (self: { pname = "colors"; - version = "0.1.1"; - sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm"; + version = "0.2"; + sha256 = "009qkab6m1gnvxc23ayhv5h2v9mpiji5hasiym7a8nm69p8678xa"; buildDepends = [ profunctors ]; meta = { homepage = "https://github.com/fumieval/colors"; description = "A type for colors"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 7386c249494..0f237e12cb0 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.3.0"; - sha256 = "1ggdzll71a05743x3a8y1n43ais85simlqsng9da2z3qa42a9dz9"; + version = "0.3.0.4"; + sha256 = "1aphk79r3ibpb9gykdnz55isp7kf48jhz4h4vgplb0ndbmz8f8zm"; buildDepends = [ base16Bytestring base64Bytestring chunkedData conduit conduitExtra monadControl monoTraversable mwcRandom primitive resourcet diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 4c9038c05ca..b9ddeec104f 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.4.1"; - sha256 = "18q2d9ga49gldw4i8a5vnncsr712b21ik0160gdw3czqilvf8nbr"; + version = "1.1.4.2"; + sha256 = "0s2ggca6g2104dylbrkn090xwsfrp0946bhwf7fgpfpg9gi1sz1g"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 53f7e05a671..327fbfe5bc6 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.2.2"; - sha256 = "04wx9c7lybqmrvhw8h6zb9vp5qyqfs9p7a9a2m2yicf1p3p0q4n8"; + version = "1.2.2.2"; + sha256 = "0jabdv91zc64bwk709hkpjd7n4gy2cmsv2dhr5ydv35whmkhyry2"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index b63f6a44108..c7c3f2590a7 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.5.4"; - sha256 = "1z628gj4sf50s7pd6p41c670rz98f8b6p3n2dvl93haczcg53l1n"; + version = "0.5.5"; + sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf"; buildDepends = [ cereal conduit conduitExtra cryptoApi resourcet transformers ]; diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index d24af97f4f2..dfcf9bec757 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cufft"; - version = "0.1.0.3"; - sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi"; + version = "0.1.1.0"; + sha256 = "0d13nf61698gzh0hcycx1z9bm2xpikkg27bjymsjhfwimvqn7z8h"; buildDepends = [ cuda ]; buildTools = [ c2hs ]; meta = { diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index d2fb0964dd9..f7e7cead1ac 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -1,16 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, exceptions, free, monadControl, MonadRandom, mtl -, semigroupoids, semigroups, transformers, transformersBase +{ cabal, bifunctors, exceptions, free, monadControl, MonadRandom +, mtl, profunctors, semigroupoids, semigroups, transformers +, transformersBase }: cabal.mkDerivation (self: { pname = "either"; - version = "4.3.1"; - sha256 = "1k7aqy3k0ivpbqhym79q49dx41gnrkn1nw2inkm6gv8dy7bj9h6x"; + version = "4.3.2"; + sha256 = "0bmw4qc263fs5ivf94qfzrq26v8kflb13gims7c474d4jhg8g0w1"; buildDepends = [ - exceptions free monadControl MonadRandom mtl semigroupoids - semigroups transformers transformersBase + bifunctors exceptions free monadControl MonadRandom mtl profunctors + semigroupoids semigroups transformers transformersBase ]; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6"; meta = { diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index 0e03c34da01..3b40f5959f7 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "entropy"; - version = "0.3.4"; - sha256 = "1khfvrk49zf0rd90d34983048mxy093ci2qk8866qq0hwi53b0q0"; + version = "0.3.4.1"; + sha256 = "10myxs2a7838sywnlfggpsd7lmvzphl10zdh1vbbi18n3x79gyk0"; meta = { homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix index 30d066e3b2e..dfbdf73a2ae 100644 --- a/pkgs/development/libraries/haskell/extra/default.nix +++ b/pkgs/development/libraries/haskell/extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "extra"; - version = "0.7"; - sha256 = "11839h4915xjgmz8av60pn8qaw3b0ckbpw4l9nq5a77qb9rgpbfs"; + version = "0.8"; + sha256 = "06ydgniar294i9xzviz7qmr3xpnlkpvyvgigwxqfz50kv77w8ijw"; buildDepends = [ filepath time ]; testDepends = [ filepath QuickCheck time ]; meta = { diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index d912f1c56bb..86e344dc2ca 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -1,18 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, caseInsensitive, conduit, cryptohash -, dataDefault, failure, hashable, HTTP, httpConduit, httpTypes -, network, text, time, unorderedContainers, vector +{ cabal, aeson, attoparsec, base16Bytestring, byteable +, caseInsensitive, conduit, cryptohash, dataDefault, failure +, hashable, HTTP, httpConduit, httpTypes, network, text, time +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "github"; - version = "0.11.1"; - sha256 = "0s94ivp3c40zhwwfxa6nzzgwh2frfih8as81i0kidx4ca35wf92k"; + version = "0.13"; + sha256 = "1vvfrlz6p43mrzskvhp9skh6xbgd5pqcn06wvxw31plpamf5pmzn"; buildDepends = [ - aeson attoparsec caseInsensitive conduit cryptohash dataDefault - failure hashable HTTP httpConduit httpTypes network text time - unorderedContainers vector + aeson attoparsec base16Bytestring byteable caseInsensitive conduit + cryptohash dataDefault failure hashable HTTP httpConduit httpTypes + network text time unorderedContainers vector ]; meta = { homepage = "https://github.com/fpco/github"; diff --git a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix index 6d2af558706..287f98d661d 100644 --- a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { description = "Libgit2 backend for gitlib"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/development/libraries/haskell/gitlib-test/default.nix b/pkgs/development/libraries/haskell/gitlib-test/default.nix index 38e1cbc36e7..e8ab6aca6cf 100644 --- a/pkgs/development/libraries/haskell/gitlib-test/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-test/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/glib/0.12.5.4.nix b/pkgs/development/libraries/haskell/glib/0.12.5.4.nix deleted file mode 100644 index c819af766c2..00000000000 --- a/pkgs/development/libraries/haskell/glib/0.12.5.4.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, utf8String -}: - -cabal.mkDerivation (self: { - pname = "glib"; - version = "0.12.5.4"; - sha256 = "1jbqfcsmsghq67lwnk6yifs34lxvh6xfbzxzfryalifb4zglccz6"; - buildDepends = [ utf8String ]; - buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ libc pkgconfig ]; - pkgconfigDepends = [ glib ]; - patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./gtk2hs.patch ]; - meta = { - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the GLIB library for Gtk2Hs"; - license = self.stdenv.lib.licenses.lgpl21; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/glib/0.13.0.5.nix b/pkgs/development/libraries/haskell/glib/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/glib/0.13.0.5.nix rename to pkgs/development/libraries/haskell/glib/default.nix diff --git a/pkgs/development/libraries/haskell/glib/gtk2hs.patch b/pkgs/development/libraries/haskell/glib/gtk2hs.patch deleted file mode 100644 index 210cf2eb571..00000000000 --- a/pkgs/development/libraries/haskell/glib/gtk2hs.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Hamish Mackenzie -Date: Mon Jul 7 21:28:50 2014 +1200 - - Fixes #1 - ---- a/glib.cabal.orig 2014-11-03 14:52:40.000000000 -0600 -+++ b/glib.cabal 2014-11-03 14:52:51.000000000 -0600 -@@ -36,6 +36,7 @@ - utf8-string >= 0.2 && < 0.4, - containers - build-tools: gtk2hsC2hs >= 0.13.8 -+ cpp-options: -U__BLOCKS__ -D__attribute__(A)= - if flag(closure_signals) - cpp-options: -DUSE_GCLOSURE_SIGNALS_IMPL - c-sources: System/Glib/hsgclosure.ccommit aa22754e04616c354557fc350f96a8f7f331e984 diff --git a/pkgs/development/libraries/haskell/gtk/0.12.5.7.nix b/pkgs/development/libraries/haskell/gtk/0.12.5.7.nix deleted file mode 100644 index 34c1480c8c3..00000000000 --- a/pkgs/development/libraries/haskell/gtk/0.12.5.7.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango -, pkgconfig, text -}: - -cabal.mkDerivation (self: { - pname = "gtk"; - version = "0.12.5.7"; - sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w"; - buildDepends = [ cairo gio glib mtl pango text ]; - buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ libc pkgconfig ]; - pkgconfigDepends = [ glib gtk ]; - patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./gtk.patch ]; - meta = { - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ graphical user interface library"; - license = self.stdenv.lib.licenses.lgpl21; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/gtk/0.13.0.3.nix b/pkgs/development/libraries/haskell/gtk/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/gtk/0.13.0.3.nix rename to pkgs/development/libraries/haskell/gtk/default.nix diff --git a/pkgs/development/libraries/haskell/gtk/gtk.patch b/pkgs/development/libraries/haskell/gtk/gtk.patch deleted file mode 100644 index 242552950df..00000000000 --- a/pkgs/development/libraries/haskell/gtk/gtk.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/gtk.cabal.orig 2014-11-03 15:13:42.000000000 -0600 -+++ b/gtk.cabal 2014-11-03 15:14:05.000000000 -0600 -@@ -148,6 +148,7 @@ - - build-tools: gtk2hsC2hs >= 0.13.8, - gtk2hsHookGenerator, gtk2hsTypeGen -+ cpp-options: -U__BLOCKS__ -D__attribute__(A)= - - exposed-modules: - Graphics.UI.Gtk diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index d77479ff058..d5ee69f5f0d 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.9"; - sha256 = "025j6d97nwjhhyhdz7bsfhzgpb1ld28va4r8yv7zfh1dvczs6lkr"; + version = "0.5.11"; + sha256 = "0jfgz4cyn6fylfrsk1yi0fykir8mhxdniq80h7hy5i2xv7qwf5vw"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix index 6de6e25b4b6..ec88bb0f174 100644 --- a/pkgs/development/libraries/haskell/hoauth2/default.nix +++ b/pkgs/development/libraries/haskell/hoauth2/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoauth2"; - version = "0.4.2"; - sha256 = "08vdrgzn1j02gn2j5apjhnv2lgp7i8xhvibqjcjf4l80spmja2h0"; + version = "0.4.3"; + sha256 = "1qmhk9h3rwp29dsjqbgsma4zgzdd6cw1jcryzd17rk32biiiylvg"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index 068aed9ff89..6eeb6f36f89 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.6.2"; - sha256 = "02v32gh5has3y8qk55cpdr0336n2hi33d5aw0ifpg84p89k8kr33"; + version = "0.6.3"; + sha256 = "0pmlspz09qj8zb1qpv6dxd25l69hh2ccsyvc37914dis74g9rw03"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix new file mode 100644 index 00000000000..454f7c55bc7 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-core/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ansiTerminal, async, deepseq, ghcPaths, hspecExpectations +, hspecMeta, HUnit, QuickCheck, quickcheckIo, random, setenv +, silently, tfRandom, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "hspec-core"; + version = "2.0.1"; + sha256 = "1yr2hkr1p95bpj5n6hqw20g8imqal6pva4nrvy0hmxdg53jyxcf7"; + buildDepends = [ + ansiTerminal async deepseq hspecExpectations HUnit QuickCheck + quickcheckIo random setenv tfRandom time transformers + ]; + testDepends = [ + ansiTerminal async deepseq ghcPaths hspecExpectations hspecMeta + HUnit QuickCheck quickcheckIo random setenv silently tfRandom time + transformers + ]; + meta = { + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix new file mode 100644 index 00000000000..b8af52ee87d --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-discover/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, hspecMeta }: + +cabal.mkDerivation (self: { + pname = "hspec-discover"; + version = "2.0.1"; + sha256 = "0k54j1id5yj60kjxs16w4hr52wanc55l131arypcjgf9w4yx3x3w"; + isLibrary = true; + isExecutable = true; + buildDepends = [ filepath ]; + testDepends = [ filepath hspecMeta ]; + noHaddock = true; + meta = { + homepage = "http://hspec.github.io/"; + description = "Automatically discover and run Hspec tests"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index c0527d380b9..8a10a300146 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations -, HUnit, QuickCheck, quickcheckIo, random, setenv, tfRandom, time +, HUnit, QuickCheck, quickcheckIo, random, setenv, time , transformers }: cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.12.3"; - sha256 = "106wzvramjw18a2wvmfik3z47zshq7yalgax389gx340g3wnrfp7"; + version = "2.0.0"; + sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal async deepseq filepath hspecExpectations HUnit - QuickCheck quickcheckIo random setenv tfRandom time transformers + QuickCheck quickcheckIo random setenv time transformers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 0848aabb515..58b0022d3b3 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,26 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths -, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, stringbuilder, tfRandom, time -, transformers +{ cabal, hspecCore, hspecDiscover, hspecExpectations, hspecMeta +, QuickCheck, stringbuilder, transformers }: cabal.mkDerivation (self: { pname = "hspec"; - version = "1.12.3"; - sha256 = "0lqihgsk46lwm4k2nc81pbi1gdfk7qnmjli90bvf4pbbhg5igjkn"; - isLibrary = true; - isExecutable = true; + version = "2.0.1"; + sha256 = "05kwxn5sws8gc1v8im2pyirrj5bzc6lnj22q2klgj4mg3apjd0jb"; buildDepends = [ - ansiTerminal async deepseq filepath hspecExpectations HUnit - QuickCheck quickcheckIo random setenv tfRandom time transformers - ]; - testDepends = [ - ansiTerminal async deepseq filepath ghcPaths hspecExpectations - hspecMeta HUnit QuickCheck quickcheckIo random setenv silently - stringbuilder tfRandom time transformers + hspecCore hspecDiscover hspecExpectations QuickCheck transformers ]; + testDepends = [ hspecCore hspecMeta QuickCheck stringbuilder ]; doCheck = false; meta = { homepage = "http://hspec.github.io/"; diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index 8411bdff144..c833b80bb9f 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -1,31 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, async, deepseq, filepath, ghcPaths -, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, stringbuilder, tfRandom, time -, transformers -}: +{ cabal, hspec, hspecDiscover }: cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.5.1"; - sha256 = "1ax507vb0zm5jalp6pvlk1fjfil766pf7w61d1igpxr0s00lnvlq"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - ansiTerminal async deepseq filepath hspecExpectations HUnit - QuickCheck quickcheckIo random setenv tfRandom time transformers - ]; - testDepends = [ - ansiTerminal async deepseq filepath ghcPaths hspecExpectations - hspecMeta HUnit QuickCheck quickcheckIo random setenv silently - stringbuilder tfRandom time transformers - ]; + version = "0.6.1"; + sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4"; + buildDepends = [ hspec hspecDiscover ]; meta = { homepage = "http://hspec.github.io/"; description = "Alpha version of Hspec 2.0"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/labeled-tree/default.nix b/pkgs/development/libraries/haskell/labeled-tree/default.nix new file mode 100644 index 00000000000..dd6ea9e7af3 --- /dev/null +++ b/pkgs/development/libraries/haskell/labeled-tree/default.nix @@ -0,0 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "labeled-tree"; + version = "1.0.0.0"; + sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7"; + meta = { + description = "Labeled tree structure"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix index 26a9bfdad2d..a873616f3c0 100644 --- a/pkgs/development/libraries/haskell/libjenkins/default.nix +++ b/pkgs/development/libraries/haskell/libjenkins/default.nix @@ -1,24 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, conduit, doctest, exceptions, filepath, free, hspec -, hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens -, monadControl, network, networkUri, resourcet, text, transformers -, xmlConduit +{ cabal, async, attoparsec, doctest, filepath, free, hspec +, hspecExpectationsLens, httpClient, httpClientTls, httpTypes, lens +, liftedAsync, liftedBase, monadControl, mtl, network, networkUri +, profunctors, text, transformers, xmlConduit }: cabal.mkDerivation (self: { pname = "libjenkins"; - version = "0.5.0"; - sha256 = "010gid9r3kcajijg7x56c77l93vlbh7fy7akjrg7b73i4zy6jnl7"; + version = "0.6.0"; + sha256 = "0rcqmj5myi2wy2acd59gqdfwiiapw1zwzm71bjqb1y66z0rnrkx4"; buildDepends = [ - async conduit exceptions free httpClient httpConduit httpTypes lens - monadControl network networkUri resourcet text transformers - xmlConduit + attoparsec free httpClient httpClientTls httpTypes liftedAsync + liftedBase monadControl mtl network networkUri profunctors text + transformers ]; testDepends = [ - async conduit doctest exceptions filepath free hspec - hspecExpectationsLens httpClient httpConduit httpTypes lens - monadControl network networkUri resourcet text transformers + async attoparsec doctest filepath free hspec hspecExpectationsLens + httpClient httpClientTls httpTypes lens liftedAsync liftedBase + monadControl mtl network networkUri profunctors text transformers xmlConduit ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index 9f1883d3ef8..1a2f875b05c 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.11.3"; - sha256 = "12a3qfkyb4h14630k312gpb5j7dxr38bqk5y2lnnafka8hcc6w5n"; + version = "1.13"; + sha256 = "1gad6dvri7a21v8zx6m2m3ghcvb4zfrra3c4ghrc7ywccxvzmxpc"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/pango/0.12.5.3.nix b/pkgs/development/libraries/haskell/pango/0.12.5.3.nix deleted file mode 100644 index e95c590e354..00000000000 --- a/pkgs/development/libraries/haskell/pango/0.12.5.3.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig -, text -}: - -cabal.mkDerivation (self: { - pname = "pango"; - version = "0.12.5.3"; - sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a"; - buildDepends = [ cairo glib mtl text ]; - buildTools = [ gtk2hsBuildtools ]; - extraLibraries = [ libc pkgconfig ]; - pkgconfigDepends = [ cairo pango ]; - patches = self.stdenv.lib.optionals self.stdenv.isDarwin [ ./pango.patch ]; - meta = { - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Pango text rendering engine"; - license = self.stdenv.lib.licenses.lgpl21; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/pango/0.13.0.3.nix b/pkgs/development/libraries/haskell/pango/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/pango/0.13.0.3.nix rename to pkgs/development/libraries/haskell/pango/default.nix diff --git a/pkgs/development/libraries/haskell/pango/pango.patch b/pkgs/development/libraries/haskell/pango/pango.patch deleted file mode 100644 index af338cbe32c..00000000000 --- a/pkgs/development/libraries/haskell/pango/pango.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/pango.cabal.orig 2014-11-03 15:11:35.000000000 -0600 -+++ b/pango.cabal 2014-11-03 15:11:57.000000000 -0600 -@@ -52,6 +52,7 @@ - build-depends: base < 4 - - build-tools: gtk2hsC2hs >= 0.13.8, gtk2hsTypeGen -+ cpp-options: -U__BLOCKS__ -D__attribute__(A)= - - exposed-modules: Graphics.Rendering.Pango - Graphics.Rendering.Pango.Font diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix index ca849127e9d..177eb6e7d35 100644 --- a/pkgs/development/libraries/haskell/pipes-text/default.nix +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pipes-text"; - version = "0.0.0.13"; - sha256 = "1sqwrs5y9s16zikwb5w21fvrqf06ld0915kc065ikdcrd6z4sk43"; + version = "0.0.0.15"; + sha256 = "10906gdb9gjhxxmxvmib6kw7py6fl2r4df5bryqvbjvr1afcc3x9"; buildDepends = [ pipes pipesBytestring pipesGroup pipesParse pipesSafe streamingCommons text transformers diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix index ecc31e4266f..bcf4272ad7a 100644 --- a/pkgs/development/libraries/haskell/rethinkdb/default.nix +++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "rethinkdb"; - version = "1.15.2.0"; - sha256 = "1cca6nrdaia5dgq2ah6sfr9qy01iasilw7zdw6k8vp5907alsh0f"; + version = "1.15.2.1"; + sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5"; buildDepends = [ aeson base64Bytestring binary dataDefault mtl network scientific text time unorderedContainers utf8String vector diff --git a/pkgs/development/libraries/haskell/sdl2/default.nix b/pkgs/development/libraries/haskell/sdl2/default.nix index 3e6a6668585..2e3eeba018d 100644 --- a/pkgs/development/libraries/haskell/sdl2/default.nix +++ b/pkgs/development/libraries/haskell/sdl2/default.nix @@ -1,13 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, SDL2 }: +{ cabal, SDL2, transformers }: cabal.mkDerivation (self: { pname = "sdl2"; - version = "1.2.0"; - sha256 = "19q7x74b9ismxmlsblqvfy4w91bspl9n1fjccz8w1qylyilr6ca2"; + version = "1.3.0"; + sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa"; + buildDepends = [ transformers ]; extraLibraries = [ SDL2 ]; pkgconfigDepends = [ SDL2 ]; + noHaddock = true; meta = { description = "Low-level bindings to SDL2"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 251eb07d8aa..1ee2053c6a9 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "2.0.1.1"; - sha256 = "0xddm8xby19323d9bcd196b1ninlvfkv5b93w1da23m7w0hy509p"; + version = "2.0.2"; + sha256 = "18yzihkjxgchb4358pbm45xk9zcmpgbp3rr27mx08nj5n0mdkwyy"; buildDepends = [ aeson blazeHtml blazeMarkup exceptions parsec systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix index 5238fee7b9f..7745fa5ddbe 100644 --- a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, clientsession, configurator, errors +{ cabal, clientsession, configurator, errors, lens , MonadCatchIOTransformers, mtl, postgresqlSimple , resourcePoolCatchio, snap, text, transformers , unorderedContainers @@ -8,10 +8,10 @@ cabal.mkDerivation (self: { pname = "snaplet-postgresql-simple"; - version = "0.5"; - sha256 = "0pzn0lg1slrllrrx1n9s1kp1pmq2ahrkjypcwnnld8zxzvz4g5jm"; + version = "0.6"; + sha256 = "042mpyj84d089pr2qjix9fvzfj4ir74kjkdx3jg84jwn602lhzi6"; buildDepends = [ - clientsession configurator errors MonadCatchIOTransformers mtl + clientsession configurator errors lens MonadCatchIOTransformers mtl postgresqlSimple resourcePoolCatchio snap text transformers unorderedContainers ]; @@ -20,7 +20,5 @@ cabal.mkDerivation (self: { description = "postgresql-simple snaplet for the Snap Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 9853c4abd08..98048f503b7 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.14"; - sha256 = "1x5cricx2n1wwvdad4i3q8s3gb28a129v3kkj9rn9803xh43zh29"; + version = "0.3.15"; + sha256 = "06cnr3hzw8xd75529nfqajgb5xy5i4ddqybgjw1v1nwpq04mhihi"; buildDepends = [ systemFilepath text time ]; testDepends = [ chell systemFilepath temporary text time transformers diff --git a/pkgs/development/libraries/haskell/terminal-size/default.nix b/pkgs/development/libraries/haskell/terminal-size/default.nix index 4387ceb423e..d143a66713a 100644 --- a/pkgs/development/libraries/haskell/terminal-size/default.nix +++ b/pkgs/development/libraries/haskell/terminal-size/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "terminal-size"; - version = "0.2.1.0"; - sha256 = "0d41af1is3vdb1kgd8dk82fags86bgs67vkbzpdhjdwa3aimsxgn"; + version = "0.3.0"; + sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw"; meta = { description = "Get terminal window height and width"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index ffd2dc00b7d..a1b3cf56165 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.7"; - sha256 = "1xwfyhjkbdl19b7cpw12lgnjzqhpiqvfhag2l8zhks21yv0l3kg0"; + version = "0.0.8"; + sha256 = "16yxf9qdy1x2w4l4ix1kp1a9vcgmd1cvkqffkj52rzckcjpyd6fs"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index dd4051d28d7..bea079c6dae 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -5,14 +5,14 @@ , ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase , network, optparseApplicative, parsec, projectTemplate, resourcet , shakespeare, split, streamingCommons, systemFileio -, systemFilepath, tar, text, time, transformers, unixCompat -, unorderedContainers, wai, waiExtra, warp, yaml, zlib +, systemFilepath, tar, text, time, transformers, transformersCompat +, unixCompat, unorderedContainers, wai, waiExtra, warp, yaml, zlib }: cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.4.0.5"; - sha256 = "06rwmcag0vlj8q647mwimk5fsjfmrxc6d1yg95b7a2g48rh1m25x"; + version = "1.4.0.6"; + sha256 = "1sx8fwi191zzq4p4lmmvk430dgf0zkik01ckxnkswvazmbjlm5vj"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -20,8 +20,9 @@ cabal.mkDerivation (self: { dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit httpReverseProxy httpTypes liftedBase network optparseApplicative parsec projectTemplate resourcet shakespeare split streamingCommons - systemFileio systemFilepath tar text time transformers unixCompat - unorderedContainers wai waiExtra warp yaml zlib + systemFileio systemFilepath tar text time transformers + transformersCompat unixCompat unorderedContainers wai waiExtra warp + yaml zlib ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index c93f238a66a..49d6421d7c4 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.4.3"; - sha256 = "1mglavffzvav4dzwqq70agz5rd4bdb66p40qa445fq1dxwbwcq6i"; + version = "1.4.3.1"; + sha256 = "11zds9zh6vpc83vv8aizd8vm5ajlnqdha5l0rz35n75c21iygg3w"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie dataDefault deepseq diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 75cde938219..09fda53aa90 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.4.0.3"; - sha256 = "00rg8q5qwyp7aa409d8ir09vgbvwa9qxkgcjpwqa4lp3ncbpiw9j"; + version = "1.4.1"; + sha256 = "10z88ki694z0kzbg84gaj10h8s9hrj5ghgbxq4y486nvmp4px8f1"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix new file mode 100644 index 00000000000..b2928683184 --- /dev/null +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "commons-bsf-1.2"; + + src = fetchurl { + url = mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz; + sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8"; + }; + + installPhase = '' + mkdir -p $out/share/java + cp lib/bsf.jar $out/share/java/ + ''; + + meta = { + description = "Interface to scripting languages, including JSR-223"; + homepage = http://commons.apache.org/proper/commons-bsf/; + license = stdenv.lib.licenses.asl20; + }; +} + diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix new file mode 100644 index 00000000000..ee407470202 --- /dev/null +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "commons-logging-1.2"; + + src = fetchurl { + url = mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz; + sha256 = "1gc70pmcv0x6ibl89jglmr22f8zpr63iaifi49nrq399qw2qhx9z"; + }; + + installPhase = '' + mkdir -p $out/share/java + cp commons-logging-*.jar $out/share/java/ + ''; + + meta = { + description = "Wrapper around a variety of logging API implementations"; + homepage = http://commons.apache.org/proper/commons-logging; + license = stdenv.lib.licenses.asl20; + }; +} + diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index d739b094874..24017d6f1c4 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: +{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext }: stdenv.mkDerivation rec { name = "libgphoto2-${meta.version}"; @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; sha256 = "0ij80nixichihv3iic7cgdq3irssk8waz1c25m6yypjl4kg6n3k0"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg ]; + buildInputs = [ libtool libjpeg libusb1 ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb libexif ]; + propagatedBuildInputs = [ libexif ]; meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; @@ -20,12 +20,13 @@ stdenv.mkDerivation rec { longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. + from digital cameras. ''; version = "2.5.5.1"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } + diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index ac06b4893f1..efdbc6e22a7 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -1,16 +1,12 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, pkgconfig, libusb1}: stdenv.mkDerivation { - name = "libusb-0.1.12"; + name = "libusb-compat-0.1.5"; - # On non-linux, we get warnings compiling, and we don't want the - # build to break. - patchPhase = '' - sed -i s/-Werror// Makefile.in - ''; + buildInputs = [ pkgconfig libusb1 ]; src = fetchurl { - url = mirror://sourceforge/libusb/libusb-0.1.12.tar.gz; - sha256 = "0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip"; + url = mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2; + sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0"; }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix new file mode 100644 index 00000000000..3a22ecb73fc --- /dev/null +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }: + +stdenv.mkDerivation rec { + version = "3.11.9"; + name = "ipopt-${version}"; + + src = fetchurl { + url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; + sha256 = "0sji4spl5dhw1s3f9y0ym09gi7d1c8wldn6wbiap4q8dq7cvklq5"; + }; + + nativeBuildInputs = [ unzip ]; + + buildInputs = [ gfortran blas liblapack ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A software package for large-scale nonlinear optimization"; + homepage = https://projects.coin-or.org/Ipopt; + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 91b8a0c2bb0..6452bd5d95a 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -12,6 +12,9 @@ shift export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS +test -n "$NIX_LISP_LD_LIBRARY_PATH" && + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH" + case "$NIX_LISP" in sbcl) NIX_LISP_LOAD_FILE="--load" diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 675fc7e7468..bb6baddc47d 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -1,5 +1,5 @@ args @ {stdenv, clwrapper, baseName, version ? "latest", src, description, deps, - buildInputs ? [], meta ? {}, overrides?(x: {})}: + buildInputs ? [], meta ? {}, overrides?(x: {}), propagatedBuildInputs ? []}: let deployConfigScript = '' config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh @@ -38,7 +38,8 @@ basePackage = { ${deployConfigScript} ${deployLaunchScript} ''; - propagatedBuildInputs = args.deps ++ [clwrapper clwrapper.lisp]; + propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp] + ++ (args.propagatedBuildInputs or []); buildInputs = buildInputs; dontStrip=true; meta = { diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh index 61c00eb92ae..742e880c4f1 100755 --- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh @@ -2,10 +2,16 @@ name="$1" -nix-instantiate "$(dirname "$0")"/../../../../ -A "lispPackages.$name" > /dev/null && exit -[ "$NIX_LISP_PACKAGES_DEFINED" != "${NIX_LISP_PACKAGES_DEFINED/$name/@@}" ] && exit +[ -z "$NIX_LISP_PACKAGES_DEFINED_LIST" ] && export NIX_LISP_PACKAGES_DEFINED_LIST="$(mktemp)" -NIX_LISP_PACKAGES_DEFINED="$NIX_LISP_PACKAGES_DEFINED $1 " +if [ -n "$NIX_LISP_UPDATE_PACKAGE" ] || [ -n "$NIX_LISP_UPDATE_PACKAGES" ]; then + export NIX_LISP_UPDATE_PACKAGE= +else + nix-instantiate "$(dirname "$0")"/../../../../ -A "lispPackages.$name" > /dev/null && exit +fi +grep "^$name\$" "$NIX_LISP_PACKAGES_DEFINED_LIST" > /dev/null && exit + +echo "$name" >> "$NIX_LISP_PACKAGES_DEFINED_LIST" [ -z "$NIX_QUICKLISP_DIR" ] && { export NIX_QUICKLISP_DIR="$(mktemp -d --tmpdir nix-quicklisp.XXXXXX)" @@ -26,14 +32,39 @@ ql_src="$(curl -L https://github.com/quicklisp/quicklisp-projects/raw/master/"$n ql_src_type="${ql_src%% *}" url="${ql_src##* }" +[ "$ql_src_type" = "kmr-git" ] && { + ql_src_type=git + url="http://git.b9.com/$url.git" + export NIX_PREFETCH_GIT_DEEP_CLONE=1 +} + +[ "$ql_src_type" = ediware-http ] && { + ql_src_type=github + url="edicl/$url"; +} + +[ "$ql_src_type" = xach-http ] && { + ql_src_type=github + url="xach/$url"; +} + +[ "$ql_src_type" = github ] && { + ql_src_type=git + url="https://github.com/$url"; + version="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)" + rev="refs/tags/$version"; +} + [ "$ql_src_type" = git ] && { fetcher="pkgs.fetchgit" - [ "${url#git://github.com/}" != "$url" ] && { + ( [ "${url#git://github.com/}" != "$url" ] || + [ "${url#https://github.com/}" != "$url" ] + ) && { url="${url/git:/https:}" url="${url%.git}" - rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) - hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev") - version="git-$(date +%Y%m%d)"; + [ -z "$rev" ] && rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) + hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | grep . | tail -n 1) + [ -z "$version" ] && version="git-$(date +%Y%m%d)"; } [ "${url#git://common-lisp.net/}" != "$url" ] && { http_repo_url="$url" @@ -41,8 +72,26 @@ url="${ql_src##* }" http_repo_url="${http_repo_url/\/projects\// /r/projects/}" http_repo_head="$http_repo_url/refs/heads/master" echo "$http_repo_head" >&2 - rev=$(curl -L "$http_repo_head"); + [ -z "$rev" ] && rev=$(curl -L "$http_repo_head"); hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev") + [ -z "$version" ] && version="git-$(date +%Y%m%d)"; + } + [ "${url#http://git.b9.com/}" != "$url" ] && { + http_repo_url="$url" + http_repo_url="${http_repo_url/git:/http:}" + http_repo_head="$http_repo_url/refs/heads/master" + echo "$http_repo_head" >&2 + rev=$(curl -L "$http_repo_head"); + hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | tail -n 1) + version="git-$(date +%Y%m%d)"; + } + [ "${url#http://common-lisp.net/}" != "$url" ] && { + http_repo_url="$url" + http_repo_url="${http_repo_url/git:/http:}" + http_repo_head="$http_repo_url/refs/heads/master" + echo "$http_repo_head" >&2 + rev=$(curl -L "$http_repo_head"); + hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | tail -n 1) version="git-$(date +%Y%m%d)"; } } @@ -57,13 +106,58 @@ url="${ql_src##* }" unset url } -cat << EOF +[ "$ql_src_type" = clnet-darcs ] && { + ql_src_type=darcs + url="http://common-lisp.net/project/$url/darcs/$url/" +} + +[ "$ql_src_type" = darcs ] && { + fetcher="pkgs.fetchdarcs" + [ -z "$version" ] && + version="$(curl "$url/_darcs/inventory" | grep '\[TAG ' | tail -n 1 | sed -e 's/.* //')" + [ -z "$version" ] && + version="$(curl "$url/_darcs/hashed_inventory" | grep '\[TAG ' | tail -n 1 | sed -e 's/.* //')" + rev="$version"; + hash=$(echo " + with (import {}); + fetchdarcs { + url=''$url''; + rev=''$version''; + sha256=''0000000000000000000000000000000000000000000000000000000000000000''; + }" | nix-instantiate - | tail -n 1 | + xargs nix-store -r 2>&1 | tee /dev/stderr | grep 'instead has' | tail -n 1 | + sed -e 's/.* instead has .//;s/[^0-9a-z].*//') +} + +[ "$ql_src_type" = froydware-http ] && { + dirurl = "http://method-combination.net/lisp/files/"; + url="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$dirurl" | grep "/$url_" | tail -n 1)" + ql_src_type=http +} + +[ "$ql_src_type" = http ] && { + fetcher="pkgs.fetchurl"; + version="$(echo "$url" | sed -re 's@.*-([0-9.]+)[-._].*@\1@')" + hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)" +} + +[ "$ql_src_type" = https ] && { + fetcher="pkgs.fetchurl"; + version="$(echo "$url" | sed -re 's@.*-([0-9.]+)[-._].*@\1@')" + hash="$(nix-prefetch-url "$url" | grep . | tail -n 1)" +} + +if [ "$ql_src" = '{"error":"Not Found"}' ]; then + echo "# $name: not found" +else +cat << EOF | grep -Ev '^[ ]+$' $name = buildLispPackage rec { baseName = "$name"; version = "${version:-\${Set me //}"; description = "$description"; deps = [$dependencies]; + # Source type: $ql_src_type src = ${fetcher:-pkgs.fetchurl} { ${url:+url = ''$url'';} sha256 = "${hash:-0000000000000000000000000000000000000000000000000000000000000000}"; @@ -74,5 +168,6 @@ cat << EOF }; }; EOF +fi for i in $dependencies; do "$0" "$i"; done diff --git a/pkgs/development/lisp-modules/iterate.darcs-context b/pkgs/development/lisp-modules/iterate.darcs-context new file mode 100644 index 00000000000..533faaec8e7 --- /dev/null +++ b/pkgs/development/lisp-modules/iterate.darcs-context @@ -0,0 +1,116 @@ + +Context: + +[make the #L reader macro standard conformant by not assuming anything about the representation of quasiquoted forms. +Douglas Katzman **20140423044759 + Ignore-this: ccdda48acdf7b2033ac0f51ed48582fc +] + +[fix for test for.previous.var-with-type-declaration +Jan Moringen **20140129144214 + Ignore-this: a617d046d90816827d370d3bbf38d2df +] + +[housekeeping +attila.lendvai@gmail.com**20140129143709 + Ignore-this: a05c5fbace98b282a464b829711e064f +] + +[added test for.previous.var-with-type-declaration +attila.lendvai@gmail.com**20140129143435 + Ignore-this: 6e9f419e118724c660d519c3fa9f8dd2 +] + +[added a restart to remove conflicting clauses +Russ Tyndall **20120508185107 + Ignore-this: b7c4c6eec565dd435b8e9e5403fcb0a8 +] + +[added new failing test bug/collect-at-beginning, as reported by Paul Sexton +attila.lendvai@gmail.com**20121218144220 + Ignore-this: d55e7c22deeaf89b90d03d7ef01179d6 +] + +[Fix: If both AT BEGINNING and RESULT-TYPE are specified, RESULT-TYPE was ignored. +attila.lendvai@gmail.com**20120509225435 + Ignore-this: 20cf116df585ffedfbe63ce7a4092249 + + Patched by Ilya Perminov +] + +[fix package nickname in case sensitive mode +attila.lendvai@gmail.com**20110927152614 + Ignore-this: fb1ba1d418b4a20a0cd4e697d943a0e6 +] + +[move list-of-forms? out of the #L eval-when, because it's also used by other parts of iterate +attila.lendvai@gmail.com**20110119161133 + Ignore-this: 97545988c4a3eab02434f222120b1a1 +] + +[added bug/walk.2 +attila.lendvai@gmail.com**20100603093335 + Ignore-this: faa1bd48d0450e76652552bb47bcff02 +] + +[first-time-p bugfix: return-code :body must return list of forms +Joerg-Cyril Hoehle **20070525141533 + if-first-time not declared obsolete + documentation strings for (iter:display-iterate-clauses) complete +] + +[fix defmacro-driver example in manual +Joerg-Cyril Hoehle **20070525081443] + +[Use @:, @. and two spaces between sentences +Joerg-Cyril Hoehle **20070525080932 + Move section on predicate (first-time-p) outside of gathering clauses + Various typos and some clarifications +] + +[document *list-end-test* removal in FOR...IN+ON +Joerg-Cyril Hoehle **20070525074338] + +[Renamed back to sharpL-reader +attila.lendvai@gmail.com**20070506100744] + +[Fix sharpL reader, add :execute to the eval-when to make (load "iterate" :compiling t) work on clisp +attila.lendvai@gmail.com**20070506100704] + +[Convert manual to Texinfo. +Luis Oliveira **20060713142915] + +[make FOR...IN/ON with dotted lists work like LOOP +hoehle@users.sourceforge.net**20070503130604 + More precisely, FOR ON accepts dotted lists, FOR IN errors out. + As a result, iterate::*list-end-test* was eliminated. + Behaviour is now constant and does not depend on some special variable. + Note: Documentation not yet updated, pending move to Texinfo. +] + +[walk-tagbody: more testcases +Joerg-Cyril Hoehle **20070503095309] + +[walk-tagbody must not macroexpand symbol/tags among its statements +Joerg-Cyril Hoehle **20070404124132] + +[add ELSE test cases, remove GNU Arch tag +Joerg-Cyril Hoehle **20070503093008] + +[Clean up #L stuff, do not leave #L enabled after loading iterate +attila.lendvai@gmail.com**20070426153431] + +[Set *list-end-test* to 'endp instead of 'atom, so (iter (for foo :in something-non-list)) fails instead of silently exists +attila.lendvai@gmail.com**20070215151652] + +[wrap code in progns, to avoid possiblity of multiple nil tags in tagbody + Henrik Hjelte **20061025145324] + +[test to detect bug, more than one nil tag in tagbody + Henrik Hjelte **20061025145128] + +[Added release.sh +attila.lendvai@gmail.com**20060506155953] + +[TAG 1.4.3 +attila.lendvai@gmail.com**20060505134701] diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 2b4cda88ef8..de9f35cb87f 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -32,13 +32,13 @@ let lispPackages = rec { iterate = buildLispPackage rec { baseName = "iterate"; - version = "1.4.3"; + version = "darcs-2014-11-01"; description = "Iteration package for Common Lisp"; deps = []; src = pkgs.fetchdarcs { url = "http://common-lisp.net/project/iterate/darcs/iterate"; - sha256 = "0m3q0s7h5s8varwx584m2akgdslj14df7kg4w1bj1fbgzsag5m1w"; - rev = version; + sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; + context = ./iterate.darcs-context; }; overrides = x: { configurePhase="buildPhase(){ true; }"; @@ -66,8 +66,6 @@ let lispPackages = rec { url = "https://github.com/fb08af68/esrap-peg.git"; sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1"; rev = ''1f2f21e32e618f71ed664cdc5e7005f8b6b0f7c8''; - - }; }; @@ -78,7 +76,6 @@ let lispPackages = rec { deps = []; src = pkgs.fetchcvs { sha256 = "a574b7f9615232366e3e5e7ee400d60dbff23f6d0e1def5a3c77aafdfd786e6a"; - date = ''2013-10-28''; module = ''cl-unification''; cvsRoot = '':pserver:anonymous:anonymous@common-lisp.net:/project/cl-unification/cvsroot''; @@ -94,8 +91,409 @@ let lispPackages = rec { url = "https://github.com/scymtym/esrap.git"; sha256 = "c56616ac01be0f69e72902f9fd830a8af2c2fa9018b66747a5da3988ae38817f"; rev = ''c71933b84e220f21e8a509ec26afe3e3871e2e26''; - - + }; + }; + + clx-truetype = buildLispPackage rec { + baseName = "clx-truetype"; + version = "git-20141112"; + description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension."; + deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/filonenko-mikhail/clx-truetype''; + sha256 = "fe3d3923909a8f0a19298bfa366bb265c5155eed43d4dd315920535d15424d65"; + rev = ''6f72905c6886a656e5a1c8167097f12375c6da7d''; + }; + overrides = x:{ + configurePhase = "rm Makefile"; + }; + }; + + cl-fad = buildLispPackage rec { + baseName = "cl-fad"; + version = "v0.7.2"; + description = "Portable pathname library"; + deps = [alexandria bordeaux-threads]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/edicl/cl-fad''; + sha256 = "87917ab4af4f713ad41faa72c7eaed2872f8dac47f49c0668ba8782590fdbca4"; + rev = ''refs/tags/v0.7.2''; + }; + }; + + bordeaux-threads = buildLispPackage rec { + baseName = "bordeaux-threads"; + version = "0.8.3"; + description = "Bordeaux Threads makes writing portable multi-threaded apps simple"; + deps = [alexandria]; + # Source type: http + src = pkgs.fetchurl { + url = ''http://common-lisp.net/project/bordeaux-threads/releases/bordeaux-threads-0.8.3.tar.gz''; + sha256 = "0c3n7qsx4jc3lg8s0n9kxfvhhyl0s7123f3038nsb96rf0bvb5hy"; + }; + }; + + zpb-ttf = buildLispPackage rec { + baseName = "zpb-ttf"; + version = "release-1.0.3"; + description = "Access TrueType font metrics and outlines from Common Lisp"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/xach/zpb-ttf''; + sha256 = "3092a3ba9f27b091224d11c0ccfb09c9a4632ebfd6c3986df3147f19e53606f2"; + rev = ''refs/tags/release-1.0.3''; + }; + }; + + cl-store = buildLispPackage rec { + baseName = "cl-store"; + version = "git-20141112"; + description = "Serialization package"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/skypher/cl-store''; + sha256 = "7096ad38d5c77d58f7aa0ef8df1884411173c140408cb7967922b315ab505472"; + rev = ''2d2455c024fe64ee24cbf914c82254fa5bd09cab''; + }; + }; + + cl-vectors = buildLispPackage rec { + baseName = "cl-vectors"; + version = "git-20141112"; + description = "cl-paths: vectorial paths manipulation"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/fjolliton/cl-vectors''; + sha256 = "2d1428911cd2699513a0b886661e9b54d1edf78558277ac83723a22c7fc9dea7"; + rev = ''7b3e5d6a8abe3de307c1dc0c4347f4efa4f25f29''; + }; + }; + + trivial-features = buildLispPackage rec { + baseName = "trivial-features"; + version = "git-20141112"; + description = "Ensures consistent *FEATURES* across multiple CLs."; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/trivial-features/trivial-features''; + sha256 = "2006aebe0c2bfed1c39a2195639e221fdc52a443b6c8522e535cbef2370a07fc"; + rev = ''2b7cdc3b8073eb33655850b51223770b535da6d9''; + }; + }; + + clsql = buildLispPackage rec { + baseName = "clsql"; + version = "git-20141112"; + description = "Common Lisp SQL Interface library"; + deps = [uffi]; + buildInputs = [pkgs.mysql pkgs.zlib]; + # Source type: git + src = pkgs.fetchgit { + url = ''http://git.b9.com/clsql.git''; + sha256 = "dacd56bc9a0348e8101184bf154b971407a98f3a753d7cce34c7a44b4b19f8fd"; + rev = ''180b52cb686a87487e12e87b13bafe131e6c3bef''; + }; + overrides = x:{ + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql}/lib/mysql" + ''; + }; + }; + + uffi = buildLispPackage rec { + baseName = "uffi"; + version = "git-20141112"; + description = "Universal Foreign Function Library for Common Lisp"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://git.b9.com/uffi.git''; + sha256 = "219e4cfebfac251c922bcb9d517980b0988d765bd18b7f5cc765a43913aaacc6"; + rev = ''a63da5b764b6fa30e32fcda4ddac88de385c9d5b''; + }; + }; + + query-fs = buildLispPackage rec { + baseName = "query-fs"; + version = "git-20141113"; + description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; + deps = [bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/fb08af68/query-fs''; + sha256 = "4ed66f255e50d2c9ea9f0b3fbaa92bde9b8acf6a5fafb0d7f12b254be9de99e9"; + rev = ''831f0180967f09b1dd345fef82144f48334279c3''; + }; + }; + + cl-fuse = buildLispPackage rec { + baseName = "cl-fuse"; + version = "git-20141113"; + description = "CFFI bindings to FUSE (Filesystem in user space)"; + deps = [bordeaux-threads cffi cl-utilities iterate trivial-backtrace trivial-utf-8]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/fb08af68/cl-fuse''; + sha256 = "1l4ydxbwzlj6gkb1c9vc96rfbj951snaidpx10pxz4wdnzg3kq99"; + rev = ''6feffaa34a21cfc7890b25357284858f924e8cb3''; + }; + propagatedBuildInputs = [pkgs.fuse]; + overrides = x : { + configurePhase = '' + export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD" + export makeFlags="$makeFlags LISP=common-lisp.sh" + ''; + }; + }; + + cffi = buildLispPackage rec { + baseName = "cffi"; + version = "0.14.0"; + description = "The Common Foreign Function Interface"; + deps = [alexandria babel trivial-features]; + # Source type: http + src = pkgs.fetchurl { + url = ''http://common-lisp.net/project/cffi/releases/cffi_${version}.tar.gz''; + sha256 = "155igjh096vrp7n71c0xcg9qbcpj6547qjvzi9shxbpi6piw6fkw"; + }; + }; + + babel = buildLispPackage rec { + baseName = "babel"; + version = "git-20141113"; + description = "Babel, a charset conversion library."; + deps = [alexandria trivial-features]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/cl-babel/babel''; + sha256 = "abe7150f25ceb7eded520d95f1665a46f4233cf13b577fd02c3f6be54c32facc"; + rev = ''74b35ea79b769c4f9aefad933923778ffa7915ab''; + }; + }; + + cl-utilities = buildLispPackage rec { + baseName = "cl-utilities"; + version = "1.2.4"; + description = "A collection of Common Lisp utility functions"; + deps = []; + # Source type: http + src = pkgs.fetchurl { + url = ''http://common-lisp.net/project/cl-utilities/cl-utilities-${version}.tar.gz''; + sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87"; + }; + }; + + trivial-utf-8 = buildLispPackage rec { + baseName = "trivial-utf-8"; + version = "2011-09-08"; + description = "A UTF-8 encoding library"; + deps = []; + # Source type: darcs + src = pkgs.fetchdarcs { + url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; + sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; + }; + }; + + cl-fuse-meta-fs = buildLispPackage rec { + baseName = "cl-fuse-meta-fs"; + version = "git-20141113"; + description = "CFFI bindings to FUSE (Filesystem in user space)"; + deps = [bordeaux-threads cl-fuse iterate pcall]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/fb08af68/cl-fuse-meta-fs''; + sha256 = "259303effea61baf293ffc5d080cb071ef15bed8fa1c76f0c1631f68d2aa3c85"; + rev = ''d3d332471ce9330e3eaebf9d6cecdd2014c3599b''; + }; + }; + + pcall = buildLispPackage rec { + baseName = "pcall"; + version = "0.3"; + description = "Common Lisp library intended to simplify 'result-oriented' parallelism"; + deps = [bordeaux-threads]; + # Source type: http + src = pkgs.fetchgit { + url = ''https://github.com/marijnh/pcall''; + sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; + rev = "4e1ef32c33c2ca18fd8ab9afb4fa793c179a3578"; + }; + }; + + command-line-arguments = buildLispPackage rec { + baseName = "command-line-arguments"; + version = "git-20141113"; + description = "small library to deal with command-line arguments"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://common-lisp.net/project/qitab/git/command-line-arguments.git''; + sha256 = "91bb321e201034c35121860cb6ec05e39c6392d5906a52b9a2d33d0f76b06123"; + rev = ''121f303bbef9c9cdf37a7a12d8adb1ad4be5a6ae''; + }; + }; + + trivial-backtrace = buildLispPackage rec { + baseName = "trivial-backtrace"; + version = "git-2014-11-01"; + description = "trivial-backtrace"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://common-lisp.net/project/trivial-backtrace/trivial-backtrace.git''; + sha256 = "1ql80z0igsng32rbp24h81pj5c4l87c1ana6c9lx3dlqpixzl4kj"; + rev = ''48a6b081e00b0d85f1e001c7258393ed34d06bc9''; + }; + }; + + drakma = buildLispPackage rec { + baseName = "drakma"; + version = "v1.3.10"; + description = "Full-featured http/https client based on usocket"; + deps = [chipz chunga cl-ssl cl-base64 cl-ppcre flexi-streams puri usocket]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/edicl/drakma''; + sha256 = "0ecc37c9d5cc91a3b86746c4f20c0b1609969db01041df04ff6a9df1d021b30a"; + rev = ''refs/tags/v1.3.10''; + }; + }; + + chipz = buildLispPackage rec { + baseName = "chipz"; + version = "git-20141113"; + description = "A library for decompressing deflate, zlib, and gzip data"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/froydnj/chipz''; + sha256 = "73ae22d58b6db5b2c86af4a465260e48a5aca19827d2b7329e2870c1148da8e2"; + rev = ''3402c94df1d0af7742df08d3ffa23fd5c04c9bf2''; + }; + }; + + chunga = buildLispPackage rec { + baseName = "chunga"; + version = "v1.1.5"; + description = "Portable chunked streams"; + deps = [trivial-gray-streams]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/edicl/chunga''; + sha256 = "5d045882be34b158185c491da85cfd4671f456435c9ff8fa311a864f633b0446"; + rev = ''refs/tags/v1.1.5''; + }; + }; + + trivial-gray-streams = buildLispPackage rec { + baseName = "trivial-gray-streams"; + version = "git-20141113"; + description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)."; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/trivial-gray-streams/trivial-gray-streams''; + sha256 = "8d5c041f95eb31aa313adc433edf91bb14656400cae1e0ec98ad7ed085bb7954"; + rev = ''0483ade330508b4b2edeabdb47d16ec9437ee1cb''; + }; + }; + + cl-ssl = buildLispPackage rec { + baseName = "cl+ssl"; + version = "git-20141113"; + description = "Common Lisp interface to OpenSSL."; + deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/cl-plus-ssl/cl-plus-ssl''; + sha256 = "6b99fc49ac38e49ee69a47ce5791606b8b811c01e5563bfd3164d393db6c4040"; + rev = ''f8695c5df48ebc3557f76a8a08dd96429bdf8df2''; + }; + propagatedBuildInputs = [pkgs.openssl]; + }; + + flexi-streams = buildLispPackage rec { + baseName = "flexi-streams"; + version = "v1.0.13"; + description = "Flexible bivalent streams for Common Lisp"; + deps = [trivial-gray-streams]; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/edicl/flexi-streams''; + sha256 = "46d6b056cffc9ea201dedde847b071db744dfbadf0a21a261717272fe3d85cab"; + rev = ''refs/tags/v1.0.13''; + }; + }; + + trivial-garbage = buildLispPackage rec { + baseName = "trivial-garbage"; + version = "git-20141113"; + description = "Portable finalizers, weak hash-tables and weak pointers."; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/trivial-garbage/trivial-garbage''; + sha256 = "69f6c910921de436393ff5f93bee36443534756965fa34e43e04d9e8919212df"; + rev = ''2721d36d71748d9736a82fe5afe333c52bae3084''; + }; + }; + + cl-base64 = buildLispPackage rec { + baseName = "cl-base64"; + version = "git-20141113"; + description = "Base64 encoding and decoding with URI support."; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://git.b9.com/cl-base64.git''; + sha256 = "a34196544cc67d54aef74e31eff2cee62a7861a5675d010fcd925f1c61c23e81"; + rev = ''f375d1fc3a6616e95ae88bb33493bb99f920ba13''; + }; + }; + + puri = buildLispPackage rec { + baseName = "puri"; + version = "git-20141113"; + description = "Portable Universal Resource Indentifier Library"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''http://git.b9.com/puri.git''; + sha256 = "71804698e7f3009fb7f570656af5d952465bfe77f72e9c41f7e2dda8a5b45c5e"; + rev = ''68260dbf320c01089c8cee54ef32c800eefcde7f''; + }; + }; + + usocket = buildLispPackage rec { + baseName = "usocket"; + version = "0.6.1"; + description = "Universal socket library for Common Lisp"; + deps = []; + # Source type: http + src = pkgs.fetchurl { + url = ''http://common-lisp.net/project/usocket/releases/usocket-${version}.tar.gz''; + sha256 = "1lnhjli85w20iy5nn6j6gsyxx42mvj8l0dfhwcjpl6dl2lz80r7a"; + }; + }; + + cl-html-parse = buildLispPackage rec { + baseName = "cl-html-parse"; + version = "git-20141113"; + description = "HTML Parser"; + deps = []; + # Source type: git + src = pkgs.fetchgit { + url = ''https://github.com/gwkkwg/cl-html-parse''; + sha256 = "0153d4962493f106849fc7cbfe03c5ff874adae8d307ea2e1ceebbb009e2f89f"; + rev = ''b21e8757210a1eb2a47104a563f58bf82ba9a579''; }; }; }; diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 6ec7934e563..260128a2dda 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -57,12 +57,13 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl name = namePrefix + name; buildInputs = [ - python wrapPython setuptools + wrapPython setuptools (distutils-cfg.override { extraCfg = distutilsExtraCfg; }) ] ++ buildInputs ++ pythonPath ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; + # propagate python to active setup-hook in nix-shell + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python ]; pythonPath = [ setuptools ] ++ pythonPath; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index aeb59dda664..7971f0bb67f 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.0"; + version = "6.1"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; - sha256 = "08qjx7yfx5p7ydbcm6lzm15qcwkgcf1jw27i9fnyr01wppz9yrsx"; + sha256 = "0g5ywnc64v2c4zlamm3l2x0l1z79199mcjz0xzv3j5wx7rsyasrc"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 64f3b7d60ab..27fd739ed54 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { --replace 'obj:/usr/X11R6/lib' 'obj:*/lib' \ --replace 'obj:/usr/lib' 'obj:*/lib' done + + paxmark m $out/lib/valgrind/*-*-linux ''; meta = { diff --git a/pkgs/development/tools/atom-shell/default.nix b/pkgs/development/tools/atom-shell/default.nix new file mode 100644 index 00000000000..141ba284cc0 --- /dev/null +++ b/pkgs/development/tools/atom-shell/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib +, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip +}: +let + atomEnv = buildEnv { + name = "env-atom"; + paths = [ + stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss + xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst + xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr + xlibs.libXcursor libcap + ]; + }; +in stdenv.mkDerivation rec { + name = "atom-shell-${version}"; + version = "0.19.1"; + + src = fetchurl { + url = "https://github.com/atom/atom-shell/releases/download/v0.19.1/atom-shell-v0.19.1-linux-x64.zip"; + sha256 = "10q1slwv2lkiqqxpv0m5a1k0gj2yp8bi9a7ilb05zz1wg7j3yw4y"; + name = "${name}.zip"; + }; + + buildInputs = [ atomEnv makeWrapper unzip ]; + + phases = [ "installPhase" "fixupPhase" ]; + + unpackCmd = "unzip"; + + installPhase = '' + mkdir -p $out/bin + unzip -d $out/bin $src + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/bin/atom + mv $out/bin/atom $out/bin/atom-shell + wrapProgram $out/bin/atom-shell \ + --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" + ''; + + meta = with stdenv.lib; { + description = "Cross platform desktop application shell"; + homepage = https://github.com/atom/atom-shell; + license = [ licenses.mit ]; + maintainers = [ maintainers.fluffynukeit ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix new file mode 100644 index 00000000000..a32ea9a3add --- /dev/null +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "icmake-${version}"; + version = "7.21.01"; + + src = fetchurl { + url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz"; + sha256 = "0jx547bb0h1z5f3v9kvjiq5bgarbrcs1h47y1nnwdkg0q1mqma1h"; + }; + + preConfigure = '' + patchShebangs ./ + sed -i "s;usr/;;g" INSTALL.im + ''; + + buildPhase = "./icm_bootstrap $out"; + + installPhase = "./icm_install all /"; + + meta = with stdenv.lib; { + description = "A program maintenance (make) utility using a C-like grammar"; + homepage = http://icmake.sourceforge.net/; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/haskell/PastePipe/default.nix b/pkgs/development/tools/haskell/PastePipe/default.nix index 92d985ecc6e..9d967c30f1c 100644 --- a/pkgs/development/tools/haskell/PastePipe/default.nix +++ b/pkgs/development/tools/haskell/PastePipe/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "PastePipe"; - version = "1.6"; - sha256 = "08rsq2j3gy98a69pjldvbhawmnzxgld7abh9kszrb0kpjmd9sgc4"; + version = "1.7"; + sha256 = "0had11n44y7zjhhymdbvahwmxcxxrbxy7c9jxijhw3n7xqhdmva0"; isLibrary = true; isExecutable = true; buildDepends = [ cmdargs HTTP network networkUri ]; diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index b0bf11bb2a0..ec2310ff582 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.8.7"; - sha256 = "03kp59nhdyq3bl91akd38iwvwwy3zgvadx85lwl3827nr6s774qk"; + version = "0.8.8"; + sha256 = "0jd901r6312yw4rzxvy5x7q18kjwjhgr5s5npczhwc4q7zvxdj7q"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/ghcid/default.nix b/pkgs/development/tools/haskell/ghcid/default.nix index 3ad43076a41..2ce069f53c3 100644 --- a/pkgs/development/tools/haskell/ghcid/default.nix +++ b/pkgs/development/tools/haskell/ghcid/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ghcid"; - version = "0.3.1"; - sha256 = "09dyynqa42q6rcms8pghlyih8a3fahb5fbhc500grqc094kgfs7c"; + version = "0.3.2"; + sha256 = "1kx20la4snldhd709y69za8bs57v90nblghfrxrvmzhrmpvh4bn3"; isLibrary = true; isExecutable = true; buildDepends = [ cmdargs extra filepath terminalSize time ]; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index a79dbb9a133..0699337640f 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdargs, cpphs, filepath, haskellSrcExts, hscolour -, transformers, uniplate +{ cabal, ansiTerminal, cmdargs, cpphs, extra, filepath +, haskellSrcExts, hscolour, transformers, uniplate }: cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9.10"; - sha256 = "08pfc0mhqkhali0hjxpa26hr5ykfdmyldh0r04v1b42a1c60k1id"; + version = "1.9.12"; + sha256 = "0ga66b7lpvgx2w1fg5gnilncg75dfxcjcrx9hvjyxh7fin4y1z6a"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdargs cpphs filepath haskellSrcExts hscolour transformers - uniplate + ansiTerminal cmdargs cpphs extra filepath haskellSrcExts hscolour + transformers uniplate ]; meta = { homepage = "http://community.haskell.org/~ndm/hlint/"; diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 18c4b2b8864..38c343903d9 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.5.1"; - sha256 = "1g8cq74cjhy8r0435m4il0iak5g03jdiz40sn4801iy765rcylpv"; + version = "1.3.5.3"; + sha256 = "18dpi97q4sz5zxv2yc6ar5nbf9gvs71n6gmxd9mv5myknvsliif2"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index a4961440a3e..07854f970dc 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -1,26 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, binary, cairo, deepseq, filepath, ghcEvents, glib, gtk -, mtl, pango, time +, mtl, pango, text, time }: cabal.mkDerivation (self: { pname = "threadscope"; - version = "0.2.4"; - sha256 = "1208gp80vj3dngc4nrj1jk5y4h1181bgwq2qj764kcjvkaxch599"; + version = "0.2.5"; + sha256 = "1nrhgir855n6n764fapaqd94dhqmsxn07ky3zf04nrx0lca9ir52"; isLibrary = false; isExecutable = true; buildDepends = [ - binary cairo deepseq filepath ghcEvents glib gtk mtl pango time + binary cairo deepseq filepath ghcEvents glib gtk mtl pango text + time ]; configureFlags = "--ghc-options=-rtsopts"; - patches = [ ./threadscope.patch ]; meta = { homepage = "http://www.haskell.org/haskellwiki/ThreadScope"; description = "A graphical tool for profiling parallel Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/tools/haskell/threadscope/threadscope.patch b/pkgs/development/tools/haskell/threadscope/threadscope.patch deleted file mode 100644 index af504a11f26..00000000000 --- a/pkgs/development/tools/haskell/threadscope/threadscope.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/threadscope.cabal.orig 2014-11-03 15:23:29.000000000 -0600 -+++ b/threadscope.cabal 2014-11-03 15:24:01.000000000 -0600 -@@ -41,7 +41,10 @@ - Executable threadscope - Main-is: Main.hs - Build-Depends: base >= 4.0 && < 5, -- gtk >= 0.12, cairo, glib, pango, -+ gtk >= 0.12 && < 0.13, -+ cairo < 0.13, -+ glib < 0.13, -+ pango < 0.13, - binary, array, mtl, filepath, - ghc-events >= 0.4.2, - containers >= 0.2 && < 0.6, diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix index d93383171dd..519ca892f3c 100644 --- a/pkgs/development/tools/misc/ShellCheck/default.nix +++ b/pkgs/development/tools/misc/ShellCheck/default.nix @@ -1,19 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, json, mtl, parsec, QuickCheck, regexCompat }: +{ cabal, json, mtl, parsec, QuickCheck, regexCompat, transformers +}: cabal.mkDerivation (self: { pname = "ShellCheck"; - version = "0.3.4"; - sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw"; + version = "0.3.5"; + sha256 = "0x4rvhpzrjkn9a9fsmp9iwv9g21hkrd8fgq05iy4wgv8nfhgv2cj"; isLibrary = true; isExecutable = true; - buildDepends = [ json mtl parsec QuickCheck regexCompat ]; - testDepends = [ json mtl parsec QuickCheck regexCompat ]; + buildDepends = [ + json mtl parsec QuickCheck regexCompat transformers + ]; + testDepends = [ + json mtl parsec QuickCheck regexCompat transformers + ]; meta = { homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; - license = "unknown"; + license = self.stdenv.lib.licenses.agpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 4c92946008e..691974353e1 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -1,31 +1,40 @@ -# This package is only used to create the documentation of zsh-cvs -# eg have a look at http://www.zsh.org/mla/users/2008/msg00715.html -# latest release is newer though +{ stdenv, fetchurl, perl, icmake }: -{ stdenv, fetchurl, perl }: +stdenv.mkDerivation rec { + name = "yodl-${version}"; + version = "3.04.00"; -stdenv.mkDerivation { - name = "yodl-2.14.3"; - - buildInputs = [ perl ]; + buildInputs = [ perl icmake ]; src = fetchurl { - url = "mirror://sourceforge/yodl/yodl_2.14.3.orig.tar.gz"; - sha256 = "0paypm76p34hap3d18vvks5rrilchcw6q56rvq6pjf9raqw8ynd4"; + url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz"; + sha256 = "14sqd03j3w9g5l5rkdnqyxv174yz38m39ycncx86bq86g63igcv6"; }; - - patches = - [ (fetchurl { - url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz"; - sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4"; - }) - ]; - # This doesn't isntall docs yet, do you need them? - installPhase = '' - # -> $out - sed -i "s@'/usr/@'$out/@" contrib/build.pl - perl contrib/build.pl make-software - perl contrib/build.pl install-software + preConfigure = '' + patchShebangs scripts/. + sed -i 's;/usr;;g' INSTALL.im + substituteInPlace build --replace /usr/bin/icmake ${icmake}/bin/icmake + substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl ''; + + buildPhase = '' + ./build programs + ./build man + ./build macros + ''; + + installPhase = '' + ./build install programs $out + ./build install man $out + ./build install macros $out + ''; + + meta = with stdenv.lib; { + description = "A package that implements a pre-document language and tools to process it"; + homepage = http://yodl.sourceforge.net/; + license = licenses.gpl3; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index baa816589ca..1b5a2ca674f 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { description = "Python debugger with GDB-like commands and Emacs bindings"; homepage = http://bashdb.sourceforge.net/pydb/; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix new file mode 100644 index 00000000000..fd6e0a99138 --- /dev/null +++ b/pkgs/development/tools/winpdb/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, buildPythonPackage, wxPython, makeDesktopItem }: + +buildPythonPackage rec { + name = "winpdb-1.4.8"; + namePrefix = ""; + + src = fetchurl { + url = "https://winpdb.googlecode.com/files/${name}.tar.gz"; + sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs"; + }; + + propagatedBuildInputs = [ wxPython ]; + + desktopItem = makeDesktopItem { + name = "winpdb"; + exec = "winpdb"; + icon = "winpdb"; + comment = "Platform independend Python debugger"; + desktopName = "Winpdb"; + genericName = "Python Debugger"; + categories = "Application;Development;Debugger;"; + }; + + # Don't call gnome-terminal with "--disable-factory" flag, which is + # unsupported since GNOME >= 3.10. Apparently, debian also does this fix: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757718 + postPatch = '' + sed -i "s/--disable-factory//" rpdb2.py + ''; + + postInstall = '' + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + + mkdir -p "$out"/share/icons + cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg + ''; + + meta = with stdenv.lib; { + description = "Platform independent Python debugger"; + longDescription = '' + Winpdb is a platform independent GPL Python debugger with support for + multiple threads, namespace modification, embedded debugging, encrypted + communication and is up to 20 times faster than pdb. + ''; + homepage = http://winpdb.org/; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 41c3133e2a8..4168a84cebc 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.61"; + name = "tibia-10.62"; src = fetchurl { - url = http://static.tibia.com/download/tibia1061.tgz; - sha256 = "0dyhzhklarx9zj281d5pjxvfd1r740wdg79b07dj8ll8zwvxfqcz"; + url = http://static.tibia.com/download/tibia1062.tgz; + sha256 = "0s7kxq3li0z8d23x51bwn2bc4vxj309vr9rzwr2025sm6yxn3x5l"; }; shell = stdenv.shell; @@ -53,5 +53,6 @@ stdenv.mkDerivation { homepage = "http://tibia.com"; license = stdenv.lib.licenses.unfree; platforms = ["i686-linux"]; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix new file mode 100644 index 00000000000..68b77dd091b --- /dev/null +++ b/pkgs/games/xsnow/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, libXt, libXpm, libXext, imake }: + +stdenv.mkDerivation rec { + + version = "1.42"; + name = "xsnow"; + + src = fetchurl { + url = "http://dropmix.xs4all.nl/rick/Xsnow/xsnow-${version}.tar.gz"; + sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; + }; + + buildInputs = [ + libXt libXpm libXext imake + ]; + + buildPhase = '' + xmkmf + make + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp xsnow $out/bin/ + cp xsnow.1 $out/share/man/man1/ + ''; + + meta = { + description = "An X-windows application that will let it snow on the root, in between and on windows"; + homepage = http://dropmix.xs4all.nl/rick/Xsnow/; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.robberer ]; + }; +} diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index b4f459d671c..ca35ed1f092 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -4,11 +4,11 @@ , pulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20141101"; + name = "dolphin-emu-20141112"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "9daaf94f3c8caf71dab16c7e591ce7905c1416c4"; - sha256 = "1n71by34mrgdxcr8c5bsbpy9azi62512knp5sjgzq6sfwzgy40d8"; + rev = "b1f8974db8b94861f02abec7ab442f6855181199"; + sha256 = "17rv92ycsfnsdqz785njw6zm8gcvr4y3d86jizwpqqn1lvwd2shj"; fetchSubmodules = false; }; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 59ff877f0a3..d739912538d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,12 +1,8 @@ +# TODO check that no license information gets lost { fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, clang, zip }: /* -About Vim and plugins -===================== -Let me tell you how Vim plugins work, so that you can decide on how to orginize -your setup. - -typical plugin files: +Typical plugin files: plugin/P1.vim autoload/P1.vim @@ -24,57 +20,18 @@ this to your .vimrc should make most plugins work: set rtp+=~/.nix-profile/vim-plugins/youcompleteme " or for p in ["youcompleteme"] | exec 'set rtp+=~/.nix-profile/vim-plugins/'.p | endfor -Its what pathogen, vundle, vim-addon-manager (VAM) use. +Its what pathogen, vundle, vim-addon-manager (VAM) and others use. +Learn about some differences by visiting http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html. -VAM's benefits: -- allows activating plugins at runtime, eg when you need them. (works around - some au command hooks, eg required for TheNerdTree plugin) -- VAM checkous out all sources (vim.sf.net, git, mercurial, ...) -- runs :helptags on update/installation only. Obviously it cannot do that on - store paths. -- it reads addon-info.json files which can declare dependencies by name - (without version) - -VAM is made up of -- the code loading plugins -- an optional pool (github.com/MarcWeber/vim-addon-manager-known-repositories) - -That pool probably is the best source to automatically derive plugin -information from or to lookup about how to get data from www.vim.org. - -I'm not sure we should package them all. Most of them are not used much. -You need your .vimrc anyway, and then VAM gets the job done ? - -How to install VAM? eg provide such a bash function: - - vim-install-vam () { - mkdir -p ~/.vim/vim-addons && git clone --depth=1 git://github.com/MarcWeber/vim-addon-manager.git ~/.vim/vim-addons/vim-addon-manager && cat >> ~/.vimrc <