Unverified Commit 6fe145f2 authored by tomberek's avatar tomberek Committed by GitHub
Browse files

Merge pull request #302939 from christoph-heiss/sourcehut-update 

sourcehut.*: update all packages
parents 39abaaa2 f22dd949

pkgs/applications/version-management/sourcehut/builds.nix

+4 −4
Original line number Diff line number Diff line
@@ -16,28 +16,28 @@ 
, setuptools

}:

let

  version = "0.89.13";

  version = "0.89.15";

  gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.39"; };



  src = fetchFromSourcehut {

    owner = "~sircmpwn";

    repo = "builds.sr.ht";

    rev = version;

    hash = "sha256-JpRVRzuHB6cgk/qW1j4zF8/K1xwz3J4nZhijmz5kVWU=";

    hash = "sha256-rmNaBnTPDDQO/ImkGkMwW8fyjQyBUBchTEnbtAK24pw=";

  };



  buildsrht-api = buildGoModule ({

    inherit src version;

    pname = "buildsrht-api";

    modRoot = "api";

    vendorHash = "sha256-kTqoUfFEoNdDDzVNJ7XIbH7tbsl5MdBL+/UDHFv7D+A=";

    vendorHash = "sha256-dwpuB+aYqzhGSdGVq/F9FTdHWMBkGMtVuZ7I3hB3b+Q=";

  } // gqlgen);



  buildsrht-worker = buildGoModule ({

    inherit src version;

    pname = "buildsrht-worker";

    modRoot = "worker";

    vendorHash = "sha256-kTqoUfFEoNdDDzVNJ7XIbH7tbsl5MdBL+/UDHFv7D+A=";

    vendorHash = "sha256-dwpuB+aYqzhGSdGVq/F9FTdHWMBkGMtVuZ7I3hB3b+Q=";

  } // gqlgen);

in

buildPythonPackage rec {

pkgs/applications/version-management/sourcehut/core.nix

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


buildPythonPackage rec {

  pname = "srht";

  version = "0.71.5";

  version = "0.71.8";

  pyproject = true;



  disabled = pythonOlder "3.7";
@@ -37,7 +37,7 @@ buildPythonPackage rec { 
    owner = "~sircmpwn";

    repo = "core.sr.ht";

    rev = version;

    hash = "sha256-YIoKOiTi/9X4bSiG+GvnwzvKYhbfywrv/dTjxaJOOTQ=";

    hash = "sha256-rDpm2HJOWScvIxOmHcat6y4CWdBE9T2gE/jZskYAFB0=";

    fetchSubmodules = true;

  };

pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix

+5 −5
Original line number Diff line number Diff line 
{ unzip

, gqlgenVersion ? "0.17.42"

, gqlgenVersion

}:

{

  overrideModAttrs = (_: {

    # No need to workaround -trimpath: it's not used in goModules,

    # but do download `go generate`'s dependencies nonetheless.

    preBuild = ''

      go generate ./loaders

      go generate ./graph

      if [ -d ./loaders ]; then go generate ./loaders; fi

      if [ -d ./graph ]; then go generate ./graph; fi

    '';

  });
@@ -25,8 +25,8 @@ 
  # If it fails, the gqlgenVersion may have to be updated.

  preBuild = ''

    unzip ''${GOPROXY#"file://"}/github.com/99designs/gqlgen/@v/v${gqlgenVersion}.zip

    go generate ./loaders

    go generate ./graph

    if [ -d ./loaders ]; then go generate ./loaders; fi

    if [ -d ./graph ]; then go generate ./graph; fi

    rm -rf github.com

  '';

}

pkgs/applications/version-management/sourcehut/git.nix

+8 −8
Original line number Diff line number Diff line
@@ -13,28 +13,28 @@ 
, setuptools

}:

let

  version = "0.85.7";

  gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; };

  version = "0.85.9";

  gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.42"; };



  src = fetchFromSourcehut {

    owner = "~sircmpwn";

    repo = "git.sr.ht";

    rev = version;

    hash = "sha256-jkESrrVE+0O2g64zzPOpqhl8DpvmosQvuF0s6Xd+lbM=";

    hash = "sha256-tmbBw6x3nqN9nRIR3xOXQ+L5EACXLQYLXQYK3lsOsAI=";

  };



  gitApi = buildGoModule ({

    inherit src version;

    pname = "gitsrht-api";

    modRoot = "api";

    vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";

    vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc=";

  } // gqlgen);



  gitDispatch = buildGoModule ({

    inherit src version;

    pname = "gitsrht-dispatch";

    modRoot = "gitsrht-dispatch";

    vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";

    vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc=";



    postPatch = ''

      substituteInPlace gitsrht-dispatch/main.go \
@@ -46,7 +46,7 @@ let 
    inherit src version;

    pname = "gitsrht-keys";

    modRoot = "gitsrht-keys";

    vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";

    vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc=";



    postPatch = ''

      substituteInPlace gitsrht-keys/main.go \
@@ -58,7 +58,7 @@ let 
    inherit src version;

    pname = "gitsrht-shell";

    modRoot = "gitsrht-shell";

    vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";

    vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc=";



    postPatch = ''

      substituteInPlace gitsrht-shell/main.go \
@@ -70,7 +70,7 @@ let 
    inherit src version;

    pname = "gitsrht-update-hook";

    modRoot = "gitsrht-update-hook";

    vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";

    vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc=";



    postPatch = ''

      substituteInPlace gitsrht-update-hook/main.go \

pkgs/applications/version-management/sourcehut/hg.nix

+4 −4
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
}:



let

  version = "0.32.4";

  gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; };

  version = "0.33.0";

  gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.45"; };



  pyproject = true;
@@ -25,7 +25,7 @@ let 
    owner = "~sircmpwn";

    repo = "hg.sr.ht";

    rev = version;

    hash = "sha256-mYkA44c9wy/Iy1h1lXkVpc9gN7rQXFm4T3YBlQ1Dj60=";

    hash = "sha256-+BYeE+8dXY/MLLYyBBLD+eKqmrPiKyyCGIZLkCPzNYM=";

    vc = "hg";

  };
@@ -33,7 +33,7 @@ let 
    inherit src version;

    pname = "hgsrht-api";

    modRoot = "api";

    vendorHash = "sha256-vuOYpnF3WjA6kOe9MVSuVMhJBQqCmIex+QUBJrP+VDs=";

    vendorHash = "sha256-K+KMhcvkG/qeQTnlHS4xhLCcvBQNNp2DcScJPm8Dbic=";

  } // gqlgen);



  hgsrht-keys = buildGoModule {