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

Merge master into staging-nixos

parents 0b7af93e bde6ce62
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -6930,6 +6930,12 @@
    githubId = 13937320;
    name = "Dalton Caron";
  };
  DomagojAlaber = {
    email = "a.domagoj@hotmail.com";
    github = "DomagojAlaber";
    githubId = 86619082;
    name = "Domagoj Alaber";
  };
  domenkozar = {
    email = "domen@dev.si";
    github = "domenkozar";
@@ -18880,6 +18886,12 @@
    githubId = 42888162;
    keys = [ { fingerprint = "A0B9 48C5 A263 55C2 035F  8567 FBB7 2A94 52D9 1A72"; } ];
  };
  neural-blade = {
    name = "Carmelo Scaccianoce";
    email = "6c5bk3syhivc1t5ae2prj6k05p12cj.swifter143@simplelogin.com";
    github = "neural-blade";
    githubId = 64137177;
  };
  neurofibromin = {
    name = "Neurofibromin";
    github = "Neurofibromin";
@@ -23860,6 +23872,12 @@
    githubId = 24507823;
    name = "Schahin Rouhanizadeh";
  };
  schembriaiden = {
    email = "aidsch@proton.me";
    github = "schembriaiden";
    githubId = 81376423;
    name = "Aiden Schembri";
  };
  schinmai-akamai = {
    email = "schinmai@akamai.com";
    github = "tchinmai7";
+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@

- `services.tandoor-recipes` now uses a sub-directory for media files by default starting with `26.05`. Existing setups should move media files out of the data directory and adjust `services.tandoor-recipes.extraConfig.MEDIA_ROOT` accordingly. See [Migrating media files for pre 26.05 installations](#module-services-tandoor-recipes-migrating-media).

- `rustic` was upgraded to `0.11.x`, which contains breaking [changes to command-line parameters and configuration file](https://rustic.cli.rs/docs/breaking_changes.html#0110).

- The packages `iw` and `wirelesstools` (`iwconfig`, `iwlist`, etc.) are no longer installed implicitly if wireless networking has been enabled.

- `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a
+3 −3
Original line number Diff line number Diff line
@@ -18,18 +18,18 @@
  nix-update-script,
}:
let
  version = "1.3.21";
  version = "1.3.22";
  src = fetchFromGitHub {
    owner = "michaelb";
    repo = "sniprun";
    tag = "v${version}";
    hash = "sha256-L/OTi6vHyfcvlVgpgjiU3MBCd6v00GKlAkUwBm4X500=";
    hash = "sha256-lehL28qI1YArYK38v5tGRe7SSzHxU8Fbf10fG4ShMUw=";
  };
  sniprun-bin = rustPlatform.buildRustPackage {
    pname = "sniprun-bin";
    inherit version src;

    cargoHash = "sha256-6xh4YyXGIqrU9ixQ6QDCGDtaROoPe8iSMlytclbqqtY=";
    cargoHash = "sha256-YbovDLXVYnwCWwUC5FNAdvGbBThbkI4kOF5ukDY1IhA=";

    nativeBuildInputs = [ makeWrapper ];

+2 −2
Original line number Diff line number Diff line
@@ -1499,11 +1499,11 @@
    "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
  },
  "yandex-cloud_yandex": {
    "hash": "sha256-dD78ZHMDhSRHzkOs0fIxjZmNCHvWTDIKuVv68Tl7sTY=",
    "hash": "sha256-TitL9PaqN2j4mDz1yCz4Mqde1CxIG4Z2sJFm3emsVRM=",
    "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
    "owner": "yandex-cloud",
    "repo": "terraform-provider-yandex",
    "rev": "v0.187.0",
    "rev": "v0.189.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-ZYVGqcviq7auN2JwqHEFWiFPvy+PkaYV7MamNKF8Frc="
  }
+68 −0
Original line number Diff line number Diff line
{
  lib,
  appimageTools,
  fetchurl,
  makeDesktopItem,
}:

let
  pname = "apidog";
  version = "2.7.51";

  src = fetchurl {
    url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
    hash = "sha256-MEVnpzVRj0Mi+ZX9CVi5dyDlV3rxuSC5tYM03bqdw0Q=";
  };

  appimageContents = appimageTools.extract {
    inherit pname version src;
  };

  desktopItem = makeDesktopItem {
    name = "apidog";
    exec = "apidog %U";
    icon = "apidog";
    desktopName = "Apidog";
    comment = "All-in-One API Platform: Design, Debug, Mock, Test, and Document.";
    categories = [
      "Development"
      "Utility"
    ];
    mimeTypes = [ "x-scheme-handler/apidog" ];
  };
in
appimageTools.wrapType2 {
  inherit pname version src;

  extraPkgs = pkgs: [
    pkgs.nss
    pkgs.gtk3
    pkgs.libx11
    pkgs.libxcb
    pkgs.libxrandr
    pkgs.libxcomposite
    pkgs.libxdamage
    pkgs.libxfixes
    pkgs.libxext
    pkgs.libdbusmenu
    pkgs.alsa-lib
    pkgs.nodejs
  ];

  extraInstallCommands = ''
    install -Dm444 ${appimageContents}/apidog.png \
      $out/share/icons/hicolor/512x512/apps/apidog.png
  '';

  desktopItems = [ desktopItem ];

  meta = with lib; {
    description = "All-in-one API design, test, mock and documentation platform";
    homepage = "https://apidog.com";
    license = licenses.unfree;
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
    platforms = [ "x86_64-linux" ];
    mainProgram = "apidog";
    maintainers = with maintainers; [ DomagojAlaber ];
  };
}
Loading