Unverified Commit 9d96b5f8 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 1cf369a0 6b4e4578

pkgs/applications/networking/browsers/firefox/packages.nix

+4 −4
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ 


  firefox-beta = buildMozillaMach rec {

    pname = "firefox-beta";

    version = "119.0b4";

    version = "119.0b9";

    applicationName = "Mozilla Firefox Beta";

    src = fetchurl {

      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

      sha512 = "7c067d759602608e527d032f7a3772df827a5b5c4270992c05abda726fcd665f4f2c5380e684623ed108364ace4afaed8b5959f75a4b0540edd5ae30422b0e54";

      sha512 = "11d07474e3ca72a4e2f60053882e09a215e0d29d6830d0cd41447bb67370118356090af7adcbacd7703ad9fcdda83c9f909419c86b8f3bf2eacd9ca3d3aa3f54";

    };



    meta = {
@@ -58,12 +58,12 @@ 


  firefox-devedition = (buildMozillaMach rec {

    pname = "firefox-devedition";

    version = "119.0b4";

    version = "119.0b9";

    applicationName = "Mozilla Firefox Developer Edition";

    branding = "browser/branding/aurora";

    src = fetchurl {

      url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";

      sha512 = "ded00bc1e090bdca5f32160d980cec47590bb952a6c7f1dc8f4df30fa452cad8c47a3c6d20cf3e8345fd5811777b475354d71d704c866fb49396a83c8a795bcb";

      sha512 = "ce3e2adb3171aa05c7af3b7a4ea25eaafbc109c522b90e26aad577192a0902000fb7d705fa5707a9a7d0be2ab1c0cddc5a98abbe6549e1377c0a1d765bda62eb";

    };



    meta = {

pkgs/applications/version-management/git-repo/default.nix

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


stdenv.mkDerivation rec {

  pname = "git-repo";

  version = "2.37";

  version = "2.38";



  src = fetchFromGitHub {

    owner = "android";

    repo = "tools_repo";

    rev = "v${version}";

    hash = "sha256-6OAubRkNXIm1HaiDq4jzBPUhgbwQowSZXSqAzAe7Rv0=";

    hash = "sha256-o3uNFGnccFU3ZSc8BZLh8JTc8517bho/qX6otC5oC5s=";

  };



  # Fix 'NameError: name 'ssl' is not defined'

pkgs/by-name/oe/oelint-adv/package.nix

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


python3.pkgs.buildPythonApplication rec {

  pname = "oelint-adv";

  version = "3.25.0";

  version = "3.26.1";

  format = "setuptools";



  src = fetchPypi {

    inherit version;

    pname = "oelint_adv";

    hash = "sha256-dhTS2DZ7Usb1jgBv9Wm86w8CCMt64aHyBrxucLZUQjs=";

    hash = "sha256-xQC3y9YeY8o4L4pLV+nLs1Ao8KH6q1BprwTeUm8f+2w=";

  };



  propagatedBuildInputs = with python3.pkgs; [

pkgs/data/misc/hackage/pin.json

+4 −4
Original line number Diff line number Diff line 
{

  "commit": "ad59313651a92d9b7356f616268c7a3d80f52886",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ad59313651a92d9b7356f616268c7a3d80f52886.tar.gz",

  "sha256": "0s66dx6daxfkdm40fcqvlh3h9bcjx1cydrmgxd7dxrlmqqgwn4lc",

  "msg": "Update from Hackage at 2023-09-13T23:29:30Z"

  "commit": "d37311b9195c41b254b2d71c74c93e51f6ccebab",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d37311b9195c41b254b2d71c74c93e51f6ccebab.tar.gz",

  "sha256": "1m2xcnyz6y03m5l5qdxc0avi4gi53g82hq4ab9qcjbxi82g3qn4v",

  "msg": "Update from Hackage at 2023-10-04T18:27:12Z"

}

pkgs/development/compilers/elm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ let 
      attoparsec = self.attoparsec_0_13_2_5;



      # aeson 2.0.3.0 does not build with attoparsec_0_13_2_5

      aeson = self.aeson_1_5_6_0;

      aeson = doJailbreak self.aeson_1_5_6_0;



      # elm-instrument needs this

      indents = self.callPackage ./packages/indents.nix {};