diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-29 12:01:20 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-29 12:01:20 +0000 |
commit | 2019d6632b1c59530c292a202ddc50a907118d63 (patch) | |
tree | a3c06b8333831153baac0f8665c72d51c2ef8698 | |
parent | 82228498659fa83e62dbb326cc680f2f0fb81979 (diff) | |
parent | 63e3e11479e32a9f9427d6c18fa877323913ac8f (diff) |
Merge master into staging-next
52 files changed, 468 insertions, 194 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2aec66efa9be..4b4f462a5cd5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12402,6 +12402,12 @@ githubId = 61306; name = "Rene Treffer"; }; + rumpelsepp = { + name = "Stefan Tatschner"; + email = "stefan@rumpelsepp.org"; + github = "rumpelsepp"; + githubId = 1961699; + }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index c216c6fa2b77..43e0ce0c21d3 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -106,6 +106,9 @@ in systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" + # this will allow octoprint access to raspberry specific hardware to check for throttling + # read-only will not work: "VCHI initialization failed" error + "a /dev/vchiq - - - - u:octoprint:rw" ]; systemd.services.octoprint = { diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 4b445c6b3083..12d0a5e38fe6 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -82,6 +82,10 @@ let # requires octoprint itself during tests doCheck = false; + postPatch = '' + substituteInPlace octoprint_pi_support/__init__.py \ + --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd + ''; }; } ) diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 793e5291d5b5..0220778277c1 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "pure-maps"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - hash = "sha256-ZPW2hNnaRfv5aTXqku7hPShN0leOuVEJ3T/OOTzwgXQ="; + hash = "sha256-07Jk5ufYbBAa/UY1B0IoyuOAVt15rGCxCRXu3OeYyWU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index a5debadc8005..f1225f87eefb 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.2.7"; + version = "4.3.1"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-X5hZspl9IekhC8XXpZS285cmVZek2oxIV3tYOz/ZBec="; + sha256 = "sha256-hfUtxPGPhPC2VgGLLIaYHlEMpXHAPZ5fkLL0glhyQcY="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index b62bda3c469f..20ef4e682c7e 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -1,24 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gdrive"; - version = "2.1.0"; - rev = version; - - goPackagePath = "github.com/prasmussen/gdrive"; + version = "2.1.1"; src = fetchFromGitHub { - owner = "prasmussen"; - repo = "gdrive"; - sha256 = "0ywm4gdmrqzb1a99vg66a641r74p7lglavcpgkm6cc2gdwzjjfg7"; - inherit rev; + owner = "prasmussen"; + repo = "gdrive"; + rev = version; + hash = "sha256-2dJmGFHfGSroucn4WgiV2NExBs5wtMDe2kX1jDBwbRs="; }; + deleteVendor = true; + vendorHash = "sha256-sHNP1YwnZYu0UfgLx5+gxJmesY8Brt7rr9cptlyk9Bk="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/prasmussen/gdrive/pull/585/commits/faa6fc3dc104236900caa75eb22e9ed2e5ecad42.patch"; + hash = "sha256-W8o2ZfhQFJISHfPavjx9sw5UB6xOZ7qRW4L0bHNddS8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { - homepage = "https://github.com/prasmussen/gdrive"; + homepage = "https://github.com/prasmussen/gdrive"; description = "A command line utility for interacting with Google Drive"; - platforms = platforms.unix; - license = licenses.mit; + license = licenses.mit; + platforms = platforms.unix; maintainers = [ maintainers.rzetterberg ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index bd3d75bd66bb..805aadfc40a9 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , copyDesktopItems -, electron_18 +, electron_22 , buildGoModule , esbuild , fetchFromGitHub @@ -57,7 +57,15 @@ in buildNpmPackage rec { hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco="; }; - npmDepsHash = "sha256-ZMXXBDVT5rHTzHOrKAUAezL/1UTMdzbBllG69kxg55M="; + patches = [ + (fetchpatch { + name = "bump-electron-to-22.1.0.patch"; + url = "https://github.com/deltachat/deltachat-desktop/commit/944d2735cda6cd5a95cb83c57484fbaf16720a9c.patch"; + hash = "sha256-kaKi32eFQ3hGLZLjiXmH9qs4GXezcDQ7zTdT2+D8NcQ="; + }) + ]; + + npmDepsHash = "sha256-J3/S/jYQvO/U8StDtYI+jozon0d4VCdeqFX6x1hHzMo="; nativeBuildInputs = [ makeWrapper @@ -105,7 +113,7 @@ in buildNpmPackage rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \ + makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index dcc13cf99cc6..9765d2fcc1e4 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -15,7 +15,7 @@ , pname ? "kicad" , stable ? true , withOCC ? true -, withNgspice ? true +, withNgspice ? !stdenv.isDarwin , libngspice , withScripting ? true , python3 @@ -170,6 +170,7 @@ stdenv.mkDerivation rec { # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? installPhase = let + bin = if stdenv.isDarwin then "*.app/Contents/MacOS" else "bin"; tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ]; in @@ -181,13 +182,13 @@ stdenv.mkDerivation rec { # wrap each of the directly usable tools (map - (tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs" + (tool: "makeWrapper ${base}/${bin}/${tool} $out/bin/${tool} $makeWrapperArgs" + optionalString (withScripting) " --set PYTHONPATH \"$program_PYTHONPATH\"" ) tools) # link in the CLI utils - (map (util: "ln -s ${base}/bin/${util} $out/bin/${util}") utils) + (map (util: "ln -s ${base}/${bin}/${util} $out/bin/${util}") utils) "runHook postInstall" ]) diff --git a/pkgs/applications/version-management/git-chglog/default.nix b/pkgs/applications/version-management/git-chglog/default.nix index b427acf960ec..6259bad88063 100644 --- a/pkgs/applications/version-management/git-chglog/default.nix +++ b/pkgs/applications/version-management/git-chglog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-chglog"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "git-chglog"; repo = "git-chglog"; rev = "v${version}"; - sha256 = "sha256-UlhJ004ceXpdB/9296cL2sbBYsjV8D+3YS1vmFgnko8="; + sha256 = "sha256-VB3JYXz50B/SkA/q1iET7p5uhArrF8JyhAWhcxLVsg8="; }; - vendorSha256 = "sha256-FLFPcmkrhZ+/UX1xpexsDv3cgC/Ocj4qTFJOX+rmdyQ="; + vendorHash = "sha256-/5s9Dvce0JWu8DaUlrtnkN6N5esEmkFvOgq0tVLZGnM="; ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 40a1e671cc56..d95b37ef1d30 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.15"; + version = "1.6.16"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; + hash = "sha256-p2I188MGoxnd7dBAMQ0bM5+GT8z3y9S4cZW2Q99DyzY="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index 6f1a37f9379a..2ec46e42cbf3 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "pekwm"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "pekdon"; repo = "pekwm"; rev = "release-${version}"; - hash= "sha256-voHPstdcd4CHnAdD3PMxca0A6MyMYJi8Ik0UlFB0vG0="; + hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ="; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix new file mode 100644 index 000000000000..9d05689657e0 --- /dev/null +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchurl +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation rec { + pname = "lxgw-neoxihei"; + version = "1.005"; + + src = fetchurl { + url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; + hash = "sha256-IvbbeBjpFz9zHt3mHu5vY8sLETKnvOMv7eHjANQ2GlA="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/LXGWNeoXiHei.ttf + + runHook postInstall + ''; + + meta = with lib; { + description = "A Simplified Chinese sans-serif font derived from IPAex Gothic"; + homepage = "https://github.com/lxgw/LxgwNeoXiHei"; + license = licenses.ipa; + platforms = platforms.all; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 4fb9768ef7ee..4d3c09a9f204 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-fRurEkatWbtGiTRNe6tA2NyYk1IRCBW8SKBSUm4FrO4="; + sha256 = "sha256-ToRY27qB/cNKjKW22MTEojxxOXMBfO1LUusy/pXKJ9A="; }; patches = [ diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index 85a980958da3..8030980b7788 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nelua"; - version = "unstable-2022-11-20"; + version = "unstable-2023-01-21"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "63909dc834708a5bd7c21d65a6633880f40295db"; - hash = "sha256-GeknXYsdRUzihzF3qHcCgbcB3w8geiWe5O1Az+4UqMs="; + rev = "d10cc61bc54050b07874a8597f8df20534885105"; + hash = "sha256-HyNYqhPCQVBJqEcAUUXfvycXE8tWIMIUJJMTIV48ne8="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index 9ced4e0a44d5..8b0ac955810e 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -28,8 +28,7 @@ let "example" ]; - # There is now a release, but it's cpu-only it seems to be for a very specific purpose - # Thus, we're sticking with the develop branch for now... + # ROCm 5.6 should release composable_kernel as stable with a tag in the future src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "composable_kernel"; @@ -53,6 +52,7 @@ let "-DCMAKE_CXX_COMPILER=hipcc" ] ++ lib.optionals (gpuTargets != [ ]) [ "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals buildTests [ "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names ]; @@ -82,7 +82,6 @@ let license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = buildExamples; # bin/example_grouped_gemm_xdl_bfp16] Error 139 }; }); @@ -93,6 +92,7 @@ in stdenv.mkDerivation { inherit (ck) pname version outputs src passthru meta; dontUnpack = true; + dontPatch = true; dontConfigure = true; dontBuild = true; @@ -109,4 +109,10 @@ in stdenv.mkDerivation { '' + '' runHook postInstall ''; + + # Fix paths + preFixup = '' + substituteInPlace $out/lib/cmake/composable_kernel/*.cmake \ + --replace "${ck}" "$out" + ''; } diff --git a/pkgs/development/libraries/discord-gamesdk/default.nix b/pkgs/development/libraries/discord-gamesdk/default.nix new file mode 100644 index 000000000000..513eebe7124f --- /dev/null +++ b/pkgs/development/libraries/discord-gamesdk/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchzip +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "discord-gamesdk"; + version = "3.2.1"; + + src = fetchzip { + url = "https://dl-game-sdk.discordapp.net/${version}/discord_game_sdk.zip"; + sha256 = "sha256-83DgL9y3lHLLJ8vgL3EOVk2Tjcue64N+iuDj/UpSdLc="; + stripRoot = false; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + installPhase = + let + processor = stdenv.hostPlatform.uname.processor; + sharedLibrary = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + runHook preInstall + + install -Dm555 lib/${processor}/discord_game_sdk${sharedLibrary} $out/lib/discord_game_sdk${sharedLibrary} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://discord.com/developers/docs/game-sdk/sdk-starter-guide"; + description = "Library to allow other programs to interact with the Discord desktop application"; + license = licenses.unfree; + maintainers = with maintainers; [ tomodachi94 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ]; + }; +} diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 8f84cd0eab80..566a1c1b83fa 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -5,21 +5,23 @@ , meson , ninja , pkg-config -, gobject-introspection , gettext -, gtk-doc -, docbook-xsl-nons , vala , libcap_ng , libvirt , libxml2 +, withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform +, gobject-introspection +, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform +, gtk-doc +, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "libvirt-glib"; version = "4.0.0"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] ++ lib.optional withDocs "devdoc"; src = fetchurl { url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz"; @@ -39,22 +41,35 @@ stdenv.mkDerivation rec { ninja pkg-config gettext - gtk-doc - docbook-xsl-nons vala gobject-introspection + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withDocs [ + gtk-doc + docbook-xsl-nons ]; - buildInputs = (lib.optionals stdenv.isLinux [ - libcap_ng - ]) ++ [ + buildInputs = [ libvirt libxml2 + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng + ] ++ lib.optionals withIntrospection [ gobject-introspection ]; strictDeps = true; + # The build system won't let us build with docs or introspection + # unless we're building natively, but will still do a mandatory + # check for the dependencies for those things unless we explicitly |