Unverified Commit 11d11d0e authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'release-23.11' into staging-next-23.11

parents 2564af38 d572fb05

nixos/modules/services/web-apps/nextcloud.nix

+1 −6
Original line number Diff line number Diff line
@@ -125,12 +125,7 @@ in { 
      '';

      example = literalExpression ''

        {

          maps = pkgs.fetchNextcloudApp {

            name = "maps";

            sha256 = "007y80idqg6b6zk6kjxg4vgw0z8fsxs9lajnv49vv1zjy6jx2i1i";

            url = "https://github.com/nextcloud/maps/releases/download/v0.1.9/maps-0.1.9.tar.gz";

            version = "0.1.9";

          };

          inherit (pkgs.nextcloud25Packages.apps) mail calendar contact;

          phonetrack = pkgs.fetchNextcloudApp {

            name = "phonetrack";

            sha256 = "0qf366vbahyl27p9mshfma1as4nvql6w75zy2zk5xwwbp343vsbc";

pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ trivialBuild { 
  inherit (llvmPackages.llvm) src version;



  postUnpack = ''

    sourceRoot="$sourceRoot/utils/emacs"

    sourceRoot="$sourceRoot/llvm/utils/emacs"

  '';



  meta = {

pkgs/applications/emulators/darling/default.nix

+6 −3
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, writeShellScript

, fetchFromGitHub

, fetchpatch

, nixosTests



, freetype

, libjpeg
@@ -107,14 +108,14 @@ let 
  ];

in stdenv.mkDerivation {

  pname = "darling";

  version = "unstable-2023-05-02";

  version = "unstable-2023-11-07";



  src = fetchFromGitHub {

    owner = "darlinghq";

    repo = "darling";

    rev = "557e7e9dece394a3f623825679474457e5b64fd0";

    rev = "34351655a40d2090e70b3033a577b8cdea967633";

    fetchSubmodules = true;

    hash = "sha256-SOoLaV7wg33qRHPQXkdMvrY++CvoG85kwd6IU6DkYa0=";

    hash = "sha256-Jhr7Do15vms8bJ8AczVSkuWrC7gUR5ZvU9/PfCmGGcg=";

  };



  outputs = [ "out" "sdk" ];
@@ -221,6 +222,8 @@ in stdenv.mkDerivation { 
      $out/libexec/darling/usr/libexec/darling/mldr

  '';



  passthru.tests.nixos = nixosTests.darling;



  meta = with lib; {

    description = "Open-source Darwin/macOS emulation layer for Linux";

    homepage = "https://www.darlinghq.org";

pkgs/applications/misc/udiskie/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -14,15 +14,15 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "udiskie";

  version = "2.5.0";

  version = "2.5.1";



  format = "setuptools";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "coldfix";

    repo = "udiskie";

    rev = "v${version}";

    hash = "sha256-wIXh7dzygjzSXo51LBt1BW+sar6qUELWC6oTGPDGgcE=";

    hash = "sha256-bmpofyW5IBRmVlzHP9YRlI/JNnnamKfF9jCG85G0wBc=";

  };



  patches = [
@@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { 
    asciidoc # Man page

    gobject-introspection

    installShellFiles

    python3.pkgs.setuptools

    wrapGAppsHook

  ];

pkgs/applications/networking/gns3/gui.nix

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { 
    setuptools

    sip_4 (pyqt5.override { withWebSockets = true; })

    truststore

    qt5.qtwayland

  ] ++ lib.optionals (pythonOlder "3.9") [

    importlib-resources

  ];