diff options
author | Christoph Heiss <christoph@c8h4.io> | 2024-02-07 10:09:30 +0100 |
---|---|---|
committer | Christoph Heiss <christoph@c8h4.io> | 2024-02-07 14:47:15 +0100 |
commit | 50fa834713a0e59b2572984bf1357ebfbf4aeedd (patch) | |
tree | 948552bfcc387d294d1597e98e165569fb96593b /pkgs/applications | |
parent | e912fc1640ab81a87c7ccd542c48877601c146f6 (diff) | |
download | nixlib-50fa834713a0e59b2572984bf1357ebfbf4aeedd.tar nixlib-50fa834713a0e59b2572984bf1357ebfbf4aeedd.tar.gz nixlib-50fa834713a0e59b2572984bf1357ebfbf4aeedd.tar.bz2 nixlib-50fa834713a0e59b2572984bf1357ebfbf4aeedd.tar.lz nixlib-50fa834713a0e59b2572984bf1357ebfbf4aeedd.tar.xz nixlib-50fa834713a0e59b2572984bf1357ebfbf4aeedd.tar.zst nixlib-50fa834713a0e59b2572984bf1357ebfbf4aeedd.zip |
sourcehut.gitsrht: 0.84.2 -> 0.85.7
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
Diffstat (limited to 'pkgs/applications')
4 files changed, 23 insertions, 20 deletions
diff --git a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix index 8737e4266f45..ee598c5ed914 100644 --- a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix +++ b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix @@ -1,5 +1,5 @@ { unzip -, gqlgenVersion ? "0.17.20" +, gqlgenVersion ? "0.17.42" }: { overrideModAttrs = (_: { diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 8f6adfde2ed3..32325a7d3600 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -13,70 +13,70 @@ , setuptools }: let - version = "0.84.2"; + version = "0.85.7"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "git.sr.ht"; rev = version; - sha256 = "sha256-sAkTsQlWtNDQ5vAhA2EeOvuJcj9A6AG8pgDyIKtr65s="; + hash = "sha256-jkESrrVE+0O2g64zzPOpqhl8DpvmosQvuF0s6Xd+lbM="; }; gitApi = buildGoModule ({ inherit src version; pname = "gitsrht-api"; modRoot = "api"; - vendorHash = "sha256-LAYp0zgosZnFEbtxzjuTH9++0lbxhACr705HqXJz3D0="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + } // gqlgen); - gitDispatch = buildGoModule { + gitDispatch = buildGoModule ({ inherit src version; pname = "gitsrht-dispatch"; modRoot = "gitsrht-dispatch"; - vendorHash = "sha256-EDvSZ3/g0xDSohrsAIpNhk+F0yy8tbnTW/3tURTonMc="; + vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; postPatch = '' substituteInPlace gitsrht-dispatch/main.go \ --replace /var/log/gitsrht-dispatch /var/log/sourcehut/gitsrht-dispatch ''; - }; + } // gqlgen); - gitKeys = buildGoModule { + gitKeys = buildGoModule ({ inherit src version; pname = "gitsrht-keys"; modRoot = "gitsrht-keys"; - vendorHash = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4="; + vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; postPatch = '' substituteInPlace gitsrht-keys/main.go \ --replace /var/log/gitsrht-keys /var/log/sourcehut/gitsrht-keys ''; - }; + } // gqlgen); - gitShell = buildGoModule { + gitShell = buildGoModule ({ inherit src version; pname = "gitsrht-shell"; modRoot = "gitsrht-shell"; - vendorHash = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI="; + vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; postPatch = '' substituteInPlace gitsrht-shell/main.go \ --replace /var/log/gitsrht-shell /var/log/sourcehut/gitsrht-shell ''; - }; + } // gqlgen); - gitUpdateHook = buildGoModule { + gitUpdateHook = buildGoModule ({ inherit src version; pname = "gitsrht-update-hook"; modRoot = "gitsrht-update-hook"; - vendorHash = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc="; + vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; postPatch = '' substituteInPlace gitsrht-update-hook/main.go \ --replace /var/log/gitsrht-update-hook /var/log/sourcehut/gitsrht-update-hook ''; - }; - + } // gqlgen); in buildPythonPackage rec { inherit src version; diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 6bc266232902..ec660981eeb5 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -16,6 +16,8 @@ buildPythonPackage rec { pname = "hgsrht"; version = "0.32.4"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; }; + pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +43,7 @@ buildPythonPackage rec { pname = "hgsrht-api"; modRoot = "api"; vendorHash = "sha256-vuOYpnF3WjA6kOe9MVSuVMhJBQqCmIex+QUBJrP+VDs="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + } // gqlgen); hgsrht-keys = buildGoModule { inherit src version; diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 59bd7c8334fa..7f3a50a87f49 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -13,6 +13,7 @@ let version = "0.15.2"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -26,7 +27,7 @@ let pname = "pastesrht-api"; modRoot = "api"; vendorHash = "sha256-jiE73PUPSHxtWp7XBdH4mJw95pXmZjCl4tk2wQUf2M4="; - } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + } // gqlgen); in buildPythonPackage rec { inherit src version; |