diff options
Diffstat (limited to 'pkgs')
35 files changed, 1449 insertions, 252 deletions
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 85b9e7c4368a..4e16ceedbbbe 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -3,25 +3,32 @@ , coreutils , fetchurl , findutils +, file , git +, glxinfo , gnugrep , gnutar , gzip , jdk +, libpulseaudio +, libX11 , libXrandr , makeWrapper +, pciutils , pkgsi686Linux +, setxkbmap , stdenv , unzip , which , writeTextFile +, xkeyboard_config , zlib }: let - version = "2.1.2.0"; - build = "143.2915827"; + version = "2.1.3.0"; + build = "143.3101438"; androidStudio = stdenv.mkDerivation { name = "android-studio"; @@ -40,6 +47,12 @@ let jdk which + # For Android emulator + file + glxinfo + pciutils + setxkbmap + # Used during setup wizard gnutar gzip @@ -47,21 +60,26 @@ let # Runtime stuff git - ]}" --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ + ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ # Gradle wants libstdc++.so.6 stdenv.cc.cc.lib # mksdcard wants 32 bit libstdc++.so.6 pkgsi686Linux.stdenv.cc.cc.lib + # aapt wants libz.so.1 zlib pkgsi686Linux.zlib # Support multiple monitors libXrandr - ]}" + + # For Android emulator + libpulseaudio + libX11 + ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams"; + sha256 = "1xlz3ibqrm4ckw4lgbkzbxvpgg0y8hips9b54p4d15f34i0r8bvj"; }; }; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index e1382d6d50b4..dea17a86b909 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -33345,8 +33345,8 @@ sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50751b5f9843fde00505edd281e404ec1d875713/recipes/inherit-local"; - sha256 = "0j785xb72nk04x6jb9x5pdwp3dkalqmy208mvj4ss4fm559qfp3i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; + sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; name = "inherit-local"; }; packageRequires = [ emacs ]; @@ -42882,8 +42882,8 @@ sha256 = "1y5x49mqippngp7ya6y7p8z81anrc644n84wpd7y62yqv8qhz0fp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4de2a8cbf1180ec7ca1648f497538b8dbf7a3945/recipes/nix-buffer"; - sha256 = "1svx1wg05fajxzjz95dfg072i6nfydr0ir4q1zhdxg1igkffqsml"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; + sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; name = "nix-buffer"; }; packageRequires = [ emacs f ]; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index e310064cb496..993b9b4e50e5 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -16203,6 +16203,27 @@ license = lib.licenses.free; }; }) {}; + inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inherit-local"; + version = "1.1"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "inherit-local"; + rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063"; + sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; + sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; + name = "inherit-local"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/inherit-local"; + license = lib.licenses.free; + }; + }) {}; init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-loader"; @@ -20413,6 +20434,27 @@ license = lib.licenses.free; }; }) {}; + nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nix-buffer"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-buffer"; + rev = "eb28bf99c3562cfda07f312ca49e0b594f0ff81b"; + sha256 = "148iyy8ma1n5a3biyal5rafxpp0zzn81nyy06jlzrkzjy44iyzwi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; + sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; + name = "nix-buffer"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/nix-buffer"; + license = lib.licenses.free; + }; + }) {}; nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 880053e05c29..cce683067e70 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags +, qjson, qca2, txt2tags, openssl , withGrass ? false, grass }: stdenv.mkDerivation rec { name = "qgis-2.16.2"; - buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla + buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ (stdenv.lib.optional withGrass grass) ++ - (with pythonPackages; [ numpy psycopg2 requests2 ]) ++ [ pythonPackages.qscintilla ]; + (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' - export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=`pwd`/output/lib:${stdenv.lib.makeLibraryPath [ openssl ]}:$LD_LIBRARY_PATH ''; src = fetchurl { @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/qgis \ - --prefix PYTHONPATH : $PYTHONPATH + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} ''; meta = { diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix new file mode 100644 index 000000000000..042401a727e9 --- /dev/null +++ b/pkgs/applications/misc/udiskie/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, asciidoc-full, gettext +, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify +, pythonPackages, udisks2, wrapGAppsHook }: + +pythonPackages.buildPythonApplication rec { + name = "udiskie-${version}"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "coldfix"; + repo = "udiskie"; + rev = version; + sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; + }; + + buildInputs = [ + asciidoc-full # For building man page. + hicolor_icon_theme + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + gettext gobjectIntrospection gtk3 libnotify pythonPackages.docopt + pythonPackages.pygobject3 pythonPackages.pyyaml udisks2 + ]; + + postBuild = "make -C doc"; + + postInstall = '' + mkdir -p $out/share/man/man8 + cp -v doc/udiskie.8 $out/share/man/man8/ + ''; + + # tests require dbusmock + doCheck = false; + + meta = with stdenv.lib; { + description = "Removable disk automounter for udisks"; + license = licenses.mit; + homepage = https://github.com/coldfix/udiskie; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix new file mode 100644 index 000000000000..8e432db84183 --- /dev/null +++ b/pkgs/data/fonts/cabin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "cabin-1.005"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Cabin"; + rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + sha256 = "16v7spviphvdh2rrr8klv11lc9hxphg12ddf0qs7xdx801ri0ppn"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A humanist sans with 4 weights and true italics"; + longDescription = '' + The Cabin font family is a humanist sans with 4 weights and true italics, + inspired by Edward Johnston’s and Eric Gill’s typefaces, with a touch of + modernism. Cabin incorporates modern proportions, optical adjustments, and + some elements of the geometric sans. It remains true to its roots, but has + its own personality. + + The weight distribution is almost monotone, although top and bottom curves + are slightly thin. Counters of the b, g, p and q are rounded and optically + adjusted. The curved stem endings have a 10 degree angle. E and F have + shorter center arms. M is splashed. + ''; + homepage = http://www.impallari.com/cabin; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix new file mode 100644 index 000000000000..28b9ee2f1e71 --- /dev/null +++ b/pkgs/data/fonts/dosis/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "dosis-1.007"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Dosis"; + rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + sha256 = "0glniyg07z5gx5gsa1ymarg2gsncjyf94wi6j9bf68v5s2w3v7md"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF v1.007 Fontlab/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A very simple, rounded, sans serif family"; + longDescription = '' + Dosis is a very simple, rounded, sans serif family. + + The lighter weights are minimalist. The bolder weights have more + personality. The medium weight is nice and balanced. The overall result is + a family that's clean and modern, and can express a wide range of + voices & feelings. + + It comes in 7 incremental weights: ExtraLight, Light, Book, Medium, + Semibold, Bold & ExtraBold + ''; + homepage = http://www.impallari.com/dosis; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix new file mode 100644 index 000000000000..e0f79b2722ce --- /dev/null +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "encode-sans-1.002"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Encode-Sans"; + rev = "11162b46892d20f55bd42a00b48cbf06b5871f75"; + sha256 = "1v5k79qlsl6nggilmjw56axwwr2b3838x6vqch4lh0dck5ri9w2c"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A versatile sans serif font family"; + longDescription = '' + The Encode Sans family is a versatile workhorse. Featuring a huge range of + weights and widths, it's ready for all kind of typographic challenges. It + also includes Tabular and Old Style figures, as well as full set of Small + Caps and other Open Type features. + + Designed by Pablo Impallari and Andres Torresi. + ''; + homepage = http://www.impallari.com/projects/overview/encode; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix new file mode 100644 index 000000000000..64779b5d388f --- /dev/null +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-baskerville-1.000"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Baskerville"; + rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + sha256 = "0i9ra6ip81zzjxl71p8zwa6ymlmkf4yi5ny22vlwx9a53kbf4ifl"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A webfont family optimized for body text"; + longDescription = '' + Libre Baskerville is a webfont family optimized for body text. It's Based + on 1941 ATF Baskerville Specimens but it has a taller x-height, wider + counters and less contrast that allow it to work on small sizes in any + screen. + ''; + homepage = http://www.impallari.com/projects/overview/libre-baskerville; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix new file mode 100644 index 000000000000..691d5556e8f2 --- /dev/null +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-bodoni-2.000"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Bodoni"; + rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + sha256 = "1ncfkvmcxh2lphfra43h8482qglpd965v96agvz092697xwrbyn9"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/v2000 - initial glyphs migration/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "Bodoni fonts adapted for today's web requirements"; + longDescription = '' + The Libre Bodoni fonts are based on the 19th century Morris Fuller + Benton's ATF design, but specifically adapted for today's web + requirements. + + They are a perfect choice for everything related to elegance, style, + luxury and fashion. + + Libre Bodoni currently features four styles: Regular, Italic, Bold and + Bold Italic. + ''; + homepage = https://github.com/impallari/Libre-Bodoni; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix new file mode 100644 index 000000000000..5037cb81f393 --- /dev/null +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-caslon-${version}"; + version = "1.002"; + + srcs = [ + (fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Caslon-Text"; + rev = "c31e21f7e8cf91f18d90f778ce20e66c68219c74"; + name = "libre-caslon-text-${version}-src"; + sha256 = "0zczv9qm8cgc7w1p64mnf0p0fi7xv89zhf1zzf1qcna15kbgc705"; + }) + + (fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Caslon-Display"; + rev = "3491f6a9cfde2bc15e736463b0bc7d93054d5da1"; + name = "libre-caslon-display-${version}-src"; + sha256 = "12jrny3y8w8z61lyw470drnhliji5b24lgxap4w3brp6z3xjph95"; + }) + ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; + homepage = http://www.impallari.com/librecaslon; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix new file mode 100644 index 000000000000..473102d77efd --- /dev/null +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-franklin-1.014"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Franklin"; + rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + sha256 = "0df41cqhw5dz3g641n4nd2jlqjf5m4fkv067afk3759m4hg4l78r"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; + homepage = https://github.com/impallari/Libre-Franklin; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index 11f874a0e894..ff4abf26ac83 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -2,7 +2,8 @@ , shared_mime_info, desktop_file_utils, libunique, libtool, bzip2 , glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd , librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon -, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2}: +, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 +, libSM }: stdenv.mkDerivation { name = "gnome-control-center-2.32.1"; @@ -14,6 +15,8 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ]; + libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon + libSM + ]; configureFlags = "--disable-scrollkeeper"; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix index ccabff27549f..7678cb3a4b42 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto -, intltool, libglade, startup_notification, GConf, upower }: +, intltool, libglade, startup_notification, GConf, upower, libSM }: stdenv.mkDerivation { name = "gnome-session-2.32.1"; @@ -11,7 +11,10 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification - GConf upower + GConf upower libSM ]; nativeBuildInputs = [ pkgconfig intltool ]; + + # gconf-sanity-check-2 not found + meta.broken = true; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index 93dfa544ea91..37f995396861 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio }: +, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio +, libSM }: stdenv.mkDerivation { name = "gnome-settings-daemon-2.32.1"; @@ -11,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit - libpulseaudio + libpulseaudio libSM ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index e7f3f5659025..6be2a440879f 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { sha256 = "0fbh0afzw1gm4r2w68b8l0vhnia1qyzdl407vyxfw4v4fkm1v16c"; }; + hardeningDisable = [ "format" ]; + buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi intltool libbonobo ORBit2 GConf dbus_glib ]; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1b02e464c3ba..42734e08cd34 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -764,8 +764,12 @@ self: super: { ''; }); - # Byte-compile elisp code for Emacs. + # Fine-tune the build. structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: { + # Statically linked Haskell libraries make the tool start-up much faster, + # which is important for use in Emacs. + enableSharedExecutables = false; + # Byte-compile elisp code for Emacs. executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; postInstall = '' local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index b09680574b04..a18ee496012a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -55,10 +55,11 @@ self: super: { }) {}; # https://github.com/ygale/timezone-series/issues/2 - timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch { + timezone-series_0_1_5_1 = appendPatch super.timezone-series_0_1_5_1 (pkgs.fetchpatch { url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch"; sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a"; }); + timezone-series = self.timezone-series_0_1_5_1; # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix index 5ccc5a7351eb..850f78c5ecbd 100644 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ b/pkgs/development/haskell-modules/configuration-lts.nix @@ -398,6 +398,7 @@ self: super: { "HDBC-mysql" = dontDistribute super."HDBC-mysql"; "HDBC-odbc" = dontDistribute super."HDBC-odbc"; "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = doDistribute super."HDBC-session_0_1_0_1"; "HDRUtils" = dontDistribute super."HDRUtils"; "HERA" = dontDistribute super."HERA"; "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; @@ -1118,6 +1119,7 @@ self: super: { "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-coerce" = dontDistribute super."aeson-coerce"; + "aeson-compat" = doDistribute super."aeson-compat_0_3_5_1"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-flatten" = dontDistribute super."aeson-flatten"; @@ -1223,6 +1225,7 @@ self: super: { "anticiv" = dontDistribute super."anticiv"; "antigate" = dontDistribute super."antigate"; "antimirov" = dontDistribute super."antimirov"; + "antiprimes" = dontDistribute super."antiprimes"; "antiquoter" = dontDistribute super."antiquoter"; "antisplice" = dontDistribute super."antisplice"; "antlrc" = dontDistribute super."antlrc"; @@ -2042,6 +2045,7 @@ self: super: { "concraft-pl" = dontDistribute super."concraft-pl"; "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrency" = dontDistribute super."concurrency"; "concurrent-barrier" = dontDistribute super."concurrent-barrier"; "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; "concurrent-machines" = dontDistribute super."concurrent-machines"; @@ -2469,6 +2473,8 @@ self: super: { "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; "derive-monoid" = dontDistribute super."derive-monoid"; + "derive-storable" = dontDistribute super."derive-storable"; + "derive-storable-plugin" = dontDistribute super."derive-storable-plugin"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = doDistribute super."deriving-compat_0_2"; @@ -4253,6 +4259,7 @@ self: super: { "hs-carbon" = dontDistribute super."hs-carbon"; "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-di" = dontDistribute super."hs-di"; "hs-dotnet" = dontDistribute super."hs-dotnet"; "hs-duktape" = dontDistribute super."hs-duktape"; "hs-excelx" = dontDistribute super."hs-excelx"; @@ -4481,6 +4488,7 @@ self: super: { "hubigraph" = dontDistribute super."hubigraph"; "hubris" = dontDistribute super."hubris"; "huckleberry" = dontDistribute super."huckleberry"; + "huff" = dontDistribute super."huff"; "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; @@ -5000,6 +5008,7 @@ self: super: { "layout" = dontDistribute super."layout"; "layout-bootstrap" = dontDistribute super."layout-bootstrap"; "lazy-io" = dontDistribute super."lazy-io"; + "lazy-io-streams" = dontDistribute super."lazy-io-streams"; "lazy-search" = dontDistribute super."lazy-search"; "lazyarray" = dontDistribute super."lazyarray"; "lazyio" = dontDistribute super."lazyio"; @@ -5270,6 +5279,8 @@ self: super: { "maccatcher" = dontDistribute super."maccatcher"; "machinecell" = dontDistribute super."machinecell"; "machines" = doDistribute super."machines_0_5_1"; + "machines-directory" = doDistribute super."machines-directory_0_2_0_8"; + "machines-io" = doDistribute super."machines-io_0_2_0_12"; "machines-zlib" = dontDistribute super."machines-zlib"; "macho" = dontDistribute super."macho"; "maclight" = dontDistribute super."maclight"; @@ -5421,6 +5432,7 @@ self: super: { "mighttpd" = dontDistribute super."mighttpd"; "mighttpd2" = dontDistribute super."mighttpd2"; "mikmod" = dontDistribute super."mikmod"; + "mikrokosmos" = dontDistribute super."mikrokosmos"; "miku" = dontDistribute super."miku"; "milena" = dontDistribute super."milena"; "mime" = dontDistribute super."mime"; @@ -5588,6 +5600,7 @@ self: super: { "multext-east-msd" = dontDistribute super."multext-east-msd"; "multi-cabal" = dontDistribute super."multi-cabal"; "multiaddr" = dontDistribute super."multiaddr"; + "multifile" = dontDistribute super."multifile"; "multifocal" = dontDistribute super."multifocal"; "multihash" = dontDistribute super."multihash"; "multipart-names" = dontDistribute super."multipart-names"; @@ -5963,6 +5976,8 @@ self: super: { "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "pango" = doDistribute super."pango_0_13_1_1"; "papa" = dontDistribute super."papa"; + "papa-base" = dontDistribute super."papa-base"; + "papa-include" = dontDistribute super."papa-include"; "papa-lens" = dontDistribute super."papa-lens"; "papa-prelude" = dontDistribute super."papa-prelude"; "papa-prelude-core" = dontDistribute super."papa-prelude-core"; @@ -6372,6 +6387,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psi" = dontDistribute super."psi"; "psqueues" = doDistribute super."psqueues_0_2_2_1"; "pstemmer" = dontDistribute super."pstemmer"; "pub" = dontDistribute super."pub"; @@ -6750,6 +6766,8 @@ self: super: { "rosa" = dontDistribute super."rosa"; "rose-trie" = dontDistribute super."rose-trie"; "roshask" = dontDistribute super."roshask"; + "rosmsg" = dontDistribute super."rosmsg"; + "rospkg" = dontDistribute super."rospkg"; "rosso" = dontDistribute super."rosso"; "rot13" = dontDistribute super."rot13"; "roundRobin" = dontDistribute super."roundRobin"; @@ -6953,6 +6971,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-github-webhook" = dontDistribute super."servant-github-webhook"; "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-matrix-param" = dontDistribute super."servant-matrix-param"; @@ -7214,6 +7233,8 @@ self: super: { "snm" = dontDistribute super."snm"; "snow-white" = dontDistribute super."snow-white"; "snowball" = dontDistribute super."snowball"; + "snowflake-core" = dontDistribute super."snowflake-core"; + "snowflake-server" = dontDistribute super."snowflake-server"; "snowglobe" = dontDistribute super."snowglobe"; "soap" = doDistribute super."soap_0_2_3_0"; "sock2stream" = dontDistribute super."sock2stream"; @@ -7759,9 +7780,11 @@ self: super: { "timeprint" = dontDistribute super."timeprint"; "timers" = dontDistribute super."timers"; "timers-updatable" = dontDistribute super."timers-updatable"; + "timespan" = dontDistribute super."timespan"; "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; "timestamper" = dontDistribute super."timestamper"; "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timezone-series" = doDistribute super."timezone-series_0_1_5_1"; "timing-convenience" = dontDistribute super."timing-convenience"; "tinyMesh" = dontDistribute super."tinyMesh"; "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e9ec33c96e03..dd5ae329c200 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7094,7 +7094,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "HDBC-session" = callPackage + "HDBC-session_0_1_0_1" = callPackage ({ mkDerivation, base, HDBC }: mkDerivation { pname = "HDBC-session"; @@ -7104,6 +7104,19 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Bracketed connection for HDBC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "HDBC-session" = callPackage + ({ mkDerivation, base, HDBC }: + mkDerivation { + pname = "HDBC-session"; + version = "0.1.1.0"; + sha256 = "4ad37a6c9d17b8f2f049ec4f3c4ea5efc8d866b02b226c6c066ab11153fc80b9"; + libraryHaskellDepends = [ base HDBC ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Bracketed connection for HDBC"; + license = stdenv.lib.licenses.bsd3; }) {}; "HDBC-sqlite3" = callPackage @@ -10400,7 +10413,6 @@ self: { testHaskellDepends = [ base base-compat carray fft JuicyPixels time ]; - doCheck = false; homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; description = "Scale JuicyPixels images with DCT"; license = stdenv.lib.licenses.bsd3; @@ -18520,8 +18532,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "XMLParser"; - version = "0.1.0.3"; - sha256 = "d62e8062e1a2d2f00d8e6d8a707fb798ae5b5cc2c48a513375d5634fef116fd4"; + version = "0.1.0.4"; + sha256 = "79e55f9ae14054c8673f25325503c75af2bb750e0068f5fefbce3a98c7e04d94"; libraryHaskellDepends = [ base parsec ]; homepage = "xy30.com"; description = "A library to parse xml"; @@ -20642,7 +20654,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson-compat" = callPackage + "aeson-compat_0_3_5_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans , bytestring, containers, exceptions, hashable, nats, QuickCheck , quickcheck-instances, scientific, semigroups, tagged, tasty @@ -20669,6 +20681,34 @@ self: { homepage = "https://github.com/phadej/aeson-compat#readme"; description = "Compatibility layer for aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "aeson-compat" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans + , bytestring, containers, exceptions, hashable, nats, QuickCheck + , quickcheck-instances, scientific, semigroups, tagged, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.5.2"; + sha256 = "e9bd5a327e086eafe673b2e2f4f04f51f54e23c6c4c261bf30b46d7be8071e90"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring containers exceptions + hashable nats scientific semigroups tagged text time + time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat base-orphans bytestring + containers exceptions hashable nats QuickCheck quickcheck-instances + scientific semigroups tagged tasty tasty-hunit tasty-quickcheck + text time time-locale-compat unordered-containers vector + ]; + homepage = "https://github.com/phadej/aeson-compat#readme"; + description = "Compatibility layer for aeson"; + license = stdenv.lib.licenses.bsd3; }) {}; "aeson-diff" = callPackage @@ -20927,6 +20967,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-pretty_0_8_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , cmdargs, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-pretty"; + version = "0.8.2"; + sha256 = "6cb429821040bdd6f819b1c6170cac630a4155fa57fa24eb3d496c06030fb9b0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring scientific text + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring cmdargs + ]; + homepage = "http://github.com/informatikr/aeson-pretty"; + description = "JSON pretty-printing library and command-line tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-qq" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim , haskell-src-meta, hspec, parsec, scientific, template-haskell @@ -21734,31 +21797,29 @@ self: { "alga" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions - , filepath, formatting, haskeline, hxt, megaparsec, mtl - , optparse-applicative, path, path-io, QuickCheck, random - , test-framework, test-framework-quickcheck2, text, tf-random - , transformers, yaml + , file-embed, filepath, formatting, haskeline, hspec, hxt + , megaparsec, mtl, optparse-applicative, path, path-io, QuickCheck + , random, text, tf-random, transformers, yaml }: mkDerivation { pname = "alga"; - version = "0.2.1"; - sha256 = "157f622f2851da9bcc2a05df9c192c8abb955745d22d4acdfc8d3a89b765d8e7"; + version = "0.2.2"; + sha256 = "3e90507199b1eb960bdad6bf6a531068cc60898d1fa289d52fa230500ee920f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions haskeline hxt megaparsec mtl path random - text tf-random transformers + base containers exceptions haskeline hxt megaparsec mtl path + QuickCheck random text tf-random transformers ]; executableHaskellDepends = [ - aeson base containers data-default exceptions filepath formatting - haskeline hxt megaparsec mtl optparse-applicative path path-io - random text tf-random transformers yaml + aeson base containers data-default exceptions file-embed filepath + formatting haskeline hxt megaparsec mtl optparse-applicative path + path-io QuickCheck random text tf-random transformers yaml ]; testHaskellDepends = [ - base containers hxt megaparsec mtl QuickCheck random test-framework - test-framework-quickcheck2 text tf-random transformers + base containers hspec hxt megaparsec mtl QuickCheck random text + tf-random transformers ]; - jailbreak = true; homepage = "https://github.com/mrkkrp/alga"; description = "Algorithmic automation for various DAWs"; license = stdenv.lib.licenses.gpl3; @@ -24097,12 +24158,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ansigraph_0_3_0_0" = callPackage + "ansigraph_0_3_0_1" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; - version = "0.3.0.0"; - sha256 = "0eb9433a0f282e07ee5f0eabba5bda296daedc801293a6a3c54915b0fbbc510f"; + version = "0.3.0.1"; + sha256 = "fbaa1bdb68753777bb345c834aee316e01698cd3fafc2b9ed9e3b1c77ee8d6c7"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/BlackBrane/ansigraph"; @@ -24220,6 +24281,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiprimes" = callPackage + ({ mkDerivation, base, hspec, primes }: + mkDerivation { + pname = "antiprimes"; + version = "0.1.0.1"; + sha256 = "8e8b457ec223b9df3c3036d1c5fd1fd4c62144a911a4284a3e38fc2a1a9c292b"; + libraryHaskellDepends = [ base primes ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/wokibe/antiprimes#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "antiquoter" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -26322,6 +26396,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-dejafu_0_1_3_0" = callPackage + ({ mkDerivation, base, concurrency, dejafu, exceptions, HUnit + , hunit-dejafu + }: + mkDerivation { + pname = "async-dejafu"; + version = "0.1.3.0"; + sha256 = "d893a14c85af9cb947e3b3298b77c3665112a54cc8876dca8fc08e6871952afd"; + libraryHaskellDepends = [ base concurrency exceptions ]; + testHaskellDepends = [ + base concurrency dejafu HUnit hunit-dejafu + ]; + jailbreak = true; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Run MonadConc operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-extras" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base , monad-control, SafeSemaphore, stm, transformers-base @@ -26461,8 +26554,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.4.0"; - sha256 = "4e4cac3e768e7488772751264b8ecf217841a8bc45e0fc2931398d1b056f416b"; + version = "0.4.4.1"; + sha256 = "4a6c8efba3282d57abde8852e16aa8ea387858dcfbe1bbb28db2e18b47f80db8"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -31682,6 +31775,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bitcoin-payment-channel_0_2_3_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base58string + , base64-bytestring, binary, bytestring, cereal, errors + , haskoin-core, hexstring, QuickCheck, scientific, text, time + }: + mkDerivation { + pname = "bitcoin-payment-channel"; + version = "0.2.3.1"; + sha256 = "b987da47e8f1c0d60dacc6b09a07097f6b390e80b0110adc4401974bbc2fd1ad"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring base58string base64-bytestring binary + bytestring cereal errors haskoin-core hexstring scientific text + time + ]; + executableHaskellDepends = [ + aeson base base16-bytestring base58string base64-bytestring binary + bytestring cereal haskoin-core hexstring QuickCheck text time + ]; + homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; + description = "Library for working with Bitcoin payment channels"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bitcoin-rpc" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, ghc-prim, HTTP, HUnit, mtl, network, QuickCheck @@ -33732,8 +33851,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.8"; - sha256 = "f730fd999e070700d90d36aadf8716aaf7d86094900f204f06f6593b5e5b1382"; + version = "0.9"; + sha256 = "3e13c7ec5be06e416fc609e565e765e91f2cdf967aa97589fcff4dc0f73b3d40"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -39927,8 +40046,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.0.0.1"; - sha256 = "3df8f7120fa540415fd83d7ddc43b9fc088cc1cefc97bc08ca32c711b636c47e"; + version = "1.0.0.2"; + sha256 = "a4fa52c6b571df5cc98c1cebf97b41085104a17b2e23c2221cd2061ec7a9c262"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async @@ -42643,6 +42762,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "concurrency" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.0.0.0"; + sha256 = "541f9e730c18464ec8399214097a5fb62cfce319baa3495bf3349e0f4d9cf19d"; + revision = "1"; + editedCabalFile = "3de0faeb048451ba463026c4d88e9cedf21470c4568a044be0b4bff460ad1c90"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + }) {}; + "concurrent-barrier" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -43100,34 +43238,6 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.5"; - sha256 = "b6e65bcfec9a9b57e268a7a16f067af500f1e8b8f7dad9b96e9aad7bf603c6cd"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-combinators_1_0_6" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: - mkDerivation { - pname = "conduit-combinators"; version = "1.0.6"; sha256 = "215c5b29fbeb0177ac7b80f67be9f3c7eaa2a231b9fcb25916ab1ceda007a2fa"; libraryHaskellDepends = [ @@ -43144,7 +43254,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Commonly used conduit functions, for both chunked and unchunked data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-connection" = callPackage @@ -45144,8 +45253,8 @@ self: { }: mkDerivation { pname = "cplex-hs"; - version = "0.2.0.2"; - sha256 = "5f6de007fa0b2548d40fdb18cb44b37b8f02cc7cbe631e74ba20ab1aec811554"; + version = "0.3.0.0"; + sha256 = "56afdd13c508767615baa4a529fab0eebc73cd679ac040ef1592023489c42355"; libraryHaskellDepends = [ base containers mtl primitive transformers vector ]; @@ -47825,6 +47934,51 @@ self: { license = "GPL"; }) {inherit (pkgs) curl;}; + "darcs_2_12_3" = callPackage + ({ mkDerivation, array, async, attoparsec, base, base16-bytestring + , binary, bytestring, cmdargs, containers, cryptohash, curl + , data-ordlist, directory, fgl, filepath, FindBin, graphviz + , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network + , network-uri, old-time, parsec, process, QuickCheck, random + , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar + , terminfo, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-compat, unix, unix-compat, utf8-string, vector + , zip-archive, zlib + }: + mkDerivation { + pname = "darcs"; + version = "2.12.3"; + sha256 = "68ed535dce4bd2d8349ba04258bb56df7d47853dac9d3365fc0325a86db1cde5"; + configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async attoparsec base base16-bytestring binary bytestring + containers cryptohash data-ordlist directory fgl filepath graphviz + hashable haskeline html HTTP mmap mtl network network-uri old-time + parsec process random regex-applicative regex-compat-tdfa sandi tar + terminfo text time transformers transformers-compat unix + unix-compat utf8-string vector zip-archive zlib + ]; + librarySystemDepends = [ curl ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + array base bytestring cmdargs containers directory filepath FindBin + HUnit mtl QuickCheck shelly split test-framework + test-framework-hunit test-framework-quickcheck2 text zip-archive + ]; + doCheck = false; + postInstall = '' + mkdir -p $out/etc/bash_completion.d + mv contrib/darcs_completion $out/etc/bash_completion.d/darcs + ''; + homepage = "http://darcs.net/"; + description = "a distributed, interactive, smart revision control system"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) curl;}; + "darcs-benchmark" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, datetime , directory, filepath, hs-gchart, html, HTTP, json, mtl, network @@ -51177,6 +51331,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_0_4_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, deepseq, dpor + , exceptions, monad-loops, mtl, ref-fd, semigroups, transformers + , transformers-base + }: + mkDerivation { + pname = "dejafu"; + version = "0.4.0.0"; + sha256 = "876c92c590cce573cb600a1bb575b42ed2c2fb332c59803c5f0667a675df80d4"; + libraryHaskellDepends = [ + base concurrency containers deepseq dpor exceptions monad-loops mtl + ref-fd semigroups transformers transformers-base + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Systematic testing for Haskell concurrency"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -51669,6 +51842,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "derive-storable" = callPackage + ({ mkDerivation, base, generic-storable, hspec, QuickCheck }: + mkDerivation { + pname = "derive-storable"; + version = "0.1.0.2"; + sha256 = "76e8ae7d85fe9befa23a8667c4531b212cea777db7e1d6b573be54d3ce8681f5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base generic-storable hspec QuickCheck ]; + homepage = "https://www.github.com/mkloczko/derive-storable/"; + description = "Derive Storable instances with help of GHC.Generics."; + license = stdenv.lib.licenses.mit; + }) {}; + + "derive-storable-plugin" = callPackage + ({ mkDerivation, base, derive-storable, ghc, ghci }: + mkDerivation { + pname = "derive-storable-plugin"; + version = "0.1.0.2"; + sha256 = "d9b080fb359169b2edd8e32cef46681666204673bd460e24dcd6bfb13ec8abcd"; + libraryHaskellDepends = [ base derive-storable ghc ghci ]; + homepage = "https://www.github.com/mkloczko/derive-storable-plugin/"; + description = "GHC core plugin supporting the derive-storable package"; + license = stdenv.lib.licenses.mit; + }) {}; + "derive-topdown" = callPackage ({ mkDerivation, base, derive, mtl, template-haskell , template-haskell-util @@ -51745,6 +51943,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_3_3" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell + , transformers, transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.3.3"; + sha256 = "b977e5f819c84443a355521579712a0cf138d5102d383e823381576a87898c21"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell transformers + transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck template-haskell + transformers transformers-compat + ]; + jailbreak = true; + homepage = "https://github.com/haskell-compat/deriving-compat"; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -52981,23 +53203,25 @@ self: { }) {}; "difftodo" = callPackage - ({ mkDerivation, base, bytestring, diff-parse, highlighting-kate - , optparse-applicative, protolude, tasty, tasty-hunit, text + ({ mkDerivation, base, bytestring, diff-parse, highlighter2 + , optparse-applicative, pretty-show, process, protolude, tasty + , tasty-hunit, text }: mkDerivation { pname = "difftodo"; - version = "0.1.0"; - sha256 = "ab1c892daec3ecee50d16f8353e6da6195d3da86e1bca0ab8f3cb908a9746066"; + version = "0.2.0"; + sha256 = "bdb2c473e15455ae2af37623283bb78fd6cf52491d86eb9a04b1241011fab899"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base diff-parse highlighting-kate protolude text + base bytestring diff-parse highlighter2 protolude text ]; executableHaskellDepends = [ - base optparse-applicative protolude text + base bytestring optparse-applicative process protolude text ]; testHaskellDepends = [ - base bytestring highlighting-kate protolude tasty tasty-hunit text + base bytestring highlighter2 pretty-show protolude tasty + tasty-hunit text ]; homepage = "https://github.com/jml/difftodo#readme"; description = "Generate todo lists from source code"; @@ -54746,8 +54970,8 @@ self: { ({ mkDerivation, base, dlist, hspec }: mkDerivation { pname = "do-list"; - version = "0.9.0"; - sha256 = "f7f0af10c6e0f817afba7939e070671b232f152adf2f9d72b6656d4b9417dfef"; + version = "0.9.1"; + sha256 = "db524f3d62271d79f6f675e13dbe069ce9d3faf0b1512d5b26a61fdd6234ccf8"; libraryHaskellDepends = [ base dlist ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/tserduke/do-list"; @@ -57842,8 +58066,8 @@ self: { }: mkDerivation { pname = "elm-init"; - version = "1.0.4"; - sha256 = "39f8ec1e64c1a5025f4568ff59b52470e846d777f3cd343176b7a25d672989d3"; + version = "1.0.5"; + sha256 = "29badb1eb03e5960da6f0d89cb7ba8211ca18dc687840c72c3cce9bef1b11270"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -63133,8 +63357,8 @@ self: { }: mkDerivation { pname = "fixfile"; - version = "0.5.0.0"; - sha256 = "ebac16bee38bc0fd05790429d40b1c4a0089b82a53da45d2e74d226c4bdf8d65"; + version = "0.6.0.0"; + sha256 = "37183ade31510ba1c3801adf5df112f7ef6291b478934d0c51839510e536888c"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath hashable hashtables lens mtl temporary vector @@ -66938,6 +67162,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-deriving_1_11_1" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec + , template-haskell + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.11.1"; + sha256 = "b38d427f990f3080108c565a81284217290a47be63bab7bf59036ece2e2cb0e9"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base hspec template-haskell ]; + jailbreak = true; + homepage = "https://github.com/dreixel/generic-deriving"; + description = "Generic programming library for generalised deriving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-lucid-scaffold" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -69284,8 +69527,8 @@ self: { "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gobjectIntrospection, gstreamer, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text + , transformers }: mkDerivation { pname = "gi-gst"; @@ -69296,20 +69539,18 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gstreamer ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gst_all_1) gstreamer;}; + }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstaudio"; @@ -69320,18 +69561,20 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gst_plugins_base, haskell-gi, haskell-gi-base - , text, transformers + , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstbase"; @@ -69342,18 +69585,20 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstvideo"; @@ -69364,13 +69609,15 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gtk" = callPackage ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo @@ -71262,8 +71509,10 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.15"; - sha256 = "1179f60fc18d4ad3f15241a810f5063f5da1aece2d2b50d8cd04c3af2f562457"; + version = "2.16"; + sha256 = "cb6129842e91bf08c13841ce9409f52c4c827533ca8b75d6ea557567e84190ba"; + revision = "1"; + editedCabalFile = "ff2ebb1142cb8d3d6613a70050b237b454cd6d177ffaee0bed694fe68c82703d"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -71639,8 +71888,8 @@ self: { }: mkDerivation { pname = "glue-common"; - version = "0.4.6"; - sha256 = "bca26c14be41205c86082e303885bd2c031634dbb7b31336ab71f37efc4f654b"; + version = "0.4.8"; + sha256 = "93e860fbbff04561621cd923081b111602a900dd2eb9306e1c77dc26b63b1912"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71663,8 +71912,8 @@ self: { }: mkDerivation { pname = "glue-core"; - version = "0.4.6"; - sha256 = "d4cecdff03ee9d1b30a804a17a186b2fc1ad84bde59031285cd21e9f550db1ff"; + version = "0.4.8"; + sha256 = "145a86d1ef7c2a8c0dd10b258a6b93497986ae3789fe79b1389ecb02ab5b8178"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71687,8 +71936,8 @@ self: { }: mkDerivation { pname = "glue-ekg"; - version = "0.4.6"; - sha256 = "c22a6f59bf4e3eddcdfd00500eaef16a9065113b52f97252c1270fdd29e1ad27"; + version = "0.4.8"; + sha256 = "9612eb9054420ae4f467b167356f1cbe1ed43ad2f62726810dbdd012c38a4501"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71710,8 +71959,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.4.6"; - sha256 = "595d107c5153ed6ac93b2b0f27fb154e76975f05c6780b78ffa2618cc395dc62"; + version = "0.4.8"; + sha256 = "3e75fea965b3d83e57c1ade5354811a96707111b912840b5c7c46c2d02ae330a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77942,6 +78191,8 @@ self: { pname = "hakyll-shakespeare"; version = "0.1.0.0.2"; sha256 = "ebaa9c1cf33b3c59e91f7000ae4fc320f8b7d6c47c3a0088da9604c91dc9d0ad"; + revision = "1"; + editedCabalFile = "8e81f615162a066f96dff257a9efea27478c87cd345bb708d1cdd4ba565c838d"; libraryHaskellDepends = [ base blaze-html containers hakyll shakespeare text ]; @@ -81842,17 +82093,16 @@ self: { }) {}; "haskelzinc" = callPackage - ({ mkDerivation, base, containers, filepath, parsec, pretty + ({ mkDerivation, base, containers, filepath, parsec3, pretty , process }: mkDerivation { pname = "haskelzinc"; - version = "0.1.0.1"; - sha256 = "82d828d7fd75f58db210169a167f24856aaa88fb7ac7e7cae16a1a46a0e56146"; + version = "0.2.0.3"; + sha256 = "a7248945f8c53b1a0f36e1c184c236fcb2bea27c970fc0453bcc0e88be767a72"; libraryHaskellDepends = [ - base containers filepath parsec pretty process + base containers filepath parsec3 pretty process ]; - jailbreak = true; description = "CP in Haskell through MiniZinc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -86159,7 +86409,7 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) systemd;}; + }) {systemd = null;}; "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: @@ -90958,6 +91208,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-di" = callPackage + ({ mkDerivation, base, compose-ltr, hspec, MissingH, QuickCheck + , template-haskell, time + }: + mkDerivation { + pname = "hs-di"; + version = "0.2.2"; + sha256 = "103128607f0303625dccb039d78d3de5790088a4f5b7bedae7e45e488ee53901"; + libraryHaskellDepends = [ base compose-ltr template-haskell ]; + testHaskellDepends = [ + base compose-ltr hspec MissingH QuickCheck template-haskell time + ]; + homepage = "https://github.com/Wizek/hs-di#readme"; + description = "Dependency Injection library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-dotnet" = callPackage ({ mkDerivation, base, ghc-prim, ole32, oleaut32 }: mkDerivation { @@ -94477,6 +94744,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) taglib;}; + "htaglib_1_0_4" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , taglib, text + }: + mkDerivation { + pname = "htaglib"; + version = "1.0.4"; + sha256 = "0b23c25f6ef721e193176fd2c4e491376235c5cb04dea0d75ebf721bd10b40a7"; + libraryHaskellDepends = [ base bytestring text ]; + librarySystemDepends = [ taglib ]; + testHaskellDepends = [ base directory filepath hspec ]; + jailbreak = true; + homepage = "https://github.com/mrkkrp/htaglib"; + description = "Bindings to TagLib, audio meta-data library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) taglib;}; + "htags" = callPackage ({ mkDerivation, base, directory, filepath, haskell-src, mtl }: mkDerivation { @@ -96056,6 +96341,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "huff" = callPackage + ({ mkDerivation, alex, alex-tools, array, base, containers + , hashable, heaps, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "huff"; + version = "0.1.0.1"; + sha256 = "ff2e9051fb45d4694bf2e1a0a84452943856b043cf58cbcb1755ac424212ca3b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alex-tools array base containers hashable heaps template-haskell + text unordered-containers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/elliottt/huff"; + description = "A fast-foward-based planner"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "huffman" = callPackage ({ mkDerivation, base, containers, fingertree }: mkDerivation { @@ -96186,6 +96492,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_0_3_0_2" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "0.3.0.2"; + sha256 = "eba6ff1b350a7b4a1e09abfc694d4c3ac47bbc36fea23439f512a763c531a7a3"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -99274,8 +99593,10 @@ self: { ({ mkDerivation, base, mtl, time, transformers }: mkDerivation { pname = "implicit-logging"; - version = "0.1.0.0"; - sha256 = "98032042eee95714c2f0e0c1a25a03f15e75223bacc85b9857b1d66d639805c0"; + version = "0.2.0.0"; + sha256 = "81b1c538b50963067410e7cbb6d60f42c0e90f068518d20505cc942e633ec3e3"; + revision = "1"; + editedCabalFile = "da2dc77f11f48a07772f4528408f90fad91d0c413d4bf855f14670df5765a60b"; libraryHaskellDepends = [ base mtl time transformers ]; jailbreak = true; homepage = "https://github.com/revnull/implicit-logging"; @@ -100184,6 +100505,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.0.0"; sha256 = "0353fcf5c58e9ed3fe33ddc3f57bfb2faccaa4d61fbf832f7fc2bfbe2c30d02e"; + revision = "1"; + editedCabalFile = "2775fc971c86a62caa0590f0f8c5ea74c3c4b59c96f9c45b0bcbc1760bc438e7"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -108060,6 +108383,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lazy-io-streams" = callPackage + ({ mkDerivation, base, bytestring, io-streams }: + mkDerivation { + pname = "lazy-io-streams"; + version = "0.1.0.0"; + sha256 = "beef343b717030f28fabb7e55bbf687d96769b16081ff8c0bd5bb73da3065d08"; + libraryHaskellDepends = [ base bytestring io-streams ]; + description = "Get lazy with your io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazy-search" = callPackage ({ mkDerivation, base, size-based }: mkDerivation { @@ -109465,10 +109799,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "libltdl"; - version = "0.1.0.3"; - sha256 = "f96f21553b2d6758aab7f59ecd96ad93b01dd61ae9aeca812214081e08a24415"; + version = "0.1.1"; + sha256 = "9327d7108607fecc30803217eb329465a569a1c26c564b49800ceb08e362f828"; libraryHaskellDepends = [ base ]; - homepage = "http://www.eecs.harvard.edu/~mainland/projects/libffi"; + homepage = "https://github.com/mainland/libltdl"; description = "FFI interface to libltdl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -109741,7 +110075,7 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) systemd;}; + }) {systemd = null;}; "libtagc" = callPackage ({ mkDerivation, base, bytestring, glib, taglib }: @@ -113654,7 +113988,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "machines-directory" = callPackage + "machines-directory_0_2_0_8" = callPackage ({ mkDerivation, base, directory, filepath, machines, machines-io , transformers }: @@ -113669,9 +114003,26 @@ self: { homepage = "http://github.com/aloiscochard/machines-directory"; description = "Directory (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "machines-io" = callPackage + "machines-directory" = callPackage + ({ mkDerivation, base, directory, filepath, machines, machines-io + , transformers + }: + mkDerivation { + pname = "machines-directory"; + version = "0.2.0.9"; + sha256 = "38e1e5874431f8cad71b3067bc16258e3dfa13b09bf9d8698d6e28d5e0fabf24"; + libraryHaskellDepends = [ + base directory filepath machines machines-io transformers + ]; + homepage = "http://github.com/aloiscochard/machines-directory"; + description = "Directory (system) utilities for the machines library"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "machines-io_0_2_0_12" = callPackage ({ mkDerivation, base, bytestring, chunked-data, machines , transformers }: @@ -113686,6 +114037,23 @@ self: { homepage = "http://github.com/aloiscochard/machines-io"; description = "IO utilities for the machines library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "machines-io" = callPackage + ({ mkDerivation, base, bytestring, chunked-data, machines + , transformers + }: + mkDerivation { + pname = "machines-io"; + version = "0.2.0.13"; + sha256 = "4d579d5e9e94fafcfca91322734263498999d2e2af45c40ff0d1db78f4a8f5d4"; + libraryHaskellDepends = [ + base bytestring chunked-data machines transformers + ]; + homepage = "http://github.com/aloiscochard/machines-io"; + description = "IO utilities for the machines library"; + license = stdenv.lib.licenses.asl20; }) {}; "machines-process" = callPackage @@ -116813,30 +117181,29 @@ self: { "mida" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions - , filepath, formatting, haskeline, HCodecs, megaparsec, mtl - , optparse-applicative, path, path-io, process, QuickCheck, random - , test-framework, test-framework-quickcheck2, text, tf-random - , transformers, yaml + , file-embed, filepath, formatting, haskeline, HCodecs, hspec + , megaparsec, mtl, optparse-applicative, path, path-io, process + , QuickCheck, random, text, tf-random, transformers, yaml }: mkDerivation { pname = "mida"; - version = "1.0.1"; - sha256 = "97e76f04d0bad25eefc19fdb7df6f53ce351918fc52815bf9a163417b730b859"; + version = "1.0.2"; + sha256 = "902ce590e9fb57138676eacc4bdcb4ed536f54df054f4c606a4c6c71b6f475f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions haskeline HCodecs megaparsec mtl random - text tf-random transformers + base containers exceptions haskeline HCodecs megaparsec mtl + QuickCheck random text tf-random transformers ]; executableHaskellDepends = [ - aeson base containers data-default exceptions filepath formatting - haskeline HCodecs megaparsec mtl optparse-applicative path path-io - process random text tf-random transformers yaml + aeson base containers data-default exceptions file-embed filepath + formatting haskeline HCodecs megaparsec mtl optparse-applicative + path path-io process QuickCheck random text tf-random transformers + yaml ]; testHaskellDepends = [ - base containers HCodecs megaparsec mtl QuickCheck random - test-framework test-framework-quickcheck2 text tf-random - transformers + base containers HCodecs hspec megaparsec mtl QuickCheck random text + tf-random transformers ]; homepage = "https://github.com/mrkkrp/mida"; description = "Language for algorithmic generation of MIDI files"; @@ -117071,6 +117438,24 @@ self: { license = "LGPL"; }) {}; + "mikrokosmos" = callPackage + ({ mkDerivation, ansi-terminal, base, containers, haskeline, HUnit + , mtl, multimap, parsec + }: + mkDerivation { + pname = "mikrokosmos"; + version = "0.1.0"; + sha256 = "49547246b9a22a9d2037424d99017d09823a2f321a9d0f6cec3309b85c5880a4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base containers haskeline HUnit mtl multimap parsec + ]; + homepage = "https://github.com/M42/mikrokosmos"; + description = "Lambda calculus interpreter"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "miku" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , containers, filepath, http-types, mtl, wai, wai-extra @@ -120762,6 +121147,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multifile" = callPackage + ({ mkDerivation, base, HaXml }: + mkDerivation { + pname = "multifile"; + version = "0.1.0.0"; + sha256 = "a0d4e0c033e8f17991fa62be64efd16d04b76befbe74cd84f547fbbdd17bef9d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base HaXml ]; + homepage = "xy30.com"; + description = "create many files from one"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multifocal" = callPackage ({ mkDerivation, array, base, containers, haskell-src-exts, HaXml , hxt, hxt-xpath, mtl, parsec, pointless-haskell, pointless-lenses @@ -125860,6 +126259,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "octane_0_16_1" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, binary-bits + , bytestring, containers, data-binary-ieee754, data-default-class + , deepseq, file-embed, http-client, http-client-tls + , overloaded-records, regex-compat, tasty, tasty-hspec + , tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "octane"; + version = "0.16.1"; + sha256 = "8b42c80e4274d8e9677eec6a349a3c7d337b129fa4194d05a288ac91ad3406ec"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary binary-bits bytestring containers + data-binary-ieee754 data-default-class deepseq file-embed + overloaded-records regex-compat text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls + ]; + testHaskellDepends = [ + base binary binary-bits bytestring containers tasty tasty-hspec + tasty-quickcheck text + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -125933,7 +126363,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; - inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; + inherit (pkgs) mesa; ovr = null; systemd = null;}; "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text @@ -126494,6 +126924,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_5_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, case-insensitive, containers, contravariant, multiset + , postgresql-simple, pretty, product-profunctors, profunctors + , QuickCheck, semigroups, text, time, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.5.1.1"; + sha256 = "4a931cbed10a9eb2c20abb1cfa7a70ead7c5b0464ec516a0dd437fef7b3dc02e"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups text time + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -128890,14 +129347,16 @@ self: { }) {inherit (pkgs.gnome) pango;}; "papa" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, papa-lens - , papa-prelude, QuickCheck, template-haskell + ({ mkDerivation, base, directory, doctest, filepath, papa-base + , papa-include, papa-prelude, QuickCheck, template-haskell }: mkDerivation { pname = "papa"; - version = "0.0.1"; - sha256 = "066d3e396e227d3775ab4d636e8c71c67ad2b883053ae593a1f4f7eb128491b3"; - libraryHaskellDepends = [ base papa-lens papa-prelude ]; + version = "0.1.0"; + sha256 = "65e86b5cda900e60856216f000cd95931780f7ba437e5ecc5924da698a9fc730"; + libraryHaskellDepends = [ + base papa-base papa-include papa-prelude + ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; @@ -128907,6 +129366,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "papa-base" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-base"; + version = "0.1.0"; + sha256 = "532ddec481ae97e7fdf074c653c3549a150f34a701572ed33aadab3f4899dcdf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-base"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-include" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , QuickCheck, semigroupoids, semigroups, template-haskell + }: + mkDerivation { + pname = "papa-include"; + version = "0.1.0"; + sha256 = "d39ff3c7bdfe065878f53f1722c9852db6bc1d8a0ea3c6152f759e1fa65a14ff"; + libraryHaskellDepends = [ base lens semigroupoids semigroups ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-include"; + description = "Third party libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "papa-lens" = callPackage ({ mkDerivation, base, directory, doctest, filepath, lens , QuickCheck, template-haskell @@ -128925,22 +129418,17 @@ self: { }) {}; "papa-prelude" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-prelude-core, papa-prelude-lens, papa-prelude-semigroupoids - , papa-prelude-semigroups, QuickCheck, template-haskell + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell }: mkDerivation { pname = "papa-prelude"; - version = "0.0.1"; - sha256 = "6336946e1164a30f1bb0b21e5b7f316a06488b2b329db7ef9ebb892168b2fc99"; - libraryHaskellDepends = [ - base papa-prelude-core papa-prelude-lens papa-prelude-semigroupoids - papa-prelude-semigroups - ]; + version = "0.1.1"; + sha256 = "5af67b6e0a8e49b36dd1bfdf7a9daeec1459ab4a6688f04fb87c4fd54e8f5ef1"; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/data61/papa-prelude"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; @@ -134958,14 +135446,13 @@ self: { }: mkDerivation { pname = "posix-acl"; - version = "0.2.0.0"; - sha256 = "3b1f8858ae8acb6d3c50a3900406b0b7b018709447c4c17aee8d2f83f12a38e2"; + version = "0.2.0.1"; + sha256 = "e3e56ee3a8cc9e84c255a17593289b86c685b167d98fee0281481509454671d2"; libraryHaskellDepends = [ base bytestring containers lifted-base monad-control transformers transformers-base unix ]; librarySystemDepends = [ acl ]; - jailbreak = true; homepage = "https://github.com/tensor5/posix-acl"; description = "Support for Posix ACL"; license = stdenv.lib.licenses.bsd3; @@ -136553,10 +137040,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "printf-safe"; - version = "0.1.0.0"; - sha256 = "492389dad3146efa2ab91fb2518c47c5dc6f94c993098e8e346cc5a77e3b5ed3"; + version = "0.1.0.1"; + sha256 = "54c6aadd6b084064cd2dfdddd80eec7fc03ccf0cb91ec544c82641836eff6a9d"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Type safe interface for Text.Printf"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -136640,12 +137126,11 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.5"; - sha256 = "1dccf0a260f37f0725f02d2f1d4f1cd61da67477dacc77caf5007584ec53a9c0"; + version = "0.2.5.1"; + sha256 = "d3e67c8b32dda838c455ddd532a668bc464cfe1d49dc74f4502175614af7ed2d"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming"; description = "Probabilistic Functional Programming"; license = stdenv.lib.licenses.bsd3; @@ -137415,8 +137900,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.1.2"; - sha256 = "a6baace79c8dd9782985836304494bf3cc4159ae6df398c9ee9d613a418a8e47"; + version = "3.2.0"; + sha256 = "6fac41cf8b4cb5a6eab97afe583f27810f6bce89b78ab0985bb11114725cd9e9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137996,6 +138481,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psi" = callPackage + ({ mkDerivation, base, bytestring, deepseq, semigroups, text }: + mkDerivation { + pname = "psi"; + version = "0.1.0.0"; + sha256 = "c8f6a8bf9359362817ae4f1f3464cb20bd70429eb2366039fba71b7828e30831"; + libraryHaskellDepends = [ + base bytestring deepseq semigroups text + ]; + description = "Yet another custom Prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "psql-helpers" = callPackage ({ mkDerivation, base, postgresql-simple }: mkDerivation { @@ -142424,8 +142922,8 @@ self: { pname = "reflex"; version = "0.4.0"; sha256 = "d60c2d425c57cf2239e1088628099f44b834e3f2c661ddb6133cc397b5476b9c"; - revision = "1"; - editedCabalFile = "5d0a189f2906a9172bee253fa9763c490f92f7ab4b71461401260321bb103b56"; + revision = "2"; + editedCabalFile = "e88ff0200373c04d57ff4b3232ada2a6965f61a23d99a8ef6bcbf96603c9d992"; libraryHaskellDepends = [ base containers dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups @@ -142435,7 +142933,7 @@ self: { base containers dependent-map MemoTrie mtl ref-tf ]; jailbreak = true; - homepage = "https://github.com/ryantrinkle/reflex"; + homepage = "https://github.com/reflex-frp/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142470,8 +142968,8 @@ self: { pname = "reflex-dom"; version = "0.3"; sha256 = "a52bacd0ebdbb559a64fc3c7abfb34d8264c3c84243b8bc126c256e505b58d3a"; - revision = "1"; - editedCabalFile = "908cf399bc1af34e18674cad421c0046b667ee8172254fce6e59dae83ce96a6a"; + revision = "2"; + editedCabalFile = "b569e2b08dac72a37173f680be5eaeb9ad57900c08301bf7b958f1cf52ac6055"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default dependent-map dependent-sum dependent-sum-template directory @@ -144980,8 +145478,8 @@ self: { }: mkDerivation { pname = "result"; - version = "0.2.4.0"; - sha256 = "043012086322e95b7b8a1f44e1603363b017a3348aa03115237b50e2baf2dec2"; + version = "0.2.5.0"; + sha256 = "92a488febc3d847a84a7d500613a0fa58450530c6c6ca64a94784023a4412c2d"; libraryHaskellDepends = [ base bifunctors keys mtl semigroups transformers ]; @@ -146193,6 +146691,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rosmsg" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, data-default + , lens-family, pureMD5, template-haskell, text + }: + mkDerivation { + pname = "rosmsg"; + version = "0.4.4.0"; + sha256 = "be16282c302f6ae7ed080460aae939c313253f364b76afbe182ff262b6c74e84"; + libraryHaskellDepends = [ + attoparsec base binary bytestring data-default lens-family pureMD5 + template-haskell text + ]; + homepage = "https://github.com/RoboticsHS/rosmsg#readme"; + description = "ROS message parser, render, TH"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rospkg" = callPackage + ({ mkDerivation, async, base, bytestring, directory, fast-tagsoup + , filepath, split, tagsoup, text + }: + mkDerivation { + pname = "rospkg"; + version = "0.2.2.1"; + sha256 = "904d31b3b2efd0807e4db2d6d7b83ff07ed2c19ee9cd5984ce93ee8cb6d19695"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring directory fast-tagsoup filepath split tagsoup + text + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/RoboticsHS/rospkg#readme"; + description = "ROS package system information"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosso" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -150717,6 +151253,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-github-webhook" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto + , github, http-types, servant, servant-server, string-conversions + , text, wai + }: + mkDerivation { + pname = "servant-github-webhook"; + version = "0.1.0.0"; + sha256 = "6d7f7c782a3652204bcf85c765212b71815f025d03e2939f1fea304af5326649"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring Crypto github http-types + servant servant-server string-conversions text wai + ]; + jailbreak = true; + homepage = "https://github.com/tsani/servant-github-webhook"; + description = "Servant combinators to facilitate writing GitHub webhooks"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , deepseq, either, exceptions, hashable, haxl, hspec, http-client @@ -151271,8 +151826,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204"; - revision = "8"; - editedCabalFile = "134f4bb4d23eb291360e897c9f83e74f22de17918452b6de79b2044c97197c6b"; + revision = "9"; + editedCabalFile = "a30c9b97b94cd82fe83b4ad43943e82edba51428ce421ab59166a8cd3622b7bb"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -156604,6 +157159,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "snowflake-core" = callPackage + ({ mkDerivation, base, QuickCheck, time-exts }: + mkDerivation { + pname = "snowflake-core"; + version = "0.1.0.1"; + sha256 = "442427fa86bee84c422c3c14e02e0f33f1d04504172dfd2620c50b3aa2ef8954"; + libraryHaskellDepends = [ base time-exts ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/jiakai0419/snowflake#readme"; + description = "twitter's snowflake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "snowflake-server" = callPackage + ({ mkDerivation, base, bytestring, containers, mtl, random + , snap-core, snap-server, snowflake-core + }: + mkDerivation { + pname = "snowflake-server"; + version = "0.1.0.0"; + sha256 = "af3baefdf4c9c51c7c0eb1441b24af8d9185ef41fae3890f961effbdca789c1c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers mtl random snap-core snap-server + snowflake-core + ]; + description = "snowflake http server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snowglobe" = callPackage ({ mkDerivation, base, bytestring, containers, gl-capture, GLUT , OpenGL, OpenGLRaw, random @@ -159629,13 +160215,12 @@ self: { }: mkDerivation { pname = "statsd-client"; - version = "0.2.0.1"; - sha256 = "7ef148b3909594fe4e845a1ebc49041af5cacaf1c557b4460f117a35a59457a5"; + version = "0.3.0.0"; + sha256 = "540cfad1006bad0f38e2ebb4550c7508f3dd7c21fd4711f87371fbe03d35df06"; libraryHaskellDepends = [ base byteable bytestring crypto-api cryptohash digest-pure DRBG network network-uri old-time random time-units ]; - jailbreak = true; homepage = "https://github.com/keithduncan/statsd-client"; description = "Statsd UDP client"; license = stdenv.lib.licenses.mit; @@ -160410,8 +160995,10 @@ self: { }: mkDerivation { pname = "store"; - version = "0.2.1.0"; - sha256 = "8f6724dc7fcf97af160106bc546d33b07ac290c81349a6c72b5db18dea6a8d6d"; + version = "0.2.1.1"; + sha256 = "e61242e5309d4efa9c7a676465dcc57a78b6b34b019bf053b6cfa5e38a449cd1"; + revision = "1"; + editedCabalFile = "12fe7b5c31b015214596f7b077529d55ac52a6589481b4eb1feea71b042aee6e"; libraryHaskellDepends = [ array base base-orphans base64-bytestring bytestring conduit containers cryptohash deepseq directory fail filepath ghc-prim @@ -160443,8 +161030,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.2.0.0"; - sha256 = "52ef7fab49c7dbd6c287de92c2f852c78f25cb32a415e56b3f21ca6b9aa5bd0a"; + version = "0.2.0.1"; + sha256 = "f4945175ef4342e6d6cc51a67d11ad1109b757f0876dc70ca4fb645c2458fa94"; libraryHaskellDepends = [ base bytestring fail ghc-prim primitive text transformers ]; @@ -164590,6 +165177,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_0_3_0_2" = callPackage + ({ mkDerivation, base, dejafu, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "0.3.0.2"; + sha256 = "1f1d2ebbad76c763e036871ec481f40c532334f7692dc187a94b77519dbe2f5d"; + libraryHaskellDepends = [ base dejafu tagged tasty ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -167067,8 +167667,8 @@ self: { ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.7"; - sha256 = "7d1c215b0d244bcd947ecb9094eec845da22109502557a5dde2e931d06496c7c"; + version = "0.7.1"; + sha256 = "db24d7da5fbdacbf3ec774c3bc0fd574023f4b00e493267f3275d2dc673eeb45"; libraryHaskellDepends = [ base deepseq text vector ]; description = "A text editor zipper library"; license = stdenv.lib.licenses.bsd3; @@ -169059,6 +169659,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timespan" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "timespan"; + version = "0.1.0.0"; + sha256 = "37500d586e16bad624a5a9419b750abf82e5107e3588dd873d6505e6e56253f8"; + libraryHaskellDepends = [ base time ]; + homepage = "https://github.com/agrafix/timespan#readme"; + description = "Useful timespan datatype and functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "timestamp-subprocess-lines" = callPackage ({ mkDerivation, base, bytestring, old-locale, process, split, time , transformers @@ -169100,12 +169712,11 @@ self: { pname = "timezone-olson"; version = "0.1.7"; sha256 = "232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa"; - revision = "1"; - editedCabalFile = "cdd67661d2460ceb1720bcbb194726a57c21b113b9383cd1f1dca91e8e71d652"; + revision = "2"; + editedCabalFile = "2b056e050fea1cd6133901097f1c5338323f343b31f19bf042ded410ec8d44eb"; libraryHaskellDepends = [ base binary bytestring extensible-exceptions time timezone-series ]; - jailbreak = true; homepage = "http://projects.haskell.org/time-ng/"; description = "A pure Haskell parser and renderer for binary Olson timezone files"; license = stdenv.lib.licenses.bsd3; @@ -169128,7 +169739,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "timezone-series" = callPackage + "timezone-series_0_1_5_1" = callPackage ({ mkDerivation, base, time }: mkDerivation { pname = "timezone-series"; @@ -169139,6 +169750,19 @@ self: { homepage = "http://projects.haskell.org/time-ng/"; description = "Enhanced timezone handling for Data.Time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "timezone-series" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "timezone-series"; + version = "0.1.6"; + sha256 = "f95ba0ad126009f98a05d1637247b677a32a087cc5036e6cfc22e77f165bdd01"; + libraryHaskellDepends = [ base time ]; + homepage = "http://projects.haskell.org/time-ng/"; + description = "Enhanced timezone handling for Data.Time"; + license = stdenv.lib.licenses.bsd3; }) {}; "timing-convenience" = callPackage @@ -170319,6 +170943,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "transient_0_4_4" = callPackage + ({ mkDerivation, base, containers, directory, mtl, random, stm + , time, transformers + }: + mkDerivation { + pname = "transient"; + version = "0.4.4"; + sha256 = "da8d580e5fab1d43d791dbcc193fbe028925efdfb1b4bbcd017bccddff4dc382"; + libraryHaskellDepends = [ + base containers directory mtl random stm time transformers + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "Making composable programs with multithreading, events and distributed computing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transient-universe" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network @@ -176475,6 +177116,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_10_4" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + version = "0.10.4"; + sha256 = "b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2"; + libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; + description = "Vector & affine spaces, linear maps, and derivatives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space-map" = callPackage ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -182214,6 +182867,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xdcc_1_1_3" = callPackage + ({ mkDerivation, ascii-progress, async, base, bytestring + , case-insensitive, concurrent-output, errors, iproute, irc-client + , irc-dcc, monad-control, network, optparse-applicative, path + , random, safe-exceptions, signal, stm, text, transformers + , transformers-base, unix-compat + }: + mkDerivation { + pname = "xdcc"; + version = "1.1.3"; + sha256 = "b34b1b10c8fc92347b0713b5b2d1ebb7450984fd7dd284d8501c291e016db49e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ascii-progress async base bytestring case-insensitive + concurrent-output errors iproute irc-client irc-dcc monad-control + network optparse-applicative path random safe-exceptions signal stm + text transformers transformers-base unix-compat + ]; + homepage = "https://github.com/JanGe/xdcc"; + description = "A wget-like utility for retrieving files from XDCC bots on IRC"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xdg-basedir" = callPackage ({ mkDerivation, base, directory, filepath }: mkDerivation { @@ -184032,8 +184710,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.18.5"; - sha256 = "90875ae906872f0b2d3cc38f265f11347c80643d4b64a6c5965183e1b700e5c3"; + version = "0.8.18.6"; + sha256 = "587f913263bf871190c24aff57808f346b72906f23ed9c1bb96e9aca63732e0a"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 8a6914cfcd3b..bb2993348fd5 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { description = "C++ rendering engine for MathML documents"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; + broken = true; }; } diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 07a95887ab40..82bf9a486791 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }: let - version = "1.1.2"; + version = "1.1.3"; in stdenv.mkDerivation rec { name = "libopus-${version}"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "1z87x5c5x951lhnm70iqr2gqn15wns5cqsw8nnkvl48jwdw00a8f"; + sha256 = "0cxnd7pjxbgh6l3cbzsw29phpr5cq28fikfhjlp1hc3y5s0gxdjq"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 0d765ec93bbb..afa480296f6f 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: +{ stdenv, fetchgit, fetchurl, makeWrapper, + ocaml, unzip, ncurses, curl, + aspcudSupport ? !stdenv.isDarwin, aspcud +}: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; @@ -45,7 +48,7 @@ in stdenv.mkDerivation rec { name = "opam-${version}"; version = "1.2.2"; - buildInputs = [ unzip curl ncurses ocaml ]; + buildInputs = [ unzip curl ncurses ocaml makeWrapper]; src = srcs.opam; @@ -69,6 +72,13 @@ in stdenv.mkDerivation rec { # Dirty, but apparently ocp-build requires a TERM makeFlags = ["TERM=screen"]; + postInstall = + if aspcudSupport then '' + wrapProgram $out/bin/opam \ + --suffix PATH : ${aspcud}/bin + '' + else ""; + doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 9a7664550552..8c86371ecab3 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -51,6 +51,7 @@ in buildFHSUserEnv rec { gst_all_1.gstreamer gst_all_1.gst-plugins-ugly libdrm + mono (steamPackages.steam-runtime-wrapped.override { inherit nativeOnly runtimeOnly newStdcpp; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 14c4873beb42..7ce23d5d6b3a 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.6400"; + version = "3.0.7100"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "08zwqqilfs3y2kjqfan4ya0s9pns6g1pgh6wciabjzv2v2ra9kq3"; + sha256 = "0fxqk4p8p72bjzlbl8da988xr6bryr1zpvaaf8if6vnclly4vmny"; }; propagatedBuildInputs = with pkgs; [ diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 57abffa601fc..b4f34b452a7d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,13 +12,13 @@ let in buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "04wl6lznffxhvfq52cmbg2amkl03454wyaqc17i0zlc6b0p14dli"; + sha256 = "0171pp7phizg5j78i1srkx2hj4fqi0qn66sn6x4gshv9grncjsgw"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d656e8ded3a4..e273bd110e2c 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -30,13 +30,13 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "15"; + minor = "19"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c"; + sha256 = "07af1m2lgblyiq0gcs26zv8n22wrhrpmf49xsm338h1n87d6r1dw"; }; patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 91e292944a67..b44b173c05c7 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4230"; + version = "2.0.0.4323"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "16nx0v5hpqlwna2hzpcpzvm7qc361yjxbqnwz5bfnnkb0h7ik5m6"; + sha256 = "1c50z7cwkm3pfn5inac96b7lazvxr2778aix4cp5b0rm01r2414x"; }; buildInputs = [ diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix new file mode 100644 index 000000000000..577c0a33b3ee --- /dev/null +++ b/pkgs/tools/misc/aspcud/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, + boost, clasp, cmake, gringo, re2c +}: + +let + version = "1.9.0"; +in + +stdenv.mkDerivation rec { + name = "aspcud-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; + sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; + }; + + buildInputs = [ boost clasp cmake gringo re2c ]; + + buildPhase = '' + cmake -DCMAKE_BUILD_TYPE=Release \ + -DGRINGO_LOC=${gringo}/bin/gringo \ + -DCLASP_LOC=${clasp}/bin/clasp \ + -DENCODING_LOC=$out/share/aspcud/specification.lp \ + . + + make + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/{aspcud,cudf2lp,lemon} $out/bin + + mkdir -p $out/share/aspcud + cp ../share/aspcud/specification.lp $out/share/aspcud + ''; + + meta = with stdenv.lib; { + description = "Solver for package problems in CUDF format using ASP"; + homepage = http://potasssco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix new file mode 100644 index 000000000000..135eda554b36 --- /dev/null +++ b/pkgs/tools/misc/clasp/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +let + version = "3.1.4"; +in + +stdenv.mkDerivation { + name = "clasp-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; + sha256 = "1zkjqc4gp4n9p2kf3k3z8x82g42any4p3shhhivny89z1jlxi9zn"; + }; + + preConfigure = "patchShebangs ./configure.sh"; + configureScript = "./configure.sh"; + + preBuild = "cd build/release"; + + installPhase = '' + mkdir -p $out/bin + cp bin/clasp $out/bin/clasp + ''; + + meta = with stdenv.lib; { + description = "Answer set solver for (extended) normal and disjunctive logic programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.all; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix new file mode 100644 index 000000000000..ae71c01314cf --- /dev/null +++ b/pkgs/tools/misc/gringo/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, + bison, re2c, scons +}: + +let + version = "4.5.4"; +in + +stdenv.mkDerivation rec { + name = "gringo-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; + sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; + }; + + buildInputs = [ bison re2c scons ]; + + patches = [ + ./gringo-4.5.4-cmath.patch + ]; + + buildPhase = '' + scons --build-dir=release + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/gringo $out/bin/gringo + ''; + + meta = with stdenv.lib; { + description = "Converts input programs with first-order variables to equivalent ground programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch new file mode 100644 index 000000000000..7b5510e2344b --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch @@ -0,0 +1,11 @@ +--- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400 ++++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400 +@@ -22,6 +22,8 @@ + #include "gringo/logger.hh" + #include "gringo/graph.hh" + ++#include <cmath> ++ + namespace Gringo { + + // {{{ definition of Defines diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 8616a40df43f..fbd2c642b9d2 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gpm, file, e2fsprogs -, libX11, libICE, perl, zip, unzip, gettext, slang}: +, libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}: stdenv.mkDerivation rec { name = "mc-${version}"; @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "0fvqzffppj0aja9hi0k1xdjg5m6s99immlla1y9yzn5fp8vwpl36"; }; - buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ]; + buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs + libssh2 openssl ]; + + configureFlags = [ "--enable-vfs-smb" ]; meta = { description = "File Manager and User Shell for the GNU Project"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9262c8c144a4..686530b13236 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -536,6 +536,10 @@ in }; aria = self.aria2; + aspcud = callPackage ../tools/misc/aspcud { + boost = boost155; + }; + at = callPackage ../tools/system/at { }; atftp = callPackage ../tools/networking/atftp { }; @@ -710,6 +714,8 @@ in ckbcomp = callPackage ../tools/X11/ckbcomp { }; + clasp = callPackage ../tools/misc/clasp { }; + cli53 = callPackage ../tools/admin/cli53 { }; cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; @@ -843,6 +849,8 @@ in gmic = callPackage ../tools/graphics/gmic { }; + gringo = callPackage ../tools/misc/gringo { }; + gti = callPackage ../tools/misc/gti { }; heatseeker = callPackage ../tools/misc/heatseeker { }; @@ -12009,6 +12017,10 @@ in docbook5_xsl = self.docbook_xsl_ns; + cabin = callPackage ../data/fonts/cabin { }; + + dosis = callPackage ../data/fonts/dosis { }; + dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; eb-garamond = callPackage ../data/fonts/eb-garamond { }; @@ -12022,6 +12034,8 @@ in inherit (pythonPackages) scfbuild; }; + encode-sans = callPackage ../data/fonts/encode-sans { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -12087,6 +12101,14 @@ in libertine = callPackage ../data/fonts/libertine { }; + libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; + + libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; + + libre-caslon = callPackage ../data/fonts/libre-caslon { }; + + libre-franklin = callPackage ../data/fonts/libre-franklin { }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; lmodern = callPackage ../data/fonts/lmodern { }; @@ -14678,6 +14700,8 @@ in udevil = callPackage ../applications/misc/udevil {}; + udiskie = callPackage ../applications/misc/udiskie { }; + sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9573e25ab46..5e4c6cdff494 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27140,47 +27140,8 @@ in modules // { }; }; - udiskie = buildPythonPackage rec { - version = "1.4.8"; - name = "udiskie-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/coldfix/udiskie/archive/${version}.tar.gz"; - sha256 = "0fj1kh6pmwyyy54ybc5fa625lhrxzhzmfx1nwz2lym5cpm4b21fl"; - }; - - preConfigure = '' - export XDG_RUNTIME_DIR=/tmp - ''; - - buildInputs = [ - pkgs.asciidoc-full # For building man page. - ]; - - propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ]; - - postBuild = "make -C doc"; - - postInstall = '' - mkdir -p $out/share/man/man8 - cp -v doc/udiskie.8 $out/share/man/man8/ - ''; - - preFixup = '' - wrapProgram "$out/bin/"* \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - ''; - - # tests require dbusmock - doCheck = false; - - meta = { - description = "Removable disk automounter for udisks"; - license = licenses.mit; - homepage = https://github.com/coldfix/udiskie; - maintainers = with maintainers; [ AndersonTorres ]; - }; - }; + # For backwards compatibility. Please use nixpkgs.udiskie instead. + udiskie = pkgs.udiskie.override { pythonPackages = self; }; # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { |