diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-14 18:54:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-14 18:54:05 +0000 |
commit | 183b673b64a8ab9a56b00fa79b0a82c68c93c7cc (patch) | |
tree | ee0db500ad309bf656c7b2edf236108f0afe1113 | |
parent | 730ff71234db1d6b6b6d0424c8384ec74525a955 (diff) | |
parent | 8a4b39330f80143b313bde8d88b6cc1264b31d18 (diff) |
Merge master into staging-next
60 files changed, 971 insertions, 330 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aec5a67ddc95..2bc0ae5f0425 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8671,6 +8671,12 @@ githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + name = "Sérgio G."; + email = "5861043+superherointj@users.noreply.github.com"; + github = "superherointj"; + githubId = 5861043; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; github = "SuperSandro2000"; diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 5c4cf0f6c558..411e0d77feb3 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, perl, perlPackages }: +{ stdenv, lib, makeWrapper, perl, perlPackages }: stdenv.mkDerivation { name = "nix-generate-from-cpan-3"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { ''; meta = { - maintainers = with stdenv.lib.maintainers; [ eelco rycee ]; + maintainers = with lib.maintainers; [ eelco rycee ]; description = "Utility to generate a Nix expression for a Perl package from CPAN"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 953aeda568f1..a71c804428da 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -956,6 +956,7 @@ ./services/x11/urxvtd.nix ./services/x11/window-managers/awesome.nix ./services/x11/window-managers/default.nix + ./services/x11/window-managers/clfswm.nix ./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/icewm.nix ./services/x11/window-managers/bspwm.nix diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix index 176c1f461271..171660c53ac3 100644 --- a/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/nixos/modules/services/x11/window-managers/clfswm.nix @@ -15,10 +15,10 @@ in services.xserver.windowManager.session = singleton { name = "clfswm"; start = '' - ${pkgs.clfswm}/bin/clfswm & + ${pkgs.lispPackages.clfswm}/bin/clfswm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.clfswm ]; + environment.systemPackages = [ pkgs.lispPackages.clfswm ]; }; } diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 87702c58727a..9ca24310e567 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -13,6 +13,7 @@ in ./berry.nix ./bspwm.nix ./cwm.nix + ./clfswm.nix ./dwm.nix ./evilwm.nix ./exwm.nix diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index 168c1d06b31e..950229baee08 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -13,4 +13,5 @@ kak-prelude = pkgs.callPackage ./kak-prelude.nix { }; kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { }; openscad-kak = pkgs.callPackage ./openscad.kak.nix { }; + quickscope-kak = pkgs.callPackage ./quickscope.kak.nix { }; } diff --git a/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix new file mode 100644 index 000000000000..f2fb1f5d57c3 --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, lua5_3 }: + +stdenv.mkDerivation rec { + pname = "quickscope-kak"; + version = "1.0.0"; + + src = fetchgit { + url = "https://git.sr.ht/~voroskoi/quickscope.kak"; + rev = "v${version}"; + sha256 = "0y1g3zpa2ql8l9rl5i2w84bka8a09kig9nq9zdchaff5pw660mcx"; + }; + + buildInputs = [ lua5_3 ]; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins/ + cp quickscope.* $out/share/kak/autoload/plugins/ + # substituteInPlace does not like the pipe + sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak + ''; + + meta = with stdenv.lib; { + description = "Highlight f and t jump positions"; + homepage = "https://sr.ht/~voroskoi/quickscope.kak/"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index db07b9e1db4e..598a94138262 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -r target/* "$out/share/java/zvtm/" echo '#!${runtimeShell}' > "$out/bin/zgrviewer" - echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" + echo "${jre}/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer" ''; meta = { diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index 5190f1a7b534..9ea122fc7f6a 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -104,5 +104,6 @@ in stdenv.mkDerivation rec { license = [ licenses.mpl20 licenses.gpl3 ]; maintainers = with maintainers; [ TheBrainScrambler ]; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = true; # 2021-01-07 }; } diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 4009bf96cd4f..e4b9e8c2f1b6 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.11.8"; + version = "2.12.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "19nkkj69506759qjfrz6d7j57z8rqjslgfrdrkx01ri68cil4mfh"; + sha256 = "04r3y71l9849wlhpzzcg2wcqnqdp5nnnhy4s205rp9xswa3mw0k3"; }; - vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray"; + vendorSha256 = "0m24wi91638zyrp7mpri4862dbx1p0glscjd0hdy0xb56vcr3i09"; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 4dfca92f39f3..0a354b230ce1 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, expat, sqlite, libmesode, fetchpatch -, autoconf-archive +, cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null , notifySupport ? true, libnotify ? null, gdk-pixbuf ? null @@ -22,20 +21,16 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.9.5"; + version = "0.10.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "14vbblf639f90bb4npg2xv53cpvk9am9ic4pmc1vnv4m3zsndjg5"; + sha256 = "0a9rzhnivxcr8v02xxzrbck7pvvv4c66ap2zy0gzxhri5p8ac03r"; }; patches = [ - (fetchpatch { - url = "https://github.com/profanity-im/profanity/commit/54667c022f17bdb547c3b8b4eec1c2889c9d60f3.patch"; - sha256 = "0aqrq45im1qnq308hyhh7dqbggzmcqb0b868wr5v8v08pd94s45k"; - }) ./patches/packages-osx.patch ]; @@ -80,6 +75,8 @@ stdenv.mkDerivation rec { homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; platforms = platforms.unix; + changelog = "https://github.com/profanity-im/profanity/releases/tag/${version}"; + downloadPage = "https://github.com/profanity-im/profanity/releases/"; maintainers = [ maintainers.devhell ]; updateWalker = true; }; diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 614ceeb0c324..6a6302e74955 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -3,7 +3,7 @@ let inherit (python27Packages) python; requirements = (import ./requirements.nix { - inherit stdenv fetchurl; + inherit lib fetchurl; pythonPackages = python27Packages; }); diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix index c15b7ac45dd8..8277028ac7b8 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -1,5 +1,5 @@ { fetchurl -, lib, stdenv +, lib , pythonPackages }: @@ -8,7 +8,7 @@ let xe = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; + name = lib.nameFromURL url ".tar"; src = fetchurl { inherit url; sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; @@ -28,7 +28,7 @@ in { pyfeed = (buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; + name = lib.nameFromURL url ".tar"; src = fetchurl { inherit url; @@ -49,7 +49,7 @@ in { wokkel = buildPythonPackage (rec { url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; - name = stdenv.lib.nameFromURL url ".tar"; + name = lib.nameFromURL url ".tar"; src = fetchurl { inherit url; sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index a9a82dc67c00..cc24e13810ed 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -86,6 +86,12 @@ stdenv.mkDerivation rec { gdb man emacs ]; + # Expects there to always be a thread with ID + # thread:0000000000000009, but notmuch new is non-deterministic so + # this isn't always the case. Upstream bug report: + # https://nmbug.notmuchmail.org/nmweb/show/871reno6g7.fsf%40alyssa.is + NOTMUCH_SKIP_TESTS = "lib-thread"; + installTargets = [ "install" "install-man" "install-info" ]; postInstall = stdenv.lib.optionalString withEmacs '' diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 3b4dd20931cb..1681d4545904 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -1,25 +1,38 @@ -{ lib, stdenv, fetchurl, automake, libtool, autoconf, intltool, perl -, gmpxx, flex, bison +{ stdenv, lib, fetchFromGitHub +, cmake, libedit, gmpxx, bison, flex +, enableReadline ? false, readline +, gtest }: stdenv.mkDerivation rec { pname = "opensmt"; - version = "20101017"; + version = "2.0.1"; - src = fetchurl { - url = "http://opensmt.googlecode.com/files/opensmt_src_${version}.tgz"; - sha256 = "0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1"; + src = fetchFromGitHub { + owner = "usi-verification-and-security"; + repo = "opensmt"; + rev = "v${version}"; + sha256 = "uoIcXWsxxRsIuFsou3RcN9e48lc7cWMgRPVJLFVslDE="; }; - buildInputs = [ automake libtool autoconf intltool perl gmpxx flex bison ]; + nativeBuildInputs = [ cmake bison flex ]; + buildInputs = [ libedit gmpxx ] + ++ lib.optional enableReadline readline; + + preConfigure = '' + substituteInPlace test/CMakeLists.txt \ + --replace 'FetchContent_Populate' '#FetchContent_Populate' + ''; + cmakeFlags = [ + "-Dgoogletest_SOURCE_DIR=${gtest.src}" + "-Dgoogletest_BINARY_DIR=./gtest-build" + ]; meta = with lib; { description = "A satisfiability modulo theory (SMT) solver"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - license = licenses.gpl3; - homepage = "http://code.google.com/p/opensmt/"; - broken = true; - downloadPage = "http://code.google.com/p/opensmt/downloads/list"; + license = if enableReadline then licenses.gpl2Plus else licenses.mit; + homepage = "https://github.com/usi-verification-and-security/opensmt"; }; } diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 702d4293f2a0..b3513818df87 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0mz5cayjgsc109nv7kdkn3gn1n79bl3hb773lrzrr0k2zblxg353"; + sha256 = "0ajx7yjkgj5ynbjmd6k3cldjn0qr51h6k80hjgr7vqd0ybyylh5p"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix index e5a2ccd89cd9..0e0dab64be16 100644 --- a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix +++ b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-draw-on-your-screen"; - version = "6"; + version = "10"; src = fetchgit { url = "https://framagit.org/abakkk/DrawOnYourScreen/"; rev = "v${version}"; - sha256 = "05i20ii8lv6mg56rz8lng80dx35l6g45j8wr7jgbp591hg0spj1w"; + sha256 = "07adzg3mf6k0pmd9lc358w0w3l4pr3p6374day1qhmci2p4zxq6p"; }; uuid = "drawOnYourScreen@abakkk.framagit.org"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A drawing extension for GNOME Shell"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ericdallo ]; + maintainers = with maintainers; [ ericdallo ahuzik ]; platforms = gnome3.gnome-shell.meta.platforms; homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; }; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index ee915491f857..959afe1b887a 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -39,6 +39,9 @@ m |