Unverified Commit 70b8fde3 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge branch 'master' into aiortm-bump

parents 1fc5f703 af9c1560

lib/systems/examples.nix

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ rec { 
  };



  gnu64 = { config = "x86_64-unknown-linux-gnu"; };

  gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix

  gnu32  = { config = "i686-unknown-linux-gnu"; };



  musl64 = { config = "x86_64-unknown-linux-musl"; };

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ with lib.maintainers; { 
    members = [

      GaetanLepage

      natsukium

      thomasjm

    ];

    scope = "Maintain Jupyter and related packages.";

    shortName = "Jupyter";

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ 
  ./programs/udevil.nix

  ./programs/usbtop.nix

  ./programs/vim.nix

  ./programs/virt-manager.nix

  ./programs/wavemon.nix

  ./programs/wayland/cardboard.nix

  ./programs/wayland/river.nix

pkgs/applications/audio/gpodder/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 


python3Packages.buildPythonApplication rec {

  pname = "gpodder";

  version = "3.11.3";

  version = "3.11.4";

  format = "other";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = version;

    sha256 = "p8BgpvMK1kP4VnRfmcvSMbXmWs5DmWBZ6te7L9b+UJQ=";

    sha256 = "kEhyV1o8VSQW9qMx6m5avj6LnJuVTONDd6msRuc8t/4=";

  };



  patches = [

pkgs/applications/audio/monkeys-audio/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:



stdenv.mkDerivation (finalAttrs: {

  version = "10.24";

  version = "10.26";

  pname = "monkeys-audio";



  src = fetchzip {

    url = "https://monkeysaudio.com/files/MAC_${

      builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";

    sha256 = "sha256-18rHv9sbxpuMfMrqoSSeEncDmQlWpdA/xNPoYJoIgJ0=";

    sha256 = "sha256-SXuuAavvqzZ7DRX6SKfPfC1smbTHVHUAv80w0RHLfpg=";

    stripRoot = false;

  };

  nativeBuildInputs = [