diff options
-rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
-rw-r--r-- | maintainers/team-list.nix | 12 | ||||
-rw-r--r-- | nixos/modules/security/sudo.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/misc/matrix-synapse.nix | 1 | ||||
-rw-r--r-- | nixos/tests/matrix-synapse.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/atom/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/editors/atom/env.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-web.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/window-managers/icewm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/dasm/default.nix | 34 | ||||
-rw-r--r-- | pkgs/development/compilers/rgbds/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/emulators/melonDS/default.nix | 41 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/alertmanager.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/bat-extras/default.nix | 42 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
18 files changed, 144 insertions, 44 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 38ed481b7c63..14675f3e23bc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3901,6 +3901,12 @@ githubId = 2396926; name = "Justin Woo"; }; + jwatt = { + email = "jwatt@broken.watch"; + github = "jjwatt"; + githubId = 2397327; + name = "Jesse Wattenbarger"; + }; jwiegley = { email = "johnw@newartisans.com"; github = "jwiegley"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 25a4995b733e..703a6a031d6f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -57,6 +57,18 @@ with lib.maintainers; { scope = "Maintain GNOME desktop environment and platform."; }; + matrix = { + members = [ + ma27 + pacien + fadenb + mguentner + ekleog + ralith + ]; + scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; + }; + php = { members = [ aanderse diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index e3e43177def3..1ed5269c5ae7 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -173,7 +173,9 @@ in config = mkIf cfg.enable { - security.sudo.extraRules = [ + # We `mkOrder 600` so that the default rule shows up first, but there is + # still enough room for a user to `mkBefore` it. + security.sudo.extraRules = mkOrder 600 [ { groups = [ "wheel" ]; commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ]; } diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 8ed4bbdd031c..e982eb16fa70 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -727,5 +727,6 @@ in { ]; meta.doc = ./matrix-synapse.xml; + meta.maintainers = teams.matrix.members; } diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index f3623aa3c094..9ca808721763 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -29,8 +29,8 @@ import ./make-test-python.nix ({ pkgs, ... } : let in { name = "matrix-synapse"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ corngood ]; + meta = with pkgs.stdenv.lib; { + maintainers = teams.matrix.members; }; nodes = { diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index fbe08dbfe7b7..dec3c7955011 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,14 +3,14 @@ let versions = { atom = { - version = "1.42.0"; - sha256 = "1ira528nwxi30jfwyivlac3wkkqb9d2z4jhxwq5m7mnpm5yli6jy"; + version = "1.48.0"; + sha256 = "1693bxbylf6jhld9bdcr5pigk36wqlbj89praldpz9s96yxig9s1"; }; atom-beta = { - version = "1.43.0"; + version = "1.49.0"; beta = 0; - sha256 = "06if3w5hx7njmyal0012zawn8f5af1z4bjcbzj2c0gd15nlsgm95"; + sha256 = "1fr6m4a7shdj3wpn6g4n95cqpkkg2x9srwjf7bqxv9f3d5jb1y33"; }; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index cf783053679a..5e3c1070ad2b 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,6 +1,7 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk +, at-spi2-core }: let @@ -10,7 +11,7 @@ let xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret libuuid at-spi2-atk + xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index acdf40e772ea..b05f64c13822 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -78,7 +78,7 @@ in mkYarnPackage rec { description = "A feature-rich client for Matrix.org"; homepage = "https://about.riot.im/"; license = licenses.asl20; - maintainers = with maintainers; [ pacien worldofpeace ma27 ]; + maintainers = teams.matrix.members; inherit (electron.meta) platforms; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index c08d1dbe0332..cc4eb4161f1b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "http://riot.im/"; - maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ]; + maintainers = stdenv.lib.teams.matrix.members; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 05cca88e6195..bacfb9674f6a 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "bbidulock"; repo = "icewm"; rev = version; - sha256 = "1glzpkpl0vl5sjn1d9jlvwd9ch16dvxvsf2n310kb0ycpfkl84vs"; + sha256 = "05jg2gs5cdxn2kfm2y6yrqxpza5s1zsgb52168psmzhb4nakpv42"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 82036c8b8e21..086e0cf7a57b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "3.4.0"; + version = "3.4.1"; repoName = "code"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0b1vdgb1xvh5lqbral3r0qaq05zd5q5ywxw02fggpyy8nyxs3z8f"; + sha256 = "158zrzyyy507rxcbsb5am9768zbakpwrl61ixab57zla7z51l0g0"; }; passthru = { diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix new file mode 100644 index 000000000000..1eb233b90b7f --- /dev/null +++ b/pkgs/development/compilers/dasm/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "dasm"; + version = "2.20.13"; + + src = fetchFromGitHub { + owner = "dasm-assembler"; + repo = "dasm"; + rev = version; + sha256 = "1nr4kvw42vyc6i4p1c06jlih11rhbjjxc27dc7cx5qj635xf4jcf"; + }; + + configurePhase = false; + installPhase = '' + mkdir -p $out/bin + install bin/* $out/bin + ''; + + preCheck = '' + patchShebangs ./test/ + ''; + + checkTarget = "test"; + doCheck = true; + + meta = with stdenv.lib; { + description = "Assembler for 6502 and other 8-bit microprocessors"; + homepage = "https://dasm-assembler.github.io"; + license = licenses.gpl2; + maintainers = [ maintainers.jwatt ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 52d388beaed5..6fc21a0ffd10 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.3.10"; + version = "0.4.0"; src = fetchFromGitHub { owner = "rednex"; repo = "rgbds"; rev = "v${version}"; - sha256 = "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq"; + sha256 = "15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix new file mode 100644 index 000000000000..94fbeba0e075 --- /dev/null +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, gtk3, libpcap, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "melonDS"; + version = "0.8.3"; + ## When updating to the release after 0.8.3, + ## - Uncomment: + ## cmakeFlags = [ "-UUNIX_PORTABLE" ]; + ## - Remove the postInstall, since cmake should then take care of installing icons, .desktop file, and romlist.bin + ## (see https://github.com/Arisotura/melonDS/pull/546) + + src = fetchFromGitHub { + owner = "Arisotura"; + repo = pname; + rev = version; + sha256 = "1lqmfwjpkdqfkns1aaxlp4yrg6i0r66mxfr4rrj7b5286k44hqwn"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + buildInputs = [ SDL2 gtk3 libpcap ]; + + postInstall = '' + install -Dm644 -t $out/share/melonDS/ ../romlist.bin + install -Dm644 -t $out/share/applications/ ../flatpak/*.desktop + + for i in ../icon/melon_*.png; do + d="''${i##*_}" + d="$out/share/icons/hicolor/''${d%.png}/apps" + install -D $i "$d/net.kuribo64.melonds.png" + done + ''; + + meta = with stdenv.lib; { + homepage = "http://melonds.kuribo64.net/"; + description = "Work in progress Nintendo DS emulator"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ artemist benley ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 15df735b7072..fbcec04e5320 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.14.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "09drdqcjvpk9s3hq5rx9yxsxq0wak5fg5gfaiqfnbnxav2c2v7kq"; + sha256 = "1hfyqp5bzsqp002synxp9jcm9fwzw9p0gcklmycmv616x3flylkf"; }; patches = [ @@ -58,6 +58,7 @@ buildPythonApplication rec { unpaddedbase64 typing-extensions authlib + pyjwt ] ++ lib.optional enableSystemd systemd; checkInputs = [ mock parameterized openssl ]; @@ -76,6 +77,6 @@ buildPythonApplication rec { homepage = "https://matrix.org"; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = with maintainers; [ ralith roblabla ekleog pacien ma27 ]; + maintainers = teams.matrix.members; }; } diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 9402fa44eed2..f5c7c062c878 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "alertmanager"; - version = "0.20.0"; + version = "0.21.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1bq6vbpy25k7apvs2ga3fbp1cbnv9j0y1g1khvz2qgz6a2zvhgg3"; + sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41"; }; buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' @@ -35,7 +35,7 @@ buildGoPackage rec { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/alertmanager"; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz globin ]; + maintainers = with maintainers; [ benley fpletz globin Frostman ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 0f98b819b0f7..36adc09cdba1 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -1,5 +1,6 @@ -{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, ncurses, bat -# batgrep and batwatch +{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat +# batdiff, batgrep, and batwatch +, coreutils , less # batgrep , ripgrep @@ -10,34 +11,35 @@ , withRustFmt ? rustfmt != null, rustfmt ? null # batwatch , withEntr ? entr != null, entr ? null - }: +# batdiff +, gitMinimal +, withDelta ? gitAndTools?delta, gitAndTools ? null +}: let # Core derivation that all the others are based on. # This includes the complete source so the per-script derivations can run the tests. core = stdenv.mkDerivation rec { pname = "bat-extras"; - version = "20200408"; + # there hasn't been a release since 2020-05-01 but there are important bugfixes + # to the test suite so we'll pull the latest commit as of 2020-06-17. + version = "20200515-dev"; # latest commit was dated 2020-05-15 src = fetchFromGitHub { owner = "eth-p"; repo = pname; - rev = "v${version}"; - sha256 = "184d5rwasfpgbj2k98alg3wy8jmzna2dgfik98w2a297ky67s51v"; + rev = "3029b6749f61f7514e9eef30e035cfab0e31eb1d"; + sha256 = "08mb94k2n182ql97c5s5j1v7np25ivynn5g0418whrx11ra41wr7"; fetchSubmodules = true; }; - nativeBuildInputs = [ bash makeWrapper ]; + # bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up + nativeBuildInputs = [ bash bat ]; dontConfigure = true; postPatch = '' - substituteInPlace lib/constants.sh \ - --replace 'EXECUTABLE_BAT="bat"' 'EXECUTABLE_BAT="${bat}/bin/bat"' - patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh - wrapProgram .test-framework/bin/best.sh \ - --prefix PATH : "${ncurses}/bin" ''; buildPhase = '' @@ -131,17 +133,13 @@ let stdenv.lib.optional cond dep; in { - batgrep = script "batgrep" [ less ripgrep ]; - batman = (script "batman" []).overrideAttrs (drv: { - doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) - }); - batwatch = script "batwatch" ([ less ] ++ optionalDep withEntr entr); - prettybat = (script "prettybat" ([] + batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta gitAndTools.delta); + batgrep = script "batgrep" [ less coreutils ripgrep ]; + batman = script "batman" []; + batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr); + prettybat = script "prettybat" ([] ++ optionalDep withShFmt shfmt ++ optionalDep withPrettier nodePackages.prettier ++ optionalDep withClangTools clang-tools - ++ optionalDep withRustFmt rustfmt) - ).overrideAttrs (drv: { - doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) - }); + ++ optionalDep withRustFmt rustfmt); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 980d280c7810..24520d139e77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8212,6 +8212,8 @@ in scry = callPackage ../development/tools/scry {}; + dasm = callPackage ../development/compilers/dasm/default.nix { }; + dbmate = callPackage ../development/tools/database/dbmate { }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; @@ -20870,6 +20872,8 @@ in meli = callPackage ../applications/networking/mailreaders/meli { }; + melonDS = callPackage ../misc/emulators/melonDS { }; + meme = callPackage ../applications/graphics/meme { }; mendeley = libsForQt5.callPackage ../applications/office/mendeley { |