diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-10-30 17:16:07 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-10-30 17:16:07 -0700 |
| commit | dd2de66d614e58a8b89046e2de73f2305df4b23f (patch) | |
| tree | f89847bb63642613f543a44e4e270643f6c1c4b7 /pkgs/applications | |
| parent | 99fe4f97c55185d3f51b759cbd5f8e3ab029eadb (diff) | |
| parent | a7d573f224707185c44c92b8a35eb6a7ad62c552 (diff) | |
| download | nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.gz nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.bz2 nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.lz nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.xz nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.zst nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications')
66 files changed, 884 insertions, 396 deletions
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix new file mode 100644 index 000000000000..543329ef679b --- /dev/null +++ b/pkgs/applications/audio/baudline/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, jack +, makeWrapper +}: + +let + rpath = stdenv.lib.makeLibraryPath + [ libXmu libXt libX11 libXext libXxf86vm jack ]; +in +stdenv.mkDerivation rec { + name = "baudline-${version}"; + version = "1.08"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz"; + sha256 = "09fn0046i69in1jpizkzbaq5ggij0mpflcsparyskm3wh71mbzvr"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://www.baudline.com/baudline_${version}_linux_i686.tar.gz"; + sha256 = "1waip5pmcf5ffcfvn8lf1rvsaq2ab66imrbfqs777scz7k8fhhjb"; + } + else + throw "baudline isn't supported (yet?) on ${stdenv.system}"; + + buildInputs = [ makeWrapper ]; + + # Prebuilt binary distribution. + # "patchelf --set-rpath" seems to break the application (cannot start), using + # LD_LIBRARY_PATH wrapper script instead. + buildPhase = "true"; + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/libexec/baudline" + + cp -r . "$out/libexec/baudline/" + + interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)" + for prog in "$out"/libexec/baudline/baudline*; do + patchelf --interpreter "$interpreter" "$prog" + ln -sr "$prog" "$out/bin/" + done + for prog in "$out"/bin/*; do + wrapProgram "$prog" --prefix LD_LIBRARY_PATH : ${rpath} + done + ''; + + meta = with stdenv.lib; { + description = "Scientific signal analysis application"; + longDescription = '' + Baudline is a time-frequency browser designed for scientific + visualization of the spectral domain. Signal analysis is performed by + Fourier, correlation, and raster transforms that create colorful + spectrograms with vibrant detail. Conduct test and measurement + experiments with the built in function generator, or play back audio + files with a multitude of effects and filters. The baudline signal + analyzer combines fast digital signal processing, versatile high speed + displays, and continuous capture tools for hunting down and studying + elusive signal characteristics. + ''; + homepage = http://www.baudline.com/; + # See http://www.baudline.com/faq.html#licensing_terms. + # (Do NOT (re)distribute on hydra.) + license = licenses.unfree; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 1646f944a830..ecf88859fc7a 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -1,31 +1,27 @@ { fetchurl, stdenv }: -let version = "0.9"; -in - stdenv.mkDerivation { - name = "cd-discid-${version}"; - src = fetchurl { - url = "mirror://debian/pool/main/c/cd-discid/cd-discid_${version}.orig.tar.gz"; - sha256 = "1fx2ky1pb07l1r0bldpw16wdsfzw7a0093ib9v66kmilwy2sq5s9"; - }; +stdenv.mkDerivation rec { + name = "cd-discid-${version}"; + version = "1.4"; - patches = [ ./install.patch ]; + src = fetchurl { + url = "http://linukz.org/download/${name}.tar.gz"; + sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz"; + }; - configurePhase = '' - sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; - s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ - "Makefile"; - ''; + installFlags = "PREFIX=$(out)"; - meta = { - homepage = http://lly.org/~rcw/cd-discid/; - license = stdenv.lib.licenses.gpl2Plus; - description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID"; + meta = with stdenv.lib; { + homepage = http://linukz.org/cd-discid.shtml; + license = licenses.gpl2Plus; + maintainers = [ maintainers.rycee ]; + platforms = platforms.unix; + description = "command-line utility to get CDDB discid information from a CD-ROM disc"; - longDescription = '' - cd-discid is a backend utility to get CDDB discid information - from a CD-ROM disc. It was originally designed for cdgrab (now - abcde), but can be used for any purpose requiring CDDB data. - ''; - }; - } + longDescription = '' + cd-discid is a backend utility to get CDDB discid information + from a CD-ROM disc. It was originally designed for cdgrab (now + abcde), but can be used for any purpose requiring CDDB data. + ''; + }; +} diff --git a/pkgs/applications/audio/cd-discid/install.patch b/pkgs/applications/audio/cd-discid/install.patch deleted file mode 100644 index 4f0256813ff1..000000000000 --- a/pkgs/applications/audio/cd-discid/install.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- cd-discid-0.9/Makefile 2003-01-05 21:18:07.000000000 +0100 -+++ cd-discid-0.9/Makefile 2008-05-26 22:14:56.000000000 +0200 -@@ -32,9 +32,9 @@ clean: - - install: cd-discid - $(INSTALL) -d -m 755 $(bindir) -- $(INSTALL) -s -m 755 -o 0 cd-discid $(bindir) -+ $(INSTALL) -s -m 755 cd-discid $(bindir) - $(INSTALL) -d -m 755 $(mandir) -- $(INSTALL) -m 644 -o 0 cd-discid.1 $(mandir) -+ $(INSTALL) -m 644 cd-discid.1 $(mandir) - - tarball: - @cd .. && tar czvf cd-discid_$(VERSION).orig.tar.gz \ diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 693d8e2a6e50..afca63a2a8a2 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation { - name = "csound-6.03.2"; + name = "csound-6.04"; enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/csound/Csound6.03.2.tar.gz; - sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m"; + url = mirror://sourceforge/csound/Csound6.04.tar.gz; + sha256 = "1030w38lxdwjz1irr32m9cl0paqmgr02lab2m7f7j1yihwxj1w0g"; }; buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ]; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 8d1b561cb873..cfe29949e4f6 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 patches = [ ./socket.patch ./gcc-47.patch ]; - buildInputs = [ alsaLib gtk libjack2 libuuid libxml2 makeWrapper + buildInputs = [ alsaLib gtk libjack2 libxml2 makeWrapper pkgconfig readline ]; + propagatedBuildInputs = [ libuuid ]; postInstall = '' for i in lash_control lash_panel diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix new file mode 100644 index 000000000000..0957420b6585 --- /dev/null +++ b/pkgs/applications/audio/mp3val/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mp3val-${version}"; + version = "0.1.8"; + + src = fetchurl { + url = "mirror://sourceforge/mp3val/${name}-src.tar.gz"; + sha256 = "17y3646ghr38r620vkrxin3dksxqig5yb3nn4cfv6arm7kz6x8cm"; + }; + + makefile = "Makefile.linux"; + + installPhase = '' + install -Dv mp3val "$out/bin/mp3val" + ''; + + meta = { + description = "A tool for validating and repairing MPEG audio streams"; + longDescription = '' + MP3val is a small, high-speed, free software tool for checking MPEG audio + files' integrity. It can be useful for finding corrupted files (e.g. + incompletely downloaded, truncated, containing garbage). MP3val is + also able to fix most of the problems. Being a multiplatform application, + MP3val can be runned both under Windows and under Linux (or BSD). The most + common MPEG audio file type is MPEG 1 Layer III (mp3), but MP3val supports + also other MPEG versions and layers. The tool is also aware of the most + common types of tags (ID3v1, ID3v2, APEv2). + ''; + homepage = http://mp3val.sourceforge.net/index.shtml; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index c200e39887a8..90129d6404b7 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,24 +1,25 @@ { stdenv, fetchurl, qt4, alsaLib, libjack2, dbus }: stdenv.mkDerivation rec { - version = "0.3.12"; + version = "0.4.0"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "14yvnc4k3hwsjflg8b2d04bc63pdl0gyqjc7vl6rdn29nbr23zwc"; + sha256 = "0nj8c8vy00524hbjqwsqkliblcf9j7h46adk6v5np645pp2iqrav"; }; buildInputs = [ qt4 alsaLib libjack2 dbus ]; configureFlags = "--enable-jack-version"; - meta = { + meta = with stdenv.lib; { description = "A Qt application to control the JACK sound server daemon"; homepage = http://qjackctl.sourceforge.net/; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 704f3f01c00e..f98f7862475f 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { else requireFile { url = "http://backstage.renoise.com/frontend/app/index.html#/login"; - name = "rns_3_0_1_reg_x86_64.tar.gz"; - sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7"; + name = "rns_3_0_1_linux_x86_64.tar.gz"; + sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd"; } else if builtins.currentSystem == "i686-linux" then if demo then diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 5ee15a925821..00d7559cd58c 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -4,11 +4,11 @@ withLirc ? false, lirc ? null } : stdenv.mkDerivation (rec { - version = "14.12"; + version = "15.08"; name = "rosegarden-${version}"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; - sha256 = "0zhlxr1njyy6837f09l6p75js0j5mxmls6m02bqafv9j32wgnxpq"; + sha256 = "1pk24bhpsmvn6rkqgll31na44w03banra1y7kiqd0gajlnw7wlls"; }; QTDIR=qt4; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 9bcad5b7649d..bd1597b02ba6 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd +, gvfs, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd }: let @@ -16,15 +16,15 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0jki2ca12mazvszy05xc7zy8nfpavl0rnzcyksvvic32l3w2yxj7"; + sha256 = "1rbwwwryhcasqgn2y1d9hvi3n4dag50dh1fd9hmkx4h9nmm3mbi0"; name = "${name}.deb"; }; - buildInputs = [ atomEnv makeWrapper ]; + buildInputs = [ atomEnv gvfs makeWrapper ]; phases = [ "installPhase" "fixupPhase" ]; @@ -41,7 +41,8 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/share/atom/resources/app/apm/bin/node wrapProgram $out/bin/atom \ - --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" + --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" \ + --prefix "PATH" : "${gvfs}/bin" wrapProgram $out/bin/apm \ --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" ''; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 21456dfcf61b..0d0c9d148149 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -106,16 +106,16 @@ rec { anyedittools = buildEclipsePlugin rec { name = "anyedit-${version}"; - version = "2.4.15.201504172030"; + version = "2.5.0.201510241327"; srcFeature = fetchurl { url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar"; - sha256 = "19hbwgqn02ghflbcp5cw3qy203mym5kwgzq4xrn0xcl8ckl5s2pp"; + sha256 = "01qaxg1b4n7y7g1xdkx1bnmpwqydln270mk14l4pl35q3c88s5nc"; }; srcPlugin = fetchurl { - url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar"; - sha256 = "1i3ghf2mhdfhify30hlyxqmyqcp40pkd5zhsiyg6finn4w81sxv2"; + url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.5.0/de.loskutov.anyedit.AnyEditTools_${version}.jar"; + sha256 = "0m4qxkscl5xih8x1znbrih4jh28wky4l62spfif9zw0s7mgl117c"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index eb814eab6f52..59f9f7110043 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc +, alsaLib, cairo, acl, gpm, AppKit , withX ? !stdenv.isDarwin , withGTK3 ? false, gtk3 ? null , withGTK2 ? true, gtk2 @@ -47,11 +47,9 @@ stdenv.mkDerivation rec { imagemagick gconf ] ++ stdenv.lib.optional (withX && withGTK2) gtk2 ++ stdenv.lib.optional (withX && withGTK3) gtk3 - ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc ]; + ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; - NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin - "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; + propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin AppKit; configureFlags = if stdenv.isDarwin diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index 13a888484e07..5ba09971675a 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, Carbon, Foundation, -libobjc, Cocoa, WebKit, Quartz, ImageCaptureCore, OSAKit +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls +, Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit }: stdenv.mkDerivation rec { emacsName = "emacs-24.5"; - name = "${emacsName}-mac-5.11"; + name = "${emacsName}-mac-5.12"; #builder = ./builder.sh; @@ -15,18 +15,17 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "0p4jh6s1qi6jm6zr82grk65x33ix1hb0fbpih4vh3vnx6310iwsb"; + sha256 = "1kryg4xw2jn2jwd9ilm2snjvgmnbbp392ry1skzl4d4xf7ff3vx1"; }; - NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; - NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin - "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; - enableParallelBuilding = true; buildInputs = [ - ncurses pkgconfig texinfo libxml2 gnutls Carbon Cocoa Foundation libobjc WebKit Quartz - ImageCaptureCore OSAKit + ncurses pkgconfig texinfo libxml2 gnutls + ]; + + propagatedBuildInputs = [ + Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit ]; postUnpack = '' @@ -36,6 +35,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' + substituteInPlace lisp/international/mule-cmds.el --replace /usr $TMPDIR substituteInPlace Makefile.in --replace "/bin/pwd" "pwd" substituteInPlace lib-src/Makefile.in --replace "/bin/pwd" "pwd" @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { separately. This is "Mac port" addition to GNU Emacs 24. This provides a native - GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later + GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later already contain the official GUI support via the NS (Cocoa) port for Mac OS X 10.4 and later. So if it is good enough for you, then you don't need to try this. diff --git a/pkgs/applications/editors/emacs-modes/dash/default.nix b/pkgs/applications/editors/emacs-modes/dash/default.nix index c71860992daf..09b03ccdba64 100644 --- a/pkgs/applications/editors/emacs-modes/dash/default.nix +++ b/pkgs/applications/editors/emacs-modes/dash/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, emacs}: let - version = "2.11.0"; + version = "2.12.1"; in stdenv.mkDerivation { name = "emacs-dash-${version}"; src = fetchurl { url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz"; - sha256 = "1piwcwilkxcbjxx832mhb7q3pz1fgwp203r581bpqcw6kd5x726q"; + sha256 = "082jl7mp4x063bpj5ad2pc5125k0d6p7rb89gcj7ny3lma9h2ij1"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 8d71ca582022..b5f4ac506cc4 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }: let - version = "2.2.1"; + version = "2.3.0"; in stdenv.mkDerivation { name = "magit-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "magit"; repo = "magit"; rev = version; - sha256 = "1bq26wrgm4wgif0hj16mkmiz0p1iilxs7dmdd1vq5df8nivmakjz"; + sha256 = "1zbx1ky1481lkvfjr4k23q7jdrk9ji9v5ghj88qib36vbmzfwww8"; }; buildInputs = [ emacs texinfo git ]; @@ -28,15 +28,10 @@ stdenv.mkDerivation { cp lisp/magit-version.el . ''; - doCheck = false; # one out of 5 tests fails, not sure why + doCheck = false; # 2 out of 15 tests fails, not sure why checkTarget = "test"; preCheck = "export EMAIL='Joe Doe <joe.doe@example.org>'"; - # postInstall = '' - # mkdir -p $out/bin - # mv "bin/"* $out/bin/ - # ''; - meta = { homepage = "https://github.com/magit/magit"; description = "Magit, an Emacs interface to Git"; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 2e0e3a1743c5..252a1e93c642 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -6,6 +6,7 @@ , withPython3 ? true, python3Packages, extraPython3Packages ? [] , withJemalloc ? true, jemalloc +, withPyGUI ? false , vimAlias ? false , configure ? null }: @@ -45,7 +46,11 @@ let }; pythonEnv = pythonPackages.python.buildEnv.override { - extraLibs = [ pythonPackages.neovim ] ++ extraPythonPackages; + extraLibs = ( + if withPyGUI + then [ pythonPackages.neovim_gui ] + else [ pythonPackages.neovim ] + ) ++ extraPythonPackages; ignoreCollisions = true; }; @@ -103,6 +108,9 @@ let $out/bin/nvim '' + optionalString withPython '' ln -s ${pythonEnv}/bin/python $out/bin/nvim-python + '' + optionalString withPyGUI '' + makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ + --prefix PATH : "$out/bin" '' + optionalString withPython3 '' ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 '' + optionalString (withPython || withPython3) '' diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index fda51dc24019..8f0c560f47d1 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk }: +{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }: let version = "0.98.110"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { name = "RStudio-${version}"; - buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk ]; + buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk makeWrapper ]; src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; @@ -61,6 +61,10 @@ stdenv.mkDerivation { cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ]; + postInstall = '' + wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin + ''; + meta = with stdenv.lib; { description = "Set of integrated tools for the R language"; homepage = http://www.rstudio.com/; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index b26d27a8bc51..49c30a1f6d60 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,10 +1,15 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: +{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2, + pkexecPath ? "/var/setuid-wrappers/pkexec", libredirect, + gksuSupport ? false, gksu}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +assert gksuSupport -> gksu != null; let build = "3083"; libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] + ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; in let # package with just the binaries sublime = stdenv.mkDerivation { @@ -35,6 +40,9 @@ in let --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $i done + + # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary. + sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_text ''; installPhase = '' @@ -44,6 +52,10 @@ in let mkdir -p $out cp -prvd * $out/ + wrapProgram $out/sublime_text \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} + # Without this, plugin_host crashes, even though it has the rpath wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so ''; @@ -64,7 +76,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Sophisticated text editor for code, markup and prose"; homepage = https://www.sublimetext.com/; - maintainers = with maintainers; [ wmertens ]; + maintainers = with maintainers; [ wmertens demin-dmitriy ]; license = licenses.unfree; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index cb151548f79d..ab7b08d8186a 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig # apple frameworks -, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private }: +, Carbon, Cocoa }: stdenv.mkDerivation rec { name = "vim-${version}"; @@ -14,16 +14,10 @@ stdenv.mkDerivation rec { sha256 = "1m34s2hsc5lcish6gmvn2iwaz0k7jc3kg9q4nf30fj9inl7gaybs"; }; - # this makes maintainers very sad - # open source CF doesn't have anything NSArray-related, causing linking errors. the - # missing symbol is in system CoreFoundation. - NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin - "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; - enableParallelBuilding = true; buildInputs = [ ncurses pkgconfig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private CoreData CoreServices Cocoa Foundation libobjc ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; nativeBuildInputs = [ gettext ]; configureFlags = [ diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index d5f5d6c672c1..7c68e94100f7 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb -, libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }: +, libxml2, makeWrapper, pkgconfig, saneBackends, systemd, vala }: -let version = "3.18.1"; in +let version = "3.19.1"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "1i37j36kbn1h8yfzcvbis6f38xz2nj5512ls3gb0j5na0bvja2cw"; - url = "https://launchpad.net/simple-scan/3.18/${version}/+download/${name}.tar.xz"; + sha256 = "1d2a8cncq36ly60jpz0fzdw1lgxynl6lyrlw0q66yijlxqn81ynr"; + url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; - buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 packagekit - saneBackends systemd vala ]; + buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends + systemd vala ]; nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 4bae82976af2..b10cca0e7bcb 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -281,7 +281,7 @@ let buildInputs = [ scope.canberra ]; nativeBuildInputs = [ scope.pkgconfig ]; # cmake does not detect path to `ilmbase` - NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR -I${pkgs.glib}/include/glib-2.0 -I${pkgs.glib}/lib/glib-2.0/include"; # some components of this package have been replaced in other packages meta = { priority = 10; }; }; diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index a5cc1ae09328..e7817dc5b524 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.7.1"; + version = "3.7.8"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "0kjqav1rdyi60vq85djmigyrgh606ga625icwj15iarlqwzv29rb"; + sha256 = "0wj1rp8fdrmsfqbcaicvfxk71vkd9hcczmb1vrnvfzypnmacn6gy"; }; buildInputs = [ diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index eafa5c104058..4c0e091bf653 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.5"; + name = "gphoto2-2.5.8"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1d0lvp5gsrss72597wixhgh8prcw4g7izfg3zdzzsswjgnlsxsal"; + sha256 = "0kgfql6c64ha1gahjdwlqhmkslnfywmc2fkys4c5682zv4awvax9"; }; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix new file mode 100644 index 000000000000..1a46b7c7afb2 --- /dev/null +++ b/pkgs/applications/misc/jp2a/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libjpeg }: + +stdenv.mkDerivation rec { + version = "1.0.6"; + name = "jp2a-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/jp2a/${name}.tar.gz"; + sha256 = "076frk3pa16s4r1b10zgy81vdlz0385zh3ykbnkaij25jn5aqc09"; + }; + + makeFlags = "PREFIX=$(out)"; + + buildInputs = [ libjpeg ]; + + meta = with stdenv.lib; { + homepage = https://csl.name/jp2a/; + description = "A small utility that converts JPG images to ASCII."; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index f1e2467362cc..ac566c9609be 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgs, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.6.0"; + version = "0.6.3"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "1ag6p416iibwgvijjc8bwyrssxw3s3j559700xfgp10vj0nqk1hb"; + sha256 = "1dn1v4ycgqbq8vknz1dy710asq8cizxmzaynn69xknwkpgda7fm9"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix deleted file mode 100644 index 135291a14905..000000000000 --- a/pkgs/applications/misc/librecad/2.0.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }: - -stdenv.mkDerivation rec { - version = "2.0.8"; - name = "librecad-${version}"; - - src = fetchurl { - url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}"; - name = name + ".tar.gz"; - sha256 = "110vn1rvzidg8k6ifz1zws2wsn4cd05xl5ha0hbff2ln7izy84zc"; - }; - - patchPhase = '' - sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh - sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp - ''; - - configurePhase = '' - qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev} - ''; - - installPhase = '' - mkdir -p $out/bin $out/share - cp -R unix/librecad $out/bin - cp -R unix/resources $out/share/librecad - ''; - - buildInputs = [ qt4 muparser which boost ]; - nativeBuildInputs = [ pkgconfig ]; - - enableParallelBuilding = true; - - meta = { - description = "A 2D CAD package based upon Qt"; - homepage = http://librecad.org; - repositories.git = git://github.com/LibreCAD/LibreCAD.git; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index b2960e9f47d4..135291a14905 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchurl, qt4, muparser, which}: +{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }: -stdenv.mkDerivation { - name = "librecad-1.0.4"; +stdenv.mkDerivation rec { + version = "2.0.8"; + name = "librecad-${version}"; src = fetchurl { - url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.4; - name = "librecad-1.0.4.tar.gz"; - sha256 = "00nzbijw7pn1zkj4256da501xcm6rkcvycpa79y6dr2p6c43yc6m"; + url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}"; + name = name + ".tar.gz"; + sha256 = "110vn1rvzidg8k6ifz1zws2wsn4cd05xl5ha0hbff2ln7izy84zc"; }; patchPhase = '' sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh - sed -i -e s,/usr/share,$out/share, src/lib/engine/rs_system.cpp + sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp ''; - configurePhase = "qmake PREFIX=$out"; + configurePhase = '' + qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev} + ''; installPhase = '' mkdir -p $out/bin $out/share @@ -22,11 +25,15 @@ stdenv.mkDerivation { cp -R unix/resources $out/share/librecad ''; - buildInputs = [ qt4 muparser which ]; + buildInputs = [ qt4 muparser which boost ]; + nativeBuildInputs = [ pkgconfig ]; + + enableParallelBuilding = true; meta = { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; + repositories.git = git://github.com/LibreCAD/LibreCAD.git; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 55de14257878..dee0f92822a2 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.77"; + version = "0.7.78"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn"; + sha256 = "0458rxla3nhw9rbb2psak8qvxwr0drfhdl82k6wvb3a38xb0qij3"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 5c6f3f9a148a..1bf10e07ee78 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.77"; + version = "0.7.78"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn"; + sha256 = "0458rxla3nhw9rbb2psak8qvxwr0drfhdl82k6wvb3a38xb0qij3"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index d6a0bfcd1205..b407c739c703 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,18 +1,18 @@ -{ stdenv, python27Packages, fetchgit }: -let - py = python27Packages; -in -py.buildPythonPackage rec { - name = "printrun"; +{ stdenv, python27Packages, fetchFromGitHub }: - src = fetchgit { - url = "https://github.com/kliment/Printrun"; - rev = "2299962bb338d3f4335b97211ee609ebaea008f7"; # printrun-20140801 - sha256 = "19nay7xclm36x56hpm87gw4ca6rnygpqaw5ypbmrz0hyxx140abj"; +python27Packages.buildPythonPackage rec { + name = "printrun-20150310"; + + src = fetchFromGitHub { + owner = "kliment"; + repo = "Printrun"; + rev = name; + sha256 = "09ijv8h4k5h15swg64s7igamvynawz7gdi7hiymzrzywdvr0zwsa"; }; - propagatedBuildInputs = with py; [ wxPython30 pyserial dbus psutil - numpy pyopengl pyglet cython ]; + propagatedBuildInputs = with python27Packages; [ + wxPython30 pyserial dbus psutil numpy pyopengl pyglet cython + ]; doCheck = false; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index e768a692f594..3d5c93c61a62 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz"; - sha256 = "1mmncvamvwr3hizc1jgpb5kscl9idmrfd2785jhwi87q11wjrwxz"; + sha256 = "a61a29ddd5a874fcdcb915dbc9d91e10787be22d794cc8ebb2ba3cff27030c67"; }; buildInputs = [ git gnupg makeWrapper pass qt5.base ]; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 454bc48afe9b..5899708a6825 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig -, libX11, libXinerama, libXft, pango -, i3Support ? false, i3 +, libX11, libXinerama, libXft, pango, cairo +, libstartup_notification, i3Support ? false, i3 }: stdenv.mkDerivation rec { name = "rofi-${version}"; - version = "0.15.8"; + version = "0.15.10"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz"; - sha256 = "1qhj8xrxfnzy16g577w0zxg1cy885rbqydlbbxgfk0dpjvq70lq6"; + sha256 = "0wwdc9dj8qfmqv4pcllq78h38hqmz9s3hqf71fsk71byiid69ln9"; }; buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango + cairo libstartup_notification ] ++ stdenv.lib.optional i3Support i3; preConfigure = '' diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index bfbc66cc0b9b..1a5fa03c54ca 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "1.2.7"; + version = "1.2.9"; name = "slic3r-${version}"; src = fetchgit { url = "git://github.com/alexrj/Slic3r"; rev = "refs/tags/${version}"; - sha256 = "1bybbl8b0lfh9wkn1k9cxd11hlc5064wzh0fk6zdmc9vnnay399i"; + sha256 = "1xwl8ay5m6pwrrnhbmnmpwyh4wc8hsi4ldzgq98f4bh6szj6jh4z"; }; buildInputs = with perlPackages; [ perl makeWrapper which diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 7f3ca4223235..97acc18211e9 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "taskwarrior-${version}"; - version = "2.4.4"; + version = "2.5.0"; enableParallelBuilding = true; src = fetchurl { url = "http://www.taskwarrior.org/download/task-${version}.tar.gz"; - sha256 = "7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b"; + sha256 = "0dj66c4pwdmfnzdlm1r23gqim6banycyzvmq266114v9b90ng3jd"; }; nativeBuildInputs = [ cmake libuuid gnutls ]; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 5c8c25553ee1..e662e9bf836b 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -37,7 +37,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ goibhniu chaoflow aszlig ]; + maintainers = with maintainers; [ chaoflow aszlig ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 965c7885416c..da962c6b7688 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -45,10 +45,11 @@ in stdenv.mkDerivation { ''; patches = - if versionOlder version "45.0.0.0" - then singleton ./nix_plugin_paths_44.patch - else singleton ./nix_plugin_paths_46.patch ++ - optional (!versionOlder version "46.0.0.0") ./build_fixes_46.patch; + (if versionOlder version "45.0.0.0" + then singleton ./nix_plugin_paths_44.patch + else singleton ./nix_plugin_paths_46.patch ++ + optional (!versionOlder version "46.0.0.0") ./build_fixes_46.patch) ++ + singleton ./widevine.patch; patchPhase = let diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}"; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 974a4ecf27b2..3ce3dd813c1f 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -13,9 +13,9 @@ sha256bin64 = "1m8vv3qh79an3719afz7n2ijqanf4cyxz2q4bzm512x52z5zipl7"; }; stable = { - version = "46.0.2490.71"; - sha256 = "1dnwhwvn39x8lm1jszjn8y7vy478zy75gm696rr2dvk4kqj1hjyd"; - sha256bin32 = "1v1acg32dzmkydzy7sh6xjbzqar052iw8x8hql2yjz5kxznir4sf"; - sha256bin64 = "15ladhxiym760mid5zq09vp73irzwlp31br9yqslzgv4460ma3np"; + version = "45.0.2454.101"; + sha256 = "1yw5xlgy5hd3iwcyf0sillq5p367fcpvp4mizpmv52cwmv52ss0v"; + sha256bin32 = "1ll8lmkmx7v74naz1vcnrwk5ighh0skfcb66jkq4kgxrb5fjgwm5"; + sha256bin64 = "1cwbd3n77dnbfnrfr8g0qng9xkgvz6y7mx489gpx1wsamgi42bzj"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/source/widevine.patch b/pkgs/applications/networking/browsers/chromium/source/widevine.patch new file mode 100644 index 000000000000..45048cada875 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/widevine.patch @@ -0,0 +1,12 @@ +diff -upr chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h +--- chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h 2015-04-15 01:18:59.000000000 +0300 ++++ chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h 2015-04-15 09:09:49.157260050 +0300 +@@ -14,4 +14,8 @@ + // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available + // as a string, e.g., "1.0.123.456"). + ++#include "third_party/widevine/cdm/widevine_cdm_common.h" ++#define WIDEVINE_CDM_AVAILABLE ++#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@" ++ + #endif // WIDEVINE_CDM_VERSION_H_ diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 4b94ecdcf5fa..5f790fc9cead 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.535"; + version = "11.2.202.540"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "13fy842plbnv4w081sbhga0jrpbwz8yydg49c2v96l2marmzw9zp"; + sha256 = "0zya9n5h669wbna182ig6dl4yf5sv4lvqk19rqhcwv3i718b0ai6"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0z99nz1k0cf86dgs367ddxfnf05m32psidpmdzi5qiqaj10h6j6s"; + sha256 = "1n8ik5f257s388ql7gkmfh1iqil0g4kzxh3zsv2x8r6ssrvpq1by"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 08a4b0dacbd9..2b3296d502d7 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -20,11 +20,11 @@ let # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.8.9"; + version = "3.10.9"; sha256 = { - "x86_64-linux" = "1mdhf57bqi4vihbzv5lz8zk4n576c1qjm7hzcq4f5qvkdsmp5in2"; - "i686-linux" = "0gighh782jjmlgqgbw2d00a3ri5h3inqdik7v70f1yygvkr7awy8"; + "x86_64-linux" = "1kg6x1z8if63s15464xiz59qwncb5xhv108icicb5s2yhjzzyi29"; + "i686-linux" = "172x9f7x425w5ljr6xa0srvv19qysmvr3gs3jkbmnxfwrfxyxf79"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 51b5df176ccf..6c8df2fcd65b 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml }: -let version = "3.14.0"; in +let version = "3.14.1"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1zbrsmrqnxzj6cnf2y1sx384nv6c8l3338ynazjfbiqbyfs5lf4j"; + sha256 = "0v6lb7miy6jbnswii816na8818xqxlvs1vadnii21xfmrsv7225i"; }; configureFlags = [ diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 4e7057116773..80f8eb840f13 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,56 +1,67 @@ -{ stdenv, fetchurl, ant, jdk }: +{ stdenv, fetchurl, fetchgit, ant, jdk, makeWrapper }: let - # The .gitmodules in freenet-official-20130413-eccc9b3198 - # points to freenet-contrib-staging-ce3b7d5 freenet_ext = fetchurl { url = https://downloads.freenetproject.org/latest/freenet-ext.jar; - sha1 = "507ab3f6ee91f47c187149136fb6d6e98f9a8c7f"; + sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij"; }; bcprov = fetchurl { - url = http://www.bouncycastle.org/download/bcprov-jdk15on-148.jar; - sha256 = "12129q8rmqwlvj6z4j0gc3w0hq5ccrkf2gdlsggp3iws7cp7wjw0"; + url = https://downloads.freenetproject.org/latest/bcprov-jdk15on-152.jar; + sha256 = "0wqpdcvcfh939fk8yr033ijzr1vjbp6ydlnv5ly8jiykwj0x3i0d"; }; + seednodes = fetchurl { + url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref; + sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9"; + }; + version = "build01470"; in stdenv.mkDerivation { - name = "freenet-20130413-eccc9b3198"; + name = "freenet-${version}"; + - src = fetchurl { - url = https://github.com/freenet/fred-official/tarball/eccc9b3198; - name = "freenet-official-eccc9b3198.tar.gz"; - sha256 = "0x0s8gmb95770l7968r99sq0588vf0n1687ivc2hixar19cw620y"; + src = fetchgit { + url = https://github.com/freenet/fred; + rev = "refs/tags/${version}"; + sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746"; }; patchPhase = '' cp ${freenet_ext} lib/freenet/freenet-ext.jar - cp ${bcprov} lib/bcprov.jar + cp ${bcprov} lib/bcprov-jdk15on-152.jar sed '/antcall.*-ext/d' -i build.xml + sed 's/@unknown@/${version}/g' -i build-clean.xml ''; - buildInputs = [ ant jdk ]; + buildInputs = [ ant jdk makeWrapper ]; buildPhase = "ant package-only"; + freenetWrapper = ./freenetWrapper; + installPhase = '' mkdir -p $out/share/freenet $out/bin - cp lib/bcprov.jar $out/share/freenet + cp lib/bcprov-jdk15on-152.jar $out/share/freenet cp lib/freenet/freenet-ext.jar $out/share/freenet cp dist/freenet.jar $out/share/freenet - cat <<EOF > $out/bin/freenet + cat <<EOF > $out/bin/freenet.wrapped #!${stdenv.shell} - ${jdk.jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\ + ${jdk.jre}/bin/java -cp $out/share/freenet/bcprov-jdk15on-152.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\ -Xmx1024M freenet.node.NodeStarter EOF - chmod +x $out/bin/freenet + chmod +x $out/bin/freenet.wrapped + makeWrapper $freenetWrapper $out/bin/freenet \ + --set FREENET_ROOT "$out" \ + --set FREENET_SEEDNODES "${seednodes}" ''; meta = { description = "Decentralised and censorship-resistant network"; homepage = https://freenetproject.org/; license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.doublec ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper new file mode 100755 index 000000000000..c1667f158b97 --- /dev/null +++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper @@ -0,0 +1,16 @@ +#! /usr/bin/env bash + +export FREENET_HOME="$HOME/.local/share/freenet" +if [ -n "$XDG_DATA_HOME" ] + then export FREENET_HOME="$XDG_DATA_HOME/freenet" +fi + +if [ ! -d $FREENET_HOME ]; then + mkdir -p $FREENET_HOME +fi + +cp -u $FREENET_SEEDNODES $FREENET_HOME/seednodes.fref +chmod u+rw $FREENET_HOME/seednodes.fref + +cd $FREENET_HOME +exec $FREENET_ROOT/bin/freenet.wrapped "$@" diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix index 7e97a31c3a92..5de60180c69d 100644 --- a/pkgs/applications/networking/remote/teamviewer/10.nix +++ b/pkgs/applications/networking/remote/teamviewer/10.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, -wineUnstable, makeWrapper, libXau , bash, patchelf, config, -acceptLicense ? false }: +wineUnstable, makeWrapper, libXau , patchelf, config }: with stdenv.lib; @@ -30,22 +29,23 @@ stdenv.mkDerivation { rm -R $out/share/teamviewer/tv_bin/wine/{bin,lib,share} cat > $out/bin/teamviewer << EOF - #!${bash}/bin/sh + #!${stdenv.shell} export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} export PATH=${topath}\''${PATH:+:\$PATH} $out/share/teamviewer/tv_bin/script/teamviewer "\$@" EOF chmod +x $out/bin/teamviewer - patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/ - ${optionalString acceptLicense " - cat > $out/share/teamviewer/config/global.conf << EOF - [int32] EulaAccepted = 1 - [int32] EulaAcceptedRevision = 6 - EOF - "} + rm -rf $out/share/teamviewer/logfiles $out/share/teamviewer/config + ln -sv /var/tmp/teamviewer10/logs/ $out/share/teamviewer/logfiles + ln -sv /var/tmp/teamviewer10/config/ $out/share/teamviewer/config + ''; + + # the fixupPhase undoes the rpath patch + postFixup = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd + patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd ''; meta = { diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 8e01d30c44fe..cddde10f9163 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnumeric-1.12.23"; + name = "gnumeric-1.12.24"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "0lcmw4jrfg9y2fhx13xw8w85vi7bcmgyn2sdjxi21xkh3szlqiq0"; + sha256 = "0lcm8k0jb8rd5y4ii803f21nv8rx6gc3mmdlrj5h0rkkn9qm57f5"; }; configureFlags = "--disable-component"; diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix new file mode 100644 index 000000000000..5ee0edb4b5e5 --- /dev/null +++ b/pkgs/applications/taxes/aangifte-2013-wa/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: + +stdenv.mkDerivation { + name = "aangifte2013-wa"; + + src = fetchurl { + url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2013_linux.tar.gz; + sha256 = "1bx6qnxikzpzrn8r66qxcind3k9yznwgp05dm549ph0w4rjbhgc9"; + }; + + dontStrip = true; + dontPatchELF = true; + + buildInputs = [ makeWrapper ]; + + buildPhase = + '' + for i in bin/*; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ + $i + done + ''; + + installPhase = + '' + mkdir -p $out + cp -prvd * $out/ + wrapProgram $out/bin/wa2013ux --prefix PATH : ${xdg_utils}/bin \ + --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 + ''; + + meta = { + description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)"; + url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix new file mode 100644 index 000000000000..78bb8214257f --- /dev/null +++ b/pkgs/applications/taxes/aangifte-2014-wa/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: + +stdenv.mkDerivation { + name = "aangifte2014-wa"; + + src = fetchurl { + url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2014_linux.tar.gz; + sha256 = "0ckwk190vyvwgv8kq0xxsxvm1kniv3iip4l5aycjx1wcyic2289x"; + }; + + dontStrip = true; + dontPatchELF = true; + + buildInputs = [ makeWrapper ]; + + buildPhase = + '' + for i in bin/*; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ + $i + done + ''; + + installPhase = + '' + mkdir -p $out + cp -prvd * $out/ + wrapProgram $out/bin/wa2014ux --prefix PATH : ${xdg_utils}/bin \ + --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 + ''; + + meta = { + description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)"; + url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix new file mode 100644 index 000000000000..0151cca52b2c --- /dev/null +++ b/pkgs/applications/taxes/aangifte-2014/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: + +stdenv.mkDerivation { + name = "aangifte2014-1"; + + src = fetchurl { + url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2014_linux.tar.gz; + sha256 = "1lkpfn9ban122hw27vvscdlg3933i2lqcdhp7lk26f894jbwzq3j"; + }; + + dontStrip = true; + dontPatchELF = true; + + buildInputs = [ makeWrapper ]; + + buildPhase = + '' + for i in bin/*; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ + $i + done + ''; + + installPhase = + '' + mkdir -p $out + cp -prvd * $out/ + wrapProgram $out/bin/ib2014ux --prefix PATH : ${xdg_utils}/bin \ + --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 + ''; + + meta = { + description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)"; + url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 6a365dc69a51..6d832f9778f0 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -71,6 +71,8 @@ rec { tig = callPackage ./tig { }; + transcrypt = callPackage ./transcrypt { }; + hub = import ./hub { inherit go; inherit stdenv fetchgit; diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix new file mode 100644 index 000000000000..2f42705c2b86 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, git, openssl }: + +stdenv.mkDerivation rec { + name = "transcrypt-0.9.7"; + + src = fetchurl { + url = https://github.com/elasticdog/transcrypt/archive/v0.9.7.tar.gz; + sha256 = "0pgrf74wdc7whvwz7lkkq6qfk38n37dc5668baq7czgckibvjqdh"; + }; + + buildInputs = [ git openssl ]; + + installPhase = '' + install -m 755 -D transcrypt $out/bin/transcrypt + install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1 + install -m 644 -D contrib/bash/transcrypt $out/share/bash-completion/completions/transcrypt + install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt + ''; + + meta = with stdenv.lib; { + description = "Transparently encrypt files within a Git repository"; + longDescription = '' + A script to configure transparent encryption of sensitive files stored in + a Git repository. Files that you choose will be automatically encrypted + when you commit them, and automatically decrypted when you check them + out. The process will degrade gracefully, so even people without your + encryption password can safely commit changes to the repository's + non-encrypted files. + ''; + homepage = https://github.com/elasticdog/transcrypt; + license = licenses.mit; + maintainers = [ maintainers.elasticdog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 485d8c54eb36..89773be9adaf 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -7,11 +7,11 @@ assert stdenv ? glibc; assert faacSupport -> faac != null; stdenv.mkDerivation { - name = "avidemux-2.5.6"; + name = "avidemux-2.6.9"; src = fetchurl { - url = mirror://sourceforge/avidemux/avidemux_2.5.6.tar.gz; - sha256 = "12wvxz0n2g85f079d8mdkkp2zm279d34m9v7qgcqndh48cn7znnn"; + url = mirror://sourceforge/avidemux/avidemux_2.6.9.tar.gz; + sha256 = "01jhgricd7m9hdhr22yrdjfrnl41zccm2yxw7gfb02mwcswvswy0"; }; buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { homepage = http://fixounet.free.fr/avidemux/; description = "Free video editor designed for simple video editing tasks"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric jagajaga ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 142822023fb9..e1dc182ba0b9 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -43,11 +43,11 @@ let }; in stdenv.mkDerivation rec { name = "kodi-" + version; - version = "15.1"; + version = "15.2"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "0187qxzyq4nhzbcwbhi71j4bl5k7pwjryhklil90gy5ziw6n3ckj"; + sha256 = "043i0f1crx9glwxil4xm45z5kxpkrx316gi4ir4d3rbd5safp2nx"; }; buildInputs = [ diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index f41d0e839ac1..ed2fb0ac8869 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -59,13 +59,13 @@ in plugin = "genesis"; namespace = "plugin.video.genesis"; - version = "4.0.1"; + version = "5.1.3"; src = fetchFromGitHub { owner = "lambda81"; repo = "lambda-addons"; - rev = "34af083980598177684eeb6e1e73da336b84575a"; - sha256 = "1fh3j4ymkrx9flpvnlyjp1q4avfmjv5a6yfwl3cmqnslkkp6kn9n"; + rev = "f2cd04f33af88d60e1330573bbf2ef9cee7f0a56"; + sha256 = "0z0ldckqqif9v5nhnjr5n2495cm3z9grjmrh7czl4xlnq4bvviqq"; }; meta = with stdenv.lib; { @@ -81,13 +81,13 @@ in plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.14"; + version = "4.0.15"; src = fetchFromGitHub { owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "a6041aa6cf8f8461c0ebb093d901320822539094"; - sha256 = "1nxa2855i1if4vsflhb88i9s12flp2yzgan2wzdv2117cmll4pvd"; + rev = "3b926898b7007827b469ecb1c27ede4238fd26f6"; + sha256 = "1bx2c3z8rbkk75hykpmls956hfkwvsm4d8gvlrh53s8zimlwgv7k"; }; meta = with stdenv.lib; { @@ -105,4 +105,4 @@ in }; -} \ No newline at end of file +} diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index 4517f27ce7dc..d4221e8f57eb 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: stdenv.mkDerivation { - name = "qarte-2.3.0"; + name = "qarte-2.4.0"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; - rev = "148"; - sha256 = "0bp2qbl2g3dygmb31lwlarki9lybkb9zxixda4lwrlz628w93fxh"; + rev = "150"; + sha256 = "0fj11jx9l5qi968c906rrksdic7w4yj414m47k6axlb4v6ghdnar"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/virtualization/nova/client.nix b/pkgs/applications/virtualization/nova/client.nix deleted file mode 100644 index bcc72d19bb39..000000000000 --- a/pkgs/applications/virtualization/nova/client.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchurl, pythonPackages }: - -pythonPackages.buildPythonPackage rec { - name = "novaclient-2012.1"; - namePrefix = ""; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-novaclient/python-${name}.tar.gz"; - md5 = "8f53a308e08b2af4645281917be77ffc"; - }; - - pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 ]; - - buildInputs = [ pythonPackages.mock pythonPackages.nose ]; - - meta = { - homepage = https://github.com/rackspace/python-novaclient; - description = "Client library and command line tool for the OpenStack Nova API"; - broken = true; - }; -} diff --git a/pkgs/applications/virtualization/nova/convert.patch b/pkgs/applications/virtualization/nova/convert.patch deleted file mode 100644 index f11c9a7fc4f2..000000000000 --- a/pkgs/applications/virtualization/nova/convert.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' nova-2011.2-orig//bin/nova-manage nova-2011.2//bin/nova-manage ---- nova-2011.2-orig//bin/nova-manage 2011-04-15 04:57:52.000000000 +0200 -+++ nova-2011.2//bin/nova-manage 2011-06-09 18:28:39.063299654 +0200 -@@ -1009,7 +1009,7 @@ - if (FLAGS.image_service == 'nova.image.local.LocalImageService' - and directory == os.path.abspath(FLAGS.images_path)): - new_dir = "%s_bak" % directory -- os.move(directory, new_dir) -+ os.rename(directory, new_dir) - os.mkdir(directory) - directory = new_dir - for fn in glob.glob("%s/*/info.json" % directory): diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix deleted file mode 100644 index 0023cf44f33b..000000000000 --- a/pkgs/applications/virtualization/nova/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl, novaclient }: - -with stdenv.lib; - -let version = "2011.2"; in - -stdenv.mkDerivation rec { - name = "nova-${version}"; - - src = fetchurl { - url = "http://launchpad.net/nova/cactus/${version}/+download/nova-${version}.tar.gz"; - sha256 = "1s2w0rm332y9x34ngjz8sys9sbldg857rx9d6r3nb1ik979fx8p7"; - }; - - patches = - [ ./convert.patch ]; - - pythonPath = with pythonPackages; - [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes - paste_deploy m2crypto ipy twisted sqlalchemy_migrate - distutils_extra simplejson readline glance cheetah lockfile httplib2 - # !!! should libvirt be a build-time dependency? Note that - # libxml2Python is a dependency of libvirt.py. - libvirt libxml2Python - novaclient - ]; - - buildInputs = - [ pythonPackages.python - pythonPackages.wrapPython - pythonPackages.mox - intltool - ] ++ pythonPath; - - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - preConfigure = - '' - # Set the built-in state location to something sensible. - sed -i nova/flags.py \ - -e "/DEFINE.*'state_path'/ s|../|/var/lib/nova|" - - substituteInPlace nova/virt/images.py --replace /usr/bin/curl ${curl}/bin/curl - - substituteInPlace nova/api/ec2/cloud.py \ - --replace 'sh genrootca.sh' $out/libexec/nova/genrootca.sh - ''; - - buildPhase = "python setup.py build"; - - installPhase = - '' - p=$(toPythonPath $out) - export PYTHONPATH=$p:$PYTHONPATH - mkdir -p $p - python setup.py install --prefix=$out - - # Nova doesn't like to be called ".nova-foo-wrapped" because it - # computes some stuff from its own argv[0]. So put the wrapped - # programs in $out/libexec under their original names. - mkdir -p $out/libexec/nova - - wrapProgram() { - local prog="$1" - local hidden=$out/libexec/nova/$(basename "$prog") - mv $prog $hidden - makeWrapper $hidden $prog "$@" - } - - wrapPythonPrograms - - cp -prvd etc $out/etc - - # Nova makes some weird assumptions about where to find its own - # programs relative to the Python directory. - ln -sfn $out/bin $out/lib/${pythonPackages.python.libPrefix}/site-packages/bin - - # Install the certificate generation script. - cp nova/CA/genrootca.sh $out/libexec/nova/ - cp nova/CA/openssl.cnf.tmpl $out/libexec/nova/ - - # Allow nova-manage etc. to find the proper configuration file. - ln -s /etc/nova/nova.conf $out/libexec/nova/nova.conf - ''; - - doCheck = false; # !!! fix - - checkPhase = "python setup.py test"; - - meta = { - homepage = http://nova.openstack.org/; - description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller"; - broken = true; - }; -} diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix new file mode 100644 index 000000000000..51d58b896d1e --- /dev/null +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -0,0 +1,67 @@ + +{ stdenv, fetchurl, pythonPackages, sqlite, which, strace }: + +pythonPackages.buildPythonPackage rec { + name = "glance-${version}"; + version = "11.0.0"; + namePrefix = ""; + + PBR_VERSION = "${version}"; + + src = fetchurl { + url = "https://github.com/openstack/glance/archive/${version}.tar.gz"; + sha256 = "05rz1lmzdmpnw8sf87vvi0l6q9g6s840z934zyinw17yfcvmqrdg"; + }; + + # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt + propagatedBuildInputs = with pythonPackages; [ + pbr sqlalchemy_1_0 anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate + httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste + jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python + WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile + + # oslo componenets + oslo-config oslo-context oslo-concurrency oslo-service oslo-utils oslo-db + oslo-i18n oslo-log oslo-messaging oslo-middleware oslo-policy oslo-serialization + ]; + + buildInputs = with pythonPackages; [ + Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8 + testresources testscenarios testtools psutil_1 oslotest psycopg2 MySQL_python + sqlite which strace + ]; + + patchPhase = '' + # it's not a test, but a class mixin + sed -i 's/ImageCacheTestCase/ImageCacheMixin/' glance/tests/unit/test_image_cache.py + + # these require network access, see https://bugs.launchpad.net/glance/+bug/1508868 + sed -i 's/test_get_image_data_http/noop/' glance/tests/unit/common/scripts/test_scripts_utils.py + sed -i 's/test_set_image_data_http/noop/' glance/tests/unit/common/scripts/image_import/test_main.py + sed -i 's/test_create_image_with_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py + sed -i 's/test_upload_image_http_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py + + # TODO: couldn't figure out why this test is failing + sed -i 's/test_all_task_api/noop/' glance/tests/integration/v2/test_tasks_api.py + ''; + + postInstall = '' + # check all binaries don't crash + for i in $out/bin/*; do + case "$i" in + *glance-artifacts) # https://bugs.launchpad.net/glance/+bug/1508879 + : + ;; + *) + $i --help + esac + done + ''; + + meta = with stdenv.lib; { + homepage = http://glance.openstack.org/; + description = "Services for discovering, registering, and retrieving virtual machine images"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix new file mode 100644 index 000000000000..42a40f035982 --- /dev/null +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, pythonPackages, xmlsec, which }: + +pythonPackages.buildPythonPackage rec { + name = "keystone-${version}"; + version = "8.0.0"; + namePrefix = ""; + + PBR_VERSION = "${version}"; + + src = fetchurl { + url = "https://github.com/openstack/keystone/archive/${version}.tar.gz"; + sha256 = "1xbrs7xgwjzrs07zyxxcl2lq18dh582gd6lx1zzzji8c0qmffy0z"; + }; + + # remove on next version bump + patches = [ ./remove-oslo-policy-tests.patch ]; + + # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt + propagatedBuildInputs = with pythonPackages; [ + pbr webob eventlet greenlet PasteDeploy paste routes cryptography six + sqlalchemy_1_0 sqlalchemy_migrate stevedore passlib keystoneclient memcached + keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack + xmlsec MySQL_python + + # oslo + oslo-cache oslo-concurrency oslo-config oslo-context oslo-messaging oslo-db + oslo-i18n oslo-log oslo-middleware oslo-policy oslo-serialization oslo-service + oslo-utils + ]; + + buildInputs = with pythonPackages; [ + coverage fixtures mock subunit tempest-lib testtools testrepository + ldap ldappool webtest requests2 oslotest pep8 pymongo which + ]; + + postInstall = '' + # check all binaries don't crash + for i in $out/bin/*; do + $i --help + done + ''; + + meta = with stdenv.lib; { + homepage = http://keystone.openstack.org/; + description = "Authentication, authorization and service discovery mechanisms via HTTP"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix new file mode 100644 index 000000000000..bd0892299b32 --- /dev/null +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -0,0 +1,60 @@ + +{ stdenv, fetchurl, pythonPackages, xmlsec, which }: + +pythonPackages.buildPythonPackage rec { + name = "neutron-${version}"; + version = "7.0.0"; + namePrefix = ""; + + PBR_VERSION = "${version}"; + + src = fetchurl { + url = "https://github.com/openstack/neutron/archive/${version}.tar.gz"; + sha256 = "02ll081xly7zfjmgkal81fy3aplbnn5zgx8xfy3yy1nv3kfnyi40"; + }; + + # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt + propagatedBuildInputs = with pythonPackages; [ + pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2 + jinja2 keystonemiddleware netaddr retrying sqlalchemy_1_0 webob alembic six + stevedore pecan ryu networking-hyperv MySQL_python + + # clients + keystoneclient neutronclient novaclient + + # oslo components + oslo-concurrency oslo-config oslo-context oslo-db oslo-i18n oslo-log oslo-messaging + oslo-middleware oslo-policy oslo-rootwrap oslo-serialization oslo-service oslo-utils + oslo-versionedobjects + ]; + + buildInputs = with pythonPackages; [ + cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository + testtools testresources testscenarios webtest oslotest os-testr tempest-lib + ddt pep8 + ]; + + postInstall = '' + # requires extra optional dependencies + # TODO: package networking_mlnx, networking_vsphere, bsnstacklib, XenAPI + rm $out/bin/{neutron-mlnx-agent,neutron-ovsvapp-agent,neutron-restproxy-agent,neutron-rootwrap-xen-dom0} + + # check all binaries don't crash + for i in $out/bin/*; do + case "$i" in + *neutron-pd-notify|*neutron-rootwrap-daemon|*neutron-rootwrap) + : + ;; + *) + $i --help + esac + done + ''; + + meta = with stdenv.lib; { + homepage = http://neutron.openstack.org/; + description = "Virtual network service for Openstack"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix new file mode 100644 index 000000000000..da62f27541c8 --- /dev/null +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, pythonPackages, openssl, openssh }: + +pythonPackages.buildPythonPackage rec { + name = "nova-${version}"; + version = "12.0.0"; + namePrefix = ""; + + PBR_VERSION = "${version}"; + + src = fetchurl { + url = "https://github.com/openstack/nova/archive/${version}.tar.gz"; + sha256 = "175n1znvmy8f5vqvabc2fa4qy8y17685z4gzpq8984mdsdnpv21w"; + }; + + # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt + propagatedBuildInputs = with pythonPackages; [ + pbr sqlalchemy_1_0 boto decorator eventlet jinja2 lxml routes cryptography + webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr + netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six + stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql + keystonemiddleware MySQL_python + + # oslo components + oslo-rootwrap oslo-reports oslo-utils oslo-i18n oslo-config oslo-context + oslo-log oslo-serialization oslo-middleware oslo-db oslo-service oslo-messaging + oslo-concurrency oslo-versionedobjects + + # clients + cinderclient neutronclient glanceclient + ]; + + buildInputs = with pythonPackages; [ + coverage fixtures mock mox3 subunit requests-mock pillow oslosphinx + oslotest testrepository testresources testtools tempest-lib bandit + oslo-vmware pep8 barbicanclient ironicclient openssl openssh + ]; + + postInstall = '' + cp -prvd etc $out/etc + + # check all binaries don't crash + for i in $out/bin/*; do + case "$i" in + *nova-dhcpbridge*) + : + ;; + *nova-rootwrap*) + : + ;; + *) + $i --help + ;; + esac + done + ''; + + meta = with stdenv.lib; { + homepage = http://nova.openstack.org/; + description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch b/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch new file mode 100644 index 000000000000..3cdc27a2d2af --- /dev/null +++ b/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch @@ -0,0 +1,61 @@ +From 6016d017004acaae288312b196ef07ea98e9962d Mon Sep 17 00:00:00 2001 +From: Brant Knudson <bknudson@us.ibm.com> +Date: Mon, 12 Oct 2015 15:12:45 -0500 +Subject: [PATCH] Remove oslo.policy implementation tests from keystone + +oslo.policy 0.12.0 contains a change to use requests to do the http +check rather than urllib. This change caused keystone tests to fail +because the keystone tests were mocking urllib, making assumptions +about how oslo.policy is implemented. Keystone doesn't need to test +internal features of oslo.policy, so these tests are removed. + +Change-Id: I9d6e4950b9fe75cbb94100c8effdcec002642027 +Closes-Bug: 1505374 +--- + keystone/tests/unit/test_policy.py | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/keystone/tests/unit/test_policy.py b/keystone/tests/unit/test_policy.py +index b2f0e52..686e2b7 100644 +--- a/keystone/tests/unit/test_policy.py ++++ b/keystone/tests/unit/test_policy.py +@@ -16,10 +16,8 @@ + import json + import os + +-import mock + from oslo_policy import policy as common_policy + import six +-from six.moves.urllib import request as urlrequest + from testtools import matchers + + from keystone import exception +@@ -118,28 +116,6 @@ def test_enforce_good_action(self): + action = "example:allowed" + rules.enforce(self.credentials, action, self.target) + +- def test_enforce_http_true(self): +- +- def fakeurlopen(url, post_data): +- return six.StringIO("True") +- +- action = "example:get_http" +- target = {} +- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen): +- result = rules.enforce(self.credentials, action, target) +- self.assertTrue(result) +- +- def test_enforce_http_false(self): +- +- def fakeurlopen(url, post_data): +- return six.StringIO("False") +- +- action = "example:get_http" +- target = {} +- with mock.patch.object(urlrequest, 'urlopen', fakeurlopen): +- self.assertRaises(exception.ForbiddenAction, rules.enforce, +- self.credentials, action, target) +- + def test_templatized_enforcement(self): + target_mine = {'project_id': 'fake'} + target_not_mine = {'project_id': 'another'} diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 1d03eece46c8..790afe756450 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -2,47 +2,53 @@ , fetchurl, fetchFromGitHub }: let - coreosImageRelease = "738.1.0"; + coreosImageRelease = "794.1.0"; + coreosImageSystemdVersion = "222"; + stage1Flavour = "coreos"; in stdenv.mkDerivation rec { - version = "0.8.0"; + version = "0.10.0"; name = "rkt-${version}"; + BUILDDIR="build-${name}"; src = fetchFromGitHub { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0"; + sha256 = "1d9n00wkzib4v5mfl46f2mqc8zfpv33kqixifmv8p4azqv78cbxn"; }; - stage1image = fetchurl { + stage1BaseImage = fetchurl { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0"; + sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym"; }; buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ]; preConfigure = '' ./autogen.sh + configureFlagsArray=( + --with-stage1=${stage1Flavour} + --with-stage1-image-path=$out/stage1-${stage1Flavour}.aci + --with-coreos-local-pxe-image-path=${stage1BaseImage} + --with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion} + ); ''; preBuild = '' - # hack to avoid downloading image during build, this has been - # improved in rkt master - mkdir -p build-rkt-0.8.0/tmp/usr_from_coreos - cp -v ${stage1image} build-rkt-0.8.0/tmp/usr_from_coreos/pxe.img + export BUILDDIR ''; installPhase = '' mkdir -p $out/bin - cp -Rv build-rkt-${version}/bin/* $out/bin + cp -Rv $BUILDDIR/bin/* $out/bin ''; meta = with lib; { description = "A fast, composable, and secure App Container runtime for Linux"; - homepage = http://rkt.io; + homepage = https://github.com/coreos/rkt; license = licenses.asl20; - maintainers = with maintainers; [ ragge ]; + maintainers = with maintainers; [ ragge steveej ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index e3172dcaa3e7..0b1cf9ebc527 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlet greenlet gflags netaddr sqlalchemy carrot routes - paste_deploy m2crypto ipy twisted sqlalchemy_migrate + PasteDeploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 libvirt libxml2Python ipaddr vte libosinfo diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 6441bb884234..adcefe6004ac 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes - paste_deploy m2crypto ipy twisted sqlalchemy_migrate + PasteDeploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that - # libxml2Python is a dependency of libvirt.py. + # libxml2Python is a dependency of libvirt.py. libvirt libxml2Python urlgrabber ]; buildInputs = - [ pythonPackages.python + [ pythonPackages.python pythonPackages.wrapPython pythonPackages.mox intltool diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix new file mode 100644 index 000000000000..595f989ff4e8 --- /dev/null +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }: + +stdenv.mkDerivation rec { + name = "kbdd"; + + src = fetchgit { + url = https://github.com/qnikst/kbdd; + rev = "47dee0232f157cd865e43d92005a2ba107f6fd75"; + sha256 = "1b9a66d216326a9759cad26393fbf8259fe7a0c2dd1075047fc989f0e52d969f"; + }; + + buildInputs = [ pkgconfig xorg.libX11 dbus_glib autoreconfHook ]; + + meta = { + description = "Simple daemon and library to make per window layout using XKB"; + homepage = https://github.com/qnikst/kbdd; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.wedens ]; + }; +} |