diff options
22 files changed, 214 insertions, 35 deletions
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index b77da3414b34..9d77be131751 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -1,6 +1,6 @@ { system ? builtins.currentSystem, config ? {}, - pkgs ? import ../.. { inherit system config; } + pkgs ? import ../../.. { inherit system config; } }: with import ../../lib/testing.nix { inherit system pkgs; }; diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 61fa7c1a67d3..6d6db6b0ea97 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -22,7 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitUntilSucceeds("xmonad --restart"); $machine->sleep(3); $machine->sendKeys("alt-shift-ret"); - $machine->waitForWindow(qr/machine.*alice/); + $machine->waitForWindow(qr/alice.*machine/); $machine->sleep(1); $machine->screenshot("terminal"); ''; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 73a9f26a1221..710c3ca335a6 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,14 +3,14 @@ let versions = { atom = { - version = "1.32.1"; - sha256 = "1x22jbhvagqw9mvq0v7z4z09qp727vl0rkyvaxn98xnj9gvcfkq9"; + version = "1.33.0"; + sha256 = "0f6m6zwgz94m3q11ipyiliap3s5a3zlrg3ldjwkqnxjl6gwlxc2r"; }; atom-beta = { - version = "1.33.0"; - beta = 1; - sha256 = "0sf98apmb57msgr5p1xly0mffzn2s808nsfsmbisk4qqmm9fv2m3"; + version = "1.34.0"; + beta = 0; + sha256 = "1xnrr4z55sj46hqr0il26sfs6s3knv60m340cw3rzzic271b3ifw"; }; }; @@ -79,7 +79,7 @@ let description = "A hackable text editor for the 21st Century"; homepage = https://atom.io/; license = licenses.mit; - maintainers = with maintainers; [ offline nequissimus synthetica ysndr ]; + maintainers = with maintainers; [ offline nequissimus ysndr ]; platforms = platforms.x86_64; }; }; diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch new file mode 100644 index 000000000000..051b7618612c --- /dev/null +++ b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch @@ -0,0 +1,19 @@ +--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c ++++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c +@@ -514,14 +514,10 @@ add_bwrap (GPtrArray *array, + g_return_val_if_fail (script->s_infile != NULL, FALSE); + + add_args (array, +- "bwrap", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/lib", "/lib", +- "--ro-bind", "/lib64", "/lib64", ++ "@bubblewrap_bin@", ++ "--ro-bind", "@storeDir@", "@storeDir@", + "--proc", "/proc", + "--dev", "/dev", +- "--symlink", "usr/bin", "/bin", +- "--symlink", "usr/sbin", "/sbin", + "--chdir", "/", + "--setenv", "GIO_USE_VFS", "local", + "--unshare-all", diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 7e7c40e81309..b581d8f09837 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, python3, wrapGAppsHook -, gtk, gnome3, gnome-autoar, glib-networking, shared-mime-info, libnotify, libexif, libseccomp -, exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2 +, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar +, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi +, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf +, substituteAll, bubblewrap +}: let pname = "nautilus"; @@ -13,11 +16,14 @@ in stdenv.mkDerivation rec { sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv"; }; - nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ]; + nativeBuildInputs = [ + meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook + desktop-file-utils + ]; buildInputs = [ glib-networking shared-mime-info libexif gtk exempi libnotify libselinux - tracker tracker-miners gnome-desktop gexiv2 libseccomp + tracker tracker-miners gexiv2 libseccomp bubblewrap gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; @@ -36,7 +42,16 @@ in stdenv.mkDerivation rec { patchShebangs build-aux/meson/postinstall.py ''; - patches = [ ./extension_dir.patch ]; + patches = [ + ./extension_dir.patch + # 3.30 now generates it's own thummbnails, + # and no longer depends on `gnome-desktop` + (substituteAll { + src = ./bubblewrap-paths.patch; + bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index f9c45f45ea4a..9a151a6ac8f7 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-topicons-plus-${version}"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "phocean"; repo = "TopIcons-plus"; rev = "v${version}"; - sha256 = "15p61krd7lcmgr1d4s2ydfjy3pyq79pq5100xzy6dln1538901m3"; + sha256 = "196s1gdir52gbc444pzrb5l7gn5xr5vqk5ajqaiqryqlmp3i8vil"; }; buildInputs = [ glib ]; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index af383b2f05e1..42208ecf8d95 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -67,8 +67,8 @@ let # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" '' - + lib.optionalString (architecture == "amd64") "\"--with-jvm-features=zgc\"" - + lib.optionalString minimal "\"--enable-headless-only\"" + + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\"" + + lib.optionalString minimal " \"--enable-headless-only\"" + ");" # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix new file mode 100644 index 000000000000..6de7a26fbd6c --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, ocaml, findlib, gtk3, gtkspell3, gtksourceview }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "lablgtk3 is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "3.0.beta1"; + name = "ocaml${ocaml.version}-lablgtk3-${version}"; + src = fetchurl { + url = https://forge.ocamlcore.org/frs/download.php/1769/lablgtk-3.0.beta1.tar.gz; + sha256 = "08izn2kwxdz1i74m11lqkl9n50bs7sy6pl8mcq6br77znarvqb91"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib gtk3 gtkspell3 gtksourceview ]; + + buildFlags = "world"; + + meta = { + description = "OCaml interface to gtk+-3"; + homepage = "http://lablgtk.forge.ocamlcore.org/"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index a7767be6dc48..5835fe3196d4 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -1,7 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k +, pytest +, cffi }: buildPythonPackage rec { @@ -13,8 +14,11 @@ buildPythonPackage rec { sha256 = "1zh38gvkqw1jm5105if6rr7ccbgyxr7k2rm5ygb9ab3bq82pyaww"; }; - # Some sort of mysterious failure with lmdb.tool - doCheck = !isPy3k; + checkInputs = [ pytest cffi ]; + checkPhase = '' + export PYTHONPATH=.:$PYTHONPATH + py.test + ''; meta = with stdenv.lib; { description = "Universal Python binding for the LMDB 'Lightning' Database"; diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix new file mode 100644 index 000000000000..8c8c6bf35018 --- /dev/null +++ b/pkgs/development/python-modules/manhole/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, requests +, process-tests +}: + +buildPythonPackage rec { + pname = "manhole"; + version = "1.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "11ivy8qiv87jl2lc1ldhv9dc4jwf3hz7wysdfiagdcd9kkd48v8m"; + }; + + # test_help expects architecture-dependent Linux signal numbers. + # + # {test_locals,test_socket_path} fail to remove /tmp/manhole-socket + # on the x86_64-darwin builder. + doCheck = stdenv.isLinux; + + checkInputs = [ pytest requests process-tests ]; + checkPhase = '' + # Based on its tox.ini + export PYTHONUNBUFFERED=yes + export PYTHONPATH=.:tests:$PYTHONPATH + + # The tests use manhole-cli + export PATH="$PATH:$out/bin" + + # test_uwsgi fails with: + # http.client.RemoteDisconnected: Remote end closed connection without response + py.test -vv -k "not test_uwsgi" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ionelmc/python-manhole; + description = "Debugging manhole for Python applications"; + license = licenses.bsd2; + maintainers = with maintainers; [ ivan ]; + }; +} diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix new file mode 100644 index 000000000000..f7eebea75630 --- /dev/null +++ b/pkgs/games/pro-office-calculator/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia, fetchpatch }: +stdenv.mkDerivation rec { + version = "1.0.6"; + name = "pro-office-calculator-${version}"; + + src = fetchFromGitHub { + owner = "RobJinman"; + repo = "pro_office_calc"; + rev = "v${version}"; + sha256 = "1irgch6cbc2f8il1zh8qf98m43h41hma80dxzz9c7xvbvl99lybd"; + }; + + buildInputs = [ qtbase qtmultimedia tinyxml-2 ]; + + # This fixes a bug resulting in "illegal instruction" + patches = [(fetchpatch { + url = https://github.com/RobJinman/pro_office_calc/commit/806180d69d4af6b3183873f471c57bfdaf529560.patch; + sha256 = "1rcdjy233yf3kv4v18c82jyg08dykj2qspvg08n5b3bir870sbxz"; + })]; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Just an ordinary calculator. Nothing to see here..."; + homepage = http://proofficecalculator.com/; + maintainers = [ maintainers.pmiddend ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 24b46c8f9caa..ee7ff114ec8f 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -27,12 +27,12 @@ let in stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; - version = "1.7.1"; + version = "1.7.5"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "0qv8ci76f5kwv5b49ijgpc6jdfp6sm21fw5hq06mq6ygyiy9vdzf"; + sha256 = "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm"; rev = "v${version}"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index e9fb0ac7a465..0f115476b5d5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.87"; + version = "4.14.88"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09g12a8lkx5xm3c65q6wbzr2asnws956w2d8apj27avxcmylsx1n"; + sha256 = "0bgm4vr1c4s4k8gyw8i92lxj82nl67jh55q0yg5bdsh8cz3viw5h"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index d4d0fcb243a6..451af3f8c8dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.8"; + version = "4.19.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wg1cy8ydd3m6x86mqxmcr4crwhsrmrp62byzq63zw87ydkd0h6m"; + sha256 = "1wnvd4901ppzmx26fiav4glfkpb8qc7srcyk2m198wwwhb36q4gw"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index a32424565d34..9ef3768332d8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.166"; + version = "4.4.167"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0nj1wvsf1c843hp9ww68gpwsjdviax67dpffafsq78ask7yyy45z"; + sha256 = "1pryjpih8js9640jhv74wzvka4199irnp7bzn33lyh35lll4rjik"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index fcb017930670..97a730210d6c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.144"; + version = "4.9.145"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0avqc9v22jxf9p71279ssa1lhml3hf2zdkc4j0pzms929m1pzl85"; + sha256 = "0pmwnnjk05xpw9qvzl59llf4ihjdicrm52ardkra41f3x0vwl0b9"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index f586ea50398f..2a9d42988b5b 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -8,18 +8,18 @@ stdenv.mkDerivation rec { name = "v4l-utils-${version}"; - version = "1.16.0"; + version = "1.16.2"; src = fetchurl { url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "1b8bx9zfaw0crjkfh0wwyixbv4683mkw0cb3nxwc7fl489c2bd7i"; + sha256 = "0iwfdp4ghzd6l9qg5545032vwmqy2rnhk0xf1g9mad67l74hhckc"; }; outputs = [ "out" "dev" ]; configureFlags = if withUtils then [ - "--with-udevdir=\${out}/lib/udev" + "--with-udevdir=${placeholder "out"}/lib/udev" ] else [ "--disable-v4l-utils" ]; diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix new file mode 100644 index 000000000000..66378e457a26 --- /dev/null +++ b/pkgs/tools/misc/intelmetool/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, zlib, pciutils }: + +stdenv.mkDerivation rec { + name = "intelmetool-${version}"; + version = "4.8.1"; + + src = fetchgit { + url = "https://review.coreboot.org/coreboot.git"; + rev = version; + sha256 = "1gjisy9b7vgzjvy1fwaqhq3589yd59kkylv7apjmg5r2b3dv4zvr"; + fetchSubmodules = false; + }; + + buildInputs = [ zlib pciutils ]; + + buildPhase = '' + make -C util/intelmetool + ''; + + installPhase = '' + mkdir -p $out/bin + cp util/intelmetool/intelmetool $out/bin + ''; + + meta = with stdenv.lib; { + description = "Dump interesting things about Management Engine"; + homepage = https://www.coreboot.org/Nvramtool; + license = licenses.gpl2; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 812d335e8087..f5c74cfb511f 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { while timeouts occur on some connections. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa28f7170560..89d4921657eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4448,6 +4448,8 @@ in pnmixer = callPackage ../tools/audio/pnmixer { }; + pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { }; + pulsemixer = callPackage ../tools/audio/pulsemixer { }; pwsafe = callPackage ../applications/misc/pwsafe { }; @@ -10317,6 +10319,8 @@ in ilmbase = callPackage ../development/libraries/ilmbase { }; + intelmetool = callPackage ../tools/misc/intelmetool { }; + imlib = callPackage ../development/libraries/imlib { libpng = libpng12; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e03cb8e8b3b7..85cc5497c40f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -361,6 +361,8 @@ let lablgl = callPackage ../development/ocaml-modules/lablgl { }; + lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; + lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0cfcb61e202..8c594faee530 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -422,6 +422,8 @@ in { mail-parser = callPackage ../development/python-modules/mail-parser { }; + manhole = callPackage ../development/python-modules/manhole { }; + markerlib = callPackage ../development/python-modules/markerlib { }; matchpy = callPackage ../development/python-modules/matchpy { }; |