diff options
Diffstat (limited to 'pkgs')
27 files changed, 245 insertions, 271 deletions
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index b3dd9f91ec8..191ec84f87b 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,38 +4,39 @@ , withQt5 ? false, qtbase }: +with stdenv.lib; + let - ver_branch = "1.19"; - version = "1.19.5"; + ver_branch = "1.22"; + version = "1.22.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0gbz8jk1ljh8rwgvldkiqma1k61sd27yh008228ahdqd5i2v1r1z"; + sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4"; }; - patches = [ ./fix-paths.patch ]; - + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt + pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt qt4 libaudit gcc6 - ] ++ stdenv.lib.optional withQt5 qtbase; + ] ++ optional withQt5 qtbase; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-tests" - ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" - ++ stdenv.lib.optional withQt5 "--enable-liblightdm-qt5"; + ] ++ optional (qt4 != null) "--enable-liblightdm-qt" + ++ optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" ]; - meta = with stdenv.lib; { + meta = { homepage = https://launchpad.net/lightdm; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/applications/display-managers/lightdm/fix-paths.patch deleted file mode 100644 index 56930418cac..00000000000 --- a/pkgs/applications/display-managers/lightdm/fix-paths.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/common/user-list.c b/common/user-list.c -index 792c6d3..57fbfb7 100644 ---- a/common/user-list.c -+++ b/common/user-list.c -@@ -331,7 +331,7 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal) - - value = g_key_file_get_string (config, "UserList", "hidden-shells", NULL); - if (!value) -- value = g_strdup ("/bin/false /usr/sbin/nologin"); -+ value = g_strdup ("/run/current-system/sw/bin/nologin"); - hidden_shells = g_strsplit (value, " ", -1); - g_free (value); - -diff --git a/src/seat.c b/src/seat.c -index f9b149d..9029742 100644 ---- a/src/seat.c -+++ b/src/seat.c -@@ -343,7 +343,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, - - /* Set POSIX variables */ - process_set_clear_environment (script, TRUE); -- process_set_env (script, "SHELL", "/bin/sh"); -+ process_set_env (script, "SHELL", "/run/current-system/sw/bin/sh"); - - /* Variables required for regression tests */ - if (g_getenv ("LIGHTDM_TEST_ROOT")) -@@ -354,7 +354,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, - process_set_env (script, "PATH", g_getenv ("PATH")); - } - else -- process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin"); -+ process_set_env (script, "PATH", "/run/current-system/sw/bin"); - - if (user) - { -diff --git a/src/session-child.c b/src/session-child.c -index e85f57d..93db0bd 100644 ---- a/src/session-child.c -+++ b/src/session-child.c -@@ -410,7 +410,7 @@ session_child_run (int argc, char **argv) - else - { - /* Set POSIX variables */ -- pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin"); -+ pam_putenv (pam_handle, "PATH=/run/current-system/sw/bin"); - pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username)); - pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username)); - pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user))); -diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c -index 47f1c10..cc82652 100644 ---- a/src/shared-data-manager.c -+++ b/src/shared-data-manager.c -@@ -68,7 +68,7 @@ delete_unused_user (gpointer key, gpointer value, gpointer user_data) - - gchar *path = g_build_filename (USERS_DIR, user, NULL); - gchar *quoted_path = g_shell_quote (path); -- gchar *cmd = g_strdup_printf ("/bin/rm -rf %s", quoted_path); -+ gchar *cmd = g_strdup_printf ("/run/current-system/sw/bin/rm -rf %s", quoted_path); - - g_spawn_command_line_async (cmd, &error); - if (error) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index fc0374985cd..39f3a12b90a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.80.0"; + version = "2.82.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1cgj30b0imv4gl12y1lcd07w3bx10sapclvjr78z78n7g32xp9ik"; + sha256 = "073iarhjsapqf1g8ji1w835biixybqq869flq58vkz37wjmray8k"; }; patches = [ diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix index 9dca8f983a4..3d567603359 100644 --- a/pkgs/applications/misc/dmenu2/default.nix +++ b/pkgs/applications/misc/dmenu2/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "A patched fork of the original dmenu - an efficient dynamic menu for X"; homepage = https://bitbucket.org/melek/dmenu2; - license = stdenv.lib.licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + license = licenses.mit; + maintainers = [ maintainers.cstrahan ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index a8d35680dbd..61b0357bb9d 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications ''; - meta = { + meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; description = "Multiplayer server browser for many Doom source ports"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.MP2E ]; }; } diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index 4a9c2b60006..170e2385d4a 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchgit, bzip2, qt4, qmake4Hook, libX11 }: +{ stdenv, fetchFromGitHub, bzip2, qt4, qmake4Hook, libX11 }: stdenv.mkDerivation rec { name = "evopedia-${version}"; version = "0.4.4"; - src = fetchgit { - url = https://github.com/evopedia/evopedia_qt; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "evopedia"; + repo = "evopedia_qt"; + rev = "v${version}"; sha256 = "0snp5qiywj306kfaywvkl7j34fivgxcb8dids1lzmbqq5xcpqqvc"; }; buildInputs = [ bzip2 qt4 libX11 ]; nativeBuildInputs = [ qmake4Hook ]; - meta = { + meta = with stdenv.lib; { description = "Offline Wikipedia Viewer"; homepage = http://www.evopedia.info; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.qknight ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix new file mode 100644 index 00000000000..e01956e3611 --- /dev/null +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchsvn +, wrapGAppsHook, makeWrapper, gettext +, python3Packages, gtk3, poppler_gi +, gnome3, gsettings_desktop_schemas, shared_mime_info, +}: + +python3Packages.buildPythonApplication rec { + name = "pdfshuffler-unstable-2017-02-26"; # no official release in 5 years + + src = fetchsvn { + url = "http://svn.gna.org/svn/pdfshuffler/trunk"; + rev = "20"; + sha256 = "1g20dy45xg5vda9y58d2b1gkczj44xgrfi59jx6hr62ynd3z0dfc"; + }; + + nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ]; + + buildInputs = [ + gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pycairo + pypdf2 + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + ''; + + doCheck = false; # no tests + + meta = with stdenv.lib; { + homepage = https://gna.org/projects/pdfshuffler/; + description = "Merge or split pdf documents and rotate, crop and rearrange their pages"; + platforms = platforms.linux; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix new file mode 100644 index 00000000000..a3fa8924df7 --- /dev/null +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -0,0 +1,45 @@ +{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK30, devicemapper, makeself, + wxGUI ? true +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "veracrypt-${version}"; + version = "1.19"; + + src = fetchurl { + url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.gz"; + sha256 = "111xs1zmic82lpn5spn0ca33q0g4za04a2k4cvjwdb7k3vcicq6v"; + }; + + # The source archive appears to be compressed twice ... + unpackPhase = + '' + gzip -dc $src | tar xz + cd Vera*/src + ''; + + nativeBuildInputs = [ makeself nasm pkgconfig ]; + buildInputs = [ fuse devicemapper ] + ++ optional wxGUI wxGTK30; + makeFlags = optionalString (!wxGUI) "NOGUI=1"; + + installPhase = + '' + mkdir -p $out/bin + cp Main/veracrypt $out/bin + mkdir -p $out/share/$name + cp License.txt $out/share/$name/LICENSE + mkdir -p $out/share/applications + sed "s,Exec=.*,Exec=$out/bin/veracrypt," Setup/Linux/veracrypt.desktop > $out/share/applications/veracrypt.desktop + ''; + + meta = { + description = "Free Open-Source filesystem on-the-fly encryption"; + homepage = https://veracrypt.codeplex.com/; + license = "VeraCrypt License"; + maintainers = with maintainers; [ dsferruzza ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index ae6ce3dd2c3..04d475f36f0 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,42 +1,36 @@ -{stdenv, fetchurl, makeWrapper, gtk2, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: +{ stdenv, fetchurl +, pkgconfig, wrapGAppsHook +, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk +, patches ? null +}: stdenv.mkDerivation rec { name = "surf-${version}"; - version="0.7"; + version = "2.0"; src = fetchurl { url = "http://dl.suckless.org/surf/surf-${version}.tar.gz"; - sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m"; + sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps"; }; - buildInputs = [ gtk2 makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ]; - # Allow users set their own list of patches inherit patches; - buildPhase = " make "; - - # `-lX11' to make sure libX11's store path is in the RPATH - NIX_LDFLAGS = "-lX11"; - preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; - preFixup = '' - wrapProgram "$out/bin/surf" \ - --prefix GIO_EXTRA_MODULES : ${glib_networking.out}/lib/gio/modules \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - description = "Simple web browser"; + meta = with stdenv.lib; { + description = "A simple web browser based on WebKit/GTK+"; longDescription = '' Surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties. - ''; + ''; homepage = http://surf.suckless.org; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = webkitgtk.meta.platforms; + maintainers = with maintainers; [ joachifm ]; }; } diff --git a/pkgs/applications/networking/browsers/surf/webkit2.nix b/pkgs/applications/networking/browsers/surf/webkit2.nix deleted file mode 100644 index 929bf7dbcb2..00000000000 --- a/pkgs/applications/networking/browsers/surf/webkit2.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchzip -, pkgconfig, wrapGAppsHook -, glib, glib_networking, gsettings_desktop_schemas, gtk2, libsoup, webkitgtk -, patches ? null -}: - -let - # http://git.suckless.org/surf/log/?h=surf-webkit2 - rev = "7e02344a615a61246ccce1c7f770e88fbd57756e"; - sha256 = "11f93fbjhl7nfgwkcc45lcm3x1wk5h87ap8fbw9w855021i57pp6"; - date = "2017-03-22"; -in - -stdenv.mkDerivation rec { - name = "surf-webkit2-${date}"; - - src = fetchzip { - url = "http://git.suckless.org/surf/snapshot/surf-${rev}.tar.gz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk2 libsoup webkitgtk ]; - - inherit patches; - - installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; - - meta = with stdenv.lib; { - description = "A simple web browser based on WebKit/GTK+"; - longDescription = '' - Surf is a simple web browser based on WebKit/GTK+. It is able to display - websites and follow links. It supports the XEmbed protocol which makes it - possible to embed it in another application. Furthermore, one can point - surf to another URI by setting its XProperties. - ''; - homepage = http://surf.suckless.org; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ joachifm ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 30fedec1a4b..c4cb25dfe98 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -6,7 +6,6 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "jitsi-${version}"; version = "2.10.5550"; @@ -15,7 +14,6 @@ stdenv.mkDerivation rec { sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d"; }; - patches = [ ./jitsi.patch ]; jitsiItem = makeDesktopItem { @@ -42,7 +40,8 @@ stdenv.mkDerivation rec { xorg.libXv ]); - buildInputs = [unzip ant jdk]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ ant jdk ]; buildPhase = ''ant make''; @@ -55,11 +54,11 @@ stdenv.mkDerivation rec { cp resources/install/generic/run.sh $out/bin/jitsi chmod +x $out/bin/jitsi substituteInPlace $out/bin/jitsi \ - --subst-var-by JAVA ${jdk}/bin/java \ - --subst-var-by EXTRALIBS ${gtk2.out}/lib + --subst-var-by JAVA ${jdk}/bin/java \ + --subst-var-by EXTRALIBS ${gtk2.out}/lib + sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi patchShebangs $out - - libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}" + libPath="$libPath:${jdk.home}/lib/${jdk.architecture}" find $out/ -type f -name '*.so' | while read file; do patchelf --set-rpath "$libPath" "$file" && \ patchelf --shrink-rpath "$file" @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.khumba ]; + maintainers = with maintainers; [ khumba ndowens ]; }; - } diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index a00aebef296..2be39df6147 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.6"; - rev = "ed729423ce548785834cdcaa21aab11ebc3a1b1a"; + version = "0.4.8"; + rev = "8e7484ed794d1aecb3e773e9003ae64c7b78bb87"; goPackagePath = "github.com/ipfs/go-ipfs"; extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "1wwzbps3ry3vlrr0iqhvxd44x0wi99dcp5hlxvh79dc0g9r7myfk"; + sha256 = "1h4n74n65z4sw3fqz8nfcrwisbvvwwfq69909w3kgrjsxs7505s5"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1b262k1lhb1g68l8hghly4pdrxx1c6wbv6ij6dg399zdwqzczl13"; + sha256 = "15jcg0wbm7g82fsmhc1vxrsszbxcghls3rsyv35n1hv5k5r5d5nh"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index aa4b83c59b5..3b1837d16f1 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "0.11.1"; - - # perl is needed here so patchShebangs can do its job - buildInputs = [perl makeWrapper]; + version = "0.11.4"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "1dw32c5i9mry6zr2a6h1369fhp1qbqimx04qgdmdnmn1imyck1h3"; + sha256 = "1za2rm8jzcdc6bkpl198nrqf5bc05nw53vlkk15nmmb9snnb69ig"; }; + # Perl is needed here for patchShebangs + nativeBuildInputs = [ perl makeWrapper ]; + buildPhase = null; installPhase = '' @@ -34,16 +34,14 @@ stdenv.mkDerivation rec { --prefix PATH : "${ncurses.out}/bin" ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/so-fancy/diff-so-fancy; description = "Good-looking diffs filter for git"; - license = stdenv.lib.licenses.mit; - + license = licenses.mit; + platforms = platforms.all; longDescription = '' diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index cf7f6b82ce2..2a9ea0715e0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,33 +1,21 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, gettext, git }: +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }: let inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock; in buildPythonApplication rec { name = "git-cola-${version}"; - version = "2.8"; + version = "2.10"; - src = fetchurl { - url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; - sha256 = "19ff7i0h5fznrkm17lp3xkxwkq27whhiil6y6bm16b1wny5hjqlr"; + src = fetchFromGitHub { + owner = "git-cola"; + repo = "git-cola"; + rev = "v${version}"; + sha256 = "067g0yya6718kxagf5qm59zizp0lizca4m3ih85y732i6rqpgwv8"; }; - buildInputs = [ git makeWrapper gettext ]; + buildInputs = [ git gettext ]; propagatedBuildInputs = [ pyqt4 sip pyinotify ]; - # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but - # "import __future__" must be placed above that. This removes the argv[0] line. - postFixup = '' - wrapPythonPrograms - - sed -i "$out/bin/.git-dag-wrapped" -e '{ - /import sys; sys.argv/d - }' - - sed -i "$out/bin/.git-cola-wrapped" -e '{ - /import sys; sys.argv/d - }' - ''; - doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 0774bbc9a62..7b36a142d15 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: -stdenv.mkDerivation { - name = "subgit-3.1.0"; +stdenv.mkDerivation rec { + name = "subgit-3.2.4"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ unzip makeWrapper ]; installPhase = '' mkdir $out; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = http://old.subgit.com/download/subgit-3.1.0.zip; - sha256 = "08qhpg6y2ziwplm0z1ghh1wfp607sw4hyb53a7qzfn759j5kcdrg"; + url = "http://subgit.com/download/${name}.zip"; + sha256 = "13r6hi2zk46bs3j17anfc85kszlwliv2yc16qx834b3v4w68hajw"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index f02c6138df7..48181040a75 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -1,6 +1,6 @@ { kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes -, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt +, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme }: kdeFramework { @@ -9,6 +9,6 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes - knotifications kservice kwidgetsaddons kwindowsystem libgcrypt + knotifications kservice kwidgetsaddons kwindowsystem libgcrypt gpgme ]; } diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 588d0b8dadc..f2f062785b6 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ] ++ libintlOrEmpty; + outputs = [ "out" "dev" ]; + doCheck = true; preCheck = "patchShebangs ./tests/"; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 2e51492f142..a28936fee49 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + + # Remove an unnecessary reference to movit.dev. + s=${movit.dev}/include + t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) + sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 5b255bd2d2b..1d56d58c68d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { ladspa-sdk ]; + outputs = [ "out" "dev" ]; + # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ @@ -31,6 +33,16 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + + # Remove an unnecessary reference to movit.dev. + s=${movit.dev}/include + t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) + sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" + + # Remove an unnecessary reference to movit.dev. + s=${qtbase.dev}/include + t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) + sed -i $out/lib/mlt/libmltqt.so -e "s|$s|$t|g" ''; passthru = { diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 11a9808392a..c0e065b3b55 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,54 +1,50 @@ -{ stdenv, fetchurl, pkgconfig -, libjpeg -, alsaLib ? null -, libX11 ? null -, qt4 ? null # The default is set to qt4 in all-packages.nix -, qt5 ? null +{ stdenv, lib, fetchurl, pkgconfig, perl, makeQtWrapper +, libjpeg, udev +, withUtils ? true +, withGUI ? true, alsaLib, libX11, qtbase, mesa_glu }: # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) -assert qt4 != null -> qt5 == null; -assert qt5 != null -> qt4 == null; - -let - inherit (stdenv.lib) optional; -in - stdenv.mkDerivation rec { - name = "v4l-utils-1.10.1"; + name = "v4l-utils-${version}"; + version = "1.12.3"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "1h1nhg5cmmzlbipak526nk4bm6d0yb217mll75f3rpg7kz1cqiv1"; + sha256 = "0vpl3jl0x441y7b5cn7zhdsyi954hp9h2p30jhnr1zkx1rpxsiss"; }; outputs = [ "out" "dev" ]; - configureFlags = [ - "--enable-libv4l" - ] ++ (if (alsaLib != null && libX11 != null && (qt4 != null || qt5 != null)) then [ - "--with-udevdir=\${out}/lib/udev" - "--enable-v4l-utils" - "--enable-qv4l2" - ] else [ - "--without-libudev" - "--without-udevdir" - "--disable-v4l-utils" - "--disable-qv4l2" - ]); + configureFlags = + if withUtils then [ + "--with-udevdir=\${out}/lib/udev" + ] else [ + "--disable-v4l-utils" + ]; postFixup = '' # Create symlink for V4l1 compatibility ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional (withUtils && withGUI) makeQtWrapper; - buildInputs = [ alsaLib libX11 qt4 qt5 ]; + buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ]; propagatedBuildInputs = [ libjpeg ]; + NIX_CFLAGS_COMPILE = lib.optional (withUtils && withGUI) "-std=c++11"; + + postPatch = '' + patchShebangs . + ''; + + postInstall = lib.optionalString (withUtils && withGUI) '' + wrapQtProgram $out/bin/qv4l2 + ''; + meta = with stdenv.lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = http://linuxtv.org/projects.php; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 49e71614bf9..a4de1ecda43 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1604,11 +1604,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.23.0"; + name = "xf86-input-libinput-0.25.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2; - sha256 = "1p596v3kbmjpdz3kz8z19bnd79l860f1pbwjvma7bz7qx3gynlqb"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2; + sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1670,11 +1670,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.2.0"; + name = "xf86-video-amdgpu-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; - sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2; + sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1703,11 +1703,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.8.0"; + name = "xf86-video-ati-7.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; - sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2; + sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1869,11 +1869,11 @@ let }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; xf86videonouveau = (mkDerivation "xf86videonouveau" { - name = "xf86-video-nouveau-1.0.13"; + name = "xf86-video-nouveau-1.0.14"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2; - sha256 = "1js7vak68g2800f1cy5r41wl5x2j7dbmbd7zxypzfgcw2fx454kd"; + url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2; + sha256 = "1h9izq510m2pvg77d0y9krc0cvvbhp2y3xlrrz6id7y47jdzkpsd"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1891,11 +1891,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" { - name = "xf86-video-openchrome-0.3.3"; + name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2; - sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4"; + url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; + sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2364,11 +2364,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.2"; + name = "xorg-server-1.19.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2; - sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; + sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; }; buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c7a4ff20a73..99c9ffa14c2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -340,7 +340,6 @@ in xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; - xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videotga = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videov4l = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videovoodoo = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4aeace9f0c2..ee85de75b40 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -122,16 +122,16 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 @@ -148,7 +148,7 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 -mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 8900ebc120c..8c842dbc841 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ibus-table-${version}"; - version = "1.9.14"; + version = "1.9.16"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "1mkx03iqrq5yq57y7hjqcmxfh41dsjykyyl70d41dflcgp5q2nhw"; + sha256 = "1gkb6nsibk59kp404b394sg638jgah2a2b6ffq3gkacqg5j30wjb"; }; postPatch = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index aa92e66d98f..b9548a5bff5 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.03.10"; + version = "2017.04.02"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0ccrwhgycz17xmsdsd0rsv7khhp1z7dnwp7fkxx7dxbivjf0h0a4"; + sha256 = "131z42aq2qnh394y4ykzm3mvsf62lia86y90as6acyg4v201lgk2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 324e2d35cfd..9dca8e7e26c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -121,6 +121,7 @@ doNotDisplayTwice rec { speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 sshfsFuse = sshfs-fuse; # added 2016-09 + surf-webkit2 = surf; # added 2017-04-02 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cf7986ca01..1fb20dab34d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3439,6 +3439,8 @@ with pkgs; inherit (pythonPackages) pillow; }; + pdfshuffler = callPackage ../applications/misc/pdfshuffler { }; + briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { @@ -4527,6 +4529,10 @@ with pkgs; python = python27; }; + veracrypt = callPackage ../applications/misc/veracrypt { + wxGUI = true; + }; + vlan = callPackage ../tools/networking/vlan { }; vmtouch = callPackage ../tools/misc/vmtouch { }; @@ -8838,10 +8844,7 @@ with pkgs; }; libv4l = lowPrio (v4l_utils.override { - alsaLib = null; - libX11 = null; - qt4 = null; - qt5 = null; + withUtils = false; }); libva = callPackage ../development/libraries/libva { }; @@ -12192,9 +12195,7 @@ with pkgs; systemd = null; }); - v4l_utils = callPackage ../os-specific/linux/v4l-utils { - qt5 = null; - }; + v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; vndr = callPackage ../development/tools/vndr { }; @@ -15557,11 +15558,7 @@ with pkgs; subunit = callPackage ../development/libraries/subunit { }; - surf = callPackage ../applications/networking/browsers/surf { - webkit = webkitgtk2; - }; - - surf-webkit2 = callPackage ../applications/networking/browsers/surf/webkit2.nix { }; + surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; |