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

Merge master into staging-next

parents 044e6c91 e20b1678

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ 


- `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.



- `duckstation` package has been removed, as it was requested by upstream and build source were changed to be incompatible with NixOS.



- `nodePackages.coc-go` and `nodePackages.coc-tsserver`, along with their vim plugins, have been removed from nixpkgs due to being unmaintained.



- `nodePackages.wavedrom-cli` has been removed, as it was unmaintained within nixpkgs.

pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix

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


buildGoModule rec {

  pname = "helm-diff";

  version = "3.13.1";

  version = "3.15.2";



  src = fetchFromGitHub {

    owner = "databus23";

    repo = "helm-diff";

    rev = "v${version}";

    hash = "sha256-7LkXoPhLqZtc1jy8JOkZrHWSIqB2oZLHsEyeNk3vl60=";

    hash = "sha256-gcIwg/EZ8A3RKSPuk3Ot6hPDS0m65V/IVqUs3VPbrSQ=";

  };



  vendorHash = "sha256-QSbml6M+ftQy4n+ybYWf2gCsbVmrnhX09w3ffW/JgUM=";

  vendorHash = "sha256-7Qw5ggvyhffmVZH7jKF21y+m1KTroucQ/ZGP67D+EjY=";



  ldflags = [

    "-s"

pkgs/applications/networking/instant-messengers/profanity/default.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "profanity";

  version = "0.15.1";

  version = "0.16.0";



  src = fetchFromGitHub {

    owner = "profanity-im";

    repo = "profanity";

    rev = finalAttrs.version;

    hash = "sha256-h+R+hasc45NZOneuqZ+z+yjfpsPm317OXq0LYe3t+cQ=";

    hash = "sha256-/1ae2+iY01C0TyrvviZIcwUQDJvr2qq2DM0GVbjoynI=";

  };



  patches = [

pkgs/applications/science/logic/tamarin-prover/default.nix

+23 −14
Original line number Diff line number Diff line
@@ -6,21 +6,21 @@ 
  # the following are non-haskell dependencies

  makeWrapper,

  which,

  buildNpmPackage,

  maude,

  graphviz,

  glibcLocales,

  fetchpatch,

}:



let

  inherit (haskellPackages) mkDerivation;



  version = "1.10.0";

  version = "1.12.0";

  src = fetchFromGitHub {

    owner = "tamarin-prover";

    repo = "tamarin-prover";

    rev = version;

    hash = "sha256-v1BruU2p/Sg/g7b9a+QRza46bD7PkMtsGq82qFaNhpI=";

    tag = version;

    hash = "sha256-yXJIJENygr/lmkrVap4ohb8Pua4kri+yaD/Dy0Hpwn4=";

  };



  # tamarin has its own dependencies, but they're kept inside the repo,
@@ -141,6 +141,20 @@ let 
    }

  );



  tamarin-frontend = buildNpmPackage {

    pname = "tamarin-frontend";

    inherit version src;



    sourceRoot = "source/frontend";



    npmDepsHash = "sha256-GJiOCyTUfseZXd5WU018MKjxvrc+UOr7l7ZZSpzCS54=";



    installPhase = ''

      mkdir -p $out

      cp dist/* $out/

    '';

  };



in

mkDerivation (

  common "tamarin-prover" src
@@ -148,21 +162,16 @@ mkDerivation ( 
    isLibrary = false;

    isExecutable = true;



    patches = [

      # Allows tamarin-prover to run with Maude 3.5.1

      # This should be removed on the next release

      (fetchpatch {

        url = "https://github.com/tamarin-prover/tamarin-prover/commit/1a41b507e7f60d081d8c91cd465386d57f814f11.patch";

        includes = [ "src/Main/Console.hs" ];

        hash = "sha256-X8qhscwy+efATrl3rLtn0Xi9M5a2CsFrjBbiqvVRtSE=";

      })

    ];



    # strip out unneeded deps manually

    doHaddock = false;

    enableSharedExecutables = false;

    postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";



    preBuild = ''

      cp ${tamarin-frontend}/*.js data/js/

      cp ${tamarin-frontend}/*.css data/css/

    '';



    # wrap the prover to be sure it can find maude, sapic, etc

    executableToolDepends = [

      makeWrapper

pkgs/by-name/az/azure-functions-core-tools/deps.json

+0 −596

File changed.

Preview size limit exceeded, changes collapsed.