diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-21 18:00:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-21 18:00:59 +0000 |
commit | 6ff18cf32981d0b679a46fe935dde1d962c90c27 (patch) | |
tree | acc9705a92baf433a25db3b95acb60c20ac21ad8 /pkgs/applications/version-management | |
parent | 262ee2400ecb4710ac9eaf9d683d202c44bc24e0 (diff) | |
parent | 6ca18af3b350ca2f23a603c00b98c625490caf13 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index e07b538544002..b523141808167 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: stdenv.mkDerivation (finalAttrs: { pname = "fnc"; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c7a2823c6608b..d37604612bdf3 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch, fetchFromGitLab, bundlerEnv +{ stdenv, lib, fetchFromGitLab, bundlerEnv , ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl , defaultGemConfig, buildRubyGem , gitlabEnterprise ? false, callPackage, yarn diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix index b127966176cdd..aed7ab9b52bfa 100644 --- a/pkgs/applications/version-management/josh/default.nix +++ b/pkgs/applications/version-management/josh/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , rustPlatform , libgit2 , openssl diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 19ba699abef45..b6bf52048f5e4 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles +{ lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles , re2Support ? true # depends on rust-cpython which won't support python312 # https://github.com/dgrunwald/rust-cpython/commit/e815555629e557be084813045ca1ddebc2f76ef9 |