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

Merge master into staging-next

parents 1604f457 0ea4f4d8

pkgs/applications/emulators/retroarch/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ let 
in

stdenv.mkDerivation rec {

  pname = "retroarch-bare";

  version = "1.17.0";

  version = "1.18.0";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "RetroArch";

    hash = "sha256-8Y8ZYZFNK7zk0bQRiWwoQbu6q3r25bN3EvLOA3kIxdU=";

    hash = "sha256-uOnFkLrLQlBbUlIFA8wrOkQdVIvO7Np7fvi+sPJPtHE=";

    rev = "v${version}";

  };

pkgs/applications/emulators/retroarch/libretro-core-info.nix

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


stdenvNoCC.mkDerivation rec {

  pname = "libretro-core-info";

  version = "1.17.0";

  version = "1.18.0";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "libretro-core-info";

    rev = "v${version}";

    hash = "sha256-iJteyqD7hUtBxj+Y2nQZXDJVM4k+TDIKLaLP3IFDOGo=";

    hash = "sha256-tIuDDueYocvRDbA8CTR5ubGI7/Up02zUENw/HaDwC0U=";

  };



  makeFlags = [

pkgs/applications/emulators/wine/sources.nix

+3 −3
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ in rec { 


  unstable = fetchurl rec {

    # NOTE: Don't forget to change the hash for staging as well.

    version = "9.4";

    version = "9.5";

    url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";

    hash = "sha256-xV/5lXYSVJuMfffN3HnXoA0ZFX0Fs3EUi/CNTd92jsY=";

    hash = "sha256-Es8vtwmBNOI1HEnqO6j02ipnTx+HIr69TDpKbKbS6XU=";

    inherit (stable) patches;



    ## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec { 
  staging = fetchFromGitLab rec {

    # https://gitlab.winehq.org/wine/wine-staging

    inherit (unstable) version;

    hash = "sha256-wij0CeAL6V8dH4nRS+UVKZMBJlSNgzr9tG1860WSbrU=";

    hash = "sha256-Jxhtd/rG5x8wENO1dVUby/DjRLKPpPTYviowPQu2qK4=";

    domain = "gitlab.winehq.org";

    owner = "wine";

    repo = "wine-staging";

pkgs/applications/networking/cluster/werf/default.nix

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


buildGoModule rec {

  pname = "werf";

  version = "1.2.297";

  version = "1.2.300";



  src = fetchFromGitHub {

    owner = "werf";

    repo = "werf";

    rev = "v${version}";

    hash = "sha256-AFuEpMSsfwjqoiLCiSyXecIe/UA72BEHs+kUaUtZU2U=";

    hash = "sha256-DWSjdgLjVJHlcXa6QV2KzASFQkCpUDSrtYpx/oa+Ff4=";

  };



  vendorHash = "sha256-mOHrNXaLnTt0WRVJI8GD48pxLvbSa6oWoxa4YFaIA6Y=";

  vendorHash = "sha256-o/s3JZe/lO6smCXVs0ZzOTqGt7ikgTsC4Wo2O9fALe8=";



  proxyVendor = true;

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

+14 −0
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, fetchpatch

, git

, libiconv

, ncurses
@@ -23,6 +24,19 @@ rustPlatform.buildRustPackage rec { 
    hash = "sha256-ev56NzrEF7xm3WmR2a0pHPs69Lvmb4He7+kIBYiJjKY=";

  };



  patches = [

    # Fix tests with Git 2.44.0+

    (fetchpatch {

      url = "https://github.com/arxanas/git-branchless/pull/1245.patch";

      hash = "sha256-gBm0A478Uhg9IQVLQppvIeTa8s1yHUMddxiUbpHUvGw=";

    })

    # Fix tests with Git 2.44.0+

    (fetchpatch {

      url = "https://github.com/arxanas/git-branchless/pull/1161.patch";

      hash = "sha256-KHobEIXhlDar8CvIVUi4I695jcJZXgGRhU86b99x86Y=";

    })

  ];



  cargoHash = "sha256-Ppw5TN/6zMNxFAx90Q9hQ7RdGxV+TT8UlOm68ldK8oc=";



  nativeBuildInputs = [ pkg-config ];