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

Merge master into staging-next

parents b06862d7 9ce0d933

pkgs/applications/networking/cluster/terraform-providers/providers.json

+3 −3
Original line number Diff line number Diff line
@@ -436,13 +436,13 @@ 
    "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA="

  },

  "gitlabhq_gitlab": {

    "hash": "sha256-BDgNtPtK43O9PlQVmGqWj3Vtv18p9KlIfl+zky1pYlw=",

    "hash": "sha256-0zU1HXGs+4qJ/IYePgX3uE7/i7vV85nXD1jiwKasgxA=",

    "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",

    "owner": "gitlabhq",

    "repo": "terraform-provider-gitlab",

    "rev": "v18.10.0",

    "rev": "v18.11.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-3A8nlFIdxUVUUnW8D//7FR3/ic3iAPiH1xRIMC1IUhY="

    "vendorHash": "sha256-a82yKFb82R6mlts5X2igussJTBldNAtwaz35QIe/hSk="

  },

  "go-gandi_gandi": {

    "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=",

pkgs/by-name/ac/acpica-tools/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { 
  meta = {

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

    description = "ACPICA Tools";

    changelog = "https://github.com/acpica/acpica/releases/tag/${finalAttrs.version}";

    license = with lib.licenses; [

      iasl

      gpl2Only

pkgs/by-name/fi/firefly-iii/package.nix

+13 −10
Original line number Diff line number Diff line
@@ -5,45 +5,48 @@ 
  nodejs-slim,

  fetchNpmDeps,

  buildPackages,

  php84,

  php85,

  nixosTests,

  nix-update-script,

  dataDir ? "/var/lib/firefly-iii",

}:



let

  php = php85;

in

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "firefly-iii";

  version = "6.4.22";

  version = "6.5.9";



  src = fetchFromGitHub {

    owner = "firefly-iii";

    repo = "firefly-iii";

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

    hash = "sha256-i20D0/z6GA7pZYrWvRJ8tUlptNI5Cl/e9UY0hKg9SP8=";

    hash = "sha256-8Orha6/cLjE9J01m77LwpvXlYrOmb/28TzxQ/RJdvDQ=";

  };



  buildInputs = [ php84 ];

  buildInputs = [ php ];



  nativeBuildInputs = [

    nodejs-slim

    nodejs-slim.npm

    nodejs-slim.python

    buildPackages.npmHooks.npmConfigHook

    php84.packages.composer

    php84.composerHooks2.composerInstallHook

    php.packages.composer

    php.composerHooks2.composerInstallHook

  ];



  composerVendor = php84.mkComposerVendor {

  composerVendor = php.mkComposerVendor {

    inherit (finalAttrs) pname src version;

    composerStrictValidation = true;

    strictDeps = true;

    vendorHash = "sha256-m+esW/yQs/GSwnw2iqVfSMXCf6/5M4634GUbt4Nnvbg=";

    vendorHash = "sha256-9TTlMVlW7aXckIgpB5M0IxcLDtHqMboQgP00pmfK1zg=";

  };



  npmDeps = fetchNpmDeps {

    inherit (finalAttrs) src;

    name = "${finalAttrs.pname}-npm-deps";

    hash = "sha256-pu8dxL0NRB1cyqlQEf2zT2wdVp2fbe+Vp85qMs7f6s0=";

    hash = "sha256-UyViUi/bIXK2aIzRgYe3oTyIMBRHpKYHIIEb6Qq1Jkk=";

  };



  preInstall = ''
@@ -52,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
  '';



  passthru = {

    phpPackage = php84;

    phpPackage = php;

    tests = nixosTests.firefly-iii;

    updateScript = nix-update-script {

      extraArgs = [

pkgs/by-name/fq/fq/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ 


buildGoModule (finalAttrs: {

  pname = "fq";

  version = "0.16.0";

  version = "0.17.0";



  src = fetchFromGitHub {

    owner = "wader";

    repo = "fq";

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

    hash = "sha256-b28zncqz0B1YIXHCjklAkVbIdXxC36bqIwJ4VrrCe18=";

    hash = "sha256-rGuUvuq9hZrqt3Uy1s1he8O+c+iF83RU6PsUlatrPcQ=";

  };



  vendorHash = "sha256-bF3N+cPJAxAEFmr2Gl3xdKLtv7yLkxze19NgDFWaBn8=";

  vendorHash = "sha256-Iga9g9VMTxtdselFn+8udjtInXWW9sNUfSzIc7OgvbY=";



  ldflags = [

    "-s"

pkgs/by-name/go/go-grip/package.nix

+3 −6
Original line number Diff line number Diff line
@@ -2,22 +2,19 @@ 
  buildGoModule,

  fetchFromGitHub,

  lib,

  gitUpdater,

}:

buildGoModule (finalAttrs: {

  pname = "go-grip";

  version = "0.5.6";

  version = "0.9.0";



  src = fetchFromGitHub {

    owner = "chrishrb";

    repo = "go-grip";

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

    hash = "sha256-c3tl5nALPqIAMSqjbbQDi6mN6M1mKJvzxxDHcj/QyuY=";

    hash = "sha256-HwD/pdWEEU+Hoo4HUJeK8y40jp1byNhw/TSpa5SNRak=";

  };



  vendorHash = "sha256-aU6vo/uqJzctD7Q8HPFzHXVVJwMmlzQXhAA6LSkRAow=";



  passthru.updateScript = gitUpdater { rev-prefix = "v"; };

  vendorHash = "sha256-QsLiCsFY6nI85jsEZtAgmObEKpBSZWhzZk+TlukM8JU=";



  meta = {

    description = "Preview Markdown files locally before committing them";