From ecf4825f325298e3b78665e7e6295c039dfe969f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 17 Feb 2018 19:32:13 -0500 Subject: qemu: 2.11.0 -> 2.11.1 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 68ab979ecfbe..48a9296fa97d 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,8 +18,8 @@ with stdenv.lib; let - version = "2.11.0"; - sha256 = "1jvzw6rdhimn583dz6an8xiw07n3ycvxmj3jpv1s312scv3k9w64"; + version = "2.11.1"; + sha256 = "1jrcff0szyjxc3vywyiclwdzk0xgq4cxvjbvmcfyjcpdrq9j5pyr"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; -- cgit 1.4.1 From 890c0b9654e78292b0596fab42446d5c2735a568 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 17 Feb 2018 20:29:11 -0500 Subject: qemu-riscv: Init at 2.11.50pre57991_713f2c1164. Fixes #35087 --- pkgs/applications/virtualization/qemu/riscv.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/virtualization/qemu/riscv.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix new file mode 100644 index 000000000000..7f25388308d1 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/riscv.nix @@ -0,0 +1,16 @@ +{ qemu, fetchFromGitHub, lib }: let + src = fetchFromGitHub { + owner = "riscv"; + repo = "riscv-qemu"; + rev = "713f2c116481d568702759bcb1b7fed835a2d575"; + sha256 = "0y4zrgidpc19pxwqqxcmj0ld50fdkf8b8c87xfcn88zrk8798qz4"; + fetchSubmodules = true; + }; + version = "2.11.50"; + date = "20180203"; + revCount = "57991"; + shortRev = "713f2c1164"; +in lib.overrideDerivation qemu (orig: { + name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; + inherit src; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f336e502885..68c821cc53ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16901,6 +16901,8 @@ with pkgs; inherit (darwin.stubs) rez setfile; }; + qemu-riscv = callPackage ../applications/virtualization/qemu/riscv.nix {}; + qgis = callPackage ../applications/gis/qgis {}; qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; -- cgit 1.4.1 From 1ea44d75b219a56681152ecb166bbaec85a00d5c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 17 Feb 2018 23:25:21 -0300 Subject: palemoon: 27.6.2 -> 27.7.2 Also, adding myself to maintainers. --- .../networking/browsers/palemoon/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 006aa88f363c..cd4f95097889 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.6.2"; + version = "27.7.2"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "0ickxrwl36iyqj3v9qq6hnfl2y652f2ppwi949pfh4f6shm9x0ri"; + sha256 = "19ki6gp6bhcvhjnclalviiyp93mqsgc22xjl0gm9x5y4sxdb5wlq"; }; desktopItem = makeDesktopItem { @@ -101,10 +101,20 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A web browser"; + longDescription = '' + Pale Moon is an Open Source, Goanna-based web browser focusing on + efficiency and customization. + + Pale Moon offers you a browsing experience in a browser completely built + from its own, independently developed source that has been forked off from + Firefox/Mozilla code a number of years ago, with carefully selected + features and optimizations to improve the browser's stability and user + experience, while offering full customization and a growing collection of + extensions and themes to make the browser truly your own. + ''; homepage = https://www.palemoon.org/; license = licenses.mpl20; - maintainers = with maintainers; [ rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj AndersonTorres ]; platforms = platforms.linux; }; - } -- cgit 1.4.1 From 96ac69288b07e1bfb58bd559c920eff86b8c6aab Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 18 Feb 2018 12:48:41 +0300 Subject: octoprint: 1.3.5 -> 1.3.6 --- pkgs/applications/misc/octoprint/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 972fbfb7b072..6587305a770f 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -54,14 +54,13 @@ let in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.3.5"; - # 1.3.5, 2017-10-16, 77753ca02602d3a798d6b0a22535e6fd69ff448a + version = "1.3.6"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "13krv9i6gm4jn4cb327q4qma4xwwashjnc0dia8vlnbjbbvkrni4"; + sha256 = "0pgpkjw5zjnks5bky51gjaksq8mhrzkl52kpgf799hl35pd08xr3"; }; # We need old Tornado @@ -70,7 +69,7 @@ in pythonPackages.buildPythonApplication rec { semantic-version flask_principal werkzeug flaskbabel tornado psutil pyserial flask_login netaddr markdown sockjs-tornado pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future dateutil futures wrapt + scandir chainmap future dateutil futures wrapt monotonic emoji ]; buildInputs = with pythonPackages; [ nose mock ddt ]; -- cgit 1.4.1 From b1047f34f7ec1b3169c52e8610be1cea5a85861d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 15 Feb 2018 20:22:46 +0000 Subject: xenPackages.xen_4_8-vanilla: fix build of qemu-xen They merged that XSA and moved the tag. --- pkgs/applications/virtualization/xen/4.8.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 44a52a1026af..b1fcf36a46c1 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -49,15 +49,9 @@ callPackage (import ./generic.nix (rec { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "refs/tags/qemu-xen-${version}"; - sha256 = "1v19pp86kcgwvsbkrdrn4rlaj02i4054avw8k70w1m0rnwgcsdbs"; + sha256 = "1l4sygd8p0mc13bskr4r1m31qh1kr58h195qn1s52869s58jyhvm"; }; buildInputs = qemuDeps; - patches = [ - (xsaPatch { - name = "216-qemuu"; - sha256 = "06w2iw1r5gip2bpbg19cziws965h9in0f6np74cr31f76yy30yxn"; - }) - ]; meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { -- cgit 1.4.1 From 23e68d119d65643528693516e8f7dad118901447 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 15 Feb 2018 20:22:46 +0000 Subject: xenPackages.xen_4_8-vanilla: stop overriding cc Nothing requires gcc49 in this version. --- pkgs/applications/virtualization/xen/packages.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 8f5262acb024..4b5f15c8ff42 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -58,10 +58,6 @@ rec { }; xen_4_8-vanilla = callPackage ./4.8.nix { - # At the very least included seabios and etherboot need gcc49, - # so we have to build all of it with gcc49. - stdenv = overrideCC stdenv gcc49; - meta = { description = "vanilla"; longDescription = '' -- cgit 1.4.1 From d4e1ef7b7b62c974d7d068b76a22651884aa6b4b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 18 Feb 2018 03:42:40 -0500 Subject: qemu-riscv: 2.11.50pre57991_713f2c1164 -> 2.11.50pre58771_af435b709d --- pkgs/applications/virtualization/qemu/riscv.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix index 7f25388308d1..a900d943dabf 100644 --- a/pkgs/applications/virtualization/qemu/riscv.nix +++ b/pkgs/applications/virtualization/qemu/riscv.nix @@ -2,15 +2,19 @@ src = fetchFromGitHub { owner = "riscv"; repo = "riscv-qemu"; - rev = "713f2c116481d568702759bcb1b7fed835a2d575"; - sha256 = "0y4zrgidpc19pxwqqxcmj0ld50fdkf8b8c87xfcn88zrk8798qz4"; + rev = "af435b709d4a5de3ec2e59ff4dcd05b0b295a730"; + sha256 = "1kqcsn8yfdg3zyd991i4v5dxznd1l4a4hjry9304lvsm3sz2wllw"; fetchSubmodules = true; }; version = "2.11.50"; - date = "20180203"; - revCount = "57991"; - shortRev = "713f2c1164"; + revCount = "58771"; + shortRev = "af435b709d"; + targets = [ "riscv32-linux-user" "riscv32-softmmu" + "riscv64-linux-user" "riscv64-softmmu" + ]; in lib.overrideDerivation qemu (orig: { name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; inherit src; + configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ]; + postInstall = null; }) -- cgit 1.4.1 From 47f25fae446e51d5229fe0386231d7446963b6cb Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 18 Feb 2018 17:16:49 +0100 Subject: redshift, liferea: remove the extra cache file They're not really useful and cause collisions in envs. --- pkgs/applications/misc/redshift/default.nix | 5 ++++- pkgs/applications/networking/newsreaders/liferea/default.nix | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 9871c559523c..c0e481ae8788 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { pythonPath = [ pygobject3 pyxdg ]; preConfigure = "./bootstrap"; - postFixup = "wrapPythonPrograms"; + postFixup = '' + wrapPythonPrograms + rm "$out/share/icons/hicolor/icon-theme.cache" + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 743da7958067..ed6fe17cc7e8 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { pythonPath = with python3Packages; [ pygobject3 pycairo ]; preFixup = '' + rm "$out/share/icons/hicolor/icon-theme.cache" buildPythonPath "$out $pythonPath" gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; -- cgit 1.4.1 From 4839b568de509478e7c49cd06a1efb5c40687e5c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 18 Feb 2018 14:08:22 -0500 Subject: qemu: Add patch for statfs f_flags in Linux user mode. --- pkgs/applications/virtualization/qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 48a9296fa97d..694026d3bac2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./no-etc-install.patch ] + patches = [ ./no-etc-install.patch ./statfs-flags.patch ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch; -- cgit 1.4.1 From e3f947a19a8f64fd190972561d75557f92d8a953 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 18 Feb 2018 14:33:43 -0500 Subject: Add missing files --- .../virtualization/qemu/statfs-flags.patch | 200 +++++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 pkgs/applications/virtualization/qemu/statfs-flags.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/qemu/statfs-flags.patch b/pkgs/applications/virtualization/qemu/statfs-flags.patch new file mode 100644 index 000000000000..c0f0162aacc9 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/statfs-flags.patch @@ -0,0 +1,200 @@ +commit d3282d2512774dc5027c98930a3852b2b6e8407a +Author: Shea Levy +Date: Sun Feb 18 13:50:11 2018 -0500 + + linux-user: Support f_flags in statfs when available. + + Signed-off-by: Shea Levy + +diff --git a/configure b/configure +index 913e14839d..52fe2bf941 100755 +--- a/configure ++++ b/configure +@@ -5303,6 +5303,22 @@ if compile_prog "" "" ; then + have_utmpx=yes + fi + ++########################################## ++# Check for newer fields of struct statfs on Linux ++ ++if test "$linux_user" = "yes"; then ++ cat > $TMPC < ++ ++int main(void) { ++ struct statfs fs; ++ fs.f_flags = 0; ++} ++EOF ++ if compile_object ; then ++ have_statfs_flags=yes ++ fi ++fi + ########################################## + # checks for sanitizers + +@@ -6518,6 +6534,10 @@ if test "$have_utmpx" = "yes" ; then + echo "HAVE_UTMPX=y" >> $config_host_mak + fi + ++if test "$have_statfs_flags" = "yes" ; then ++ echo "HAVE_STATFS_FLAGS=y" >> $config_host_mak ++fi ++ + if test "$ivshmem" = "yes" ; then + echo "CONFIG_IVSHMEM=y" >> $config_host_mak + fi +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 82b35a6bdf..77481eca2c 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -9534,6 +9534,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, + __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]); + __put_user(stfs.f_namelen, &target_stfs->f_namelen); + __put_user(stfs.f_frsize, &target_stfs->f_frsize); ++#ifdef HAVE_STATFS_FLAGS ++ __put_user(stfs.f_flags, &target_stfs->f_flags); ++#endif + memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); + unlock_user_struct(target_stfs, arg2, 1); + } +diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h +index a35c52a60a..9f90451caf 100644 +--- a/linux-user/syscall_defs.h ++++ b/linux-user/syscall_defs.h +@@ -362,7 +362,14 @@ struct kernel_statfs { + int f_ffree; + kernel_fsid_t f_fsid; + int f_namelen; ++#ifdef HAVE_STATFS_FLAGS ++ int f_frsize; ++ int f_flags; ++ int f_spare[4]; ++#else + int f_spare[6]; ++#endif ++ + }; + + struct target_dirent { +@@ -2223,7 +2230,13 @@ struct target_statfs { + /* Linux specials */ + target_fsid_t f_fsid; + int32_t f_namelen; ++#ifdef HAVE_STATFS_FLAGS ++ int32_t f_frsize; ++ int32_t f_flags; ++ int32_t f_spare[4]; ++#else + int32_t f_spare[6]; ++#endif + }; + #else + struct target_statfs { +@@ -2239,7 +2252,13 @@ struct target_statfs { + /* Linux specials */ + target_fsid_t f_fsid; + abi_long f_namelen; ++#ifdef HAVE_STATFS_FLAGS ++ abi_long f_frsize; ++ abi_long f_flags; ++ abi_long f_spare[4]; ++#else + abi_long f_spare[6]; ++#endif + }; + #endif + +@@ -2255,7 +2274,13 @@ struct target_statfs64 { + uint64_t f_bavail; + target_fsid_t f_fsid; + uint32_t f_namelen; ++#ifdef HAVE_STATFS_FLAGS ++ uint32_t f_frsize; ++ uint32_t f_flags; ++ uint32_t f_spare[4]; ++#else + uint32_t f_spare[6]; ++#endif + }; + #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \ + defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \ +@@ -2271,7 +2296,12 @@ struct target_statfs { + target_fsid_t f_fsid; + abi_long f_namelen; + abi_long f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ abi_long f_flags; ++ abi_long f_spare[4]; ++#else + abi_long f_spare[5]; ++#endif + }; + + struct target_statfs64 { +@@ -2285,7 +2315,12 @@ struct target_statfs64 { + target_fsid_t f_fsid; + abi_long f_namelen; + abi_long f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ abi_long f_flags; ++ abi_long f_spare[4]; ++#else + abi_long f_spare[5]; ++#endif + }; + #elif defined(TARGET_S390X) + struct target_statfs { +@@ -2299,7 +2334,13 @@ struct target_statfs { + kernel_fsid_t f_fsid; + int32_t f_namelen; + int32_t f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ int32_t f_flags; ++ int32_t f_spare[4]; ++#else + int32_t f_spare[5]; ++#endif ++ + }; + + struct target_statfs64 { +@@ -2313,7 +2354,12 @@ struct target_statfs64 { + kernel_fsid_t f_fsid; + int32_t f_namelen; + int32_t f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ int32_t f_flags; ++ int32_t f_spare[4]; ++#else + int32_t f_spare[5]; ++#endif + }; + #else + struct target_statfs { +@@ -2327,7 +2373,12 @@ struct target_statfs { + target_fsid_t f_fsid; + uint32_t f_namelen; + uint32_t f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ uint32_t f_flags; ++ uint32_t f_spare[4]; ++#else + uint32_t f_spare[5]; ++#endif + }; + + struct target_statfs64 { +@@ -2341,7 +2392,12 @@ struct target_statfs64 { + target_fsid_t f_fsid; + uint32_t f_namelen; + uint32_t f_frsize; ++#ifdef HAVE_STATFS_FLAGS ++ uint32_t f_flags; ++ uint32_t f_spare[4]; ++#else + uint32_t f_spare[5]; ++#endif + }; + #endif + -- cgit 1.4.1