Unverified Commit 44a8d171 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents a756efd5 eb19d9bd

nixos/modules/services/misc/serviio.nix

+9 −1
Original line number Diff line number Diff line
@@ -39,6 +39,14 @@ in 
        '';

      };



      openFirewall = lib.mkOption {

        type = lib.types.bool;

        default = false;

        description = ''

          Open ports in the firewall for the Serviio Media Server.

        '';

      };



      dataDir = lib.mkOption {

        type = lib.types.path;

        default = "/var/lib/serviio";
@@ -76,7 +84,7 @@ in 


    users.groups.serviio = { };



    networking.firewall = {

    networking.firewall = lib.mkIf cfg.openFirewall {

      allowedTCPPorts = [

        8895 # serve UPnP responses

        23423 # console

pkgs/by-name/an/ants/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "ANTs";

  version = "2.6.2";

  version = "2.6.3";



  src = fetchFromGitHub {

    owner = "ANTsX";

    repo = "ANTs";

    tag = "v${finalAttrs.version}";

    hash = "sha256-TQR3HghaFBBiHl5oz3vmu7DIGT8UY5/CxY0pP0bLZx4=";

    hash = "sha256-AaurwFIDVKhAp8+Gu3TUlGJP33ChQ6flPTYWe/cVK0w=";

  };



  nativeBuildInputs = [

pkgs/by-name/br/brave/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -3,24 +3,24 @@ 


let

  pname = "brave";

  version = "1.83.109";

  version = "1.83.112";



  allArchives = {

    aarch64-linux = {

      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";

      hash = "sha256-mbhJnNheLdFGto4AuXMW0Gfajo+lThE4qqT7kzNvUHU=";

      hash = "sha256-IqPxbt3nCIrrqr3yVS0gDdiYsQ2OXVm3dabY8AH7IK0=";

    };

    x86_64-linux = {

      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";

      hash = "sha256-ZpB0BhXeTa0SBRh2Dj/qLDi8cABUVmW8o5aK0kRPEUM=";

      hash = "sha256-Q0V5V9JYGAgKAV3L43fy5I8ojIcxyU7C5OnqvatlkPE=";

    };

    aarch64-darwin = {

      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";

      hash = "sha256-8NzqrvxKiamBdpOnCxVfs50kmDu1xl3HApTUY9MdANQ=";

      hash = "sha256-bHePzMfb/FcCkH2aWqi8669mYcfTT/908ZasxOhFDHk=";

    };

    x86_64-darwin = {

      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";

      hash = "sha256-EJ+eT0RyleAjAofRiVeAyk5yLWSeAOf7QFGT5/HhWjo=";

      hash = "sha256-DNtEb7stYQ5uG+L7pdXXQZp/6dtx9eUlLgM0MpNLJac=";

    };

  };

pkgs/by-name/po/pot/package.nix

deleted100644 → 0
+0 −108
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  rustPlatform,

  fetchFromGitHub,

  nodejs,

  pnpm_9,

  wrapGAppsHook3,

  cargo,

  rustc,

  cargo-tauri_1,

  pkg-config,

  esbuild,

  buildGoModule,

  libayatana-appindicator,

  gtk3,

  webkitgtk_4_0,

  libsoup_2_4,

  openssl,

  xdotool,

}:



let

  pnpm = pnpm_9;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "pot";

  version = "3.0.7";



  src = fetchFromGitHub {

    owner = "pot-app";

    repo = "pot-desktop";

    tag = finalAttrs.version;

    hash = "sha256-0Q1hf1AGAZv6jt05tV3F6++lzLpddvjhiykIhV40cPs=";

  };



  postPatch = ''

    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \

      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"

  '';



  pnpmDeps = pnpm.fetchDeps {

    inherit (finalAttrs) pname version src;

    fetcherVersion = 1;

    hash = "sha256-iYQNGRWqXYBU+WIH/Xm8qndgOQ6RKYCtAyi93kb7xrQ=";

  };



  cargoRoot = "src-tauri";

  buildAndTestSubdir = "src-tauri";



  cargoDeps = rustPlatform.fetchCargoVendor {

    inherit (finalAttrs)

      pname

      version

      src

      cargoRoot

      ;

    hash = "sha256-dyXINRttgsqCfmgtZNXxr/Rl8Yn0F2AVm8v2Ao+OBsw=";

  };



  nativeBuildInputs = [

    rustPlatform.cargoSetupHook

    cargo

    rustc

    cargo-tauri_1.hook

    nodejs

    pnpm.configHook

    wrapGAppsHook3

    pkg-config

  ];



  buildInputs = [

    gtk3

    libsoup_2_4

    libayatana-appindicator

    openssl

    webkitgtk_4_0

    xdotool

  ];



  env.ESBUILD_BINARY_PATH = "${lib.getExe (

    esbuild.override {

      buildGoModule =

        args:

        buildGoModule (

          args

          // rec {

            version = "0.21.5";

            src = fetchFromGitHub {

              owner = "evanw";

              repo = "esbuild";

              tag = "v${version}";

              hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";

            };

          }

        );

    }

  )}";



  meta = {

    description = "Cross-platform translation software";

    mainProgram = "pot";

    homepage = "https://pot-app.com";

    platforms = lib.platforms.linux;

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ linsui ];

  };

})

pkgs/by-name/vs/vsce/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ buildNpmPackage (finalAttrs: { 
    homepage = "https://github.com/microsoft/vscode-vsce";

    description = "Visual Studio Code Extension Manager";

    maintainers = with lib.maintainers; [

      aaronjheng

      xiaoxiangmoe

    ];

    license = lib.licenses.mit;