Merge branch 'master' into staging

Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
This commit is contained in:
Vladimír Čunát 2017-01-30 18:39:36 +01:00
commit 9cd2dbc569
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
75 changed files with 1672 additions and 1616 deletions

View file

@ -623,7 +623,7 @@ evaluate correctly.</para>
from bad to good: from bad to good:
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>Uses <literal>git://</literal> which won't be proxied. <para>Bad: Uses <literal>git://</literal> which won't be proxied.
<programlisting> <programlisting>
src = fetchgit { src = fetchgit {
url = "git://github.com/NixOS/nix.git"; url = "git://github.com/NixOS/nix.git";
@ -634,7 +634,7 @@ src = fetchgit {
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
<para>This is ok, but an archive fetch will still be faster. <para>Better: This is ok, but an archive fetch will still be faster.
<programlisting> <programlisting>
src = fetchgit { src = fetchgit {
url = "https://github.com/NixOS/nix.git"; url = "https://github.com/NixOS/nix.git";
@ -645,7 +645,7 @@ src = fetchgit {
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
<para>Fetches a snapshot archive and you get the rev you want. <para>Best: Fetches a snapshot archive and you get the rev you want.
<programlisting> <programlisting>
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";

View file

@ -68,6 +68,10 @@ pkgs.stdenv.mkDerivation {
inputFile = ../pkgs/development/r-modules/README.md; inputFile = ../pkgs/development/r-modules/README.md;
outputFile = "languages-frameworks/r.xml"; outputFile = "languages-frameworks/r.xml";
} }
+ toDocbook {
inputFile = ./languages-frameworks/vim.md;
outputFile = "./languages-frameworks/vim.xml";
}
+ '' + ''
echo ${lib.nixpkgsVersion} > .version echo ${lib.nixpkgsVersion} > .version

View file

@ -28,6 +28,7 @@ such as Perl or Haskell. These are described in this chapter.</para>
<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md --> <xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md -->
<xi:include href="ruby.xml" /> <xi:include href="ruby.xml" />
<xi:include href="texlive.xml" /> <xi:include href="texlive.xml" />
<xi:include href="vim.xml" />
</chapter> </chapter>

View file

@ -0,0 +1,102 @@
---
title: User's Guide for Vim in Nixpkgs
author: Marc Weber
date: 2016-06-25
---
# User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs
You'll get a vim(-your-suffix) in PATH also loading the plugins you want.
Loading can be deferred; see examples.
VAM (=vim-addon-manager) and Pathogen plugin managers are supported.
Vundle, NeoBundle could be your turn.
## dependencies by Vim plugins
VAM introduced .json files supporting dependencies without versioning
assuming that "using latest version" is ok most of the time.
## HOWTO
First create a vim-scripts file having one plugin name per line. Example:
"tlib"
{'name': 'vim-addon-sql'}
{'filetype_regex': '\%(vim)$', 'names': ['reload', 'vim-dev-plugin']}
Such vim-scripts file can be read by VAM as well like this:
call vam#Scripts(expand('~/.vim-scripts'), {})
Create a default.nix file:
{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }:
nixpkgs.vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }
Create a generate.vim file:
ActivateAddons vim-addon-vim2nix
let vim_scripts = "vim-scripts"
call nix#ExportPluginsForNix({
\ 'path_to_nixpkgs': eval('{"'.substitute(substitute(substitute($NIX_PATH, ':', ',', 'g'), '=',':', 'g'), '\([:,]\)', '"\1"',"g").'"}')["nixpkgs"],
\ 'cache_file': '/tmp/vim2nix-cache',
\ 'try_catch': 0,
\ 'plugin_dictionaries': ["vim-addon-manager"]+map(readfile(vim_scripts), 'eval(v:val)')
\ })
Then run
nix-shell -p vimUtils.vim_with_vim2nix --command "vim -c 'source generate.vim'"
You should get a Vim buffer with the nix derivations (output1) and vam.pluginDictionaries (output2).
You can add your vim to your system's configuration file like this and start it by "vim-my":
my-vim =
let plugins = let inherit (vimUtils) buildVimPluginFrom2Nix; in {
copy paste output1 here
}; in vim_configurable.customize {
name = "vim-my";
vimrcConfig.vam.knownPlugins = plugins; # optional
vimrcConfig.vam.pluginDictionaries = [
copy paste output2 here
];
# Pathogen would be
# vimrcConfig.pathogen.knownPlugins = plugins; # plugins
# vimrcConfig.pathogen.pluginNames = ["tlib"];
};
Sample output1:
"reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "reload";
src = fetchgit {
url = "git://github.com/xolox/vim-reload";
rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1";
sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh";
};
dependencies = ["nim-misc"];
};
[...]
Sample output2:
[
''vim-addon-manager''
''tlib''
{ "name" = ''vim-addon-sql''; }
{ "filetype_regex" = ''\%(vim)$$''; "names" = [ ''reload'' ''vim-dev-plugin'' ]; }
]
## Important repositories
- [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository
from VAM plugin manager meant to be used by others as well used by
- [vim2nix](http://github.com/MarcWeber/vim-addon-vim2nix) which generates the
.nix code

View file

@ -102,25 +102,7 @@ rec {
min = x: y: if x < y then x else y; min = x: y: if x < y then x else y;
max = x: y: if x > y then x else y; max = x: y: if x > y then x else y;
/* Reads a JSON file. It is useful to import pure data into other nix /* Reads a JSON file. */
expressions.
Example:
mkDerivation {
src = fetchgit (importJSON ./repo.json)
#...
}
where repo.json contains:
{
"url": "git://some-domain/some/repo",
"rev": "265de7283488964f44f0257a8b4a055ad8af984d",
"sha256": "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"
}
*/
importJSON = path: importJSON = path:
builtins.fromJSON (builtins.readFile path); builtins.fromJSON (builtins.readFile path);

View file

@ -206,7 +206,7 @@
ripple-data-api = 186; ripple-data-api = 186;
mediatomb = 187; mediatomb = 187;
rdnssd = 188; rdnssd = 188;
ihaskell = 189; # ihaskell = 189; # unused
i2p = 190; i2p = 190;
lambdabot = 191; lambdabot = 191;
asterisk = 192; asterisk = 192;
@ -469,7 +469,7 @@
#ripple-data-api = 186; #unused #ripple-data-api = 186; #unused
mediatomb = 187; mediatomb = 187;
#rdnssd = 188; # unused #rdnssd = 188; # unused
ihaskell = 189; # ihaskell = 189; # unused
i2p = 190; i2p = 190;
lambdabot = 191; lambdabot = 191;
asterisk = 192; asterisk = 192;

View file

@ -261,7 +261,7 @@
./services/misc/gitolite.nix ./services/misc/gitolite.nix
./services/misc/gogs.nix ./services/misc/gogs.nix
./services/misc/gpsd.nix ./services/misc/gpsd.nix
./services/misc/ihaskell.nix #./services/misc/ihaskell.nix
./services/misc/leaps.nix ./services/misc/leaps.nix
./services/misc/mantisbt.nix ./services/misc/mantisbt.nix
./services/misc/mathics.nix ./services/misc/mathics.nix

View file

@ -8,7 +8,7 @@ let
homeDir = "/var/lib/i2pd"; homeDir = "/var/lib/i2pd";
extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sLf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
toYesNo = b: if b then "true" else "false"; toYesNo = b: if b then "true" else "false";

View file

@ -64,10 +64,7 @@ in
security.setuidPrograms = [ "e_freqset" ]; security.setuidPrograms = [ "e_freqset" ];
environment.etc = singleton services.xserver.exportConfiguration = true;
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
target = "X11/xkb";
};
fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];

View file

@ -183,10 +183,7 @@ in
GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
}; };
environment.etc = singleton services.xserver.exportConfiguration = true;
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
target = "X11/xkb";
};
# Enable helpful DBus services. # Enable helpful DBus services.
services.udisks2.enable = true; services.udisks2.enable = true;

View file

@ -199,10 +199,7 @@ in
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];
environment.etc = singleton { services.xserver.exportConfiguration = true;
source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
target = "X11/xkb";
};
environment.variables = environment.variables =
{ {

View file

@ -465,23 +465,15 @@ in
} }
]; ];
environment.etc = environment.etc = mkMerge [
(optionals cfg.exportConfiguration (mkIf cfg.exportConfiguration {
[ { source = "${configFile}"; "X11/xorg.conf".source = configFile;
target = "X11/xorg.conf"; "X11/xkb".source = cfg.xkbDir;
} })
# -xkbdir command line option does not seems to be passed to xkbcomp.
{ source = "${cfg.xkbDir}";
target = "X11/xkb";
}
])
# Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5 # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5
++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in (let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in
[{ { "${cfgPath}".source = xorg.xf86inputevdev.out + "/share" + cfgPath; })
source = xorg.xf86inputevdev.out + "/share" + cfgPath; ];
target = cfgPath;
}]
);
environment.systemPackages = environment.systemPackages =
[ xorg.xorgserver.out [ xorg.xorgserver.out

View file

@ -11,11 +11,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "brackets-${version}"; name = "brackets-${version}";
version = "1.7"; version = "1.8";
src = fetchurl { src = fetchurl {
url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb"; url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
sha256 = "0nsiy3gvp8rd71a0misf6v1kz067kxnszr5mpch9fj4jqmg6nj8m"; sha256 = "0b2k0vv1qwmsg1wckp71yrb86zp8zisskmzzvx9ir19bma9jzr42";
name = "${name}.deb"; name = "${name}.deb";
}; };

View file

@ -1,4 +1,14 @@
{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }: { stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl,
R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper,
# If you have set up an R wrapper with other packages by following
# something like https://nixos.org/nixpkgs/manual/#r-packages, RStudio
# by default not be able to access any of those R packages. In order
# to do this, override the argument "R" here with your respective R
# wrapper, and set "useRPackages" to true. This will add the
# environment variable R_PROFILE_USER to the RStudio wrapper, pointing
# to an R script which will allow R to use these packages.
useRPackages ? false
}:
let let
version = "0.98.110"; version = "0.98.110";
@ -72,8 +82,14 @@ stdenv.mkDerivation rec {
mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";
}; };
postInstall = '' postInstall = let rProfile =
wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin # RStudio seems to bypass the environment variables that the R
# wrapper already applies, and so this sets R_PROFILE_USER to
# again make those R packages accessible:
if useRPackages
then "--set R_PROFILE_USER ${R}/${R.passthru.fixLibsR}" else "";
in ''
wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin ${rProfile}
mkdir $out/share mkdir $out/share
cp -r ${desktopItem}/share/applications $out/share cp -r ${desktopItem}/share/applications $out/share
mkdir $out/share/icons mkdir $out/share/icons

View file

@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
enableParallelBuilding = true; # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
#enableParallelBuilding = true;
# To handle the lack of 'local' RPATH; required, as they call one of # To handle the lack of 'local' RPATH; required, as they call one of
# their built binaries requiring their libs, in the build process. # their built binaries requiring their libs, in the build process.

View file

@ -10,7 +10,13 @@ stdenv.mkDerivation rec {
libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm
libXcursor libXfixes libXcursor libXfixes
]; ];
src = fetchgit (stdenv.lib.importJSON ./src.json);
src = fetchgit {
url = https://github.com/mkeeter/ao;
rev = "69fadb81543cc9031e4a7ec2036c7f2ab505a620";
sha256 = "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7";
};
cmakeFlags = "-G Ninja"; cmakeFlags = "-G Ninja";
buildPhase = "ninja"; buildPhase = "ninja";
installPhase = '' installPhase = ''

View file

@ -1,5 +0,0 @@
{
"url": "https://github.com/mkeeter/ao",
"rev": "69fadb81543cc9031e4a7ec2036c7f2ab505a620",
"sha256": "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7"
}

View file

@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
pythonPackages.buildPythonApplication rec {
version = "3.4.0";
name = "gcalcli-${version}";
src = fetchFromGitHub {
owner = "insanum";
repo = "gcalcli";
rev = "v${version}";
sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8";
};
propagatedBuildInputs = with pythonPackages; [
dateutil
gflags
google_api_python_client
httplib2
oauth2client
parsedatetime
six
vobject
] ++ lib.optional (!pythonPackages.isPy3k) futures;
meta = with lib; {
homepage = https://github.com/insanum/gcalcli;
description = "CLI for Google Calendar";
license = licenses.mit;
};
}

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "terragrunt-${version}"; name = "terragrunt-${version}";
version = "0.9.3"; version = "0.9.6";
goPackagePath = "github.com/gruntwork-io/terragrunt"; goPackagePath = "github.com/gruntwork-io/terragrunt";
@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}"; rev = "v${version}";
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = "terragrunt"; repo = "terragrunt";
sha256 = "0i6sqgyxhi6icp7nps9prc40m9wsbr71v967kgl2865sgb214rdx"; sha256 = "0x4qpf4jqrm55rg5xifk6gz4gy42506k5g1l5461xln0rsmifpkf";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;

View file

@ -146,6 +146,8 @@ in stdenv.mkDerivation {
fi fi
fi fi
done done
paxmark m $out/${appdir}/dropbox
''; '';
meta = { meta = {

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "purple-hangouts-hg-${version}"; name = "purple-hangouts-hg-${version}";
version = "2016-10-01"; version = "2016-12-22";
src = fetchhg { src = fetchhg {
url = "https://bitbucket.org/EionRobb/purple-hangouts/"; url = "https://bitbucket.org/EionRobb/purple-hangouts/";
rev = "00e28b7"; rev = "754e3bb971cfe913b90c7fd028fe47a42f9e83cb";
sha256 = "08jllhhww3cqlw6dg9w1hli3havdfzb47grcdl184537gl2bl49d"; sha256 = "0b826hj5jgfdckzh9wyycxxhpyxhrhxm3n0mhaf3f57gqarriics";
}; };
buildInputs = [ pidgin glib json_glib protobuf protobufc ]; buildInputs = [ pidgin glib json_glib protobuf protobufc ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
install -Dm755 -t $out/lib/pidgin/ libhangouts.so install -Dm755 -t $out/lib/pidgin/ libhangouts.so
for size in 16 22 24 48; do for size in 16 22 24 48; do
install -TDm644 hangouts$size.png $out/pixmaps/pidgin/protocols/$size/hangouts.png install -TDm644 hangouts$size.png $out/share/pixmaps/pidgin/protocols/$size/hangouts.png
done done
''; '';

View file

@ -1,15 +1,15 @@
{ stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : { stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } :
let let
version = "2016-03-17"; version = "1.3.0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "telegram-purple-${version}"; name = "telegram-purple-${version}";
src = fetchgit { src = fetchgit {
url = "https://github.com/majn/telegram-purple"; url = "https://github.com/majn/telegram-purple";
rev = "ee2a6fb740fe9580336e4af9a153b845bc715927"; rev = "0340e4f14b2480782db4e5b9242103810227c522";
sha256 = "0pxaj95b6nzy73dckpr3v4nljyijkx71vmnp9dcj48d22pvy0nyf"; sha256 = "1xb7hrgisbpx00dsrm5yz934bdd7nfzicd7k855iynk3hjzqj7k5";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/pidgin/server.tglpub|g" telegram-purple.c sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/pidgin/server.tglpub|g" telegram-purple.c
echo "#define GIT_COMMIT \"${builtins.substring 0 10 src.rev}\"" > commit.h
''; '';
installPhase = '' installPhase = ''

View file

@ -6,7 +6,7 @@ let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32"; else "ia32";
version = "0.4.5"; version = "0.5.3";
myIcon = fetchurl { myIcon = fetchurl {
url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png"; url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
@ -15,7 +15,7 @@ let
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {
name = "Rambox"; name = "Rambox";
exec = name; exec = "rambox";
icon = myIcon; icon = myIcon;
desktopName = name; desktopName = name;
genericName = "Rambox messenger"; genericName = "Rambox messenger";
@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz"; url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz";
sha256 = if bits == "x64" then sha256 = if bits == "x64" then
"0z2rmfiwhb6v2hkzgrbkd4nhdvm1rssh0mbfbdmdwxq91qzp6558" else "14pp466l0fj98p5qsb7i11hd603gwsir26m3j4gljzcizb9hirqv" else
"0gq0ywk1jr0apl39dnm0vwdwg1inr7fari3cmfz3fvaym7gc8fki"; "13xmljsdahffdzndg30qxh8mj7bgd9jwkxknrvlh3l6w35pbj085";
}; };
phases = [ "unpackPhase" "installPhase" "postFixup" ]; phases = [ "unpackPhase" "installPhase" "postFixup" ];
@ -42,19 +42,19 @@ in stdenv.mkDerivation rec {
]; ];
installPhase = '' installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Rambox patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox
patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" Rambox patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" rambox
mkdir -p $out/bin $out/share/rambox mkdir -p $out/bin $out/share/rambox
cp -r * $out/share/rambox cp -r * $out/share/rambox
ln -s $out/share/rambox/Rambox $out/bin ln -s $out/share/rambox/rambox $out/bin
mkdir -p $out/share/applications mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications
''; '';
postFixup = '' postFixup = ''
paxmark m $out/share/rambox/Rambox paxmark m $out/share/rambox/rambox
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -21,12 +21,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6"; version = "1.7";
name = "weechat-${version}"; name = "weechat-${version}";
src = fetchurl { src = fetchurl {
url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
sha256 = "0d1wcpsxx13clcf1ygcn5hsa1pjkck4xznbjbxphbdxd5whsbv3k"; sha256 = "1l34rgr83nf2h71mwzhv5c0x03msrwv3kzx3cwzczx72xrih12n7";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];

View file

@ -2,19 +2,20 @@
, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }: , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "20161126"; version = "20170128";
name = "neomutt-${version}"; name = "neomutt-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neomutt"; owner = "neomutt";
repo = "neomutt"; repo = "neomutt";
rev = "neomutt-${version}"; rev = "neomutt-${version}";
sha256 = "10ycfya11pvwv0rdyyak56r6f8ia8yf0h8qyi904bbpvm8lqvqfd"; sha256 = "082ksn4fsj48nkz61ia0hcxz3396p6a4p9q8738w15qkycq23c20";
}; };
nativeBuildInputs = [ which autoconf automake ];
buildInputs = buildInputs =
[ autoconf automake cyrus_sasl gdbm gpgme kerberos libidn ncurses [ cyrus_sasl gdbm gpgme kerberos libidn ncurses
notmuch which openssl perl lmdb ]; notmuch openssl perl lmdb ];
configureFlags = [ configureFlags = [
"--enable-debug" "--enable-debug"
@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
"--enable-keywords" "--enable-keywords"
"--enable-smtp" "--enable-smtp"
"--enable-nntp" "--enable-nntp"
"--enable-compressed"
"--with-homespool=mailbox" "--with-homespool=mailbox"
"--with-gss" "--with-gss"
"--with-mailpath=" "--with-mailpath="

View file

@ -10,7 +10,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.23.4"; version = "0.23.5";
name = "notmuch-${version}"; name = "notmuch-${version}";
passthru = { passthru = {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz"; url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "0fs5crf8v3jghc8jnm61cv7wxhclcg88hi5894d8fma9kkixcv8h"; sha256 = "0ry2k9sdwd1vw8cf6svch8wk98523s07mwxvsf7b8kghqnrr89n6";
}; };
buildInputs = [ buildInputs = [

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "git-hub-${version}"; name = "git-hub-${version}";
version = "0.10"; version = "0.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "0zy1g6zzv6cw8ffj8ffm28qa922fys2826n5813p8icqypi04y0k"; sha256 = "1lpi373vzr6gda0gic7w37qhipfg7bjpn8nwjjgz44vf2vjlhf9k";
rev = "v${version}"; rev = "v${version}";
repo = "git-hub"; repo = "git-hub";
owner = "sociomantic-tsunami"; owner = "sociomantic-tsunami";

View file

@ -18,11 +18,14 @@ let
python = python2; python = python2;
buildType = "release"; buildType = "release";
inherit (importJSON ./upstream-info.json) version extpackRev extpack main; extpack = "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5";
extpackRev = 112026;
main = "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40";
version = "5.1.10";
# See https://github.com/NixOS/nixpkgs/issues/672 for details # See https://github.com/NixOS/nixpkgs/issues/672 for details
extensionPack = requireFile rec { extensionPack = requireFile rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRev}.vbox-extpack"; name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack";
sha256 = extpack; sha256 = extpack;
message = '' message = ''
In order to use the extension pack, you need to comply with the VirtualBox Personal Use In order to use the extension pack, you need to comply with the VirtualBox Personal Use

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = (lib.importJSON ../upstream-info.json).guest; sha256 = "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41";
}; };
KERN_DIR = "${kernel.dev}/lib/modules/*/build"; KERN_DIR = "${kernel.dev}/lib/modules/*/build";

View file

@ -1,8 +0,0 @@
{
"__NOTE": "Generated using update.py from the same directory.",
"extpack": "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5",
"extpackRev": "112026",
"guest": "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41",
"main": "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40",
"version": "5.1.10"
}

View file

@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "siji-${date}";
date = "2016-05-13";
src = fetchFromGitHub {
owner = "stark";
repo = "siji";
rev = "95369afac3e661cb6d3329ade5219992c88688c1";
sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
};
installPhase = ''
mkdir -p $out/share/fonts/pcf
cp -v */*.pcf $out/share/fonts/pcf
'';
meta = {
homepage = "https://github.com/stark/siji";
description = "An iconic bitmap font based on Stlarch with additional glyphs";
liscense = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.asymmetric ];
};
}

View file

@ -37,7 +37,7 @@ core-packages:
- ghcjs-base-0 - ghcjs-base-0
default-package-overrides: default-package-overrides:
# LTS Haskell 7.16 # LTS Haskell 7.18
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
- AC-Vector ==2.3.2 - AC-Vector ==2.3.2
@ -50,7 +50,7 @@ default-package-overrides:
- ad ==4.3.2.1 - ad ==4.3.2.1
- adjunctions ==4.3 - adjunctions ==4.3
- adler32 ==0.1.1.0 - adler32 ==0.1.1.0
- aeson ==0.11.2.1 - aeson ==0.11.3.0
- aeson-better-errors ==0.9.1.0 - aeson-better-errors ==0.9.1.0
- aeson-casing ==0.1.0.5 - aeson-casing ==0.1.0.5
- aeson-compat ==0.3.6 - aeson-compat ==0.3.6
@ -170,7 +170,7 @@ default-package-overrides:
- auto-update ==0.1.4 - auto-update ==0.1.4
- autoexporter ==0.2.3 - autoexporter ==0.2.3
- aws ==0.14.1 - aws ==0.14.1
- b9 ==0.5.30 - b9 ==0.5.31
- bake ==0.4 - bake ==0.4
- bank-holidays-england ==0.1.0.5 - bank-holidays-england ==0.1.0.5
- base-compat ==0.9.1 - base-compat ==0.9.1
@ -194,7 +194,7 @@ default-package-overrides:
- binary-bits ==0.5 - binary-bits ==0.5
- binary-conduit ==1.2.4.1 - binary-conduit ==1.2.4.1
- binary-list ==1.1.1.2 - binary-list ==1.1.1.2
- binary-orphans ==0.1.5.2 - binary-orphans ==0.1.6.0
- binary-parser ==0.5.2 - binary-parser ==0.5.2
- binary-search ==1.0.0.3 - binary-search ==1.0.0.3
- binary-tagged ==0.1.4.2 - binary-tagged ==0.1.4.2
@ -262,7 +262,7 @@ default-package-overrides:
- Cabal ==1.24.2.0 - Cabal ==1.24.2.0
- cabal-dependency-licenses ==0.1.2.0 - cabal-dependency-licenses ==0.1.2.0
- cabal-file-th ==0.2.4 - cabal-file-th ==0.2.4
- cabal-helper ==0.7.2.0 - cabal-helper ==0.7.3.0
- cabal-rpm ==0.10.1 - cabal-rpm ==0.10.1
- cabal-sort ==0.0.5.3 - cabal-sort ==0.0.5.3
- cabal-src ==0.3.0.2 - cabal-src ==0.3.0.2
@ -319,7 +319,7 @@ default-package-overrides:
- clay ==0.11 - clay ==0.11
- clckwrks ==0.23.19.2 - clckwrks ==0.23.19.2
- clckwrks-cli ==0.2.17.1 - clckwrks-cli ==0.2.17.1
- clckwrks-plugin-media ==0.6.16.1 - clckwrks-plugin-media ==0.6.16.2
- clckwrks-plugin-page ==0.4.3.5 - clckwrks-plugin-page ==0.4.3.5
- clckwrks-theme-bootstrap ==0.4.2.1 - clckwrks-theme-bootstrap ==0.4.2.1
- cli ==0.1.2 - cli ==0.1.2
@ -334,6 +334,7 @@ default-package-overrides:
- cmark-lucid ==0.1.0.0 - cmark-lucid ==0.1.0.0
- cmdargs ==0.10.14 - cmdargs ==0.10.14
- code-builder ==0.1.3 - code-builder ==0.1.3
- code-page ==0.1.1
- codo-notation ==0.5.2 - codo-notation ==0.5.2
- colour ==2.3.3 - colour ==2.3.3
- commutative ==0.0.1.4 - commutative ==0.0.1.4
@ -358,7 +359,7 @@ default-package-overrides:
- configuration-tools ==0.2.15 - configuration-tools ==0.2.15
- configurator ==0.3.0.0 - configurator ==0.3.0.0
- configurator-export ==0.1.0.1 - configurator-export ==0.1.0.1
- connection ==0.2.6 - connection ==0.2.7
- constraints ==0.8 - constraints ==0.8
- consul-haskell ==0.3 - consul-haskell ==0.3
- containers-unicode-symbols ==0.3.1.1 - containers-unicode-symbols ==0.3.1.1
@ -472,7 +473,7 @@ default-package-overrides:
- do-list ==1.0.1 - do-list ==1.0.1
- dockerfile ==0.1.0.1 - dockerfile ==0.1.0.1
- docopt ==0.7.0.5 - docopt ==0.7.0.5
- doctest ==0.11.0 - doctest ==0.11.1
- doctest-discover ==0.1.0.7 - doctest-discover ==0.1.0.7
- doctest-prop ==0.2.0.1 - doctest-prop ==0.2.0.1
- docvim ==0.3.2.1 - docvim ==0.3.2.1
@ -543,7 +544,7 @@ default-package-overrides:
- farmhash ==0.1.0.5 - farmhash ==0.1.0.5
- fast-builder ==0.0.0.6 - fast-builder ==0.0.0.6
- fast-digits ==0.2.1.0 - fast-digits ==0.2.1.0
- fast-logger ==2.4.7 - fast-logger ==2.4.8
- fasta ==0.10.4.0 - fasta ==0.10.4.0
- fay ==0.23.1.12 - fay ==0.23.1.12
- fay-base ==0.20.0.1 - fay-base ==0.20.0.1
@ -579,8 +580,8 @@ default-package-overrides:
- fmlist ==0.9 - fmlist ==0.9
- fn ==0.3.0.1 - fn ==0.3.0.1
- focus ==0.1.5 - focus ==0.1.5
- fold-debounce ==0.2.0.4 - fold-debounce ==0.2.0.5
- fold-debounce-conduit ==0.1.0.4 - fold-debounce-conduit ==0.1.0.5
- foldl ==1.2.3 - foldl ==1.2.3
- FontyFruity ==0.5.3.2 - FontyFruity ==0.5.3.2
- force-layout ==0.4.0.6 - force-layout ==0.4.0.6
@ -659,7 +660,7 @@ default-package-overrides:
- gloss ==1.10.2.5 - gloss ==1.10.2.5
- gloss-rendering ==1.10.3.5 - gloss-rendering ==1.10.3.5
- GLURaw ==2.0.0.3 - GLURaw ==2.0.0.3
- GLUT ==2.7.0.10 - GLUT ==2.7.0.11
- gogol ==0.1.0 - gogol ==0.1.0
- gogol-adexchange-buyer ==0.1.0 - gogol-adexchange-buyer ==0.1.0
- gogol-adexchange-seller ==0.1.0 - gogol-adexchange-seller ==0.1.0
@ -834,7 +835,7 @@ default-package-overrides:
- heap ==1.0.3 - heap ==1.0.3
- heaps ==0.3.3 - heaps ==0.3.3
- hebrew-time ==0.1.1 - hebrew-time ==0.1.1
- hedis ==0.9.5 - hedis ==0.9.7
- here ==1.2.9 - here ==1.2.9
- heredoc ==0.2.0.0 - heredoc ==0.2.0.0
- hex ==0.1.2 - hex ==0.1.2
@ -880,11 +881,11 @@ default-package-overrides:
- hPDB ==1.2.0.9 - hPDB ==1.2.0.9
- hPDB-examples ==1.2.0.7 - hPDB-examples ==1.2.0.7
- HPDF ==1.4.10 - HPDF ==1.4.10
- hpio ==0.8.0.5 - hpio ==0.8.0.6
- hprotoc ==2.4.0 - hprotoc ==2.4.0
- hquantlib ==0.0.3.3 - hquantlib ==0.0.3.3
- hreader ==1.0.2 - hreader ==1.0.2
- hruby ==0.3.4.2 - hruby ==0.3.4.3
- hs-bibutils ==5.5 - hs-bibutils ==5.5
- hs-GeoIP ==0.3 - hs-GeoIP ==0.3
- hsass ==0.4.0 - hsass ==0.4.0
@ -902,7 +903,7 @@ default-package-overrides:
- hslua ==0.4.1 - hslua ==0.4.1
- hsndfile ==0.8.0 - hsndfile ==0.8.0
- hsndfile-vector ==0.5.2 - hsndfile-vector ==0.5.2
- HsOpenSSL ==0.11.3.2 - HsOpenSSL ==0.11.4
- HsOpenSSL-x509-system ==0.1.0.3 - HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0 - hsp ==0.10.0
- hspec ==2.2.4 - hspec ==2.2.4
@ -932,7 +933,7 @@ default-package-overrides:
- html ==1.0.1.2 - html ==1.0.1.2
- html-conduit ==1.2.1.1 - html-conduit ==1.2.1.1
- htoml ==1.0.0.3 - htoml ==1.0.0.3
- HTTP ==4000.3.4 - HTTP ==4000.3.5
- http-api-data ==0.2.4 - http-api-data ==0.2.4
- http-client ==0.4.31.2 - http-client ==0.4.31.2
- http-client-openssl ==0.2.0.4 - http-client-openssl ==0.2.0.4
@ -989,7 +990,7 @@ default-package-overrides:
- indents ==0.3.3 - indents ==0.3.3
- inflections ==0.2.0.1 - inflections ==0.2.0.1
- ini ==0.3.5 - ini ==0.3.5
- inline-c ==0.5.5.9 - inline-c ==0.5.6.1
- inline-c-cpp ==0.1.0.0 - inline-c-cpp ==0.1.0.0
- inline-r ==0.9.0.1 - inline-r ==0.9.0.1
- insert-ordered-containers ==0.1.0.1 - insert-ordered-containers ==0.1.0.1
@ -1089,7 +1090,7 @@ default-package-overrides:
- libxml-sax ==0.7.5 - libxml-sax ==0.7.5
- LibZip ==1.0.1 - LibZip ==1.0.1
- lift-generics ==0.1.1 - lift-generics ==0.1.1
- lifted-async ==0.9.1 - lifted-async ==0.9.1.1
- lifted-base ==0.2.3.8 - lifted-base ==0.2.3.8
- line ==1.0.1.0 - line ==1.0.1.0
- linear ==1.20.5 - linear ==1.20.5
@ -1099,7 +1100,7 @@ default-package-overrides:
- list-fusion-probe ==0.1.0.6 - list-fusion-probe ==0.1.0.6
- list-prompt ==0.1.1.0 - list-prompt ==0.1.1.0
- list-t ==1 - list-t ==1
- ListLike ==4.5 - ListLike ==4.5.1
- load-env ==0.1.1 - load-env ==0.1.1
- loch-th ==0.2.1 - loch-th ==0.2.1
- log-domain ==0.10.3.1 - log-domain ==0.10.3.1
@ -1185,7 +1186,7 @@ default-package-overrides:
- MonadRandom ==0.4.2.3 - MonadRandom ==0.4.2.3
- monads-tf ==0.1.0.3 - monads-tf ==0.1.0.3
- mongoDB ==2.1.1.1 - mongoDB ==2.1.1.1
- mono-traversable ==1.0.1 - mono-traversable ==1.0.1.1
- mono-traversable-instances ==0.1.0.0 - mono-traversable-instances ==0.1.0.0
- monoid-extras ==0.4.2 - monoid-extras ==0.4.2
- monoid-subclasses ==0.4.2.1 - monoid-subclasses ==0.4.2.1
@ -1259,7 +1260,7 @@ default-package-overrides:
- OneTuple ==0.2.1 - OneTuple ==0.2.1
- oo-prototypes ==0.1.0.0 - oo-prototypes ==0.1.0.0
- opaleye ==0.5.2.2 - opaleye ==0.5.2.2
- opaleye-trans ==0.3.3 - opaleye-trans ==0.3.4
- open-browser ==0.2.1.0 - open-browser ==0.2.1.0
- OpenGL ==3.0.1.0 - OpenGL ==3.0.1.0
- OpenGLRaw ==3.2.4.0 - OpenGLRaw ==3.2.4.0
@ -1285,7 +1286,7 @@ default-package-overrides:
- pagination ==0.1.1 - pagination ==0.1.1
- palette ==0.1.0.4 - palette ==0.1.0.4
- pandoc ==1.17.1 - pandoc ==1.17.1
- pandoc-citeproc ==0.10.3 - pandoc-citeproc ==0.10.4
- pandoc-types ==1.16.1.1 - pandoc-types ==1.16.1.1
- pango ==0.13.3.1 - pango ==0.13.3.1
- parallel ==3.2.1.0 - parallel ==3.2.1.0
@ -1487,7 +1488,7 @@ default-package-overrides:
- rest-types ==1.14.1.1 - rest-types ==1.14.1.1
- rest-wai ==0.2.0.1 - rest-wai ==0.2.0.1
- result ==0.2.6.0 - result ==0.2.6.0
- rethinkdb ==2.2.0.7 - rethinkdb ==2.2.0.8
- rethinkdb-client-driver ==0.0.23 - rethinkdb-client-driver ==0.0.23
- retry ==0.7.4.2 - retry ==0.7.4.2
- rev-state ==0.1.2 - rev-state ==0.1.2
@ -1501,7 +1502,7 @@ default-package-overrides:
- runmemo ==1.0.0.1 - runmemo ==1.0.0.1
- rvar ==0.2.0.3 - rvar ==0.2.0.3
- s3-signer ==0.3.0.0 - s3-signer ==0.3.0.0
- safe ==0.3.10 - safe ==0.3.11
- safe-exceptions ==0.1.4.0 - safe-exceptions ==0.1.4.0
- safecopy ==0.9.2 - safecopy ==0.9.2
- SafeSemaphore ==0.10.1 - SafeSemaphore ==0.10.1
@ -1556,7 +1557,7 @@ default-package-overrides:
- setlocale ==1.0.0.4 - setlocale ==1.0.0.4
- sets ==0.0.5.2 - sets ==0.0.5.2
- SHA ==1.6.4.2 - SHA ==1.6.4.2
- shake ==0.15.10 - shake ==0.15.11
- shake-language-c ==0.10.0 - shake-language-c ==0.10.0
- shakespeare ==2.0.12.1 - shakespeare ==2.0.12.1
- shell-conduit ==4.5.2 - shell-conduit ==4.5.2
@ -1635,7 +1636,7 @@ default-package-overrides:
- stm-delay ==0.1.1.1 - stm-delay ==0.1.1.1
- stm-stats ==0.2.0.0 - stm-stats ==0.2.0.0
- STMonadTrans ==0.3.4 - STMonadTrans ==0.3.4
- stopwatch ==0.1.0.3 - stopwatch ==0.1.0.4
- storable-complex ==0.2.2 - storable-complex ==0.2.2
- storable-endian ==0.2.6 - storable-endian ==0.2.6
- storable-record ==0.0.3.1 - storable-record ==0.0.3.1
@ -1643,9 +1644,9 @@ default-package-overrides:
- store-core ==0.2.0.2 - store-core ==0.2.0.2
- Strafunski-StrategyLib ==5.0.0.10 - Strafunski-StrategyLib ==5.0.0.10
- stratosphere ==0.1.6 - stratosphere ==0.1.6
- streaming ==0.1.4.3 - streaming ==0.1.4.5
- streaming-bytestring ==0.1.4.5 - streaming-bytestring ==0.1.4.6
- streaming-commons ==0.1.16 - streaming-commons ==0.1.17
- streamproc ==1.6.2 - streamproc ==1.6.2
- streams ==3.3 - streams ==3.3
- strict ==0.3.2 - strict ==0.3.2
@ -1687,12 +1688,12 @@ default-package-overrides:
- tagstream-conduit ==0.5.5.3 - tagstream-conduit ==0.5.5.3
- tar ==0.5.0.3 - tar ==0.5.0.3
- tardis ==0.4.1.0 - tardis ==0.4.1.0
- tasty ==0.11.0.4 - tasty ==0.11.1
- tasty-ant-xml ==1.0.4 - tasty-ant-xml ==1.0.4
- tasty-dejafu ==0.3.0.2 - tasty-dejafu ==0.3.0.2
- tasty-expected-failure ==0.11.0.4 - tasty-expected-failure ==0.11.0.4
- tasty-golden ==2.3.1.1 - tasty-golden ==2.3.1.1
- tasty-hspec ==1.1.3 - tasty-hspec ==1.1.3.1
- tasty-html ==0.4.1.1 - tasty-html ==0.4.1.1
- tasty-hunit ==0.9.2 - tasty-hunit ==0.9.2
- tasty-kat ==0.0.3 - tasty-kat ==0.0.3
@ -1847,7 +1848,7 @@ default-package-overrides:
- vado ==0.0.8 - vado ==0.0.8
- validate-input ==0.4.0.0 - validate-input ==0.4.0.0
- validation ==0.5.4 - validation ==0.5.4
- validity ==0.3.0.4 - validity ==0.3.1.1
- varying ==0.5.0.3 - varying ==0.5.0.3
- vault ==0.3.0.6 - vault ==0.3.0.6
- vcswrapper ==0.1.5 - vcswrapper ==0.1.5
@ -1872,7 +1873,7 @@ default-package-overrides:
- wai-conduit ==3.0.0.3 - wai-conduit ==3.0.0.3
- wai-cors ==0.2.5 - wai-cors ==0.2.5
- wai-eventsource ==3.0.0 - wai-eventsource ==3.0.0
- wai-extra ==3.0.19 - wai-extra ==3.0.19.1
- wai-logger ==2.3.0 - wai-logger ==2.3.0
- wai-middleware-caching ==0.1.0.2 - wai-middleware-caching ==0.1.0.2
- wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-lru ==0.1.0.0
@ -1892,14 +1893,14 @@ default-package-overrides:
- wai-transformers ==0.0.7 - wai-transformers ==0.0.7
- wai-websockets ==3.0.1.1 - wai-websockets ==3.0.1.1
- waitra ==0.0.4.0 - waitra ==0.0.4.0
- warp ==3.2.9 - warp ==3.2.10
- warp-tls ==3.2.2 - warp-tls ==3.2.3
- web-plugins ==0.2.9 - web-plugins ==0.2.9
- web-routes ==0.27.11 - web-routes ==0.27.11
- web-routes-boomerang ==0.28.4.2 - web-routes-boomerang ==0.28.4.2
- web-routes-happstack ==0.23.10 - web-routes-happstack ==0.23.10
- web-routes-hsp ==0.24.6.1 - web-routes-hsp ==0.24.6.1
- web-routes-th ==0.22.6 - web-routes-th ==0.22.6.1
- web-routes-wai ==0.24.3 - web-routes-wai ==0.24.3
- webdriver ==0.8.4 - webdriver ==0.8.4
- webdriver-angular ==0.1.11 - webdriver-angular ==0.1.11
@ -1911,7 +1912,7 @@ default-package-overrides:
- weigh ==0.0.3 - weigh ==0.0.3
- werewolf ==1.5.1.1 - werewolf ==1.5.1.1
- werewolf-slack ==1.0.2.0 - werewolf-slack ==1.0.2.0
- wikicfp-scraper ==0.1.0.6 - wikicfp-scraper ==0.1.0.7
- Win32 ==2.3.1.1 - Win32 ==2.3.1.1
- Win32-extras ==0.2.0.1 - Win32-extras ==0.2.0.1
- Win32-notify ==0.3.0.1 - Win32-notify ==0.3.0.1
@ -1922,15 +1923,15 @@ default-package-overrides:
- wl-pprint ==1.2 - wl-pprint ==1.2
- wl-pprint-extras ==3.5.0.5 - wl-pprint-extras ==3.5.0.5
- wl-pprint-terminfo ==3.7.1.4 - wl-pprint-terminfo ==3.7.1.4
- wl-pprint-text ==1.1.0.4 - wl-pprint-text ==1.1.1.0
- word-trie ==0.3.0 - word-trie ==0.3.0
- word8 ==0.1.2 - word8 ==0.1.2
- wordpass ==1.0.0.7 - wordpass ==1.0.0.7
- Workflow ==0.8.3 - Workflow ==0.8.3
- wrap ==0.0.0 - wrap ==0.0.0
- wreq ==0.4.1.0 - wreq ==0.4.1.0
- writer-cps-mtl ==0.1.1.1 - writer-cps-mtl ==0.1.1.2
- writer-cps-transformers ==0.1.1.0 - writer-cps-transformers ==0.1.1.2
- wuss ==1.1.3 - wuss ==1.1.3
- X11 ==1.6.1.2 - X11 ==1.6.1.2
- x509 ==1.6.5 - x509 ==1.6.5
@ -1949,7 +1950,7 @@ default-package-overrides:
- xml-conduit ==1.3.5 - xml-conduit ==1.3.5
- xml-conduit-parse ==0.3.1.0 - xml-conduit-parse ==0.3.1.0
- xml-conduit-writer ==0.1.1.1 - xml-conduit-writer ==0.1.1.1
- xml-hamlet ==0.4.0.12 - xml-hamlet ==0.4.1
- xml-lens ==0.1.6.3 - xml-lens ==0.1.6.3
- xml-to-json-fast ==2.0.0 - xml-to-json-fast ==2.0.0
- xml-types ==0.3.6 - xml-types ==0.3.6
@ -1959,7 +1960,7 @@ default-package-overrides:
- xss-sanitize ==0.3.5.7 - xss-sanitize ==0.3.5.7
- yackage ==0.8.1 - yackage ==0.8.1
- yahoo-finance-api ==0.1.0.0 - yahoo-finance-api ==0.1.0.0
- yaml ==0.8.21.1 - yaml ==0.8.21.2
- Yampa ==0.10.5 - Yampa ==0.10.5
- YampaSynth ==0.2 - YampaSynth ==0.2
- yarr ==1.4.0.2 - yarr ==1.4.0.2
@ -1987,7 +1988,7 @@ default-package-overrides:
- yesod-static-angular ==0.1.8 - yesod-static-angular ==0.1.8
- yesod-table ==2.0.3 - yesod-table ==2.0.3
- yesod-test ==1.5.4.1 - yesod-test ==1.5.4.1
- yesod-websockets ==0.2.4.1 - yesod-websockets ==0.2.5
- yi ==0.12.6 - yi ==0.12.6
- yi-fuzzy-open ==0.1.0.1 - yi-fuzzy-open ==0.1.0.1
- yi-language ==0.2.1 - yi-language ==0.2.1
@ -2619,7 +2620,6 @@ dont-distribute-packages:
breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] breakout: [ i686-linux, x86_64-linux, x86_64-darwin ]
breve: [ i686-linux, x86_64-linux, x86_64-darwin ] breve: [ i686-linux, x86_64-linux, x86_64-darwin ]
brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ]
brick: [ i686-linux, x86_64-linux, x86_64-darwin ]
brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] brillig: [ i686-linux, x86_64-linux, x86_64-darwin ]
broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ]
broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]

File diff suppressed because it is too large Load diff

View file

@ -1,13 +0,0 @@
diff -r -u orig/lib/rdoc/generator/template/darkfish/filepage.rhtml new/lib/rdoc/generator/template/darkfish/filepage.rhtml
--- orig/lib/rdoc/generator/template/darkfish/filepage.rhtml
+++ new/lib/rdoc/generator/template/darkfish/filepage.rhtml
@@ -88,9 +88,6 @@
<body class="file file-popup">
<div id="metadata">
<dl>
- <dt class="modified-date">Last Modified</dt>
- <dd class="modified-date"><%= file.last_modified %></dd>
-
<% if file.requires %>
<dt class="requires">Requires</dt>
<dd class="requires">

View file

@ -180,14 +180,6 @@ let
) args; in self; ) args; in self;
in { in {
ruby_1_9_3 = generic {
version = rubyVersion "1" "9" "3" "p551";
sha256 = {
src = "1s2ibg3s2iflzdv7rfxi1qqkvdbn2dq8gxdn0nxrb77ls5ffanxv";
git = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s";
};
};
ruby_2_0_0 = generic { ruby_2_0_0 = generic {
version = rubyVersion "2" "0" "0" "p647"; version = rubyVersion "2" "0" "0" "p647";
sha256 = { sha256 = {

View file

@ -1,32 +1,6 @@
{ patchSet, useRailsExpress, ops, patchLevel }: { patchSet, useRailsExpress, ops, patchLevel }:
rec { rec {
"1.9.3" = [
./ssl_v3.patch
./rand-egd.patch
./ruby19-parallel-install.patch
./bitperfect-rdoc.patch
] ++ ops useRailsExpress [
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/01-fix-make-clean.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/02-zero-broken-tests.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/03-railsbench-gc.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/04-display-more-detailed-stack-trace.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/05-fork-support-for-gc-logging.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/06-track-live-dataset-size.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/07-webrick_204_304_keep_alive_fix.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/09-thread-variables.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/10-faster-loading.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/11-falcon-st-opt.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/12-falcon-sparse-array.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/13-falcon-array-queue.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/14-railsbench-gc-fixes.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/15-show-full-backtrace-on-stack-overflow.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/16-configurable-fiber-stack-sizes.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/17-backport-psych-20.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/18-fix-missing-c-return-event.patch"
"${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/19-fix-process-daemon-call.patch"
];
"2.0.0" = [ "2.0.0" = [
./ssl_v3.patch ./ssl_v3.patch
./rand-egd.patch ./rand-egd.patch

View file

@ -1,15 +0,0 @@
Index: ruby-1.9.3-p392/lib/mkmf.rb
===================================================================
--- ruby-1.9.3-p392.orig/lib/mkmf.rb
+++ ruby-1.9.3-p392/lib/mkmf.rb
@@ -2039,8 +2039,8 @@ static: $(STATIC_LIB)#{$extout ? " insta
end
for f in files
dest = "#{dir}/#{File.basename(f)}"
- mfile.print("install-rb#{sfx}: #{dest} #{dir}\n")
- mfile.print("#{dest}: #{f}\n")
+ mfile.print("install-rb#{sfx}: #{dest}\n")
+ mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n")
mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
if defined?($installed_list) and !$extout
mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")

View file

@ -1,42 +0,0 @@
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index e272cba..3a1fa71 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -87,6 +87,7 @@
have_func("PEM_def_callback")
have_func("PKCS5_PBKDF2_HMAC")
have_func("PKCS5_PBKDF2_HMAC_SHA1")
+have_func("RAND_egd")
have_func("X509V3_set_nconf")
have_func("X509V3_EXT_nconf_nid")
have_func("X509_CRL_add0_revoked")
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index 29cbf8c..27466fe 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -148,6 +148,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
return str;
}
+#ifdef HAVE_RAND_EGD
/*
* call-seq:
* egd(filename) -> true
@@ -186,6 +187,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
}
return Qtrue;
}
+#endif /* HAVE_RAND_EGD */
/*
* call-seq:
@@ -219,8 +221,10 @@ Init_ossl_rand(void)
rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1);
rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1);
rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
+#ifdef HAVE_RAND_EGD
rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1);
rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
+#endif /* HAVE_RAND_EGD */
rb_define_module_function(mRandom, "status?", ossl_rand_status, 0);
}

View file

@ -1,13 +1,10 @@
{ stdenv, fetchurl, cmake, boost, ruby_1_9, ignition, tinyxml { stdenv, fetchurl, cmake, boost, ruby, ignition, tinyxml
, name ? "sdformat-${version}" , name ? "sdformat-${version}"
, version ? "4.0.0" # versions known to work with this expression include 3.7.0 , version ? "4.0.0" # versions known to work with this expression include 3.7.0
, srchash-sha256 ? "b0f94bb40b0d83e35ff250a7916fdfd6df5cdc1e60c47bc53dd2da5e2378163e" , srchash-sha256 ? "b0f94bb40b0d83e35ff250a7916fdfd6df5cdc1e60c47bc53dd2da5e2378163e"
, ... , ...
}: }:
let
ruby = ruby_1_9;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2"; url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2";
@ -26,6 +23,7 @@ stdenv.mkDerivation rec {
]; ];
meta = { meta = {
broken = true;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
} }

View file

@ -10,7 +10,14 @@ stdenv.mkDerivation rec{
libjpeg zeromq3 ncurses openssl libpng readline pkgconfig libjpeg zeromq3 ncurses openssl libpng readline pkgconfig
zlib libX11 which zlib libX11 which
]; ];
src = fetchgit (stdenv.lib.importJSON ./src.json);
src = fetchgit {
url = "https://github.com/torch/distro";
rev = "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f";
sha256 = "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy";
fetchSubmodules = true;
};
buildPhase = '' buildPhase = ''
cd .. cd ..
export PREFIX=$out export PREFIX=$out

View file

@ -1,6 +0,0 @@
{
"url": "https://github.com/torch/distro",
"rev": "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f",
"sha256": "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy",
"fetchSubmodules": true
}

View file

@ -1,11 +1,12 @@
{ stdenv, fetchurl, python, buildPythonPackage, pycairo { stdenv, fetchurl, python, buildPythonPackage, pycairo
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado
, freetype, libpng, pkgconfig, mock, pytz, pygobject3 , freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
, enableGhostscript ? false, ghostscript ? null, gtk3 , enableGhostscript ? false, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobjectIntrospection , enableGtk2 ? false, pygtk ? null, gobjectIntrospection
, enableGtk3 ? false, cairo , enableGtk3 ? false, cairo
, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, Cocoa, Foundation, CoreData, cf-private, libobjc, libcxx , enableQt ? false, pyqt4
, libcxx
}: }:
assert enableGhostscript -> ghostscript != null; assert enableGhostscript -> ghostscript != null;
@ -15,14 +16,15 @@ assert enableTk -> (tcl != null)
&& (tkinter != null) && (tkinter != null)
&& (libX11 != null) && (libX11 != null)
; ;
assert enableQt -> pyqt4 != null;
buildPythonPackage rec { buildPythonPackage rec {
name = "matplotlib-${version}"; name = "matplotlib-${version}";
version = "1.5.3"; version = "2.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; url = "mirror://pypi/m/matplotlib/${name}.tar.gz";
sha256 = "1g7bhr6v3wdxyx29rfxgf57l9w19s79cdlpyi0h4y0c5ywwxr9d0"; sha256 = "04zqymd5dw6lxvfbxf1sycdnibjk5qky5rfsn6wb46lwha2hkkrn";
}; };
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
@ -30,17 +32,17 @@ buildPythonPackage rec {
XDG_RUNTIME_DIR = "/tmp"; XDG_RUNTIME_DIR = "/tmp";
buildInputs = [ python which sphinx stdenv ] buildInputs = [ python which sphinx stdenv ]
++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional enableGhostscript ghostscript;
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation CoreData
cf-private libobjc ];
propagatedBuildInputs = propagatedBuildInputs =
[ cycler dateutil nose numpy pyparsing tornado freetype [ cycler dateutil nose numpy pyparsing tornado freetype
libpng pkgconfig mock pytz libpng pkgconfig mock pytz
] ]
++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]; ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt4 ]
++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ];
patches = patches =
[ ./basedirlist.patch ] ++ [ ./basedirlist.patch ] ++
@ -64,8 +66,8 @@ buildPythonPackage rec {
${python.interpreter} tests.py ${python.interpreter} tests.py
''; '';
# The entry point for running tests, tests.py, is not included in the release. # Test data is not included in the distribution (the `tests` folder
# https://github.com/matplotlib/matplotlib/issues/6017 # is missing)
doCheck = false; doCheck = false;
prePatch = '' prePatch = ''

View file

@ -53,6 +53,37 @@ in with pkgs; {
and then run `nix-shell .` to be dropped into a shell with those packages and then run `nix-shell .` to be dropped into a shell with those packages
available. available.
## RStudio
RStudio by default will not use the libraries installed like above.
You must override its R version with your custom R environment, and
set `useRPackages` to `true`, like below:
```nix
{
packageOverrides = super: let self = super.pkgs; in
{
rEnv = super.rWrapper.override {
packages = with self.rPackages; [
devtools
ggplot2
reshape2
yaml
optparse
];
};
rstudioEnv = super.rstudio.override {
R = rEnv;
useRPackages = true;
};
};
}
```
Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
this into your user profile.
## Updating the package set ## Updating the package set
```bash ```bash

View file

@ -1,12 +1,19 @@
{ stdenv, R, makeWrapper, recommendedPackages, packages }: { stdenv, R, makeWrapper, recommendedPackages, packages }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = R.name + "-wrapper"; name = R.name + "-wrapper";
buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages; buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages;
unpackPhase = ":"; unpackPhase = ":";
# This filename is used in 'installPhase', but needs to be
# referenced elsewhere. This will be relative to this package's
# path.
passthru = {
fixLibsR = "fix_libs.R";
};
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cd ${R}/bin cd ${R}/bin
@ -14,6 +21,17 @@ stdenv.mkDerivation {
makeWrapper ${R}/bin/$exe $out/bin/$exe \ makeWrapper ${R}/bin/$exe $out/bin/$exe \
--prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
done done
# RStudio (and perhaps other packages) overrides the R_LIBS_SITE
# which the wrapper above applies, and as a result packages
# installed in the wrapper (as in the method described in
# https://nixos.org/nixpkgs/manual/#r-packages) aren't visible.
# The below turns R_LIBS_SITE into some R startup code which can
# correct this.
echo "# Autogenerated by wrapper.nix from R_LIBS_SITE" > $out/${passthru.fixLibsR}
echo -n ".libPaths(c(.libPaths(), \"" >> $out/${passthru.fixLibsR}
echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${passthru.fixLibsR}
echo -n "\"))" >> $out/${passthru.fixLibsR}
echo >> $out/${passthru.fixLibsR}
''; '';
meta = { meta = {

View file

@ -4,8 +4,8 @@ buildRubyGem rec {
inherit ruby; inherit ruby;
name = "${gemName}-${version}"; name = "${gemName}-${version}";
gemName = "bundler"; gemName = "bundler";
version = "1.13.7"; version = "1.14.3";
sha256 = "1avvvdzw0k5k2m5n79b96nkmdfd0sjamc676fz7asz4prz2wiw59"; sha256 = "1znvh83phzvp97l3kcgk9vbwsnq45qc8nrb4dnqv17mrhgcwfqcx";
dontPatchShebangs = true; dontPatchShebangs = true;
postFixup = '' postFixup = ''

View file

@ -1,30 +1,14 @@
# NOTE: the `nixpkgs` version of this file is copied from the upstream repository # NOTE: this file is copied from the upstream repository for this package.
# for this package. Please make any changes to https://github.com/timbertson/gup/ # Please submit any changes you make here to https://github.com/timbertson/gup/
{ stdenv, lib, pythonPackages }: { stdenv, lib, python, which, pychecker ? null }:
{ src, version, meta ? {}, passthru ? {}, forceTests ? false }: { src, version, meta ? {} }:
let
testInputs = [
pythonPackages.mocktest or null
pythonPackages.whichcraft
pythonPackages.nose
pythonPackages.nose_progressive
];
pychecker = pythonPackages.pychecker or null;
usePychecker = forceTests || pychecker != null;
enableTests = forceTests || (lib.all (dep: dep != null) testInputs);
in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit src meta passthru; inherit src meta;
name = "gup-${version}"; name = "gup-${version}";
buildInputs = [ pythonPackages.python ] buildInputs = lib.remove null [ python which pychecker ];
++ (lib.optionals enableTests testInputs) SKIP_PYCHECKER = pychecker == null;
++ (lib.optional usePychecker pychecker)
;
SKIP_PYCHECKER = !usePychecker;
buildPhase = "make python"; buildPhase = "make python";
inherit pychecker;
testPhase = if enableTests then "make test" else "true";
installPhase = '' installPhase = ''
mkdir $out mkdir $out
cp -r python/bin $out/bin cp -r python/bin $out/bin

View file

@ -1,6 +0,0 @@
#!/bin/bash
set -eu
if [ -n "${GUP_TARGET:-}" ]; then
gup --always
fi
curl -LSs -o "$1" https://raw.githubusercontent.com/timbertson/gup/master/nix/gup-python.nix

View file

@ -1,21 +1,21 @@
{ stdenv, fetchFromGitHub, lib, pythonPackages, nix-update-source, curl }: { stdenv, fetchFromGitHub, lib, python, which }:
let
version = "0.6.0";
src = fetchFromGitHub {
sha256 = "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr";
rev = "version-${version}";
repo = "gup";
owner = "timbertson";
};
in
import ./build.nix import ./build.nix
{ inherit stdenv lib pythonPackages; } { inherit stdenv lib python which; }
{ inherit (nix-update-source.fetch ./src.json) src version; { inherit src version;
meta = { meta = {
homepage = https://github.com/timbertson/gup/; inherit (src.meta) homepage;
description = "A better make, inspired by djb's redo"; description = "A better make, inspired by djb's redo";
license = stdenv.lib.licenses.lgpl2Plus; license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.timbertson ]; maintainers = [ stdenv.lib.maintainers.timbertson ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
passthru = {
updateScript = ''
set -e
echo
cd ${toString ./.}
${nix-update-source}/bin/nix-update-source --prompt version src.json
./build.nix.gup build.nix
'';
};
} }

View file

@ -1,17 +0,0 @@
{
"fetch": {
"args": {
"owner": "timbertson",
"repo": "gup",
"rev": "version-0.6.0",
"sha256": "053xnx39jh9kn9l572z4k0q7bbxjpisf1fm9aq27ybj2ha1rh6wr"
},
"fn": "fetchFromGitHub",
"rev": "version-0.6.0",
"version": "0.6.0"
},
"owner": "timbertson",
"repo": "gup",
"rev": "version-{version}",
"type": "fetchFromGitHub"
}

View file

@ -0,0 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "bashdb-4.4-0.92";
src = fetchurl {
url = "mirror://sourceforge/bashdb/${name}.tar.bz2";
sha256 = "6a8c2655e04339b954731a0cb0d9910e2878e45b2fc08fe469b93e4f2dbaaf92";
};
meta = {
description = "Bash script debugger";
homepage = http://bashdb.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,5 +1,7 @@
{ stdenv, fetchurl, ncurses }: { stdenv, fetchurl, ncurses }:
let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lsof-${version}"; name = "lsof-${version}";
version = "4.89"; version = "4.89";
@ -24,20 +26,19 @@ stdenv.mkDerivation rec {
}; };
unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
patches = [ ./dfile.patch ]; patches = [ ./dfile.patch ];
configurePhase = '' # Stop build scripts from searching global include paths
# Stop build scripts from searching global include paths LSOF_INCLUDE = "${stdenv.cc.libc}/include";
export LSOF_INCLUDE=${stdenv.cc.libc}/include configurePhase = "./Configure -n ${dialect}";
./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"}
'';
preBuild = '' preBuild = ''
sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/'
for filepath in $(find dialects/${dialect} -type f); do
sed -i "s,/usr/include,$LSOF_INCLUDE,g" $filepath
done
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/man/man8 mkdir -p $out/bin $out/man/man8
cp lsof.8 $out/man/man8/ cp lsof.8 $out/man/man8/
@ -53,6 +54,6 @@ stdenv.mkDerivation rec {
from it). from it).
''; '';
maintainers = [ stdenv.lib.maintainers.mornfall ]; maintainers = [ stdenv.lib.maintainers.mornfall ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "theme-vertex"; pname = "theme-vertex";
version = "20161009"; version = "20170128";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "horst3180"; owner = "horst3180";
repo = "vertex-theme"; repo = "vertex-theme";
rev = "c861918a7fccf6d0768d45d790a19a13bb23485e"; rev = version;
sha256 = "13abgl18m04sj44gqipxbagpan4jqral65w59rgnhb6ldxgnhg33"; sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

View file

@ -366,6 +366,8 @@ rec {
''; '';
})); }));
vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; };
buildVimPluginFrom2Nix = a: buildVimPlugin ({ buildVimPluginFrom2Nix = a: buildVimPlugin ({
buildPhase = ":"; buildPhase = ":";
configurePhase =":"; configurePhase =":";

View file

@ -19,7 +19,7 @@ buildPhase() {
sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source)
sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
unset src # used by the nv makefile unset src # used by the nv makefile
make SYSSRC=$sysSrc SYSOUT=$sysOut module make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_JOBS
cd .. cd ..
fi fi
@ -31,6 +31,9 @@ installPhase() {
mkdir -p "$out/etc/OpenCL/vendors" mkdir -p "$out/etc/OpenCL/vendors"
cp -p nvidia.icd $out/etc/OpenCL/vendors/ cp -p nvidia.icd $out/etc/OpenCL/vendors/
mkdir -p "$out/share/vulkan/icd.d"
cp -p nvidia_icd.json "$out/share/vulkan/icd.d/"
mkdir -p "$out/lib" mkdir -p "$out/lib"
cp -prd *.so.* tls "$out/lib/" cp -prd *.so.* tls "$out/lib/"
rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
@ -68,7 +71,7 @@ installPhase() {
ln -srnf "$libname" "$libname_short" ln -srnf "$libname" "$libname_short"
fi fi
if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so ]]; then if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so || $libname_short =~ libGLX.so || $libname_short =~ libGLX_nvidia.so ]]; then
major=0 major=0
else else
major=1 major=1

View file

@ -1,12 +1,15 @@
{ stdenv, fetchurl, kernel, writeScript, coreutils, gnugrep, jq, curl { stdenv, fetchurl, kernel, writeScript, coreutils, gnugrep, jq, curl
}: }:
let stdenv.mkDerivation rec {
data = stdenv.lib.importJSON ./update.json; name = "tp_smapi-${version}-${kernel.version}";
in stdenv.mkDerivation rec {
name = "tp_smapi-${data.version}-${kernel.version}";
src = fetchurl { inherit (data) url sha256; }; version = "0.42";
src = fetchurl {
url = "https://github.com/evgeni/tp_smapi/archive/tp-smapi/${version}.tar.gz";
sha256 = "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381";
};
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];

View file

@ -1,5 +0,0 @@
{
"version": "0.42",
"url": "https://github.com/evgeni/tp_smapi/archive/tp-smapi/0.42.tar.gz",
"sha256": "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381"
}

View file

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
, systemd, nettle, libedit }: , systemd, nettle, libedit, zlib, libiconv
}:
# Note: ATM only the libraries have been tested in nixpkgs. # Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,11 +16,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gnutls jansson liburcu lmdb libidn gnutls jansson liburcu libidn
nettle libedit nettle libedit
libiconv
# without sphinx &al. for developer documentation # without sphinx &al. for developer documentation
] ]
++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ]; # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
++ stdenv.lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, jre, makeWrapper, bash }: { stdenv, fetchurl, jre, makeWrapper, bash }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zookeeper-3.4.6"; name = "zookeeper-3.4.9";
src = fetchurl { src = fetchurl {
url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
sha256 = "01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994"; sha256 = "0dgmja1lm7qn92x2xfmz5qj2k6sj2f6yzyj3a55r7iv1590l1wz7";
}; };
buildInputs = [ makeWrapper jre ]; buildInputs = [ makeWrapper jre ];
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
homepage = "http://zookeeper.apache.org"; homepage = "http://zookeeper.apache.org";
description = "Apache Zookeeper"; description = "Apache Zookeeper";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ nathan-gs cstrahan ]; maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -343,6 +343,7 @@ let
|| system == "x86_64-openbsd" || system == "x86_64-openbsd"
|| system == "x86_64-cygwin" || system == "x86_64-cygwin"
|| system == "x86_64-solaris" || system == "x86_64-solaris"
|| system == "aarch64-linux"
|| system == "mips64el-linux"; || system == "mips64el-linux";
isMips = system == "mips-linux" isMips = system == "mips-linux"
|| system == "mips64el-linux"; || system == "mips64el-linux";

View file

@ -1,16 +1,17 @@
{ stdenv, lib, fetchgit { stdenv, lib, fetchurl
, extra-cmake-modules, ki18n , extra-cmake-modules, ki18n
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
, kitemviews, lcms2, libXrandr, qtx11extras , kitemviews, lcms2, libXrandr, qtx11extras
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "colord-kde-0.5.0.20160224"; name = "colord-kde-${version}";
src = fetchgit { version = "0.5.0";
url = "git://anongit.kde.org/colord-kde";
rev = "3729d1348c57902b74283bc8280ffb5561b221db"; src = fetchurl {
sha256 = "03ww8nskgxl38dwkbb39by18gxvrcm6w2zg9s7q05i76rpl6kkkw"; url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
}; };
nativeBuildInputs = [ extra-cmake-modules ki18n ]; nativeBuildInputs = [ extra-cmake-modules ki18n ];

View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "fzf-${version}"; name = "fzf-${version}";
version = "0.15.9"; version = "0.16.2";
rev = "${version}"; rev = "${version}";
goPackagePath = "github.com/junegunn/fzf"; goPackagePath = "github.com/junegunn/fzf";
@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev; inherit rev;
owner = "junegunn"; owner = "junegunn";
repo = "fzf"; repo = "fzf";
sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l"; sha256 = "160474x0m3fzxi2ddy53chzhmlrx6lvialjknfxb72rm938fc845";
}; };
outputs = [ "bin" "out" "man" ]; outputs = [ "bin" "out" "man" ];
@ -33,13 +33,6 @@ buildGoPackage rec {
ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
''; '';
preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
# fixes cycle between $out and $bin
# otool -l shows that the binary includes an LC_RPATH to $out/lib
# it seems safe to remove that since but the directory does not exist.
install_name_tool -delete_rpath $out/lib $bin/bin/fzf
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/junegunn/fzf; homepage = https://github.com/junegunn/fzf;
description = "A command-line fuzzy finder written in Go"; description = "A command-line fuzzy finder written in Go";

View file

@ -23,8 +23,17 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/junegunn/go-shellwords"; url = "https://github.com/junegunn/go-shellwords";
rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; rev = "33bd8f1ebe16d6e5eb688cc885749a63059e9167";
sha256 = "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"; sha256 = "0xcymw0fm0ir8d9swh1bkpknnqgx5ijjsj433z4d9riy8h8ywpw8";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "854ae91cdcbf914b499b1d7641d07859f3653481";
sha256 = "19hj2nv2awc6zhpiapv8xv2yjdwfpxhvx5wnr99if6kg0y1ybsa7";
}; };
} }
] ]

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, { stdenv, fetchurl, makeWrapper,
systemd, # udevadm systemd, # udevadm
busybox, busybox,
coreutils, # os-prober desn't seem to work with pure busybox coreutils, # os-prober desn't seem to work with pure busybox
devicemapper, # lvs devicemapper, # lvs
# optional dependencies # optional dependencies
@ -11,11 +11,11 @@ ntfs3g ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.65"; version = "1.71";
name = "os-prober-${version}"; name = "os-prober-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz"; url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz";
sha256 = "c4a7661a52edae722f7e6bacb3f107cf7086cbe768275fadf5398d04360bfc84"; sha256 = "5d6141e02b58e82194422b97d683d61c7ff78175d89c2f055f5d2e7a363bdd20";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];

View file

@ -5,13 +5,13 @@ let
inherit (pythonPackages) python nose pycrypto requests2 mock; inherit (pythonPackages) python nose pycrypto requests2 mock;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "svtplay-dl-${version}"; name = "svtplay-dl-${version}";
version = "1.9"; version = "1.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "spaam"; owner = "spaam";
repo = "svtplay-dl"; repo = "svtplay-dl";
rev = version; rev = version;
sha256 = "0kqly2jzpn1l26is65nhaq0xdvsjylh7wm12fw9r1wz1558pqswf"; sha256 = "1xnafj87rp12b7mikvyi3b77vrrhnkjav9gn20fj9yi5p070vkf1";
}; };
pythonPaths = [ pycrypto requests2 ]; pythonPaths = [ pycrypto requests2 ];

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "mptre"; owner = "mptre";
repo = "yank"; repo = "yank";
rev = "v${meta.version}"; rev = "v${meta.version}";
sha256 = "1m8pnarm8n5x6ylbzxv8j9amylrllw166arrj4cx9f2jp2zbzcic"; sha256 = "0d1vvmz6wg1m2byd22bxikywnm2970kyfsm46fhagxardsxbp6hj";
inherit name; inherit name;
}; };
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
''; '';
downloadPage = "https://github.com/mptre/yank/releases"; downloadPage = "https://github.com/mptre/yank/releases";
license = licenses.mit; license = licenses.mit;
version = "0.7.1"; version = "0.8.0";
maintainers = [ maintainers.dochang ]; maintainers = [ maintainers.dochang ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

View file

@ -15,11 +15,11 @@ with stdenv.lib;
buildPythonApplication rec { buildPythonApplication rec {
name = "youtube-dl-${version}"; name = "youtube-dl-${version}";
version = "2017.01.24"; version = "2017.01.28";
src = fetchurl { src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
sha256 = "6691206f68b8ecf8e9f81a85c63b4c00676f66f549d37e9ea36113eda6d1e4d8"; sha256 = "16dyci631i6dgy1ia9vg69wk5zn8f1zd7bjwhw6adacrcx2nb89w";
}; };
buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

View file

@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
name = pname + "-" + version; name = pname + "-" + version;
pname = "i2pd"; pname = "i2pd";
version = "2.10.0"; version = "2.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PurpleI2P"; owner = "PurpleI2P";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0lw0vcibp3v5xz855h4x2rs3ff7yx86znzjfnfri348wg413js5c"; sha256 = "1ky4ckv5p86xxgjkgxdi48c9q9h4pff2blilg03bxks8f8dxfy9f";
}; };
buildInputs = [ boost zlib openssl ]; buildInputs = [ boost zlib openssl ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty { stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty
, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }: , makeWrapper, perl, openssl, autoreconfHook, openssh }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mosh-1.2.6"; name = "mosh-1.2.6";
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
patches = [ ./ssh_path.patch ];
postPatch = ''
substituteInPlace scripts/mosh.pl \
--subst-var-by ssh "${openssh}/bin/ssh"
'';
postInstall = '' postInstall = ''
wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
''; '';

View file

@ -0,0 +1,13 @@
diff --git i/scripts/mosh.pl w/scripts/mosh.pl
index c511482..55bf5f3 100755
--- i/scripts/mosh.pl
+++ w/scripts/mosh.pl
@@ -66,7 +66,7 @@ my $use_remote_ip = 'proxy';
my $family = 'prefer-inet';
my $port_request = undef;
-my @ssh = ('ssh');
+my @ssh = ('@ssh@');
my $term_init = 1;

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, }: { stdenv, fetchFromGitHub, pythonPackages, }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
version = "7.0.12"; version = "7.0.13";
name = "offlineimap-${version}"; name = "offlineimap-${version}";
namePrefix = ""; namePrefix = "";
@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
owner = "OfflineIMAP"; owner = "OfflineIMAP";
repo = "offlineimap"; repo = "offlineimap";
rev = "v${version}"; rev = "v${version}";
sha256 = "1i83p40lxjqnvh88x623iydrwnsxib1k91qbl9myc4hi5i4fnr6x"; sha256 = "0108xmp9df6cb1nzw3ym59mir3phgfdgp5d43n44ymsk2cc39xcc";
}; };
doCheck = false; doCheck = false;

View file

@ -1,12 +1,12 @@
{stdenv, fetchurl, lzo, openssl, zlib}: {stdenv, fetchurl, lzo, openssl, zlib}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.29"; version = "1.0.31";
name = "tinc-${version}"; name = "tinc-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
sha256 = "0y1alzxgds067m83qdkg12hsy6disa2ad3y2i0h1pgpvdxy02mq3"; sha256 = "d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b";
}; };
buildInputs = [ lzo openssl zlib ]; buildInputs = [ lzo openssl zlib ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc" "--sysconfdir=/etc"
]; ];
meta = { meta = {
description = "VPN daemon with full mesh routing"; description = "VPN daemon with full mesh routing";
longDescription = '' longDescription = ''
tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and

View file

@ -1,29 +0,0 @@
{ lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }:
python3Packages.buildPythonApplication rec {
version = "0.2.2";
name = "nix-update-source-${version}";
src = fetchFromGitHub {
owner = "timbertson";
repo = "nix-update-source";
rev = "version-${version}";
sha256 = "0liigkr37ib2xy269bcp53ivpir4mpg6lzwnfrsqc4kbkz3l16gg";
};
propagatedBuildInputs = [ nix-prefetch-scripts ];
passthru = {
fetch = path:
let
fetchers = {
# whitelist of allowed fetchers
inherit (pkgs) fetchgit fetchurl fetchFromGitHub;
};
json = lib.importJSON path;
fetchFn = builtins.getAttr json.fetch.fn fetchers;
src = fetchFn json.fetch.args;
in
json // json.fetch // { inherit src; };
};
meta = {
description = "Utility to autimate updating of nix derivation sources";
maintainers = with lib.maintainers; [ timbertson ];
};
}

View file

@ -2256,15 +2256,15 @@ with pkgs;
}; };
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { # ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
inherit (haskellPackages) ihaskell ghcWithPackages; # inherit (haskellPackages) ihaskell ghcWithPackages;
ipython = python3.buildEnv.override { # ipython = python3.buildEnv.override {
extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ]; # extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ];
}; # };
packages = config.ihaskell.packages or (self: []); # packages = config.ihaskell.packages or (self: []);
}; # };
imapproxy = callPackage ../tools/networking/imapproxy { }; imapproxy = callPackage ../tools/networking/imapproxy { };
@ -5890,7 +5890,6 @@ with pkgs;
bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
inherit (callPackage ../development/interpreters/ruby {}) inherit (callPackage ../development/interpreters/ruby {})
ruby_1_9_3
ruby_2_0_0 ruby_2_0_0
ruby_2_1_10 ruby_2_1_10
ruby_2_2_5 ruby_2_2_5
@ -5899,7 +5898,6 @@ with pkgs;
# Ruby aliases # Ruby aliases
ruby = ruby_2_3; ruby = ruby_2_3;
ruby_1_9 = ruby_1_9_3;
ruby_2_0 = ruby_2_0_0; ruby_2_0 = ruby_2_0_0;
ruby_2_1 = ruby_2_1_10; ruby_2_1 = ruby_2_1_10;
ruby_2_2 = ruby_2_2_5; ruby_2_2 = ruby_2_2_5;
@ -6729,6 +6727,8 @@ with pkgs;
ruby = ruby_2_2; ruby = ruby_2_2;
}; };
bashdb = callPackage ../development/tools/misc/bashdb { };
gdb = callPackage ../development/tools/misc/gdb { gdb = callPackage ../development/tools/misc/gdb {
guile = null; guile = null;
hurd = gnu.hurdCross; hurd = gnu.hurdCross;
@ -12247,6 +12247,8 @@ with pkgs;
hasklig = callPackage ../data/fonts/hasklig {}; hasklig = callPackage ../data/fonts/hasklig {};
siji = callPackage ../data/fonts/siji { };
sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { };
source-code-pro = callPackage ../data/fonts/source-code-pro {}; source-code-pro = callPackage ../data/fonts/source-code-pro {};
@ -13369,6 +13371,8 @@ with pkgs;
game-music-emu = callPackage ../applications/audio/game-music-emu { }; game-music-emu = callPackage ../applications/audio/game-music-emu { };
gcalcli = callPackage ../applications/misc/gcalcli { };
gcolor2 = callPackage ../applications/graphics/gcolor2 { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { };
get_iplayer = callPackage ../applications/misc/get_iplayer {}; get_iplayer = callPackage ../applications/misc/get_iplayer {};
@ -17558,8 +17562,6 @@ with pkgs;
nix-prefetch-zip nix-prefetch-zip
nix-prefetch-scripts; nix-prefetch-scripts;
nix-update-source = callPackage ../tools/package-management/nix-update-source {};
nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
nix-repl = callPackage ../tools/package-management/nix-repl { }; nix-repl = callPackage ../tools/package-management/nix-repl { };

View file

@ -805,7 +805,7 @@ in {
alot = buildPythonPackage rec { alot = buildPythonPackage rec {
rev = "0.3.7"; rev = "0.5";
name = "alot-${rev}"; name = "alot-${rev}";
disabled = isPy3k; disabled = isPy3k;
@ -814,7 +814,7 @@ in {
owner = "pazz"; owner = "pazz";
repo = "alot"; repo = "alot";
inherit rev; inherit rev;
sha256 = "0sscmmf42gsrjbisi6wm01alzlnq6wqhpwkm8pc557075jfg19il"; sha256 = "1hzajfh0f21k97xip9blg7zifiv3y5k33swp2h9sc57qd7qkr5i6";
}; };
postPatch = '' postPatch = ''
@ -831,6 +831,7 @@ in {
self.python_magic self.python_magic
self.configobj self.configobj
self.pygpgme self.pygpgme
self.mock
]; ];
postInstall = '' postInstall = ''
@ -2993,11 +2994,11 @@ in {
boto = buildPythonPackage rec { boto = buildPythonPackage rec {
name = "boto-${version}"; name = "boto-${version}";
version = "2.42.0"; version = "2.45.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://github.com/boto/boto/archive/${version}.tar.gz"; url = "https://github.com/boto/boto/archive/${version}.tar.gz";
sha256 = "04ywn8xszk57s87jnkv4j1hswc6ra7z811y9lawfvhvnfshrpx5d"; sha256 = "18z5nacnbdpw3pmzc56didhy4sfik8riap204px24350g9xlgz7i";
}; };
checkPhase = '' checkPhase = ''
@ -14211,8 +14212,6 @@ in {
matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
enableGhostscript = true; enableGhostscript = true;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation CoreData;
inherit (pkgs.darwin) cf-private libobjc;
}; };