diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-18 18:51:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-18 18:51:53 +0000 |
commit | 7e57508cfca73b5d6285c39ca68de014cd202792 (patch) | |
tree | 82b192815e3e621b5f9fda11e331df5c08de583d | |
parent | c223ba254c5398825810c16e8b36d1adab8f7251 (diff) | |
parent | efd24386146c7874d01be33e70de5a3b79cc93fc (diff) |
Merge master into staging-next
86 files changed, 1205 insertions, 324 deletions
diff --git a/nixos/modules/services/misc/matrix-synapse.xml b/nixos/modules/services/misc/matrix-synapse.xml index 5544c2035fb7..358b631eb485 100644 --- a/nixos/modules/services/misc/matrix-synapse.xml +++ b/nixos/modules/services/misc/matrix-synapse.xml @@ -206,7 +206,7 @@ Success! <link linkend="opt-services.nginx.virtualHosts._name_.root">root</link> = pkgs.element-web.override { conf = { default_server_config."m.homeserver" = { - "base_url" = "${config.networking.domain}"; + "base_url" = "https://${fqdn}"; "server_name" = "${fqdn}"; }; }; diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix index a010a5316bae..b8b95d846c6a 100644 --- a/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -122,7 +122,7 @@ in { timezone = config.time.timeZone; }; - services = { + service = { logging.level = mkIf cfg.verbose (mkDefault "debug"); metrics.enabled = mkDefault false; }; diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 63d15e813afe..5c969fc9c917 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -107,7 +107,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: for track in tracks.splitlines(): server.succeed(f"{mpc} add {track}") - _, added_tracks = server.execute(f"{mpc} listall") + _, added_tracks = server.execute(f"{mpc} playlist") # Check we succeeded adding audio tracks to the playlist assert len(added_tracks.splitlines()) > 0 diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index ffe9e549eb23..db8f8ad793a2 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; + sha256 = "sha256-LYndZhg4ILN0E8aRqgUBFzzzLv88TMSXG2OeFxImDu0="; }; nativeBuildInputs = [ pkg-config ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/sjaehn/BChoppr; + homepage = "https://github.com/sjaehn/BChoppr"; description = "An audio stream chopping LV2 plugin"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index c8fae58ac2fb..6b0ca55f27f1 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "1.2.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj"; + sha256 = "sha256-R6QTADPE2PW/ySQla2lQbb308jrHXZ43DpFxUfQ0/NY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index 58f8fee3cefc..ec6fd4d8ed93 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "6.0"; + version = "6.2"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "052zpabkbkqzqzf8r6mdq9p6arn9mr1ywx6x3y9rqxj6sfprxd65"; + sha256 = "sha256-t7DRPV0FSg6v81GzHLK2O++sfjr2aFT+xg3+wFd0UFg="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 2159fa630d92..8d495b936292 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ - mv $out/AudioPluginServer* $out/lib/ - cp renoise $out/renoise for path in ${toString buildInputs}; do @@ -56,6 +54,13 @@ stdenv.mkDerivation rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${mpg123}/lib:$out/lib \ $out/renoise + + for path in $out/AudioPluginServer*; do + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath $out/lib \ + $path + done ''; meta = { diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index ba7ebfcfdff6..133deec19521 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -38,16 +38,16 @@ let in rustPlatform.buildRustPackage rec { pname = "emulsion"; - version = "7.2"; + version = "8.0"; src = fetchFromGitHub { owner = "ArturKovacs"; repo = pname; rev = "v${version}"; - sha256 = "1king04p5j4gsvprrfppwaxa5jn4ga4nc0v63wl6fvq2ngwnkg4g"; + sha256 = "sha256-xv3q59HobunrFyc+CPLztpsQd20Eu4+JI+iYhlGI0bc="; }; - cargoSha256 = "19vb2q5w3063l7349p1b8q40n97a4hxdvc7h7qsx1iiwp75knbd0"; + cargoSha256 = "sha256-37xtdFbtbfGUqaSpzlxDQfe1+0ESHz/rgO1iTPBEBLc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 7cd31adfa32a..4d2ef2254e13 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,15 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config -, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31 -, gtest, nlopt, xorg, makeDesktopItem -, cgal_5, gmp, ilmbase, mpfr, qhull, openvdb, systemd +{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem, pkg-config, wrapGAppsHook +, boost, cereal, cgal_5, curl, dbus, eigen, expat, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme +, ilmbase, libpng, mpfr, nlopt, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg }: stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.2.0"; + version = "2.3.0"; nativeBuildInputs = [ cmake + copyDesktopItems pkg-config + wrapGAppsHook ]; buildInputs = [ @@ -17,21 +18,27 @@ stdenv.mkDerivation rec { cereal cgal_5 curl + dbus eigen expat glew + glib gmp + gtk3 + hicolor-icon-theme ilmbase libpng mpfr nlopt openvdb + pcre systemd tbb - wxGTK31 + wxGTK31-gtk3 xorg.libX11 ] ++ checkInputs; + doCheck = true; checkInputs = [ gtest ]; # The build system uses custom logic - defined in @@ -62,30 +69,43 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "0954k9sm09y8qnz1jyswyysg10k54ywz8mswnwa4n2hnpq9qx73m"; + sha256 = "08zyvik8cyj1n9knbg8saan7j8s60nzkyj4a77818zbi9lpi65i5"; rev = "version_${version}"; }; cmakeFlags = [ "-DSLIC3R_FHS=1" + "-DSLIC3R_GTK=3" ]; postInstall = '' + ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer" + mkdir -p "$out/share/pixmaps/" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" - mkdir -p "$out/share/applications" - cp "$desktopItem"/share/applications/* "$out/share/applications/" + ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" ''; - desktopItem = makeDesktopItem { - name = "PrusaSlicer"; - exec = "prusa-slicer"; - icon = "PrusaSlicer"; |