From 272f2c365c0778836aeace102946f1040268c4a1 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Tue, 25 Nov 2014 23:49:11 +0100 Subject: [PATCH 01/65] git: Support $SSL_CERT_FILE --- .../git-and-tools/git/default.nix | 9 +++++++-- .../git-and-tools/git/ssl-cert-file.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 7ba69a9fc18..69e88f32c41 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -24,7 +24,12 @@ stdenv.mkDerivation { sha256 = "0mvgvr2hz25p49dhhizcw9591f2h17y2699mpmndis3kzap0c6zy"; }; - patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; + patches = [ + ./docbook2texi.patch + ./symlinks-in-bin.patch + ./cert-path.patch + ./ssl-cert-file.patch + ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x @@ -142,6 +147,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ simons the-kenny wmertens ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch new file mode 100644 index 00000000000..dd216b7bf6f --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch @@ -0,0 +1,13 @@ +This patch adds support for the OpenSSL SSL_CERT_FILE environment variable. +GIT_SSL_CAINFO still takes precedence. + +--- git-orig/http.c.orig 2014-11-25 23:27:56.000000000 +0100 ++++ git-orig/http.c 2014-11-25 23:28:48.000000000 +0100 +@@ -433,6 +433,7 @@ + #if LIBCURL_VERSION_NUM >= 0x070908 + set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); + #endif ++ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); + set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); + + set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); From 72b81cf8bbaa389c05baf2943b6330f9f333d6b4 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Tue, 25 Nov 2014 23:52:01 +0100 Subject: [PATCH 02/65] Remove unnecessary $GIT_SSL_CAINFO from sys env --- nixos/modules/security/ca.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 8e653cd4284..e17ad448f40 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -16,7 +16,6 @@ with lib; { SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; # FIXME: unneeded - remove eventually. OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; }; }; From 17ad66bfd1aac95a55ceff6c8a3691e68f7728ca Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Wed, 26 Nov 2014 20:31:51 +0200 Subject: [PATCH 03/65] haskell: add network-data package --- .../libraries/haskell/network-data/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/network-data/default.nix diff --git a/pkgs/development/libraries/haskell/network-data/default.nix b/pkgs/development/libraries/haskell/network-data/default.nix new file mode 100644 index 00000000000..d6c94c97a32 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-data/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cereal, prettyclass }: + +cabal.mkDerivation (self: { + pname = "network-data"; + version = "0.5.2"; + sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s"; + buildDepends = [ cereal prettyclass ]; + meta = { + description = "Library for network data structures and their serialization"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 78b33244b1f..60f92d700ca 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1743,6 +1743,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {}; + networkData = callPackage ../development/libraries/haskell/network-data {}; + networkFancy = callPackage ../development/libraries/haskell/network-fancy {}; networkInfo = callPackage ../development/libraries/haskell/network-info {}; From 959946a5af0b06f67c039053203bd395d511f524 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Wed, 26 Nov 2014 21:41:06 +0100 Subject: [PATCH 04/65] e17: remove old desktop manager --- .../services/x11/desktop-managers/default.nix | 2 +- .../services/x11/desktop-managers/e17.nix | 30 ------------ pkgs/desktops/e17/default.nix | 48 ------------------- pkgs/desktops/e17/e_dbus/default.nix | 31 ------------ pkgs/desktops/e17/e_dbus/setup-hook.sh | 8 ---- pkgs/desktops/e17/ecore/default.nix | 33 ------------- pkgs/desktops/e17/edje/default.nix | 29 ----------- pkgs/desktops/e17/eet/default.nix | 29 ----------- pkgs/desktops/e17/eeze/default.nix | 23 --------- pkgs/desktops/e17/efreet/default.nix | 29 ----------- pkgs/desktops/e17/eina/default.nix | 18 ------- pkgs/desktops/e17/eio/default.nix | 24 ---------- pkgs/desktops/e17/elementary/default.nix | 19 -------- pkgs/desktops/e17/embryo/default.nix | 22 --------- pkgs/desktops/e17/emotion/default.nix | 19 -------- pkgs/desktops/e17/enlightenment/default.nix | 32 ------------- pkgs/desktops/e17/ethumb/default.nix | 23 --------- pkgs/desktops/e17/evas/default.nix | 25 ---------- pkgs/desktops/e17/terminology/default.nix | 17 ------- pkgs/top-level/all-packages.nix | 5 -- 20 files changed, 1 insertion(+), 465 deletions(-) delete mode 100644 nixos/modules/services/x11/desktop-managers/e17.nix delete mode 100644 pkgs/desktops/e17/default.nix delete mode 100644 pkgs/desktops/e17/e_dbus/default.nix delete mode 100644 pkgs/desktops/e17/e_dbus/setup-hook.sh delete mode 100644 pkgs/desktops/e17/ecore/default.nix delete mode 100644 pkgs/desktops/e17/edje/default.nix delete mode 100644 pkgs/desktops/e17/eet/default.nix delete mode 100644 pkgs/desktops/e17/eeze/default.nix delete mode 100644 pkgs/desktops/e17/efreet/default.nix delete mode 100644 pkgs/desktops/e17/eina/default.nix delete mode 100644 pkgs/desktops/e17/eio/default.nix delete mode 100644 pkgs/desktops/e17/elementary/default.nix delete mode 100644 pkgs/desktops/e17/embryo/default.nix delete mode 100644 pkgs/desktops/e17/emotion/default.nix delete mode 100644 pkgs/desktops/e17/enlightenment/default.nix delete mode 100644 pkgs/desktops/e17/ethumb/default.nix delete mode 100644 pkgs/desktops/e17/evas/default.nix delete mode 100644 pkgs/desktops/e17/terminology/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index ebdb2ad0649..b76e6b1da4e 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix - ./e17.nix ./e18.nix ./e19.nix ./gnome3.nix ./xbmc.nix + ./e18.nix ./e19.nix ./gnome3.nix ./xbmc.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/e17.nix b/nixos/modules/services/x11/desktop-managers/e17.nix deleted file mode 100644 index 4cac53c9c75..00000000000 --- a/nixos/modules/services/x11/desktop-managers/e17.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.e17; - -in - -{ - options = { - - services.xserver.desktopManager.e17.enable = mkOption { - default = false; - example = true; - description = "Enable support for the E17 desktop environment."; - }; - - }; - - - config = mkIf (xcfg.enable && cfg.enable) { - - services.dbus.packages = [ pkgs.e17.ethumb ]; - - }; - -} diff --git a/pkgs/desktops/e17/default.nix b/pkgs/desktops/e17/default.nix deleted file mode 100644 index 648a3577863..00000000000 --- a/pkgs/desktops/e17/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ callPackage, pkgs }: -rec { - #### CORE EFL - - eina = callPackage ./eina { }; - - eet = callPackage ./eet { }; - - evas = callPackage ./evas { }; - - ecore = callPackage ./ecore { }; - - eio = callPackage ./eio { }; - - embryo = callPackage ./embryo { }; - - edje = callPackage ./edje { lua = pkgs.lua5; }; - - efreet = callPackage ./efreet { }; - - e_dbus = callPackage ./e_dbus { }; - - eeze = callPackage ./eeze { }; - - emotion = callPackage ./emotion { }; - - ethumb = callPackage ./ethumb { }; - - elementary = callPackage ./elementary { }; - - - #### WINDOW MANAGER - - enlightenment = callPackage ./enlightenment { }; - - - #### APPLICATIONS - - terminology = callPackage ./terminology { }; - - - - #### ART - - - - -} diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix deleted file mode 100644 index cfc0203b3e0..00000000000 --- a/pkgs/desktops/e17/e_dbus/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, expat, ecore, eina, evas -, dbus_libs }: -stdenv.mkDerivation rec { - name = "e_dbus-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "16ckrpzzw5x1cs0fwqkk8431al55xil5magihkp9l3s77g0qd26q"; - }; - buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; - propagatedBuildInputs = [ dbus_libs ]; - setupHook = ./setup-hook.sh; - configureFlags = '' - --disable-edbus-test - --disable-edbus-test-client - --disable-edbus-notify-send - --disable-edbus-notify-test - --disable-edbus-async-test - ''; - meta = { - description = "Enlightenment's D-Bus wrapping and glue layer library"; - longDescription = '' - Enlightenment's E_Dbus is a set of wrappers around DBus APIs by - third party, so they can be easily used by EFL applications, - automatically providing Ecore/main loop integration, as well as - Eina data types. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/e_dbus/setup-hook.sh b/pkgs/desktops/e17/e_dbus/setup-hook.sh deleted file mode 100644 index 33e3a6b0f18..00000000000 --- a/pkgs/desktops/e17/e_dbus/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addDbusIncludePath () { - if test -d "$1/include/dbus-1.0" - then - export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include" - fi -} - -envHooks+=(addDbusIncludePath) diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix deleted file mode 100644 index 4a3eef4ec49..00000000000 --- a/pkgs/desktops/e17/ecore/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext, libXrender -, libXcomposite, libXfixes, libXdamage }: -stdenv.mkDerivation rec { - name = "ecore-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "08ljda6p0zj1h5sq3l0js6mihw8cr6ydynn42dnka36vachvmfjb"; - }; - buildInputs = [ pkgconfig eina evas ]; - propagatedBuildInputs = [ libX11 libXext libXcomposite libXrender libXfixes - libXdamage - ]; - meta = { - description = "Enlightenment's core mainloop, display abstraction and utility library"; - longDescription = '' - Enlightenment's Ecore is a clean and tiny event loop library - with many modules to do lots of convenient things for a - programmer, to save time and effort. - - It's small and lean, designed to work on embedded systems all - the way to large and powerful multi-cpu workstations. It - serialises all system signals, events etc. into a single event - queue, that is easily processed without needing to worry about - concurrency. A properly written, event-driven program using this - kind of programming doesn't need threads, nor has to worry about - concurrency. It turns a program into a state machine, and makes - it very robust and easy to follow. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix deleted file mode 100644 index 62758b2094e..00000000000 --- a/pkgs/desktops/e17/edje/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, lua, expat, zlib, libjpeg, eina, eet, evas -, ecore, embryo }: -stdenv.mkDerivation rec { - name = "edje-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1hsyj46bk94yd9ymf9425pf4ygy36h5gdkg9fhf8qds8cnn2kcy7"; - }; - buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ]; - patchPhase = '' - substituteInPlace src/bin/edje_cc_out.c --replace '%s/embryo_cc' '${embryo}/bin/embryo_cc' - substituteInPlace src/bin/edje_cc_out.c --replace 'eina_prefix_bin_get(pfx),' "" - ''; - meta = { - description = "Enlightenment's abstract GUI layout and animation object library"; - longDescription = '' - Enlightenment's Edje is a complex graphical design & layout - library based on Evas that provides an abstraction layer between - the application code and the interface, while allowing extremely - flexible dynamic layouts and animations. - - In more popular terms, Edje makes every application that uses it - "skinable". - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix deleted file mode 100644 index 079d07187ff..00000000000 --- a/pkgs/desktops/e17/eet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }: -stdenv.mkDerivation rec { - name = "eet-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0ys2579v45f9x2n47shq0k63g0sdbj1ndhh72dvfajihsgjwd767"; - }; - buildInputs = [ pkgconfig eina zlib libjpeg ]; - meta = { - description = "Enlightenment's data encode/decode and storage library"; - longDescription = '' - Enlightenment's EET is a tiny library designed to write an - arbitary set of chunks of data to a file and optionally compress - each chunk (very much like a zip file) and allow fast - random-access reading of the file later on. EET files are - perfect for storing data that is written once (or rarely) and - read many times, especially when the program does not want to - have to read all the data in at once. - - Use this library when you need to pack C structure and you want - to retrieve it quickly with as few as possible memory use. You - can also use it to serialize data quickly and exchange them - between two program over ipc or network link. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix deleted file mode 100644 index 162fbcf1aef..00000000000 --- a/pkgs/desktops/e17/eeze/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, ecore, udev }: -stdenv.mkDerivation rec { - name = "eeze-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0274fs4cxgw6420yyz9frrc8zhj0qqyvwczzslq3kih3sx1nikxr"; - }; - buildInputs = [ pkgconfig eina ecore ]; - propagatedBuildInputs = [ udev ]; - meta = { - description = "Enlightenment's device abstraction library"; - longDescription = '' - Enlightenment's Eeze is a library for manipulating devices - through udev with a simple and fast api. It interfaces directly - with libudev, avoiding such middleman daemons as udisks/upower - or hal, to immediately gather device information the instant it - becomes known to the system. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix deleted file mode 100644 index dfe755db597..00000000000 --- a/pkgs/desktops/e17/efreet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, ecore }: -stdenv.mkDerivation rec { - name = "efreet-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1yw7qjddqcnsz1vb693pa57v9wydvzfy198dc23mz46qfqx08nlg"; - }; - buildInputs = [ pkgconfig eina eet ecore ]; - meta = { - description = "Enlightenment's standards handling for freedesktop.org standards"; - longDescription = '' - Enlightenment's Efreet is a library designed to help apps work - several of the Freedesktop.org standards regarding Icons, - Desktop files and Menus. To that end it implements the following - specifications: - - * XDG Base Directory Specification - * Icon Theme Specification - * Desktop Entry Specification - * Desktop Menu Specification - * FDO URI Specification - * Shared Mime Info Specification - * Trash Specification - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix deleted file mode 100644 index 653bb639b1b..00000000000 --- a/pkgs/desktops/e17/eina/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "eina-${version}"; - version = "1.7.10"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "06pqn17zknmxzdk5gw6df0gpbicnrdjl9g4vncw57k2wzf5icy33"; - }; - meta = { - description = "Enlightenment's core data structure library"; - longDescription = '' - Enlightenment's Eina is a core data structure and common utility - library. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/eio/default.nix b/pkgs/desktops/e17/eio/default.nix deleted file mode 100644 index b56422fd774..00000000000 --- a/pkgs/desktops/e17/eio/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eet, eina, ecore }: -stdenv.mkDerivation rec { - name = "eio-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1bsam5q364kc4xwfv7pql6686gj0byhk42zwjqx9ajf70l23kss6"; - }; - buildInputs = [ pkgconfig eet eina ecore ]; - meta = { - description = "A library that integrates with EFL to provide efficient filesystem IO"; - longDescription = '' - Eio integrates with EFL (Ecore, Eina) to provide efficient filesystem Input/Output. - It use the best techniques to achieve such purpose, like using at-variants, splice, - properly handling errors and doing it in an asynchronous fashion by means of worker - threads. It is also ported to Windows, so multi-platform. - - Whenever you need to list a directory, copy, move or delete files, Eio will do that - task better than you'd achieve with naive implementations, and it is easy to use. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/elementary/default.nix b/pkgs/desktops/e17/elementary/default.nix deleted file mode 100644 index b0240d986de..00000000000 --- a/pkgs/desktops/e17/elementary/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje }: -stdenv.mkDerivation rec { - name = "elementary-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "08cb4x9639xyrb8d4vzvhl6v385qjfswl717sicm7iimh5zlm2l9"; - }; - buildInputs = [ pkgconfig eina eet evas ecore edje ]; - meta = { - description = "Enlightenment's core data structure library"; - longDescription = '' - Enlightenment's Eina is a core data structure and common utility - library. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix deleted file mode 100644 index 59b5540f25d..00000000000 --- a/pkgs/desktops/e17/embryo/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina }: -stdenv.mkDerivation rec { - name = "embryo-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "104fsa179w2dfg00sfnap7c3b4ixcps4crxa6yav755awssdcim9"; - }; - buildInputs = [ pkgconfig eina ]; - meta = { - description = "Enlightenment's small Pawn based virtual machine and compiler"; - longDescription = '' - Enlightenment's Embryo is a tiny library designed to interpret - limited Small programs compiled by the included compiler, - embryo_cc. It is mostly a cleaned up and smaller version of the - original Small abstract machine. The compiler is mostly - untouched. - ''; - homepage = http://enlightenment.org/; - license = with stdenv.lib.licenses; [ bsd2.shortName bsd3.shortName ]; # not sure - }; -} diff --git a/pkgs/desktops/e17/emotion/default.nix b/pkgs/desktops/e17/emotion/default.nix deleted file mode 100644 index 9ec3631b1e7..00000000000 --- a/pkgs/desktops/e17/emotion/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje, vlc }: -stdenv.mkDerivation rec { - name = "emotion-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw"; - }; - buildInputs = [ pkgconfig ecore evas eet eina edje vlc ]; - meta = { - description = "A library to easily integrate media playback into EFL applications"; - longDescription = '' - Emotion is a library to easily integrate media playback into EFL applications, - it will take care of using Ecore's main loop and video display is done using Evas. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix deleted file mode 100644 index 953c90e8003..00000000000 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus -, embryo, eio, xcbutilkeysyms, libjpeg }: -stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.17.1"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1z2vx9r7yc55rs673jg7d685slgdv9dss45asg50wh5wxp2mfi3y"; - }; - buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo - eio xcbutilkeysyms libjpeg ]; - configureFlags = '' - --with-profile=FAST_PC - --disable-illume - --disable-illume2 - ''; - meta = { - description = "A window manager"; - longDescription = '' - The Enlightenment Desktop shell provides an efficient yet - breathtaking window manager based on the Enlightenment - Foundation Libraries along with other essential desktop - components like a file manager, desktop icons and widgets. - - It boasts a un-precedented level of theme-ability while still - being capable of performing on older hardware or embedded - devices. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/ethumb/default.nix b/pkgs/desktops/e17/ethumb/default.nix deleted file mode 100644 index 344abe1e3f1..00000000000 --- a/pkgs/desktops/e17/ethumb/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet, e_dbus, emotion, libexif }: -stdenv.mkDerivation rec { - name = "ethumb-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l"; - }; - buildInputs = [ pkgconfig eina evas ecore edje eet emotion libexif ]; - propagatedBuildInputs = [ e_dbus libexif ]; - meta = { - description = "A thumbnail generation library"; - longDescription = '' - Ethumb - thumbnail generation library. Features: - * create thumbnails with a predefined frame (possibly an edje frame); - * have an option to create fdo-like thumbnails; - * have a client/server utility; - * TODO: make thumbnails from edje backgrounds, icons and themes; - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.lgpl21; - }; -} diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix deleted file mode 100644 index c271caa980d..00000000000 --- a/pkgs/desktops/e17/evas/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, freetype, fontconfig, libpng, libjpeg -, libX11, libXext, eina, eet }: -stdenv.mkDerivation rec { - name = "evas-${version}"; - version = "1.7.5"; - src = fetchurl { - url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0x3k89q2wxgxjsbhdf4qws7jgpjl7rpqji98ca3nf25jf2lm1cvh"; - }; - buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg - libX11 libXext eina eet - ]; - meta = { - description = "Enlightenment's canvas and scenegraph rendering library"; - longDescription = '' - Enlightenment's Evas is a clean display canvas API that - implements a scene graph, not an immediate-mode rendering - target, is cross-platform, for several target display systems - that can draw anti-aliased text, smooth super and sub-sampled - scaled images, alpha-blend objects and much more. - ''; - homepage = http://enlightenment.org/; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/desktops/e17/terminology/default.nix b/pkgs/desktops/e17/terminology/default.nix deleted file mode 100644 index 35e2f3f5a34..00000000000 --- a/pkgs/desktops/e17/terminology/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, elementary, eina, eet, evas, edje, emotion, ecore, ethumb, efreet }: - -stdenv.mkDerivation rec { - name = "terminology-${version}"; - version = "0.7.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1x248dh9r292r8ycvf43vrfk4l8wpli50sgywp0zy3q93f8ljgs5"; - }; - buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ]; - - meta = { - description = "Terminology, the E17 terminal emulator"; - homepage = http://www.enlightenment.org/p.php?p=about/terminology; - license = stdenv.lib.licenses.bsd2; # not sure - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c5caa1649..e0ba0a322c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11718,11 +11718,6 @@ let enlightenment = callPackage ../desktops/enlightenment { }; - e17 = recurseIntoAttrs ( - let callPackage = newScope pkgs.e17; in - import ../desktops/e17 { inherit callPackage pkgs; } - ); - e18 = recurseIntoAttrs ( let callPackage = newScope pkgs.e18; in import ../desktops/e18 { inherit callPackage pkgs; } From 084fb3a0d36c5a77556c3c71eafdb82cc472e1c2 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Wed, 26 Nov 2014 21:42:59 +0100 Subject: [PATCH 05/65] e18: remove old desktop manager --- .../services/x11/desktop-managers/default.nix | 2 +- .../services/x11/desktop-managers/e18.nix | 43 ------------------- pkgs/desktops/e18/default.nix | 16 ------- pkgs/desktops/e18/econnman.nix | 23 ---------- pkgs/desktops/e18/efl.nix | 23 ---------- pkgs/desktops/e18/elementary.nix | 20 --------- pkgs/desktops/e18/emotion.nix | 20 --------- pkgs/desktops/e18/enlightenment.nix | 35 --------------- pkgs/desktops/e18/evas.nix | 17 -------- pkgs/desktops/e18/terminology.nix | 23 ---------- pkgs/top-level/all-packages.nix | 5 --- 11 files changed, 1 insertion(+), 226 deletions(-) delete mode 100644 nixos/modules/services/x11/desktop-managers/e18.nix delete mode 100644 pkgs/desktops/e18/default.nix delete mode 100644 pkgs/desktops/e18/econnman.nix delete mode 100644 pkgs/desktops/e18/efl.nix delete mode 100644 pkgs/desktops/e18/elementary.nix delete mode 100644 pkgs/desktops/e18/emotion.nix delete mode 100644 pkgs/desktops/e18/enlightenment.nix delete mode 100644 pkgs/desktops/e18/evas.nix delete mode 100644 pkgs/desktops/e18/terminology.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index b76e6b1da4e..bffbb56e681 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix - ./e18.nix ./e19.nix ./gnome3.nix ./xbmc.nix + ./e19.nix ./gnome3.nix ./xbmc.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/e18.nix b/nixos/modules/services/x11/desktop-managers/e18.nix deleted file mode 100644 index faafd21b07d..00000000000 --- a/nixos/modules/services/x11/desktop-managers/e18.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.e18; - e18_enlightenment = pkgs.e18.enlightenment.override { set_freqset_setuid = true; }; - -in - -{ - options = { - - services.xserver.desktopManager.e18.enable = mkOption { - default = false; - example = true; - description = "Enable the E18 desktop environment."; - }; - - }; - - config = mkIf (xcfg.enable && cfg.enable) { - - environment.systemPackages = [ - pkgs.e18.efl pkgs.e18.evas pkgs.e18.emotion pkgs.e18.elementary e18_enlightenment - pkgs.e18.terminology pkgs.e18.econnman - ]; - - services.xserver.desktopManager.session = [ - { name = "E18"; - start = '' - ${e18_enlightenment}/bin/enlightenment_start - waitPID=$! - ''; - }]; - - security.setuidPrograms = [ "e18_freqset" ]; - - }; - -} diff --git a/pkgs/desktops/e18/default.nix b/pkgs/desktops/e18/default.nix deleted file mode 100644 index 56361eb85ce..00000000000 --- a/pkgs/desktops/e18/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ callPackage, pkgs }: -rec { - #### CORE EFL - efl = callPackage ./efl.nix { }; - evas = callPackage ./evas.nix { }; - emotion = callPackage ./emotion.nix { }; - elementary = callPackage ./elementary.nix { }; - - #### WINDOW MANAGER - enlightenment = callPackage ./enlightenment.nix { }; - - #### APPLICATIONS - econnman = callPackage ./econnman.nix { }; - terminology = callPackage ./terminology.nix { }; - -} diff --git a/pkgs/desktops/e18/econnman.nix b/pkgs/desktops/e18/econnman.nix deleted file mode 100644 index f2c67edf4f8..00000000000 --- a/pkgs/desktops/e18/econnman.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, python27, python27Packages, dbus, makeWrapper }: -stdenv.mkDerivation rec { - name = "econnman-${version}"; - version = "1.1"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz"; - sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; - }; - - buildInputs = [ makeWrapper pkgconfig e18.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus e18.elementary ]; - postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages - ''; - - meta = { - description = "Econnman is a user interface for the connman network connection manager"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; - }; -} diff --git a/pkgs/desktops/e18/efl.nix b/pkgs/desktops/e18/efl.nix deleted file mode 100644 index ca09ac32ee5..00000000000 --- a/pkgs/desktops/e18/efl.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages }: -stdenv.mkDerivation rec { - name = "efl-${version}"; - version = "1.10.2"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "0py8x0kv2hgl5v983xb6653fvmvn20im6picpc0hqfyxy09g1b24"; - }; - buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; - propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ]; - configureFlags = [ "--with-opengl=full" "--with-tests=none" "--enable-wayland" "--enable-sdl" "--enable-drm" ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${xlibs.libXtst} $NIX_CFLAGS_COMPILE" - export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" - ''; - meta = { - description = "Enlightenment Core libraries"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; - }; -} diff --git a/pkgs/desktops/e18/elementary.nix b/pkgs/desktops/e18/elementary.nix deleted file mode 100644 index f808d5c905b..00000000000 --- a/pkgs/desktops/e18/elementary.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18 }: -stdenv.mkDerivation rec { - name = "elementary-${version}"; - version = "1.10.2"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "0y3knvmabl9adc8pd54p7qxpf7gvciixc1rk40hqppwhdgbgpz28"; - }; - buildInputs = [ pkgconfig e18.efl ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - ''; - meta = { - description = "Widget set/toolkit"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; - }; -} diff --git a/pkgs/desktops/e18/emotion.nix b/pkgs/desktops/e18/emotion.nix deleted file mode 100644 index 7e1c3be6400..00000000000 --- a/pkgs/desktops/e18/emotion.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, vlc }: -stdenv.mkDerivation rec { - name = "emotion_generic_players-${version}"; - version = "1.10.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "1nwlrk9inrhiv6jpzji10ikcdlhzhz7f2b5qhi2ai8bb6j61ryyc"; - }; - buildInputs = [ pkgconfig e18.efl vlc ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - ''; - meta = { - description = "Extra video decoders"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/e18/enlightenment.nix b/pkgs/desktops/e18/enlightenment.nix deleted file mode 100644 index c3cd585e525..00000000000 --- a/pkgs/desktops/e18/enlightenment.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit, bzip2, set_freqset_setuid ? false }: - -stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.18.8"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz"; - sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l"; - }; - buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - ''; - - # this is a hack and without this cpufreq module is not working: - # when set_freqset_setuid is true and "e18_freqset" is set in setuidPrograms (this is taken care of in e18 NixOS module), - # then this postInstall does the folowing: - # 1. moves the "freqset" binary to "e18_freqset", - # 2. linkes "e18_freqset" to enlightenment/bin so that, - # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e18_freqset, - # 4. and finaly, linkes /var/setuid-wrappers/e18_freqset to original destination where enlightenment wants it - postInstall = if set_freqset_setuid then '' - export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; - mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e18_freqset - ln -sv $CPUFREQ_DIRPATH/e18_freqset $out/bin/e18_freqset - ln -sv /var/setuid-wrappers/e18_freqset $CPUFREQ_DIRPATH/freqset - '' else ""; - meta = { - description = "The Compositing Window Manager and Desktop Shell"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/e18/evas.nix b/pkgs/desktops/e18/evas.nix deleted file mode 100644 index 9ddd94dbaea..00000000000 --- a/pkgs/desktops/e18/evas.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18, zlib }: -stdenv.mkDerivation rec { - name = "evas_generic_loaders-${version}"; - version = "1.10.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "0qx44g7a8pzcgspx8q10zjiwzafis301fhpchd4pskfxhqd4qagm"; - }; - buildInputs = [ pkgconfig e18.efl zlib ]; - meta = { - description = "Extra image decoders"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/e18/terminology.nix b/pkgs/desktops/e18/terminology.nix deleted file mode 100644 index 892abc6ea5f..00000000000 --- a/pkgs/desktops/e18/terminology.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e18 }: -stdenv.mkDerivation rec { - name = "terminology-${version}"; - version = "0.6.1"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x"; - }; - buildInputs = [ pkgconfig e18.efl e18.elementary ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" - export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" - ''; - meta = { - description = "The best terminal emulator written with the EFL"; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0ba0a322c2..50198b0e1c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11718,11 +11718,6 @@ let enlightenment = callPackage ../desktops/enlightenment { }; - e18 = recurseIntoAttrs ( - let callPackage = newScope pkgs.e18; in - import ../desktops/e18 { inherit callPackage pkgs; } - ); - e19 = recurseIntoAttrs ( let callPackage = newScope pkgs.e19; in import ../desktops/e19 { inherit callPackage pkgs; } From b3826b94126a4f9d49d64091fadf9fb5d67d426d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Nov 2014 15:47:19 -0500 Subject: [PATCH 06/65] Add aws-ec2 haskell package --- pkgs/top-level/haskell-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7ebbdd80ef6..e41c22b34d4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -214,6 +214,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aws = callPackage ../development/libraries/haskell/aws {}; + awsEc2 = callPackage ../development/libraries/haskell/aws-ec2 {}; + authenticate = callPackage ../development/libraries/haskell/authenticate {}; authenticateOauth = callPackage ../development/libraries/haskell/authenticate-oauth {}; From 7de1691b6d92eddc80b3bd0f4abed8e5dd4520df Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Nov 2014 15:49:16 -0500 Subject: [PATCH 07/65] Missing file --- .../libraries/haskell/aws-ec2/default.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/haskell/aws-ec2/default.nix diff --git a/pkgs/development/libraries/haskell/aws-ec2/default.nix b/pkgs/development/libraries/haskell/aws-ec2/default.nix new file mode 100644 index 00000000000..8fec25eb9cb --- /dev/null +++ b/pkgs/development/libraries/haskell/aws-ec2/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aws, base16Bytestring, base64Bytestring +, blazeBuilder, byteable, conduitExtra, cryptohash, httpConduit +, httpTypes, mtl, optparseApplicative, resourcet, scientific, text +, time, unorderedContainers, vector, xmlConduit +}: + +cabal.mkDerivation (self: { + pname = "aws-ec2"; + version = "0.2.2"; + sha256 = "1jlm6a4mb3mzzvql8llnvci4qd8imf58m681iqhcw1qq6hy56srl"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aws base16Bytestring base64Bytestring blazeBuilder byteable + conduitExtra cryptohash httpConduit httpTypes mtl + optparseApplicative resourcet scientific text time + unorderedContainers vector xmlConduit + ]; + meta = { + homepage = "https://github.com/zalora/aws-ec2"; + description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) From 3ff9a7507a0872814a04c4bd6f40bcb394903745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 26 Nov 2014 21:22:30 +0100 Subject: [PATCH 08/65] paramiko: disable tests on py33 --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f211ee98680..797a300f9a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6203,7 +6203,8 @@ let propagatedBuildInputs = with self; [ pycrypto ecdsa ]; - doCheck = !isPyPy; + # https://github.com/paramiko/paramiko/issues/449 + doCheck = !(isPyPy || isPy33); checkPhase = '' ${python}/bin/${python.executable} test.py --no-sftp --no-big-file ''; From 9047f389bf0e646cdedf6c5c569e61d5a0e24669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 26 Nov 2014 21:50:48 +0100 Subject: [PATCH 09/65] pygame: fix build, add all deps, use buildPythonPackage --- .../python-modules/pygame/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 93fa70e44bc..3a24767ae4e 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, python, pkgconfig -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11 +, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi }: -stdenv.mkDerivation { +buildPythonPackage { name = "pygame-1.9.1"; src = fetchurl { @@ -11,24 +11,21 @@ stdenv.mkDerivation { }; buildInputs = [ - python pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg + pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg + smpeg portmidi libX11 ]; patches = [ ./pygame-v4l.patch ]; - configurePhase = '' - for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg}; do + preConfigure = '' + for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg} ${portmidi} ${libX11}; do sed -e "/origincdirs =/a'$i/include'," -i config_unix.py sed -e "/origlibdirs =/aoriglibdirs += '$i/lib'," -i config_unix.py done - yes Y | LOCALBASE=/ python config.py + LOCALBASE=/ python config.py ''; - buildPhase = "python setup.py build"; - - installPhase = "python setup.py install --prefix=$out"; - meta = { description = "Python library for games"; homepage = "http://www.pygame.org/"; From 51a59b34d333e79c57b70ece77f92d2b6e0e0abd Mon Sep 17 00:00:00 2001 From: Ryan Newton Date: Wed, 26 Nov 2014 15:53:42 -0500 Subject: [PATCH 10/65] haskell-hsbencher and haskell-GenericPretty: add packages --- .../haskell/GenericPretty/default.nix | 15 +++++++++++++ .../libraries/haskell/hsbencher/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/haskell/GenericPretty/default.nix create mode 100644 pkgs/development/libraries/haskell/hsbencher/default.nix diff --git a/pkgs/development/libraries/haskell/GenericPretty/default.nix b/pkgs/development/libraries/haskell/GenericPretty/default.nix new file mode 100644 index 00000000000..d2b8fedfc5e --- /dev/null +++ b/pkgs/development/libraries/haskell/GenericPretty/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "GenericPretty"; + version = "1.2.1"; + sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php"; + meta = { + homepage = "https://github.com/RazvanRanca/GenericPretty"; + description = "A generic, derivable, haskell pretty printer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsbencher/default.nix b/pkgs/development/libraries/haskell/hsbencher/default.nix new file mode 100644 index 00000000000..6103fc9cddf --- /dev/null +++ b/pkgs/development/libraries/haskell/hsbencher/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, dataDefault, filepath, GenericPretty, HUnit +, ioStreams, mtl, random, testFramework, testFrameworkHunit, text +, time +}: + +cabal.mkDerivation (self: { + pname = "hsbencher"; + version = "1.20.0.2"; + sha256 = "1ydx70ik48s9fsn51snpl4aq7imfwgqmfin46sqpz0xlcyxs040z"; + buildDepends = [ + async dataDefault filepath GenericPretty ioStreams mtl random time + ]; + testDepends = [ HUnit testFramework testFrameworkHunit text time ]; + doCheck = false; + meta = { + description = "Launch and gather data from Haskell and non-Haskell benchmarks"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e41c22b34d4..f751b2a3504 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -900,6 +900,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {}; + GenericPretty = callPackage ../development/libraries/haskell/GenericPretty {}; + genericsSop = callPackage ../development/libraries/haskell/generics-sop {}; ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; @@ -1247,6 +1249,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hS3 = callPackage ../development/libraries/haskell/hS3 {}; + hsbencher = callPackage ../development/libraries/haskell/hsbencher {}; + hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {}; hsc3 = callPackage ../development/libraries/haskell/hsc3 {}; From f93140e8f53f00ba69e92b639b7f3198018a8b66 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Nov 2014 15:52:58 -0500 Subject: [PATCH 11/65] Add vk-aws-route53 haskell package --- .../haskell/vk-aws-route53/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/vk-aws-route53/default.nix diff --git a/pkgs/development/libraries/haskell/vk-aws-route53/default.nix b/pkgs/development/libraries/haskell/vk-aws-route53/default.nix new file mode 100644 index 00000000000..4d8188792ac --- /dev/null +++ b/pkgs/development/libraries/haskell/vk-aws-route53/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aws, httpConduit, httpTypes, resourcet, text, time +, xmlConduit, xmlHamlet +}: + +cabal.mkDerivation (self: { + pname = "vk-aws-route53"; + version = "0.1.2"; + sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x"; + buildDepends = [ + aws httpConduit httpTypes resourcet text time xmlConduit xmlHamlet + ]; + meta = { + description = "Amazon Route53 DNS service plugin for the aws package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e41c22b34d4..5b9d4f58438 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2709,6 +2709,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vinyl = callPackage ../development/libraries/haskell/vinyl {}; + vkAwsRoute53 = callPackage ../development/libraries/haskell/vk-aws-route53 {}; + void = callPackage ../development/libraries/haskell/void {}; vty = callPackage ../development/libraries/haskell/vty {}; From 34adc1bc68fbd7ef7bc7cf3cd07ea4450a9e576f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Nov 2014 15:55:10 -0500 Subject: [PATCH 12/65] Add vk-posix-pty haskellPackage --- .../libraries/haskell/vk-posix-pty/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/vk-posix-pty/default.nix diff --git a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix new file mode 100644 index 00000000000..533b9ae7215 --- /dev/null +++ b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "vk-posix-pty"; + version = "0.2.0.2"; + sha256 = "0dp9kpn1qzfqykmyq20sg0snyk8zrqa2g8c5xp9rfp0zfgmh37dh"; + isLibrary = true; + isExecutable = true; + meta = { + homepage = "https://bitbucket.org/merijnv/posix-pty +https://github.com/proger/posix-pty/tree/fork"; + description = "Pseudo terminal interaction with subprocesses"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5b9d4f58438..f8e4a9801b2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2711,6 +2711,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vkAwsRoute53 = callPackage ../development/libraries/haskell/vk-aws-route53 {}; + vkPosixPty = callPackage ../development/libraries/haskell/vk-posix-pty {}; + void = callPackage ../development/libraries/haskell/void {}; vty = callPackage ../development/libraries/haskell/vty {}; From 2125d9eb65e63aaa2cfb7a1118b09340d81a72c9 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Wed, 26 Nov 2014 22:04:45 +0100 Subject: [PATCH 13/65] e18: remove pythonefl --- pkgs/top-level/python-packages.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f211ee98680..1b0567f6aed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11826,26 +11826,6 @@ let }; }; - pythonefl = buildPythonPackage rec { - name = "python-efl-${version}"; - version = "1.10.0"; - src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; - sha256 = "1inv2qalnm9paifdwyh9q3ffxcp9bjj92phvfw1rgkaildvfji5i"; - }; - preConfigure = '' - export NIX_CFLAGS_COMPILE="-I${pkgs.e18.efl}/include/eo-1 -I${pkgs.e18.efl}/include/eina-1 -I${pkgs.e18.efl}/include/eina-1/eina -I${pkgs.e18.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e18.efl}/include/efl-1 -I${pkgs.e18.efl}/include/eet-1 -I${pkgs.e18.efl}/include/ecore-1 -I${pkgs.e18.efl}/include/ecore-evas-1 -I${pkgs.e18.efl}/include/ecore-file-1 -I${pkgs.e18.efl}/include/ecore-input-1 -I${pkgs.e18.efl}/include/ecore-imf-1 -I${pkgs.e18.efl}/include/ecore-con-1 -I${pkgs.e18.efl}/include/edje-1 -I${pkgs.e18.efl}/include/eldbus-1 -I${pkgs.e18.efl}/include/efreet-1 -I${pkgs.e18.efl}/include/ethumb-client-1 -I${pkgs.e18.efl}/include/ethumb-1 -I${pkgs.e18.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" - ''; - buildInputs = with self; [ pkgs.pkgconfig pkgs.e18.efl pkgs.e18.elementary ]; - meta = { - description = "Python bindings for EFL and Elementary."; - homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; - }; - }; - snapperGUI = buildPythonPackage rec { name = "Snapper-GUI"; From d6201245e5f06dd6c12034fdc93a95b4ae9e68e3 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Wed, 26 Nov 2014 21:11:34 +0100 Subject: [PATCH 14/65] rekonq: update to rekonq-2.4.2 and add wrapper --- pkgs/applications/networking/browsers/rekonq/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 3deabd42e01..ce36e26d6fc 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -3,11 +3,11 @@ assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 stdenv.mkDerivation rec { - name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0 + name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0 src = fetchurl { - url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; - sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g"; + url = "mirror://sourceforge/rekonq/${name}.tar.xz"; + sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079"; }; buildInputs = [ kde4.kdelibs qca2 qoauth ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c5caa1649..951866d129f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12693,6 +12693,10 @@ let { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2"; }; + rekonqWrapper = wrapFirefox { + browser = kde4.rekonq; browserName = "rekonq"; desktopName = "Rekonq"; + }; + vimb = callPackage ../applications/networking/browsers/vimb { webkit = webkitgtk2; }; From 00146e3e086c61add917958e0697cc4507960933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 26 Nov 2014 22:12:59 +0100 Subject: [PATCH 15/65] shotwell: 0.18.0 -> 0.20.2, fix build --- pkgs/applications/graphics/shotwell/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 1953f951d16..48044fba166 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkit +{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils , lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }: @@ -18,12 +18,12 @@ let buildInputs = [ pkgconfig glib libsoup ]; }; in stdenv.mkDerivation rec { - version = "0.18.0"; + version = "0.20.2"; name = "shotwell-${version}"; src = fetchurl { - url = "mirror://gnome/sources/shotwell/0.18/${name}.tar.xz"; - sha256 = "0cq0zs13f3f4xyz46yvj4qfpm5nh4ypds7r53pkqm4a3n8ybf5v7"; + url = "mirror://gnome/sources/shotwell/0.20/${name}.tar.xz"; + sha256 = "0h5pdczsrkplvlvq54zk3am4kjmfpd6pn2sz0ky8lfq1fngwiqip"; }; NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ''; - buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkit pkgconfig + buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg makeWrapper gnome_doc_utils ]; From 88aa54a09fceff44ebd978e19f0a372082a8f6e5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 27 Nov 2014 00:15:12 +0300 Subject: [PATCH 16/65] yed: add package --- pkgs/applications/graphics/yed/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/graphics/yed/default.nix diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix new file mode 100644 index 00000000000..2929513952e --- /dev/null +++ b/pkgs/applications/graphics/yed/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, unzip, jre }: + +stdenv.mkDerivation rec { + name = "yEd-3.13"; + + src = fetchurl { + url = "http://www.yworks.com/products/yed/demo/${name}.zip"; + sha256 = "1d5qs6q31k49y9gh054aafck548pv9f97b3il4iksnna1r59w5jy"; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + mkdir -p $out/yed + cp -r * $out/yed + mkdir -p $out/bin + + makeWrapper ${jre}/bin/java $out/bin/yed \ + --add-flags "-jar $out/yed/yed.jar --" + ''; + + meta = with stdenv.lib; { + license = licenses.unfreeRedistributable; + homepage = http://www.yworks.com/en/products/yfiles/yed/; + description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; + platforms = jre.meta.platforms; + maintainer = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c5caa1649..15d3e96a4a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11295,6 +11295,8 @@ let qt = qt4; }; + yed = callPackage ../applications/graphics/yed {}; + ykpers = callPackage ../applications/misc/ykpers {}; yoshimi = callPackage ../applications/audio/yoshimi { From dc9f08427839dc0d6eb164d3f474c391b1efe83d Mon Sep 17 00:00:00 2001 From: muflax Date: Wed, 26 Nov 2014 21:23:17 +0000 Subject: [PATCH 17/65] parcellite: 1.1.7 -> 1.1.9 --- pkgs/tools/misc/parcellite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index d516e50124c..0f85a47b9e1 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2 }: stdenv.mkDerivation rec { - name = "parcellite-1.1.7"; + name = "parcellite-1.1.9"; src = fetchurl { url = "mirror://sourceforge/parcellite/${name}.tar.gz"; - sha256 = "0pszw3yd4a08p6jsz7asayr7jir08bxbwvfb16k01cj7ya4kf3w7"; + sha256 = "1m0igxny8f8hlbwcbsr4vg08808sqwy05h61ia2bxsrf122rba6b"; }; buildInputs = [ pkgconfig intltool gtk2 ]; From 822d37f5a4d82ea10758cd5b07b4852caab9de65 Mon Sep 17 00:00:00 2001 From: Ryan Newton Date: Wed, 26 Nov 2014 17:13:54 -0500 Subject: [PATCH 18/65] haskell-handa-gdata and haskell-hsbencher-fusion: add packages --- .../libraries/haskell/handa-gdata/default.nix | 27 +++++++++++++++++++ .../haskell/hsbencher-fusion/default.nix | 23 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/haskell/handa-gdata/default.nix create mode 100644 pkgs/development/libraries/haskell/hsbencher-fusion/default.nix diff --git a/pkgs/development/libraries/haskell/handa-gdata/default.nix b/pkgs/development/libraries/haskell/handa-gdata/default.nix new file mode 100644 index 00000000000..b96c68297cb --- /dev/null +++ b/pkgs/development/libraries/haskell/handa-gdata/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, base64Bytestring, binary, caseInsensitive, cmdargs +, dataDefault, filepath, GenericPretty, HTTP, httpConduit, json +, network, pureMD5, random, regexPosix, resourcet, split, time +, unixCompat, utf8String, xml +}: + +cabal.mkDerivation (self: { + pname = "handa-gdata"; + version = "0.7.0.1"; + sha256 = "1azjfhwcirf6nv7pym8lcrghvjbrb1hh1y2w43g7qxxdmk54n8g7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base64Bytestring binary caseInsensitive cmdargs dataDefault + filepath GenericPretty HTTP httpConduit json network pureMD5 random + regexPosix resourcet split time unixCompat utf8String xml + ]; + doCheck = false; + meta = { + homepage = "http://code.google.com/p/hgdata"; + description = "Library and command-line utility for accessing Google services and APIs"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix new file mode 100644 index 00000000000..c045cf8e720 --- /dev/null +++ b/pkgs/development/libraries/haskell/hsbencher-fusion/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, criterion, csv, dataDefault, filepath, handaGdata +, hsbencher, httpConduit, mtl, network, statistics, text, time +}: + +cabal.mkDerivation (self: { + pname = "hsbencher-fusion"; + version = "0.3.3"; + sha256 = "0vp1biv5jwac3bhj7qxl8x3bw73436qn284fippmlr6f54c15yw8"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + criterion csv dataDefault filepath handaGdata hsbencher httpConduit + mtl network statistics text time + ]; + doCheck = false; + meta = { + description = "Backend for uploading benchmark data to Google Fusion Tables"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f751b2a3504..c7860bb99a1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1146,6 +1146,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; + handaGdata = callPackage ../development/libraries/haskell/handa-gdata {}; + haskellForMaths = callPackage ../development/libraries/haskell/HaskellForMaths {}; haxl = callPackage ../development/libraries/haskell/haxl {}; @@ -1251,6 +1253,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hsbencher = callPackage ../development/libraries/haskell/hsbencher {}; + hsbencherFusion = callPackage ../development/libraries/haskell/hsbencher-fusion {}; + hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {}; hsc3 = callPackage ../development/libraries/haskell/hsc3 {}; From e86ebdc0e3b4c53d396402ab53d10c5f939f3cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 26 Nov 2014 23:11:00 +0100 Subject: [PATCH 19/65] synfigstudio: fix a strange build error Also enableParallelBuilding. fonts.conf isn't supposed to be put into buildIputs, but it's still weird. --- pkgs/applications/graphics/synfigstudio/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 6af51e81778..2b3f4c80bcd 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ETL boost cairo fontsConf gettext glibmm gtk gtkmm imagemagick intltool + ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool intltool libsigcxx libtool libxmlxx pkgconfig synfig ]; @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { export FONTCONFIG_FILE=${fontsConf} ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A 2D animation program"; homepage = http://www.synfig.org; From 055eeb6c514c967a79513e06747820987d2b6afd Mon Sep 17 00:00:00 2001 From: Ryan Newton Date: Wed, 26 Nov 2014 18:08:53 -0500 Subject: [PATCH 20/65] haskell-hsbencher: update to 1.20.0.3 --- pkgs/development/libraries/haskell/hsbencher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsbencher/default.nix b/pkgs/development/libraries/haskell/hsbencher/default.nix index 6103fc9cddf..0786aa18b3c 100644 --- a/pkgs/development/libraries/haskell/hsbencher/default.nix +++ b/pkgs/development/libraries/haskell/hsbencher/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hsbencher"; - version = "1.20.0.2"; - sha256 = "1ydx70ik48s9fsn51snpl4aq7imfwgqmfin46sqpz0xlcyxs040z"; + version = "1.20.0.3"; + sha256 = "1qnj4zhq6j4cvnxcparm2xr9qc6l9q7j72h4dr5jz04lz8c2fkcl"; buildDepends = [ async dataDefault filepath GenericPretty ioStreams mtl random time ]; From 64453d01f42b1e35a2548a28aedb307b21dce2c5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 26 Nov 2014 16:33:59 -0500 Subject: [PATCH 21/65] src: bump --- .../version-management/src/default.nix | 4 ++-- .../version-management/src/path.patch | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index d3b0ee9131b..ced82dd45c0 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, rcs, git }: stdenv.mkDerivation rec { - name = "src-0.12"; + name = "src-0.13"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "1w8k9z2dxim99nniid9kjsc5lzri7m4sd0n819y73aqcdi54lr1s"; + sha256 = "03x0slgi6bnzgfn7f9qbl6jma0pj7357kwdh832l3v8zafk41p51"; }; buildInputs = [ python ]; diff --git a/pkgs/applications/version-management/src/path.patch b/pkgs/applications/version-management/src/path.patch index 05e643e9e0f..ef500c8e04e 100644 --- a/pkgs/applications/version-management/src/path.patch +++ b/pkgs/applications/version-management/src/path.patch @@ -1,24 +1,24 @@ -diff -Naur src-0.12-orig/src src-0.12/src ---- src-0.12-orig/src 2014-11-21 08:19:59.000000000 -0500 -+++ src-0.12/src 2014-11-21 15:54:54.598113846 -0500 +diff -Naur src-0.13-orig/src src-0.13/src +--- src-0.13-orig/src 2014-11-24 03:56:16.000000000 -0500 ++++ src-0.13/src 2014-11-26 16:32:32.925151003 -0500 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!@python@/bin/python # # src - simple revision control. # -@@ -58,6 +58,8 @@ +@@ -51,6 +51,8 @@ import sys, os, subprocess, time, calendar, stat, glob, shutil, hashlib +os.environ['PATH'] = "@rcs@/bin:@git@/bin:" + os.environ['PATH'] + - version="0.12" + version="0.13" def rfc3339(t): -diff -Naur src-0.12-orig/srctest src-0.12/srctest ---- src-0.12-orig/srctest 2014-11-21 08:12:00.000000000 -0500 -+++ src-0.12/srctest 2014-11-21 15:58:31.370500990 -0500 +diff -Naur src-0.13-orig/srctest src-0.13/srctest +--- src-0.13-orig/srctest 2014-11-21 08:12:00.000000000 -0500 ++++ src-0.13/srctest 2014-11-26 16:33:13.627715388 -0500 @@ -12,7 +12,7 @@ # Set the PATH to include the current directory, so the repository From bdc323c5400e635c45d5df0318340bf20262d93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 27 Nov 2014 00:44:39 +0100 Subject: [PATCH 22/65] opentsdb: mark as broken It tries to download things and fails. CC @ocharles. --- pkgs/tools/misc/opentsdb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index b0980222f13..196ce303bed 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { mkdir build cd build ../configure --prefix=$out + patchShebangs ./build-aux/ ''; installPhase = '' @@ -29,5 +30,6 @@ stdenv.mkDerivation rec { homepage = http://opentsdb.net; license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; + #broken = true; }; } From 17a1b67cb6f9e663b7ecda165610dec241320ed4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 26 Nov 2014 15:44:03 -0800 Subject: [PATCH 23/65] btrfsprogs: 3.17.1 -> 3.17.2 --- pkgs/tools/filesystems/btrfsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index a7014ceb27c..2fa81510243 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.17.1"; in +let version = "3.17.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1axazaw6ps5gy4l6j2jrivxqx8ysva3v1cynmrd1g345gff5f0bc"; + sha256 = "1ijn8kd13hliqph9vijfl9zzvnkb6d6i7fqggbiwjvhslhjcgv2h"; }; buildInputs = [ From 577e402dd951e40b5df947537987dbd303a8ffd7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 26 Nov 2014 15:45:20 -0800 Subject: [PATCH 24/65] libksba: 1.3.1 -> 1.3.2 --- pkgs/development/libraries/libksba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index ed40bfa876b..1293c2245ac 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.3.1"; + name = "libksba-1.3.2"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "1ya6mcd6pk2v1pylvlk6wv3869aslz2mr2xw2gs6faxx2ravk5mw"; + sha256 = "01l4hvcknk9nb4bvyb6aqaid19jg0wv3ik54j1b89hnzamwm75gb"; }; propagatedBuildInputs = [ libgpgerror ]; From e1988740a533d1cf4e91280eaba8de7cae9d4e81 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 26 Nov 2014 15:47:36 -0800 Subject: [PATCH 25/65] yubikey-personalization: 1.16.0 -> 1.16.1 --- pkgs/tools/misc/yubikey-personalization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index c80cedd4606..aa26167825b 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "1zspbb10k9x9mjv8hadmwwgzjlign372al3zshypj9ri55ky0xs3"; + sha256 = "1zivikg1ndxziwdmy2x66f9x0jxwbl0km4vxr5wgjsk94q6h45li"; }; buildInputs = [ pkgconfig libusb libyubikey json_c ]; From 021efdf0211d8d8763be417c69abd250bf7c8efa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 26 Nov 2014 15:50:15 -0800 Subject: [PATCH 26/65] yubico-piv-tool: 0.1.0 -> 0.1.2 --- pkgs/tools/misc/yubico-piv-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index b15c615fc34..f2821135cf6 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-0.1.0"; + name = "yubico-piv-tool-0.1.2"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "1m573f0vn3xgzsl29ps679iykp5krwd0fnr4nhm1fw2hm5zahrhf"; + sha256 = "0sqakrlw4j60xhlmp2fq6ccj3lqf13kwvmahsrj3xr5qdi7h0fza"; }; buildInputs = [ pkgconfig openssl pcsclite ]; From 8d248638bb207d099883e94487de273e1f9b9760 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 26 Nov 2014 23:43:23 -0200 Subject: [PATCH 27/65] MPV: update to 0.7.0 Now quvi support was dropped by upstream, and MPV uses Youtube-dl directly. Another minor change is the update of Waf internal builder. --- pkgs/applications/video/mpv/default.nix | 15 +++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 28b3727fa4f..5acdcac9737 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -20,7 +20,7 @@ # For screenshots , libpngSupport ? true, libpng ? null # for Youtube support -, quviSupport ? false, libquvi ? null +, youtubeSupport ? false, youtubeDL ? null , cacaSupport ? false, libcaca ? null , vaapiSupport ? false, libva ? null }: @@ -41,7 +41,7 @@ assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; -assert quviSupport -> libquvi != null; +assert youtubeSupport -> youtubeDL != null; assert cacaSupport -> libcaca != null; # Purity problem: Waf needed to be is downloaded by bootstrap.py @@ -50,19 +50,19 @@ assert cacaSupport -> libcaca != null; let waf = fetchurl { - url = http://ftp.waf.io/pub/release/waf-1.7.16; - sha256 = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61"; + url = http://ftp.waf.io/pub/release/waf-1.8.1; + sha256 = "ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d"; }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.6.2"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "1s42i3vf8i86lx62kw00vvimjizvp8zpxdq53mqhdz1p5im2ylr0"; + sha256 = "0rz8dp44yag442gamaa2vdmf69h25gqh2bgybx89prkfh8n4hy8x"; }; buildInputs = with stdenv.lib; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ++ optional speexSupport speex ++ optional bs2bSupport libbs2b ++ optional libpngSupport libpng - ++ optional quviSupport libquvi + ++ optional youtubeSupport youtubeDL ++ optional sdl2Support SDL2 ++ optional cacaSupport libcaca ++ optional vaapiSupport libva @@ -126,6 +126,5 @@ stdenv.mkDerivation rec { } # TODO: Wayland support -# TODO: investigate libquvi problems (related to Youtube support) # TODO: investigate caca support # TODO: investigate lua5_sockets bug diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 883cfc529a3..6c9b71c5f03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10227,7 +10227,7 @@ let lua = lua5_1; lua5_sockets = lua5_1_sockets; bs2bSupport = config.mpv.bs2bSupport or true; - quviSupport = config.mpv.quviSupport or false; + youtubeSupport = config.mpv.youtubeSupport or true; cacaSupport = config.mpv.cacaSupport or true; vaapiSupport = config.mpv.vaapiSupport or false; }; From 0f4e9835d7fceba4f192e549ecd24ca7add7e6e3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Nov 2014 06:53:43 +0000 Subject: [PATCH 28/65] Adds ocaml-uucp Uucp is an OCaml library providing efficient access to a selection of character properties of the Unicode character database. Homepage: http://erratique.ch/software/uucp --- .../ocaml-modules/uucp/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/ocaml-modules/uucp/default.nix diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix new file mode 100644 index 00000000000..2ee39cab9f4 --- /dev/null +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, ocaml, findlib, opam }: + +let + inherit (stdenv.lib) getVersion versionAtLeast; + + pname = "uucp"; + version = "0.9.0"; + webpage = "http://erratique.ch/software/${pname}"; +in + +assert versionAtLeast (getVersion ocaml) "4.00"; + +stdenv.mkDerivation { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "1cwjr16cg03h30r97lnb32g725qi7ma76kr2aly5smc3m413dhqy"; + }; + + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install | sh + ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname} + ''; + + meta = with stdenv.lib; { + description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 883cfc529a3..41777d983ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3758,6 +3758,7 @@ let sawja = callPackage ../development/ocaml-modules/sawja { }; uucd = callPackage ../development/ocaml-modules/uucd { }; + uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; uutf = callPackage ../development/ocaml-modules/uutf { }; From 073c764f6c1d5e6759de94e8892f6889639db2cc Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Thu, 27 Nov 2014 09:57:59 +0200 Subject: [PATCH 29/65] Bump snort to 2.9.7.0 and daq to 2.0.4 --- pkgs/applications/networking/ids/daq/default.nix | 4 ++-- pkgs/applications/networking/ids/snort/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 3e7a80f137d..287a4239c2c 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, flex, bison, libpcap}: stdenv.mkDerivation rec { - name = "daq-2.0.2"; + name = "daq-2.0.4"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "1a39qbm9nc05yr8llawl7mz0ny1fci4acj9c2k1h4klrqikiwpfn"; + sha256 = "0g15kny0s6mpqfc723jxv7mgjfh45izhwcidhjzh52fd04ysm552"; }; buildInputs = [ flex bison libpcap ]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 5b740cec935..3f99094ffd4 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { - name = "snort-2.9.6.2"; + name = "snort-2.9.7.0"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "0xsxbd5h701ncnhn9sf7zkmzravlqhn1182whinphfjjw72py7cf"; + sha256 = "16z4mi7bri7ygvc0j4hhl2pgcw6xwxah1h3wk5vpy2yj8pmayf4p"; }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; From ea428389817fd165d7b7e10bd010a19ed90b57ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Nov 2014 11:34:47 +0100 Subject: [PATCH 30/65] fix teamspeak_client build --- .../networking/instant-messengers/teamspeak/client.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 3870533aa89..8a3e7203f26 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg , fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null -, libredirect, quazip +, libredirect, quazip, less, which }: let @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper less which ]; unpackPhase = '' - yes | sh $src + echo -e 'q\ny' | sh -xe $src cd TeamSpeak* ''; From 91bdca38a0867b31eb595e1aa1045cac4e137887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Nov 2014 12:09:17 +0100 Subject: [PATCH 31/65] NetworkManager.service -> network-manager.service --- nixos/doc/manual/configuration/network-manager.xml | 2 +- nixos/doc/manual/installation/installing.xml | 6 +++--- nixos/modules/services/networking/networkmanager.nix | 6 +++--- pkgs/tools/networking/network-manager/default.nix | 6 +++++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index e65060021b4..ceac40b7a1f 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -13,7 +13,7 @@ use NetworkManager. You can enable NetworkManager by setting: services.networkmanager.enable = true; -Some desktop managers (e.g., GNOME) enable NetworkManager +some desktop managers (e.g., GNOME) enable NetworkManager automatically for you. All users that should have permission to change network settings diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index dd1acba2168..c21759bc926 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -25,14 +25,14 @@ run start display-manager to start KDE. The boot process should have brought up networking (check - ifconfig). Networking is necessary for the + ip a). Networking is necessary for the installer, since it will download lots of stuff (such as source tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP server on your network. Otherwise configure networking manually using ifconfig. To manually configure the network on the graphical installer, - first disable NetworkManager with - stop NetworkManager. + first disable network-manager with + systemctl stop network-manager. The NixOS installer doesn’t do any partitioning or formatting yet, so you need to that yourself. Use the following diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index bc1c95d3fd3..39e83e7b427 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -177,8 +177,8 @@ in { systemd.services."networkmanager-init" = { description = "NetworkManager initialisation"; wantedBy = [ "network.target" ]; - wants = [ "NetworkManager.service" ]; - before = [ "NetworkManager.service" ]; + wants = [ "network-manager.service" ]; + before = [ "network-manager.service" ]; script = '' mkdir -m 700 -p /etc/NetworkManager/system-connections mkdir -m 755 -p ${stateDirs} @@ -193,7 +193,7 @@ in { }; powerManagement.resumeCommands = '' - systemctl restart NetworkManager + Systemctl restart network-manager ''; security.polkit.extraConfig = polkitConf; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index ea14183ba3c..671f7ec4ff9 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -64,10 +64,14 @@ stdenv.mkDerivation rec { # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' + # rename to network-manager to be in style + mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service + echo "Alias=NetworkManager.service" >> $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ''; meta = with stdenv.lib; { From 34ca304f58ffeeb2f4b095c9e41b015e0e99aa18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Nov 2014 12:09:52 +0100 Subject: [PATCH 32/65] network-manager: 0.9.8.8 -> 0.9.8.10 --- .../network-manager-applet/default.nix | 2 +- .../networking/network-manager/default.nix | 4 +-- .../network-manager/nixos-purity.patch | 30 ------------------- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 850981c5d33..d289695398c 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "1sx97cp9nb5p82kg2dl6dmqri7wichpjqchhx7bk77limngby7jq"; + sha256 = "1jz0vawfixzm892m6plrzhsybgdxwv96pfwld9p85lb7wshykzj6"; }; buildInputs = [ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 671f7ec4ff9..ed4b3812e28 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.8.8"; + version = "0.9.8.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "0mbsl6x3aavdnam8i87p0zz8fvvgi96g199s35wgg5r8rplks2la"; + sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86"; }; preConfigure = '' diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch index 5736009571e..505dd8b2b3c 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -28,36 +28,6 @@ index 237661f..48bc33f 100644 NULL }; const char **path = dhcpcd_paths; -diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c -index 8e216f4..6e00210 100644 ---- a/src/dns-manager/nm-dns-dnsmasq.c -+++ b/src/dns-manager/nm-dns-dnsmasq.c -@@ -52,9 +52,7 @@ static inline const char * - find_dnsmasq (void) - { - static const char *paths[] = { -- "/usr/local/sbin/dnsmasq", -- "/usr/sbin/dnsmasq", -- "/sbin/dnsmasq", -+ "@dnsmasq@/bin/dnsmasq", - NULL - }; - const char **binary = paths; -diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c -index ca2f9dc..ce718d0 100644 ---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c -+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c -@@ -170,9 +170,7 @@ static inline const char * - nm_find_dnsmasq (void) - { - static const char *dnsmasq_binary_paths[] = { -- "/usr/local/sbin/dnsmasq", -- "/usr/sbin/dnsmasq", -- "/sbin/dnsmasq", -+ "@dnsmasq@/bin/dnsmasq", - NULL - }; - diff --git a/src/nm-device.c b/src/nm-device.c index 1dc94ee..e60f3c8 100644 --- a/src/nm-device.c From 113248420068cbf48c993286f0c0bfe88de65be2 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 27 Nov 2014 12:04:45 +0000 Subject: [PATCH 33/65] opentsdb: Use fetchurl to fetch all dependencies --- pkgs/tools/misc/opentsdb/default.nix | 155 ++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 196ce303bed..868e993737b 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,6 +1,140 @@ -{ stdenv, autoconf, automake, fetchurl, curl, jdk, jre, makeWrapper, nettools, python }: +{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }: with stdenv.lib; -stdenv.mkDerivation rec { +let + thirdPartyDeps = { + guava = { + "guava-18.0.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar; + md5 = "947641f6bb535b1d942d1bc387c45290"; + }; + }; + gwt = { + "gwt-dev-2.6.0.jar" = fetchurl { + url = http://central.maven.org/maven2/com/google/gwt/gwt-dev/2.6.0/gwt-dev-2.6.0.jar; + md5 = "23d8bf52709230c2c7e6dd817261f9ee"; + }; + "gwt-user-2.6.0.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/google/gwt/gwt-user/2.6.0/gwt-user-2.6.0.jar; + md5 = "99226fc2764f2b8fd6db6e05d0847659"; + }; + }; + hamcrest = { + "hamcrest-core-1.3.jar" = fetchurl { + url = http://central.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; + md5 = "6393363b47ddcbba82321110c3e07519"; + }; + }; + hbase = { + "asynchbase-1.6.0.jar" = fetchurl { + url = http://central.maven.org/maven2/org/hbase/asynchbase/1.6.0/asynchbase-1.6.0.jar; + md5 = "6738dd73fd48d30cbf5c78f62bc18852"; + }; + }; + jackson = { + "jackson-annotations-2.4.3.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3.jar; + md5 = "31ef4fa866f9d24960a6807c9c299e98"; + }; + "jackson-core-2.4.3.jar" = fetchurl { + url = http://central.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar; + md5 = "750ef3d86f04fe0d6d14d6ae904a6d2d"; + }; + "jackson-databind-2.4.3.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar; + md5 = "4fcb9f74280eaa21de10191212c65b11"; + }; + }; + javassist = { + "javassist-3.18.1-GA.jar" = fetchurl { + url = http://central.maven.org/maven2/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar; + md5 = "5bb83868c87334320562af7eded65cc2"; + }; + }; + junit = { + "junit-4.11.jar" = fetchurl { + url = http://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar; + md5 = "3c42be5ea7cbf3635716abbb429cb90d"; + }; + }; + logback = { + "logback-classic-1.0.13.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/logback-classic-1.0.13.jar; + md5 = "b4dc8eb42150aafd6d9fd3d211807621"; + }; + "logback-core-1.0.13.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/logback-core-1.0.13.jar; + md5 = "3d5f8ce8dca36e493d39177b71958bd4"; + }; + }; + mockito = { + "mockito-1.9.0.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/mockito-1.9.0.jar; + md5 = "cab21b44958a173a5b1d55a6aff0ab54"; + }; + "mockito-core-1.9.5.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/mockito-core-1.9.5.jar; + md5 = "98f3076e2a691d1ac291624e5a46b80b"; + }; + }; + netty = { + "netty-3.9.4.Final.jar" = fetchurl { + url = http://central.maven.org/maven2/io/netty/netty/3.9.4.Final/netty-3.9.4.Final.jar; + md5 = "b3701ef46c7518d0d63705e2f092dbe5"; + }; + }; + objenesis = { + "objenesis-1.3.jar" = fetchurl { + url = http://repo1.maven.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar; + md5 = "2d649907bd6203f2661f70d430a6ade8"; + }; + }; + powermock = { + "powermock-mockito-release-full-1.5.4-full.jar" = fetchurl { + url = http://repo1.maven.org/maven2/org/powermock/powermock-mockito-release-full/1.5.4/powermock-mockito-release-full-1.5.4-full.jar; + md5 = "5dee1dce6952bb7338d4d053157ae647"; + }; + }; + protobuf = { + "protobuf-java-2.5.0.jar" = fetchurl { + url = http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar; + md5 = "a44473b98947e2a54c54e0db1387d137"; + }; + }; + slf4j = { + "log4j-over-slf4j-1.7.7.jar" = fetchurl { + url = http://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/1.7.7/log4j-over-slf4j-1.7.7.jar; + md5 = "93ab42a5216afd683c35988c6b6fc3d8"; + }; + "slf4j-api-1.7.7.jar" = fetchurl { + url = http://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar; + md5 = "ca4280bf93d64367723ae5c8d42dd0b9"; + }; + }; + suasync = { + "suasync-1.4.0.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/suasync-1.4.0.jar; + md5 = "289ce3f3e6a9bb17857981eacf6d74b6"; + }; + }; + validation-api = { + "validation-api-1.0.0.GA.jar" = fetchurl { + url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar; + md5 = "40c1ee909493066397a6d4d9f8d375d8"; + }; + "validation-api-1.0.0.GA-sources.jar" = fetchurl { + url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar; + md5 = "f816682933b59c5ffe32bdb4ab4bf628"; + }; + }; + zookeeper = { + "zookeeper-3.3.6.jar" = fetchurl { + url = https://opentsdb.googlecode.com/files/zookeeper-3.3.6.jar; + md5 = "02786e11c19d1671640992f1bda4a858"; + }; + }; + }; + +in stdenv.mkDerivation rec { name = "opentsdb-2.1.0-rc1"; src = fetchurl { @@ -11,6 +145,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ]; configurePhase = '' + echo > build-aux/fetchdep.sh.in ./bootstrap mkdir build cd build @@ -18,6 +153,20 @@ stdenv.mkDerivation rec { patchShebangs ./build-aux/ ''; + buildPhase = + concatStringsSep + "\n" + (mapAttrsToList + (folder: jars: + "mkdir -p third_party/${folder}\n" + + (concatStringsSep + "\n" + (mapAttrsToList + (jar: src: + "ln -s ${src} third_party/${folder}/${jar}") + jars))) + thirdPartyDeps); + installPhase = '' make install wrapProgram $out/bin/tsdb \ @@ -30,6 +179,6 @@ stdenv.mkDerivation rec { homepage = http://opentsdb.net; license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - #broken = true; + maintainers = [ maintainers.ocharles ]; }; } From f2e2ab62315eb5afe5c7cc43002ec98c8732448f Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 27 Nov 2014 12:14:38 +0000 Subject: [PATCH 34/65] Bosun only builds on x86_64-linux Reported upstream at https://github.com/bosun-monitor/bosun/issues/427 --- pkgs/servers/monitoring/bosun/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index e7e70873d59..dfbf8d1b927 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -40,6 +40,6 @@ in stdenv.mkDerivation rec { ''; homepage = http://bosun.org; license = licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = ["x86_64-linux"]; }; } From cfe24446a4a40ccccca401683c10eb714d8dab25 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 26 Nov 2014 18:08:30 +0100 Subject: [PATCH 35/65] Fully functional faust, faust2alsa and faust2alsaconsole --- .../audio/faust-compiler/default.nix | 70 +++++++++++++--- pkgs/applications/audio/faust/default.nix | 79 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 3 files changed, 142 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/audio/faust/default.nix diff --git a/pkgs/applications/audio/faust-compiler/default.nix b/pkgs/applications/audio/faust-compiler/default.nix index f924fe2953d..5e980691df6 100644 --- a/pkgs/applications/audio/faust-compiler/default.nix +++ b/pkgs/applications/audio/faust-compiler/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unzip }: +{ fetchurl, stdenv, unzip, pkgconfig, makeWrapper, libsndfile, libmicrohttpd, vim }: stdenv.mkDerivation rec { @@ -9,20 +9,70 @@ stdenv.mkDerivation rec { sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip pkgconfig makeWrapper libsndfile libmicrohttpd vim]; + + + makeFlags="PREFIX = $(out)"; + FPATH="$out"; # <- where to search patchPhase = '' - sed -i '77,101d' Makefile - sed -i 's#?= $(shell uname -s)#:= Linux#g' architecture/osclib/oscpack/Makefile - sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@$out@g" -i tools/faust2appls/faustpath + sed -i 's@?= $(shell uname -s)@:= Linux@g' architecture/osclib/oscpack/Makefile + sed -i 's@faust/misc.h@../../architecture/faust/misc.h@g' tools/sound2faust/sound2faust.cpp + sed -i 's@faust/gui/@../../architecture/faust/gui/@g' architecture/faust/misc.h + ''; + + buildPhase = '' + make -C compiler -f Makefile.unix + make -C architecture/osclib + g++ -O3 tools/sound2faust/sound2faust.cpp `pkg-config --cflags --static --libs sndfile` -o tools/sound2faust/sound2faust + make httpd + ''; - postInstallPhase = '' - rm -rf $out/include/ - ''; + installPhase = '' - makeFlags = "PREFIX=$(out)"; - FPATH = "$out"; # <- where to search + echo install faust itself + mkdir -p $out/bin/ + mkdir -p $out/include/ + mkdir -p $out/include/faust/ + mkdir -p $out/include/faust/osc/ + install compiler/faust $out/bin/ + + echo install architecture and faust library files + mkdir -p $out/lib/faust + cp architecture/*.lib $out/lib/faust/ + cp architecture/*.cpp $out/lib/faust/ + + echo install math documentation files + cp architecture/mathdoctexts-*.txt $out/lib/faust/ + cp architecture/latexheader.tex $out/lib/faust/ + + echo install additional binary libraries: osc, http + ([ -e architecture/httpdlib/libHTTPDFaust.a ] && cp architecture/httpdlib/libHTTPDFaust.a $out/lib/faust/) || echo libHTTPDFaust not available + cp architecture/osclib/*.a $out/lib/faust/ + cp -r architecture/httpdlib/html/js $out/lib/faust/js + ([ -e architecture/httpdlib/src/hexa/stylesheet ] && cp architecture/httpdlib/src/hexa/stylesheet $out/lib/faust/js/stylesheet.js) || echo stylesheet not available + ([ -e architecture/httpdlib/src/hexa/jsscripts ] && cp architecture/httpdlib/src/hexa/jsscripts $out/lib/faust/js/jsscripts.js) || echo jsscripts not available + + echo install includes files for architectures + cp -r architecture/faust $out/include/ + + echo install additional includes files for binary libraries: osc, http + cp architecture/osclib/faust/faust/OSCControler.h $out/include/faust/gui/ + cp architecture/osclib/faust/faust/osc/*.h $out/include/faust/osc/ + cp architecture/httpdlib/src/include/*.h $out/include/faust/gui/ + + + echo patch header and cpp files + find $out/include/ -name "*.h" -type f | xargs sed "s@#include \"faust/@#include \"$out/include/faust/@g" -i + find $out/lib/faust/ -name "*.cpp" -type f | xargs sed "s@#include \"faust/@#include \"$out/include/faust/@g" -i + sed -i "s@../../architecture/faust/gui/@$out/include/faust/gui/@g" $out/include/faust/misc.h + + wrapProgram $out/bin/faust \ + --set FAUSTLIB $out/lib/faust \ + --set FAUST_LIB_PATH $out/lib/faust \ + --set FAUSTINC $out/include/ + ''; meta = with stdenv.lib; { description = "A functional programming language for realtime audio signal processing"; diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust/default.nix new file mode 100644 index 00000000000..9d25573ccc8 --- /dev/null +++ b/pkgs/applications/audio/faust/default.nix @@ -0,0 +1,79 @@ +{ fetchurl, stdenv, bash, alsaLib, atk, cairo, faust-compiler, fontconfig, freetype +, gcc, gdk_pixbuf, glib, gtk, makeWrapper, pango, pkgconfig, unzip +, gtkSupport ? true +}: + +stdenv.mkDerivation rec { + + version = "0.9.67"; + name = "faust-${version}"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip"; + sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"; + }; + + buildInputs = [ bash unzip faust-compiler gcc makeWrapper pkgconfig ] + ++ stdenv.lib.optionals gtkSupport [ + alsaLib atk cairo fontconfig freetype gdk_pixbuf glib gtk pango + ] + ; + + makeFlags="PREFIX=$(out)"; + FPATH="$out"; # <- where to search + + phases = [ "unpackPhase installPhase postInstall" ]; + + installPhase = '' + mkdir $out/bin + install tools/faust2appls/faust2alsaconsole $out/bin + install tools/faust2appls/faustpath $out/bin + install tools/faust2appls/faustoptflags $out/bin + install tools/faust2appls/faust2alsa $out/bin + + wrapProgram $out/bin/faust2alsaconsole \ + --prefix PKG_CONFIG_PATH : ${alsaLib}/lib/pkgconfig \ + --set FAUSTLIB ${faust-compiler}/lib/faust \ + --set FAUSTINC ${faust-compiler}/include/ + + GTK_PKGCONFIG_PATHS=${gtk}/lib/pkgconfig:${pango}/lib/pkgconfig:${glib}/lib/pkgconfig:${cairo}/lib/pkgconfig:${gdk_pixbuf}/lib/pkgconfig:${atk}/lib/pkgconfig:${freetype}/lib/pkgconfig:${fontconfig}/lib/pkgconfig + + wrapProgram $out/bin/faust2alsa \ + --prefix PKG_CONFIG_PATH : ${alsaLib}/lib/pkgconfig:$GTK_PKGCONFIG_PATHS \ + --set FAUSTLIB ${faust-compiler}/lib/faust \ + --set FAUSTINC ${faust-compiler}/include/ \ + '' + stdenv.lib.optionalString (!gtkSupport) "rm $out/bin/faust2alsa" + ; + + postInstall = '' + find $out/bin/ -name "faust2*" -type f | xargs sed "s@/bin/bash@${bash}/bin/bash@g" -i + sed -i "s@/bin/bash@${bash}/bin/bash@g" $out/bin/faustpath + sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@${faust-compiler}@g" -i $out/bin/faustpath + sed -i "s@/bin/bash@${bash}/bin/bash@g" $out/bin/faustoptflags + find $out/bin/ -name "faust2*" -type f | xargs sed "s@pkg-config@${pkgconfig}/bin/pkg-config@g" -i + find $out/bin/ -name "faust2*" -type f | xargs sed "s@CXX=g++@CXX=${gcc}/bin/g++@g" -i + find $out/bin/ -name "faust2*" -type f | xargs sed "s@faust -i -a @${faust-compiler}/bin/faust -i -a ${faust-compiler}/lib/faust/@g" -i + ''; + + meta = with stdenv.lib; { + description = "A functional programming language for realtime audio signal processing"; + longDescription = '' + FAUST (Functional Audio Stream) is a functional programming + language specifically designed for real-time signal processing + and synthesis. FAUST targets high-performance signal processing + applications and audio plug-ins for a variety of platforms and + standards. + The Faust compiler translates DSP specifications into very + efficient C++ code. Thanks to the notion of architecture, + FAUST programs can be easily deployed on a large variety of + audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, + puredata, csound, supercollider, pure, vst, coreaudio) without + any change to the FAUST code. + ''; + homepage = http://faust.grame.fr/; + downloadPage = http://sourceforge.net/projects/faudiostream/files/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.magnetophon ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c5caa1649..03d82986943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12394,6 +12394,9 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; + + faust = callPackage ../applications/audio/faust { }; + faust-compiler = callPackage ../applications/audio/faust-compiler { }; fceux = callPackage ../misc/emulators/fceux { }; From 48c483a894869424a0c559ab1e67ce1d1842acf3 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 27 Nov 2014 12:28:44 +0000 Subject: [PATCH 36/65] haskellPackages.snapErrorCollector: Update to 1.1.0 --- .../libraries/haskell/snap-error-collector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap-error-collector/default.nix b/pkgs/development/libraries/haskell/snap-error-collector/default.nix index fae4082d224..b9b6376394a 100644 --- a/pkgs/development/libraries/haskell/snap-error-collector/default.nix +++ b/pkgs/development/libraries/haskell/snap-error-collector/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snap-error-collector"; - version = "1.0.0"; - sha256 = "1rywfbc489kgbcm7svgrim3zihma5j9vy6cwhlc6dgvsb1rb37j2"; + version = "1.1.0"; + sha256 = "06pqlv93qgibl5gbrp7p1vg6x421nrpkvhazbrcipdpbawrsgaj2"; buildDepends = [ async MonadCatchIOTransformers monadLoops snap stm time transformers From 9e72a00823c30d26440a9579db04217d23ef7d3e Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Thu, 27 Nov 2014 21:11:36 +0800 Subject: [PATCH 37/65] Added lzma-conduit package --- .../haskell/lzma-conduit/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lzma-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/lzma-conduit/default.nix b/pkgs/development/libraries/haskell/lzma-conduit/default.nix new file mode 100644 index 00000000000..f93a53c8670 --- /dev/null +++ b/pkgs/development/libraries/haskell/lzma-conduit/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bindingsDSL, conduit, HUnit, lzma, QuickCheck, resourcet +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +, transformers +}: + +cabal.mkDerivation (self: { + pname = "lzma-conduit"; + version = "1.1.1"; + sha256 = "1i1khkxpia5hp3f0p7h656yvbgwsxffpl2czxjbkiw6iz31rapwg"; + buildDepends = [ bindingsDSL conduit resourcet transformers ]; + testDepends = [ + conduit HUnit QuickCheck resourcet testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + extraLibraries = [ lzma ]; + meta = { + homepage = "http://github.com/alphaHeavy/lzma-conduit"; + description = "Conduit interface for lzma/xz compression"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c9b47f61bc1..748bb833643 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1576,6 +1576,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lushtags = callPackage ../development/libraries/haskell/lushtags {}; + lzmaConduit = callPackage ../development/libraries/haskell/lzma-conduit {}; + lzmaEnumerator = callPackage ../development/libraries/haskell/lzma-enumerator {}; maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; From e7cd18e90709673de175d67d9d2033b26555640d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Nov 2014 17:35:23 +0100 Subject: [PATCH 38/65] Don't set $MANPATH The default is derived automatically from $PATH, so it's in fact better *not* to set it. --- nixos/modules/programs/environment.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index d79aff5dc55..a5ec387df64 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -40,7 +40,6 @@ in # TODO: move most of these elsewhere environment.profileRelativeEnvVars = { PATH = [ "/bin" "/sbin" "/lib/kde4/libexec" ]; - MANPATH = [ "/man" "/share/man" ]; INFOPATH = [ "/info" "/share/info" ]; PKG_CONFIG_PATH = [ "/lib/pkgconfig" ]; TERMINFO_DIRS = [ "/share/terminfo" ]; From 78a73ab041afda85fe5c209268b1272b45a33fe4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Nov 2014 17:51:46 +0100 Subject: [PATCH 39/65] chromium: Remove .py[co] files prior to building. Thanks to @iElectric for the notification, although I'm not really sure whether this will fix the following failed Hydra build: http://hydra.nixos.org/build/17609086/nixlog/1/raw The reason is that this failure doesn't happen on every build, but let's see whether it will happen again now. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index cfdddf28856..dea816e5be9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -190,6 +190,7 @@ let libExecPath="${libExecPath}" python build/linux/unbundle/replace_gyp_files.py ${gypFlags} python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags} + find . -iname '*.py[co]' -delete ''; buildPhase = let From 6f31905563ab028645b9668ad7eddf1a147be528 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 26 Nov 2014 20:54:12 +0100 Subject: [PATCH 40/65] grsecurity: Update stable and test patches stable: 3.0-3.14.25-201411231452 -> 3.0-3.14.25-201411260106 test: 3.0-3.17.4-201411231452 -> 3.0-3.17.4-201411260107 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e0e328566c8..18241472011 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -61,16 +61,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.25"; - revision = "201411231452"; + revision = "201411260106"; branch = "stable"; - sha256 = "033i7lgc0qp63d772xgikb3bh9hp78xapdaqwi85lgbzi39ak2gz"; + sha256 = "19131hkbf8zrqq31iiw99hslb5g29yqfl67jzlc4y4c8092s7fdm"; }; grsecurity_unstable = grsecPatch { kversion = "3.17.4"; - revision = "201411231452"; + revision = "201411260107"; branch = "test"; - sha256 = "1ns8im11lbqyvk2kmaz88ymw1b1ni1h4byb763rbrnxclrid1f2d"; + sha256 = "1ynwmgm5c2fcd2dr76s3sqap3bv9b04p7qvf92pa1p4hgj2lva2n"; }; grsec_fix_path = From 77ff279f2767cf1f28eed03a1f93e5df54c99bf5 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 27 Nov 2014 15:43:54 +0100 Subject: [PATCH 41/65] nixos/services.openssh: Allow knownHost keys to have multiple lines. Useful for adding several public keys of different types for the same host. --- .../modules/services/networking/ssh/sshd.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index fee1bace046..d52109b72b5 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -17,11 +17,13 @@ let knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); - knownHostsFile = pkgs.writeText "ssh_known_hosts" ( - flip concatMapStrings knownHosts (h: '' - ${concatStringsSep "," h.hostNames} ${if h.publicKey != null then h.publicKey else readFile h.publicKeyFile} - '') - ); + knownHostsFile = pkgs.runCommand "ssh_known_hosts" {} '' + #!${pkgs.bash}/bin/bash + ${flip concatMapStrings knownHosts (h: '' + pubkeyfile=${builtins.toFile "host.pub" (if h.publicKey == null then readFile h.publicKeyFile else h.publicKey)} + ${pkgs.gnused}/bin/sed 's/^/${concatStringsSep "," h.hostNames} /' $pubkeyfile >> $out + '')} + ''; userOptions = { @@ -254,7 +256,10 @@ in description = '' The public key data for the host. You can fetch a public key from a running SSH server with the ssh-keyscan - command. + command. The public key should not include any host names, only + the key type and the key itself. It is allowed to add several + lines here, each line will be treated as type/key pair and the + host names will be prepended to each line. ''; }; publicKeyFile = mkOption { @@ -264,7 +269,9 @@ in The path to the public key file for the host. The public key file is read at build time and saved in the Nix store. You can fetch a public key file from a running SSH server - with the ssh-keyscan command. + with the ssh-keyscan command. The content + of the file should follow the same format as described for + the publicKey option. ''; }; }; From 444987193e47aad56f7e78684a11f8ded3b830a5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Nov 2014 18:07:54 +0100 Subject: [PATCH 42/65] nixos: Rename virtualbox to virtualboxGuest. Especially new users could be confused by this, so we're now marking services.virtualbox.enable as obsolete and defaulting to services.virtualboxGuest.enable instead. I believe this now makes it clear, that this option is for guest additions only. Signed-off-by: aszlig --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- nixos/modules/rename.nix | 3 +++ nixos/modules/virtualisation/virtualbox-guest.nix | 4 ++-- nixos/modules/virtualisation/virtualbox-image.nix | 2 +- pkgs/build-support/grsecurity/default.nix | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 7178c4b1dfb..a3b763a8a94 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -235,7 +235,7 @@ chomp $virt; # Check if we're a VirtualBox guest. If so, enable the guest # additions. if ($virt eq "oracle") { - push @attrs, "services.virtualbox.enable = true;" + push @attrs, "services.virtualboxGuest.enable = true;" } diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index ea7d9763ce6..2b2d8e8cec5 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -107,6 +107,9 @@ in zipModules ([] ++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ] ++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ] +# VirtualBox +++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ] + # KDE ++ deprecated [ "kde" "extraPackages" ] [ "environment" "kdePackages" ] # ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] # !!! doesn't work! diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index a5a4db79787..a0e4bd558e0 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -6,7 +6,7 @@ with lib; let - cfg = config.services.virtualbox; + cfg = config.services.virtualboxGuest; kernel = config.boot.kernelPackages; in @@ -17,7 +17,7 @@ in options = { - services.virtualbox = { + services.virtualboxGuest = { enable = mkOption { default = false; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 106b269d9e1..8232f6e50df 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -128,6 +128,6 @@ in { boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; - services.virtualbox.enable = true; + services.virtualboxGuest.enable = true; }; } diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index e268c046ac6..19e8f14ebf1 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -84,7 +84,7 @@ let let boolToKernOpt = b: if b then "y" else "n"; # Disable RANDSTRUCT under virtualbox, as it has some kind of # breakage with the vbox guest drivers - #randstruct = optionalString config.services.virtualbox.enable + #randstruct = optionalString config.services.virtualboxGuest.enable # "GRKERNSEC_RANDSTRUCT n"; # Disable restricting links under the testing kernel, as something From 14f09e01c15591c10bf9a31e4f4b7987b5c6a71b Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Nov 2014 18:24:57 +0100 Subject: [PATCH 43/65] nixos: Add enable option for programs/virtualbox. We will simply rename the previous module and add a warning whenever the module is included directly, pointing the user to the right option and also enable it as well (in case somebody has missed the option and is wondering why VirtualBox doesn't work anymore). Signed-off-by: aszlig --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/virtualbox-host.nix | 56 ++++++++++++++++++++++ nixos/modules/programs/virtualbox.nix | 54 +++------------------ 3 files changed, 64 insertions(+), 47 deletions(-) create mode 100644 nixos/modules/programs/virtualbox-host.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 85afcb824fb..cf9e7fa3bfa 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -67,6 +67,7 @@ ./programs/ssmtp.nix ./programs/uim.nix ./programs/venus.nix + ./programs/virtualbox-host.nix ./programs/wvdial.nix ./programs/freetds.nix ./programs/zsh/zsh.nix diff --git a/nixos/modules/programs/virtualbox-host.nix b/nixos/modules/programs/virtualbox-host.nix new file mode 100644 index 00000000000..d32ebc7ebcb --- /dev/null +++ b/nixos/modules/programs/virtualbox-host.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + virtualbox = config.boot.kernelPackages.virtualbox; +in + +{ + options = { + services.virtualboxHost.enable = mkEnableOption "VirtualBox Host support"; + }; + + config = mkIf config.services.virtualboxHost.enable { + boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; + boot.extraModulePackages = [ virtualbox ]; + environment.systemPackages = [ virtualbox ]; + + users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers; + + services.udev.extraRules = + '' + KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" + KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" + SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" + SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" + SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" + ''; + + # Since we lack the right setuid binaries, set up a host-only network by default. + + systemd.services."vboxnet0" = + { description = "VirtualBox vboxnet0 Interface"; + requires = [ "dev-vboxnetctl.device" ]; + after = [ "dev-vboxnetctl.device" ]; + wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ]; + path = [ virtualbox ]; + serviceConfig.RemainAfterExit = true; + serviceConfig.Type = "oneshot"; + script = + '' + if ! [ -e /sys/class/net/vboxnet0 ]; then + VBoxManage hostonlyif create + fi + ''; + postStop = + '' + VBoxManage hostonlyif remove vboxnet0 + ''; + }; + + networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ]; + }; +} diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix index 1a190573e94..a00b1e5f64d 100644 --- a/nixos/modules/programs/virtualbox.nix +++ b/nixos/modules/programs/virtualbox.nix @@ -1,48 +1,8 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let virtualbox = config.boot.kernelPackages.virtualbox; in - -{ - boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; - boot.extraModulePackages = [ virtualbox ]; - environment.systemPackages = [ virtualbox ]; - - users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers; - - services.udev.extraRules = - '' - KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" - KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" - KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" - SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" - SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" - SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" - SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" - ''; - - # Since we lack the right setuid binaries, set up a host-only network by default. - - systemd.services."vboxnet0" = - { description = "VirtualBox vboxnet0 Interface"; - requires = [ "dev-vboxnetctl.device" ]; - after = [ "dev-vboxnetctl.device" ]; - wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ]; - path = [ virtualbox ]; - serviceConfig.RemainAfterExit = true; - serviceConfig.Type = "oneshot"; - script = - '' - if ! [ -e /sys/class/net/vboxnet0 ]; then - VBoxManage hostonlyif create - fi - ''; - postStop = - '' - VBoxManage hostonlyif remove vboxnet0 - ''; - }; - - networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ]; +let + msg = "Importing is " + + "deprecated, please use `services.virtualboxHost.enable = true' " + + "instead."; +in { + config.warnings = [ msg ]; + config.services.virtualboxHost.enable = true; } From 2249474632c882628eedc52183ff7a3691120e23 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Nov 2014 19:03:41 +0100 Subject: [PATCH 44/65] nixos/sshd: Fix build if knownHosts is empty. Introduced by 77ff279f2767cf1f28eed03a1f93e5df54c99bf5. Build failure: https://headcounter.org/hydra/build/583158/nixlog/5/raw Signed-off-by: aszlig --- nixos/modules/services/networking/ssh/sshd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index d52109b72b5..4db8d1e2545 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -18,10 +18,10 @@ let knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); knownHostsFile = pkgs.runCommand "ssh_known_hosts" {} '' - #!${pkgs.bash}/bin/bash + touch "$out" ${flip concatMapStrings knownHosts (h: '' pubkeyfile=${builtins.toFile "host.pub" (if h.publicKey == null then readFile h.publicKeyFile else h.publicKey)} - ${pkgs.gnused}/bin/sed 's/^/${concatStringsSep "," h.hostNames} /' $pubkeyfile >> $out + ${pkgs.gnused}/bin/sed 's/^/${concatStringsSep "," h.hostNames} /' $pubkeyfile >> "$out" '')} ''; From b4cedc79657e8f60727cf4b43027a5732d392ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Nov 2014 19:01:34 +0100 Subject: [PATCH 45/65] nixos: reverse logic in nixos interactive tests documentation --- .../development/running-nixos-tests.xml | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml index d9be761eb01..156dcd205a5 100644 --- a/nixos/doc/manual/development/running-nixos-tests.xml +++ b/nixos/doc/manual/development/running-nixos-tests.xml @@ -39,24 +39,13 @@ $ firefox result/log.html -It is also possible to run the test environment interactively, -allowing you to experiment with the VMs. For example: +Running Tests interactively - -$ nix-build login.nix -A driver -$ ./result/bin/nixos-run-vms - - -The script nixos-run-vms starts the virtual -machines defined by test. The root file system of the VMs is created -on the fly and kept across VM restarts in -./hostname.qcow2. - -Finally, the test itself can be run interactively. This is +The test itself can be run interactively. This is particularly useful when developing or debugging a test: -$ nix-build tests/ -A nfs.driver +$ nix-build nixos/tests/login.nix -A driver $ ./result/bin/nixos-test-driver starting VDE switch for network 1 > @@ -66,6 +55,7 @@ You can then take any Perl statement, e.g. > startAll +> testScript > $machine->succeed("touch /tmp/foo") @@ -74,4 +64,16 @@ script and drops you back into the test driver command line upon its completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script). - \ No newline at end of file +To just start and experiment with the VMs, run: + + +$ nix-build nixos/tests/login.nix -A driver +$ ./result/bin/nixos-run-vms + + +The script nixos-run-vms starts the virtual +machines defined by test. The root file system of the VMs is created +on the fly and kept across VM restarts in +./hostname.qcow2. + + From 28a1af6e06ec9837ea9a64e6e9ed0d07a45cd032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Nov 2014 20:00:56 +0100 Subject: [PATCH 46/65] fix printing test --- nixos/modules/services/printing/cupsd.nix | 15 +++++++++++++++ nixos/tests/printing.nix | 13 ++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 9c289f68512..22667739494 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -90,6 +90,20 @@ in ''; }; + extraConf = mkOption { + type = types.lines; + default = ""; + example = + '' + BrowsePoll cups.example.com + LogLevel debug + ''; + description = '' + Extra contents of the configuration file of the CUPS daemon + (cupsd.conf). + ''; + }; + clientConf = mkOption { type = types.lines; default = ""; @@ -258,6 +272,7 @@ in Order deny,allow + ${cfg.extraConf} ''; security.pam.services.cups = {}; diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index a55e077c269..79f4db3257a 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({pkgs, ... }: { { config, pkgs, ... }: { services.printing.enable = true; services.printing.listenAddresses = [ "*:631" ]; - services.printing.cupsdConf = + services.printing.extraConf = '' Order allow,deny @@ -40,10 +40,10 @@ import ./make-test.nix ({pkgs, ... }: { $server->fail("curl --fail --connect-timeout 2 http://client:631/"); # Add a HP Deskjet printer connected via USB to the server. - $server->succeed("lpadmin -p DeskjetLocal -v usb://HP/Deskjet%205400%20series?serial=TH93I152S123XY -m 'drv:///sample.drv/deskjet.ppd' -E"); + $server->succeed("lpadmin -p DeskjetLocal -E -v usb://foobar/printers/foobar"); # Add it to the client as well via IPP. - $client->succeed("lpadmin -p DeskjetRemote -v ipp://server/printers/DeskjetLocal -m 'drv:///sample.drv/deskjet.ppd' -E"); + $client->succeed("lpadmin -p DeskjetRemote -E -v ipp://server/printers/DeskjetLocal"); $client->succeed("lpadmin -d DeskjetRemote"); # Do some status checks. @@ -55,7 +55,7 @@ import ./make-test.nix ({pkgs, ... }: { $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die; # Test printing various file types. - foreach my $file ("${pkgs.groff}/share/doc/*/examples/mom/typesetting.pdf", + foreach my $file ("${pkgs.groff}/share/doc/*/examples/mom/penguin.pdf", "${pkgs.groff}/share/doc/*/meref.ps", "${pkgs.cups}/share/doc/cups/images/cups.png", "${pkgs.xz}/share/doc/xz/faq.txt") @@ -72,9 +72,8 @@ import ./make-test.nix ({pkgs, ... }: { # (showing that the right filters have been applied). Of # course, since there is no actual USB printer attached, the # file will stay in the queue forever. - $server->waitForFile("/var/spool/cups/d*-*"); - $server->succeed("lpq -a") =~ /remroot.*$fn/ or die; - $server->succeed("hexdump -C -n2 /var/spool/cups/d*-*") =~ /1b 45/ or die; # 1b 45 = printer reset + $server->waitForFile("/var/spool/cups/d00001-001"); + $server->succeed("lpq -a") =~ /$fn/ or die; # Delete the job on the client. It should disappear on the # server as well. From aecd509ae30807113a680ca90150fe23498fea66 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 27 Nov 2014 23:06:07 +0300 Subject: [PATCH 47/65] racer: add maintainer --- pkgs/development/tools/rust/racer/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 277f83ded73..2847db3ec5a 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustSrc}/src" ''; - meta = { + meta = with stdenv.lib; { description = "A utility intended to provide rust code completion for editors and IDEs."; homepage = https://github.com/phildawes/racer; license = stdenv.lib.licenses.mit; + maintainers = [ maintainers.jagajaga ]; }; } From b7f51920ee29cd56a21640d48694526f87cfbb3f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 27 Nov 2014 21:06:24 +0100 Subject: [PATCH 48/65] sselp prints X selection to standard out --- pkgs/tools/X11/sselp/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/X11/sselp/default.nix diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix new file mode 100644 index 00000000000..3e47715a8c7 --- /dev/null +++ b/pkgs/tools/X11/sselp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, libX11 }: + +stdenv.mkDerivation rec { + version = "0.2"; + name = "sselp-${version}"; + + src = fetchurl { + url = "http://dl.suckless.org/tools/${name}.tar.gz"; + sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd"; + }; + + buildInputs = [ libX11 ]; + + patchPhase = '' + sed -i "s@/usr/local@$out@g" config.mk + sed -i "s@/usr/X11R6/include@${libX11}/include@g" config.mk + sed -i "s@/usr/X11R6/lib@${libX11}/lib@g" config.mk + ''; + + meta = { + homepage = "http://tools.suckless.org/sselp"; + description = "Prints the X selection to stdout, usefull in scripts"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c68b8f0d012..8127ed7a01d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4721,6 +4721,8 @@ let flex = flex_2_5_35; }; + sselp = callPackage ../tools/X11/sselp{ }; + stm32flash = callPackage ../development/tools/misc/stm32flash { }; strace = callPackage ../development/tools/misc/strace { }; From 647617885d57b658c041cd02feb8f6a5a655dd3c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 27 Nov 2014 21:30:36 +0100 Subject: [PATCH 49/65] added platforms and maintainers --- pkgs/tools/X11/sselp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 3e47715a8c7..6ef7128dd4c 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -21,5 +21,7 @@ stdenv.mkDerivation rec { homepage = "http://tools.suckless.org/sselp"; description = "Prints the X selection to stdout, usefull in scripts"; license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; }; } From 9ef95441898d749e6a222943f4686b462ada6842 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 27 Nov 2014 23:20:09 +0300 Subject: [PATCH 50/65] Adding quirc QR code decoder --- pkgs/tools/graphics/quirc/default.nix | 39 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/graphics/quirc/default.nix diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix new file mode 100644 index 00000000000..cab02f6573d --- /dev/null +++ b/pkgs/tools/graphics/quirc/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, pkgconfig}: +let + s = + rec { + date = "2014-11-01"; + version = "git-${date}"; + baseName = "quirc"; + name = "${baseName}-${version}"; + url = "https://github.com/dlbeer/quirc"; + rev = "3a3df0d1d6adc59fdc2cadecfaed91650b84cacb"; + sha256 = "0wk2lmnw1k6m12dxs5a684mrm05x362h5kr3dwkfj8pyvdw3am18"; + }; + buildInputs = [ + SDL SDL_gfx libjpeg pkgconfig + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchgit { + inherit (s) url sha256 rev; + }; + NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL"; + configurePhase = '' + sed -e 's/-[og] root//g' -i Makefile + ''; + preInstall = '' + mkdir -p "$out"/{bin,lib,include} + find . -maxdepth 1 -type f -perm +111 -exec cp '{}' "$out"/bin ';' + ''; + makeFlags = "PREFIX=$(out)"; + meta = { + inherit (s) version; + description = ''A small QR code decoding library''; + license = stdenv.lib.licenses.isc; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c68b8f0d012..3a7fbdac712 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10517,6 +10517,8 @@ let qtractor = callPackage ../applications/audio/qtractor { }; + quirc = callPackage ../tools/graphics/quirc {}; + quodlibet = callPackage ../applications/audio/quodlibet { inherit (pythonPackages) mutagen; }; From 0fc32b90d82092a12636ad5742a82c23713de172 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 28 Nov 2014 00:06:25 +0300 Subject: [PATCH 51/65] Add qrcode minimalistic QR-code decode/encode tool (for pure codes only) --- pkgs/tools/graphics/qrcode/default.nix | 34 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/graphics/qrcode/default.nix diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix new file mode 100644 index 00000000000..e5bc5517b89 --- /dev/null +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchgit}: +let + s = + rec { + baseName = "qrcode"; + date = "2014-01-01"; + version = "git-${date}"; + name = "${baseName}-${version}"; + url = "https://github.com/qsantos/qrcode"; + rev = "2843cbada3b768f60ee1ae13c65160083558cc03"; + sha256 = "0x321xhzxk6ldvpr2090w14khj9n2gfay9db5vvvli16affpcrvb"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchgit { + inherit (s) rev url sha256; + }; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/qrcode} + cp qrcode "$out/bin" + cp DOCUMENTATION LICENCE "$out/share/doc/qrcode" + ''; + meta = { + inherit (s) version; + description = ''A small QR-code tool''; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a7fbdac712..32837a7ef80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10507,6 +10507,8 @@ let qmmp = callPackage ../applications/audio/qmmp { }; + qrcode = callPackage ../tools/graphics/qrcode {}; + qsampler = callPackage ../applications/audio/qsampler { }; qsynth = callPackage ../applications/audio/qsynth { }; From 917bf6865a52648af8c871cc9c3ab71895f5f872 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 27 Nov 2014 21:04:28 +0100 Subject: [PATCH 52/65] add neovim --- pkgs/applications/editors/neovim/default.nix | 65 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ pkgs/top-level/lua-packages.nix | 37 +++++++++++ 3 files changed, 106 insertions(+) create mode 100644 pkgs/applications/editors/neovim/default.nix diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix new file mode 100644 index 00000000000..1c1c050b000 --- /dev/null +++ b/pkgs/applications/editors/neovim/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchgit, fetchurl, unzip, callPackage, ncurses, gettext, pkgconfig, +cmake, pkgs, lpeg, lua, luajit, luaMessagePack, luabitop }: + +stdenv.mkDerivation rec { + name = "neovim-nightly"; + + version = "nightly"; + + src = fetchgit { + url = "https://github.com/neovim/neovim"; + rev = "68fcd8b696dae33897303c9f8265629a31afbf17"; + sha256 = "0hxkcy641jpn4qka44gfvhmb6q3dkjx6lvn9748lcl2gx2d36w4i"; + }; + + libmsgpack = stdenv.mkDerivation rec { + version = "0.5.9"; + name = "libmsgpack-${version}"; + + src = fetchgit { + rev = "ecf4b09acd29746829b6a02939db91dfdec635b4"; + url = "https://github.com/msgpack/msgpack-c"; + sha256 = "076ygqgxrc3vk2l20l8x2cgcv05py3am6mjjkknr418pf8yav2ww"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "MessagePack implementation for C and C++"; + homepage = http://msgpack.org; + maintainers = [ maintainers.manveru ]; + license = licenses.asl20; + platforms = platforms.all; + }; + }; + + enableParallelBuilding = true; + + buildInputs = [ + ncurses + pkgconfig + cmake + pkgs.libuvVersions.v0_11_29 + luajit + lua + lpeg + luaMessagePack + luabitop + libmsgpack + ]; + nativeBuildInputs = [ gettext ]; + + LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; + LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; + cmakeFlags = [ + "-DUSE_BUNDLED_MSGPACK=ON" + ]; + + meta = with stdenv.lib; { + description = "Aggressive refactor of Vim"; + homepage = http://www.neovim.org; + maintainers = with maintainers; [ manveru ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 128badfa52b..ec9f9409145 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10956,6 +10956,10 @@ let vimpc = callPackage ../applications/audio/vimpc { }; + neovim = callPackage ../applications/editors/neovim { + inherit (lua52Packages) lpeg luaMessagePack luabitop; + }; + virtviewer = callPackage ../applications/virtualization/virt-viewer { gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 19cb2b6e24f..245483e76b3 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -218,4 +218,41 @@ let }; }; + lpeg = buildLuaPackage rec { + name = "lpeg-${version}"; + version = "0.12"; + src = fetchurl { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz"; + sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg"; + }; + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion} + install -p lpeg.so $out/lib/lua/${lua.luaversion} + install -p re.lua $out/lib/lua/${lua.luaversion} + ''; + + meta = { + homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; + hydraPlatforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; + }; + + luaMessagePack = buildLuaPackage rec { + name = "lua-MessagePack-${version}"; + version = "0.3.1"; + src = fetchurl { + url = "https://github.com/fperrad/lua-MessagePack/archive/${version}.tar.gz"; + sha256 = "185mrd6bagwwm94jxzanq01l72ama3x4hf160a7yw7hgim2y5h9c"; + }; + buildInputs = [ unzip ]; + + meta = { + homepage = "http://fperrad.github.io/lua-MessagePack/index.html"; + hydraPlatforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; + }; }; in self From dae0611770645a17cc991d302a0bab2d4302bb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 27 Nov 2014 22:59:34 +0100 Subject: [PATCH 53/65] pidginotr: update from 4.0.0 to 4.0.1 --- .../instant-messengers/pidgin-plugins/otr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 7cbc38ea0dc..2fa7d5f37f2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libotr, pidgin, intltool } : stdenv.mkDerivation rec { - name = "pidgin-otr-4.0.0"; + name = "pidgin-otr-4.0.1"; src = fetchurl { url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; - sha256 = "14a6vxvlkm8wazng9aj7p82dr12857fx5is1frcyd7my5l4kysym"; + sha256 = "02pkkf86fh5jvzsdn9y78impsgzj1n0p81kc2girvk3vq941yy0v"; }; postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; From 3c7ac9db0604a38089b98c7a81b533319a66fac1 Mon Sep 17 00:00:00 2001 From: muflax Date: Wed, 26 Nov 2014 23:50:28 +0000 Subject: [PATCH 54/65] ccl: 1.8 -> 1.10 --- lib/maintainers.nix | 1 + pkgs/development/compilers/ccl/default.nix | 72 +++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e64ecce1b4e..7ff3a25b3df 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -108,6 +108,7 @@ mornfall = "Petr Ročkai "; MP2E = "Cray Elliott "; msackman = "Matthew Sackman "; + muflax = "Stefan Dorn "; nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; notthemessiah = "Brian Cohen "; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 7678c066df2..6ca11ef7aec 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,49 +1,47 @@ -a : -let - buildInputs = with a; [ - - ]; -in -rec { - version = "1.8"; - name = "ccl-${version}"; +{ stdenv, fetchsvn, gcc, glibc, m4 }: - /* There are also MacOS and FreeBSD and Windows versions */ - src = a.fetchurl { - url = "ftp://ftp.clozure.com/pub/release/${version}/${name}-linuxx86.tar.gz"; - sha256 = "1dgg6a8i2csa6xidsq66hbw7zx62gm2178hpkp88yyzgxylszp01"; +/* TODO: there are also MacOS, FreeBSD and Windows versions */ +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; + +stdenv.mkDerivation rec { + name = "ccl-${version}"; + version = "1.10"; + revision = "16313"; + + src = fetchsvn { + url = http://svn.clozure.com/publicsvn/openmcl/release/1.10/linuxx86/ccl; + rev = revision; + sha256 = "11lmdvzj1mbm7mbr22vjbcrsvinyz8n32a91ms324xqdqpr82ifb"; }; - - inherit buildInputs; - configureFlags = []; - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doPatchElf" "doCopy"]; + buildInputs = [ gcc glibc m4 ]; - doCopy = a.fullDepEntry '' + CCL_RUNTIME = if stdenv.system == "x86_64-linux" then "lx86cl64" else "lx86cl"; + CCL_KERNEL = if stdenv.system == "x86_64-linux" then "linuxx8664" else "linuxx8632"; + + buildPhase = '' + sed -i lisp-kernel/${CCL_KERNEL}/Makefile -e's/svnversion/echo ${revision}/g' + + make -C lisp-kernel/${CCL_KERNEL} clean + make -C lisp-kernel/${CCL_KERNEL} all + + ./${CCL_RUNTIME} -n -b -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' + ''; + + installPhase = '' mkdir -p "$out/share" - cp -r . "$out/share/ccl-installation" + cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - for i in $(find . -maxdepth 1 -type f -perm +111); do - echo -e '#! /bin/sh\n'"$out/share/ccl-installation/$(basename "$i")"'"$@"\n' > "$out"/bin/"$(basename "$i")" - chmod a+x "$out"/bin/"$(basename "$i")" - done - '' ["minInit" "doUnpack" "defEnsureDir"]; + echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" + chmod a+x "$out"/bin/"${CCL_RUNTIME}" + ''; - doPatchElf = a.fullDepEntry '' - patchelfFile="$(type -P patchelf)" - goodInterp="$(patchelf --print-interpreter "$patchelfFile")" - find . -type f -perm +111 -exec patchelf --set-interpreter "$goodInterp" '{}' ';' - '' ["minInit" "doUnpack"]; - meta = { description = "Clozure Common Lisp"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux; + homepage = http://ccl.clozure.com/; + maintainers = with stdenv.lib.maintainers; [ raskin muflax ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl21; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c5caa1649..eb694251210 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2933,7 +2933,7 @@ let chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { }; }; - ccl = builderDefsPackage ../development/compilers/ccl {}; + ccl = callPackage ../development/compilers/ccl { }; clang = wrapGCC llvmPackages.clang; From 52ea3bb61ff51da5fd6c6b676b4d7b00272d67b8 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Fri, 28 Nov 2014 01:34:54 +0300 Subject: [PATCH 55/65] Revert "ccl: 1.8 -> 1.10" --- lib/maintainers.nix | 1 - pkgs/development/compilers/ccl/default.nix | 72 +++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 38 insertions(+), 37 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7ff3a25b3df..e64ecce1b4e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -108,7 +108,6 @@ mornfall = "Petr Ročkai "; MP2E = "Cray Elliott "; msackman = "Matthew Sackman "; - muflax = "Stefan Dorn "; nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; notthemessiah = "Brian Cohen "; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 6ca11ef7aec..7678c066df2 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,47 +1,49 @@ -{ stdenv, fetchsvn, gcc, glibc, m4 }: +a : +let + buildInputs = with a; [ + + ]; +in +rec { + version = "1.8"; + name = "ccl-${version}"; -/* TODO: there are also MacOS, FreeBSD and Windows versions */ -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; - -stdenv.mkDerivation rec { - name = "ccl-${version}"; - version = "1.10"; - revision = "16313"; - - src = fetchsvn { - url = http://svn.clozure.com/publicsvn/openmcl/release/1.10/linuxx86/ccl; - rev = revision; - sha256 = "11lmdvzj1mbm7mbr22vjbcrsvinyz8n32a91ms324xqdqpr82ifb"; + /* There are also MacOS and FreeBSD and Windows versions */ + src = a.fetchurl { + url = "ftp://ftp.clozure.com/pub/release/${version}/${name}-linuxx86.tar.gz"; + sha256 = "1dgg6a8i2csa6xidsq66hbw7zx62gm2178hpkp88yyzgxylszp01"; }; + + inherit buildInputs; + configureFlags = []; - buildInputs = [ gcc glibc m4 ]; + /* doConfigure should be removed if not needed */ + phaseNames = ["doUnpack" "doPatchElf" "doCopy"]; - CCL_RUNTIME = if stdenv.system == "x86_64-linux" then "lx86cl64" else "lx86cl"; - CCL_KERNEL = if stdenv.system == "x86_64-linux" then "linuxx8664" else "linuxx8632"; - - buildPhase = '' - sed -i lisp-kernel/${CCL_KERNEL}/Makefile -e's/svnversion/echo ${revision}/g' - - make -C lisp-kernel/${CCL_KERNEL} clean - make -C lisp-kernel/${CCL_KERNEL} all - - ./${CCL_RUNTIME} -n -b -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' - ''; - - installPhase = '' + doCopy = a.fullDepEntry '' mkdir -p "$out/share" - cp -r . "$out/share/ccl-installation" + cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" - chmod a+x "$out"/bin/"${CCL_RUNTIME}" - ''; + for i in $(find . -maxdepth 1 -type f -perm +111); do + echo -e '#! /bin/sh\n'"$out/share/ccl-installation/$(basename "$i")"'"$@"\n' > "$out"/bin/"$(basename "$i")" + chmod a+x "$out"/bin/"$(basename "$i")" + done + '' ["minInit" "doUnpack" "defEnsureDir"]; + doPatchElf = a.fullDepEntry '' + patchelfFile="$(type -P patchelf)" + goodInterp="$(patchelf --print-interpreter "$patchelfFile")" + find . -type f -perm +111 -exec patchelf --set-interpreter "$goodInterp" '{}' ';' + '' ["minInit" "doUnpack"]; + meta = { description = "Clozure Common Lisp"; - homepage = http://ccl.clozure.com/; - maintainers = with stdenv.lib.maintainers; [ raskin muflax ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl21; + maintainers = [ + a.lib.maintainers.raskin + ]; + platforms = with a.lib.platforms; + linux; }; } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaf4d5a348d..32837a7ef80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2933,7 +2933,7 @@ let chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { }; }; - ccl = callPackage ../development/compilers/ccl { }; + ccl = builderDefsPackage ../development/compilers/ccl {}; clang = wrapGCC llvmPackages.clang; From 856e5839e1102dcbe4f499c004b819d9dde10a26 Mon Sep 17 00:00:00 2001 From: muflax Date: Thu, 27 Nov 2014 22:48:07 +0000 Subject: [PATCH 56/65] ccl: 1.8 -> 1.10 (reapply after false revert) --- lib/maintainers.nix | 1 + pkgs/development/compilers/ccl/default.nix | 72 +++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e64ecce1b4e..7ff3a25b3df 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -108,6 +108,7 @@ mornfall = "Petr Ročkai "; MP2E = "Cray Elliott "; msackman = "Matthew Sackman "; + muflax = "Stefan Dorn "; nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; notthemessiah = "Brian Cohen "; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 7678c066df2..6ca11ef7aec 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,49 +1,47 @@ -a : -let - buildInputs = with a; [ - - ]; -in -rec { - version = "1.8"; - name = "ccl-${version}"; +{ stdenv, fetchsvn, gcc, glibc, m4 }: - /* There are also MacOS and FreeBSD and Windows versions */ - src = a.fetchurl { - url = "ftp://ftp.clozure.com/pub/release/${version}/${name}-linuxx86.tar.gz"; - sha256 = "1dgg6a8i2csa6xidsq66hbw7zx62gm2178hpkp88yyzgxylszp01"; +/* TODO: there are also MacOS, FreeBSD and Windows versions */ +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; + +stdenv.mkDerivation rec { + name = "ccl-${version}"; + version = "1.10"; + revision = "16313"; + + src = fetchsvn { + url = http://svn.clozure.com/publicsvn/openmcl/release/1.10/linuxx86/ccl; + rev = revision; + sha256 = "11lmdvzj1mbm7mbr22vjbcrsvinyz8n32a91ms324xqdqpr82ifb"; }; - - inherit buildInputs; - configureFlags = []; - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doPatchElf" "doCopy"]; + buildInputs = [ gcc glibc m4 ]; - doCopy = a.fullDepEntry '' + CCL_RUNTIME = if stdenv.system == "x86_64-linux" then "lx86cl64" else "lx86cl"; + CCL_KERNEL = if stdenv.system == "x86_64-linux" then "linuxx8664" else "linuxx8632"; + + buildPhase = '' + sed -i lisp-kernel/${CCL_KERNEL}/Makefile -e's/svnversion/echo ${revision}/g' + + make -C lisp-kernel/${CCL_KERNEL} clean + make -C lisp-kernel/${CCL_KERNEL} all + + ./${CCL_RUNTIME} -n -b -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' + ''; + + installPhase = '' mkdir -p "$out/share" - cp -r . "$out/share/ccl-installation" + cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - for i in $(find . -maxdepth 1 -type f -perm +111); do - echo -e '#! /bin/sh\n'"$out/share/ccl-installation/$(basename "$i")"'"$@"\n' > "$out"/bin/"$(basename "$i")" - chmod a+x "$out"/bin/"$(basename "$i")" - done - '' ["minInit" "doUnpack" "defEnsureDir"]; + echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" + chmod a+x "$out"/bin/"${CCL_RUNTIME}" + ''; - doPatchElf = a.fullDepEntry '' - patchelfFile="$(type -P patchelf)" - goodInterp="$(patchelf --print-interpreter "$patchelfFile")" - find . -type f -perm +111 -exec patchelf --set-interpreter "$goodInterp" '{}' ';' - '' ["minInit" "doUnpack"]; - meta = { description = "Clozure Common Lisp"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux; + homepage = http://ccl.clozure.com/; + maintainers = with stdenv.lib.maintainers; [ raskin muflax ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl21; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32837a7ef80..aaf4d5a348d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2933,7 +2933,7 @@ let chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { }; }; - ccl = builderDefsPackage ../development/compilers/ccl {}; + ccl = callPackage ../development/compilers/ccl { }; clang = wrapGCC llvmPackages.clang; From e9ec3ea1f2b29e261694e80bb7bfc84a3d0b7226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 28 Nov 2014 00:34:17 +0100 Subject: [PATCH 57/65] Add drumgizmo, an LV2 sample based drum plugin --- pkgs/applications/audio/drumgizmo/default.nix | 28 +++++++++++++++++++ .../libraries/audio/libsmf/default.nix | 20 +++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 52 insertions(+) create mode 100644 pkgs/applications/audio/drumgizmo/default.nix create mode 100644 pkgs/development/libraries/audio/libsmf/default.nix diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix new file mode 100644 index 00000000000..2daafda554e --- /dev/null +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, alsaLib, expat, glib, jack2, libX11, libpng +, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig +}: + +stdenv.mkDerivation rec { + version = "0.9.6"; + name = "drumgizmo-${version}"; + + src = fetchurl { + url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; + sha256 = "1qs8aa1v8cw5zgfzcnr2dc4w0y5yzsgrywlnx2hfvx2si3as0mw4"; + }; + + configureFlags = [ "--enable-lv2" ]; + + buildInputs = [ + alsaLib expat glib jack2 libX11 libpng libpthreadstubs libsmf + libsndfile lv2 pkgconfig + ]; + + meta = with stdenv.lib; { + description = "An LV2 sample based drum plugin"; + homepage = http://www.drumgizmo.org; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix new file mode 100644 index 00000000000..6126793b3e4 --- /dev/null +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, fetchurl, glib, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.3"; + name = "libsmf-${version}"; + src = fetchurl { + url = "https://github.com/stump/libsmf/archive/${name}.tar.gz"; + sha256 = "16c0n40h0r56gzbh5ypxa4dwp296dan3jminml2qkb4lvqarym6k"; + }; + + buildInputs = [ glib pkgconfig ]; + + meta = with stdenv.lib; { + description = "A C library for reading and writing Standard MIDI Files"; + homepage = https://github.com/stump/libsmf; + license = licenses.bsd2; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaf4d5a348d..fa759062910 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6744,6 +6744,8 @@ let librdf = callPackage ../development/libraries/librdf { }; + libsmf = callPackage ../development/libraries/audio/libsmf { }; + lilv = callPackage ../development/libraries/audio/lilv { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; @@ -9279,6 +9281,8 @@ let doodle = callPackage ../applications/search/doodle { }; + drumgizmo = callPackage ../applications/audio/drumgizmo { inherit (xlibs) libX11; }; + dunst = callPackage ../applications/misc/dunst { }; dvb_apps = callPackage ../applications/video/dvb-apps { }; From 456312a5fcb9029949170c17c54800c6a588dc24 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 28 Nov 2014 02:31:01 +0000 Subject: [PATCH 58/65] youtube-dl: update to 2014.11.27 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 0a68ec60eb8..88d6ff1ff06 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.11.16"; + version = "2014.11.27"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0i0j5dzmwil5x5qh6bghqy7zmj8wqqilp5m9sq95vqmsxpjfgw3q"; + sha256 = "0bmjlp3jk5nd2i9jpbqbv2smh5rdxcjajv7fccfinmi6v2bjm1aa"; }; buildInputs = [ python ]; From 457d56fcece3118e054a046ecd1eaaad99318fcc Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 28 Nov 2014 11:00:56 +0100 Subject: [PATCH 59/65] calibre: update from 2.11.0 to 2.12.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f6159c79b1f..4656e5add13 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.11.0"; + name = "calibre-2.12.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "19pn55yvc7yiz21gri5838zf7n88l6m2abbwzswn4x8v9915lls1"; + sha256 = "1qp3aq6f6ngfy8m0bj6rzdf6p2vmk4bxycxfby2n8byfhr8gaclf"; }; inherit python; From 02ca1adc05bc3572c9b693f34683f5831bbdf23d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 28 Nov 2014 11:02:58 +0100 Subject: [PATCH 60/65] groovy: update from 2.3.7 to 2.3.8 --- pkgs/development/interpreters/groovy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index c611577adfb..9a2bd0ff328 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; - sha256 = "09957vi33c8bgk6z4wnidch5sz3s183yh6xba8cdjy5f7jpzmmiq"; + sha256 = "0fgsn1s7vhxcrwb2wa6zvrdzff7zbb2s6f7xj6c9x7gl9mdfcwpn"; }; installPhase = '' From 4261ab39a8f09f381c6c75dd22ac11779f1a1b7d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 28 Nov 2014 11:05:37 +0100 Subject: [PATCH 61/65] nzbget: update from 14.0 to 14.1 --- pkgs/tools/networking/nzbget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index edf7825a2d3..aacc7ee6885 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -2,11 +2,11 @@ , gnutls, libgcrypt }: stdenv.mkDerivation rec { - name = "nzbget-14.0"; + name = "nzbget-14.1"; src = fetchurl { url = "mirror://sourceforge/nzbget/${name}.tar.gz"; - sha256 = "1r9qdp17px8vq3mh18fzxhm5cqd37wcz2vv7hsxdq8rmgxhl7lj1"; + sha256 = "062bvf0r290qi3xgbvvwgxxmnka7raa71dz9fg1mq0zpc5mq2sx1"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ]; From a94da8c44c0e694450dbd6f30737cd254702251b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 28 Nov 2014 11:07:09 +0100 Subject: [PATCH 62/65] checkstyle: update from 6.1 to 6.1.1 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 7971f0bb67f..69abe8ac7b9 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.1"; + version = "6.1.1"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; - sha256 = "0g5ywnc64v2c4zlamm3l2x0l1z79199mcjz0xzv3j5wx7rsyasrc"; + sha256 = "07qickjgayakzfq54nwb9rpxydjkymxw6lnhzxri36mxspq9pzda"; }; installPhase = '' From 9bcf0178d66aa3ec92a819b52b507951d504c900 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 26 Nov 2014 18:50:47 +0100 Subject: [PATCH 63/65] xrandr-invert-colors, a tool to invert the colors of your screen --- .../misc/xrandr-invert-colors/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/xrandr-invert-colors/default.nix diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix new file mode 100644 index 00000000000..e9bb722dcab --- /dev/null +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -0,0 +1,26 @@ +{ fetchurl, stdenv, libXrandr}: + +stdenv.mkDerivation rec { + version = "v0.01"; + name = "xrandr-invert-colors-${version}"; + src = fetchurl { + url = "https://github.com/zoltanp/xrandr-invert-colors/archive/${version}.tar.gz"; + sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75"; + }; + + buildInputs = [ libXrandr ]; + + installPhase = '' + mkdir -p $out/bin + mv xrandr-invert-colors.bin xrandr-invert-colors + install xrandr-invert-colors $out/bin + ''; + + meta = with stdenv.lib; { + description = "Inverts the colors of your screen"; + license = stdenv.lib.licenses.gpl3Plus; + homepage = https://github.com/zoltanp/xrandr-invert-colors; + maintainers = [stdenv.lib.maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77ad7fc20cc..3b27e447009 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11966,6 +11966,7 @@ let xfce = xfce4_10; xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); + xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; ### SCIENCE From 650226e3c433d9db439ad57e9dc52d2077aaea46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 28 Nov 2014 14:14:10 +0000 Subject: [PATCH 64/65] libsmf: fix the sha256 hash --- pkgs/development/libraries/audio/libsmf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index 6126793b3e4..f64ed7e4194 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libsmf-${version}"; src = fetchurl { url = "https://github.com/stump/libsmf/archive/${name}.tar.gz"; - sha256 = "16c0n40h0r56gzbh5ypxa4dwp296dan3jminml2qkb4lvqarym6k"; + sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n"; }; buildInputs = [ glib pkgconfig ]; From f9c96df1d5d8cf6db264c41cb2de227636381203 Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Fri, 28 Nov 2014 17:46:39 +0100 Subject: [PATCH 65/65] libc++abi: Fix importing includes from libc++. And add myself to maintainers. Close #5167. --- pkgs/development/libraries/libc++abi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix index 68db6a5dc6c..cbfe8e8f665 100644 --- a/pkgs/development/libraries/libc++abi/default.nix +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { postUnpack = '' unpackFile ${libcxx.src} + cp -r libcxx-*/include libcxxabi*/ '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin # Hack: NIX_CFLAGS_COMPILE doesn't work here because clang++ isn't @@ -44,7 +45,7 @@ stdenv.mkDerivation { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ]; platforms = stdenv.lib.platforms.unix; }; }