diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management')
18 files changed, 68 insertions, 44 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/forgejo/default.nix b/nixpkgs/pkgs/applications/version-management/forgejo/default.nix index e1d1c6638c0a..9c896ec87652 100644 --- a/nixpkgs/pkgs/applications/version-management/forgejo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/forgejo/default.nix @@ -39,14 +39,14 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.20.4-0"; + version = "1.20.4-1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-guKU3VG1Wyhr5p6w0asL/CopQ5b7HiNi26Tw8WCEpwE="; + hash = "sha256-Fxlj+ckw1LSgiQDex3ZizHakIKd52U6JcdTurJj8YWg="; }; vendorHash = "sha256-dgtZjsLBwblhdge3BvdbK/mN/TeZKps9K5dJbqomtjo="; diff --git a/nixpkgs/pkgs/applications/version-management/gg/default.nix b/nixpkgs/pkgs/applications/version-management/gg/default.nix index b94fea8da858..ea701c6f07b3 100644 --- a/nixpkgs/pkgs/applications/version-management/gg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gg/default.nix @@ -20,7 +20,7 @@ in buildGoModule { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "e628aeddb94d2470de860df09ef65499f8c5493fb336bf3df8502842ee02487f"; + hash = "sha256-5iiu3blNJHDehg3wnvZUmfjFST+zNr89+FAoQu4CSH8="; }; postPatch = '' substituteInPlace cmd/gg/editor_unix.go \ @@ -33,7 +33,7 @@ in buildGoModule { "-X" "main.buildCommit=${commit}" ]; - vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; + vendorHash = "sha256-IU3Ac9rXsyPqRJrPJMW1eNVzQy7qoVBs9XYaLX9c5AU="; nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; nativeCheckInputs = [ bash coreutils git ]; diff --git a/nixpkgs/pkgs/applications/version-management/gh/default.nix b/nixpkgs/pkgs/applications/version-management/gh/default.nix index 1d6fb52db11d..981b58381774 100644 --- a/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.34.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Bb0vEaMOjgQ5p9r/tfciKo4/MXjUCUIdoDSB/Bido/8="; + hash = "sha256-ddVszWyfu9BsP4yvOtVTHhZ51D8j4Vf1pdyahF0gjVk="; }; vendorHash = "sha256-iql/CEWwg6t5k8qOFEQotMUUJd4VQ/H4JcuL2Eunqg0="; diff --git a/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix b/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix index 26c34e583027..9606b9e15d07 100644 --- a/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-Dy7gHT6WmZ1TjA5s+VmOUkaRvrA9v7mWQSLPscgBHgY="; + hash = "sha256-oHW73Y31z+0jOJdSJJa550mJYV8IP2fN+oNwT+3sySM="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/version-management/git-hound/default.nix b/nixpkgs/pkgs/applications/version-management/git-hound/default.nix index d2be44bc1a2f..7a135b69a2e3 100644 --- a/nixpkgs/pkgs/applications/version-management/git-hound/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-hound/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E="; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; meta = with lib; { description = "Reconnaissance tool for GitHub code search"; diff --git a/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix b/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix index 4e9c3b7a5ccc..c10a27102490 100644 --- a/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "0p1n29k2a2rpznwxlwzkmx38ic6g041k9vx7msvick7cydn417fx"; + hash = "sha256-3Z1AbPPsTBa3rqfvNAMBz7CIRq/zc9q5/TcLJWYSNlw="; }; - vendorSha256 = "0m64grnmhjvfsw7a56474s894sgd24rvcp5kamhzzyc4q556hqny"; + vendorHash = "sha256-3mJoSsGE+f9hVbNctjMR7WmSkCaHmKIO125LWG1+xFQ="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json index d0c88d1ecb48..955edc421ac8 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.3.3", - "repo_hash": "sha256-+h3ksxuphegTvjrKTWk68fgan1n2g64b1sn5nMoYhLc=", + "version": "16.3.4", + "repo_hash": "sha256-VM3yH+6R8FyzwAhXtjbQsoMhPVALvDxQvmwyNZE0JCQ=", "yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.3.3-ee", + "rev": "v16.3.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.3.3", - "GITLAB_PAGES_VERSION": "16.3.3", + "GITALY_SERVER_VERSION": "16.3.4", + "GITLAB_PAGES_VERSION": "16.3.4", "GITLAB_SHELL_VERSION": "14.26.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8", - "GITLAB_WORKHORSE_VERSION": "16.3.3" + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.10", + "GITLAB_WORKHORSE_VERSION": "16.3.4" } } diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index de6f3c0eb50d..9d9f930e43bb 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.3.3"; + version = "16.3.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-V9uh5QkvQ1ifO5DNCivg47NBjgE06Ehz7DnmBeU3lVY="; + hash = "sha256-5fNRoxWNBky7dJLFg+OyshfIcAqCAj41hvfrQRPIuzg="; }; vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0="; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index c628b45c8596..775889d83ade 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.3.3"; + version = "16.3.4"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-TPXMXuxckALObfEcIguJbGToIGp8b2bpd974epaXpyk="; + hash = "sha256-hz5YCQi1O+/ana/Vpawh2nQj7fmcI6huvKFTG9rVDjw="; }; vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM="; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 83f263e49024..adcd203be21e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.3.3"; + version = "16.3.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/nixpkgs/pkgs/applications/version-management/gitls/default.nix b/nixpkgs/pkgs/applications/version-management/gitls/default.nix index 4cda10b38057..28fbba659f42 100644 --- a/nixpkgs/pkgs/applications/version-management/gitls/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitls/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0="; }; - vendorSha256 = null; + vendorHash = null; passthru.tests.version = testers.testVersion { package = gitls; diff --git a/nixpkgs/pkgs/applications/version-management/gitui/default.nix b/nixpkgs/pkgs/applications/version-management/gitui/default.nix index 1d03427ecc49..257d7fd4aacc 100644 --- a/nixpkgs/pkgs/applications/version-management/gitui/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - hash = "sha256-sqYG27TImVpsoG0PH5AQrAyFTHOXOJnWEqG9RxLbkLo="; + hash = "sha256-mT5toF4mKRP0dlwlfKHjmFFQJ/cWSb2vwg1uZbhZRhI="; }; - cargoHash = "sha256-Dlvr+lwCj68CSa2G2lc4dNShCfj56h9FqA9UZUOq+IQ="; + cargoHash = "sha256-8j0NtJB2ErrpljPHSMRD/4IGZuqA8wLuzPnuQqxaXRg="; nativeBuildInputs = [ pkg-config ]; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; - changelog = "https://github.com/extrawurst/gitui/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; mainProgram = "gitui"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne yanganto mfrw ]; diff --git a/nixpkgs/pkgs/applications/version-management/got/default.nix b/nixpkgs/pkgs/applications/version-management/got/default.nix index ddbf9153ce84..f00ee82d1c2f 100644 --- a/nixpkgs/pkgs/applications/version-management/got/default.nix +++ b/nixpkgs/pkgs/applications/version-management/got/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.92"; + version = "0.93"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - hash = "sha256-HaNCxgbl0ewvI96jr9/BgJphqoQC5P2atj5a51bj99c="; + hash = "sha256-wlcnJr7f3Bd9SEgrKiPlr7pTSjaRj47qwktI2jepINE="; }; nativeBuildInputs = [ pkg-config bison ] @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { on the same repository. ''; homepage = "https://gameoftrees.org"; + changelog = "https://gameoftrees.org/releases/CHANGES"; license = licenses.isc; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ abbe afh ]; diff --git a/nixpkgs/pkgs/applications/version-management/gst/default.nix b/nixpkgs/pkgs/applications/version-management/gst/default.nix index f0f347d14ca4..bf7abf12d7bf 100644 --- a/nixpkgs/pkgs/applications/version-management/gst/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gst/default.nix @@ -13,10 +13,10 @@ buildGoModule rec { owner = "uetchy"; repo = "gst"; rev = "v${version}"; - sha256 = "07cixz5wlzzb4cwcrncg2mz502wlhd3awql5js1glw9f6qfwc5in"; + hash = "sha256-NhbGHTYucfqCloVirkaDlAtQfhWP2cw4I+t/ysvvkR0="; }; - vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh"; + vendorHash = "sha256-kGPg6NyhVfVOn0BFQY83/VYdpUjOqaf5I4bev0uhvUw="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/nixpkgs/pkgs/applications/version-management/pijul/default.nix index 4d3cea9c00c9..1ea92e333d5b 100644 --- a/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchCrate , rustPlatform +, installShellFiles , pkg-config , libsodium , openssl @@ -22,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-mRi0NUETTdYE/oM+Jo7gW/zNby8dPAKl6XhzP0Qzsf0="; doCheck = false; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl libsodium xxHash ] ++ (lib.optionals gitImportSupport [ libgit2 ]) ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -31,6 +32,13 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional gitImportSupport "git"; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd pijul \ + --bash <($out/bin/pijul completion bash) \ + --fish <($out/bin/pijul completion fish) \ + --zsh <($out/bin/pijul completion zsh) + ''; + meta = with lib; { description = "A distributed version control system"; homepage = "https://pijul.org"; diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh b/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh index 239d767ed9b4..54727e0317cb 100755 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh @@ -38,7 +38,7 @@ update_version() { (cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version") - # Update vendorSha256 of Go modules + # Update vendorHash of Go modules retry=true while "$retry"; do retry=false; diff --git a/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix b/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix index 998b1793c187..c3c7964b52a3 100644 --- a/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix +++ b/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix @@ -1,4 +1,4 @@ -{ buildVersion, x64sha256, dev ? false }: +{ buildVersion, aarch64sha256, x64sha256, dev ? false }: { fetchurl, lib, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook , pkexecPath ? "/run/wrappers/bin/pkexec" @@ -8,14 +8,23 @@ let pnameBase = "sublime-merge"; packageAttribute = "sublime-merge${lib.optionalString dev "-dev"}"; - binaries = [ "sublime_merge" "crash_reporter" "git-credential-sublime" "ssh-askpass-sublime" ]; + binaries = [ "sublime_merge" crashHandlerBinary "git-credential-sublime" "ssh-askpass-sublime" ]; primaryBinary = "sublime_merge"; primaryBinaryAliases = [ "smerge" ]; + crashHandlerBinary = if lib.versionAtLeast buildVersion "2086" then "crash_handler" else "crash_reporter"; downloadUrl = arch: "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz"; versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}"; versionFile = builtins.toString ./default.nix; - libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango curl ]; + neededLibraries = [ + xorg.libX11 + glib + gtk3 + cairo + pango + curl + ]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; in let binaryPackage = stdenv.mkDerivation rec { @@ -35,7 +44,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -76,6 +85,10 @@ in let passthru = { sources = { + "aarch64-linux" = fetchurl { + url = downloadUrl "arm64"; + sha256 = aarch64sha256; + }; "x86_64-linux" = fetchurl { url = downloadUrl "x64"; sha256 = x64sha256; @@ -109,7 +122,7 @@ in stdenv.mkDerivation (rec { passthru = { updateScript = let - script = writeShellScript "${pnameBase}-update-script" '' + script = writeShellScript "${packageAttribute}-update-script" '' set -o errexit PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]} @@ -137,6 +150,6 @@ in stdenv.mkDerivation (rec { maintainers = with maintainers; [ zookatron ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; }) diff --git a/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix index 01bd8b3573ff..84ddb35415d8 100644 --- a/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix +++ b/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,15 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2083"; - x64sha256 = "bWHbP8j228jUDr1XDLRciq7hcET6o6Udr/lLODXRudc="; + buildVersion = "2091"; + aarch64sha256 = "dkPKuuzQQtL3eZlaAPeL7e2p5PCxroFRSp6Rw5wHODc="; + x64sha256 = "T5g6gHgl9xGytEOsh3VuB08IrbDvMu24o/1edCGmfd4="; } {}; sublime-merge-dev = common { - buildVersion = "2085"; - x64sha256 = "40yI6EtP2l22aPP50an3ycvdEcAqJphhGhYYoOPyHw0="; + buildVersion = "2090"; + aarch64sha256 = "96nJn+7bVoLM6D14pFujlj3JOQL5PwdU1+SWzEjoYhU="; + x64sha256 = "bu51gsu0XxZBF8/HncPttcKiIRpC7qsKTgR9cktKOnI="; dev = true; } {}; } |