JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: replace bazaar with breezy

Browse Source
This commit is contained in:
rnhmjoj 2020-04-19 10:48:42 +02:00
parent 6a13fe4ece
commit aee614c996
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/misc/redmine.nix
View File

@ -26,7 +26,7 @@ let
scm_mercurial_command: ${pkgs.mercurial}/bin/hg scm_mercurial_command: ${pkgs.mercurial}/bin/hg
scm_git_command: ${pkgs.gitAndTools.git}/bin/git scm_git_command: ${pkgs.gitAndTools.git}/bin/git
scm_cvs_command: ${pkgs.cvs}/bin/cvs scm_cvs_command: ${pkgs.cvs}/bin/cvs
scm_bazaar_command: ${pkgs.bazaar}/bin/bzr scm_bazaar_command: ${pkgs.breezy}/bin/bzr
scm_darcs_command: ${pkgs.darcs}/bin/darcs scm_darcs_command: ${pkgs.darcs}/bin/darcs
${cfg.extraConfig} ${cfg.extraConfig}
@ -297,7 +297,7 @@ in
environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; environment.SCHEMA = "${cfg.stateDir}/cache/schema.db";
path = with pkgs; [ path = with pkgs; [
imagemagick imagemagick
bazaar breezy
cvs cvs
darcs darcs
gitAndTools.git gitAndTools.git

8
pkgs/applications/misc/ikiwiki/default.nix
View File

@ -2,7 +2,7 @@
, gitSupport ? false, git ? null , gitSupport ? false, git ? null
, docutilsSupport ? false, python ? null, docutils ? null , docutilsSupport ? false, python ? null, docutils ? null
, monotoneSupport ? false, monotone ? null , monotoneSupport ? false, monotone ? null
, bazaarSupport ? false, bazaar ? null , bazaarSupport ? false, breezy ? null
, cvsSupport ? false, cvs ? null, cvsps ? null , cvsSupport ? false, cvs ? null, cvsps ? null
, subversionSupport ? false, subversion ? null , subversionSupport ? false, subversion ? null
, mercurialSupport ? false, mercurial ? null , mercurialSupport ? false, mercurial ? null
@ -12,7 +12,7 @@
assert docutilsSupport -> (python != null && docutils != null); assert docutilsSupport -> (python != null && docutils != null);
assert gitSupport -> (git != null); assert gitSupport -> (git != null);
assert monotoneSupport -> (monotone != null); assert monotoneSupport -> (monotone != null);
assert bazaarSupport -> (bazaar != null); assert bazaarSupport -> (breezy != null);
assert cvsSupport -> (cvs != null && cvsps != null && perlPackages.Filechdir != null); assert cvsSupport -> (cvs != null && cvsps != null && perlPackages.Filechdir != null);
assert subversionSupport -> (subversion != null); assert subversionSupport -> (subversion != null);
assert mercurialSupport -> (mercurial != null); assert mercurialSupport -> (mercurial != null);
@ -39,7 +39,7 @@ stdenv.mkDerivation {
++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals docutilsSupport [python docutils]
++ lib.optionals gitSupport [git] ++ lib.optionals gitSupport [git]
++ lib.optionals monotoneSupport [monotone] ++ lib.optionals monotoneSupport [monotone]
++ lib.optionals bazaarSupport [bazaar] ++ lib.optionals bazaarSupport [breezy]
++ lib.optionals cvsSupport [cvs cvsps perlPackages.Filechdir] ++ lib.optionals cvsSupport [cvs cvsps perlPackages.Filechdir]
++ lib.optionals subversionSupport [subversion] ++ lib.optionals subversionSupport [subversion]
++ lib.optionals mercurialSupport [mercurial]; ++ lib.optionals mercurialSupport [mercurial];
@ -64,7 +64,7 @@ stdenv.mkDerivation {
wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \
${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''} ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''}
${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''} ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''}
${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''} ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''}
${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''}
${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''}
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''} ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''}

4
pkgs/applications/version-management/cvs2svn/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchurl, makeWrapper { lib, fetchurl, makeWrapper
, python2Packages , python2Packages
, cvs, subversion, git, bazaar , cvs, subversion, git, breezy
}: }:
python2Packages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
checkInputs = [ subversion git bazaar ]; checkInputs = [ subversion git breezy ];
checkPhase = "python run-tests.py"; checkPhase = "python run-tests.py";

4
pkgs/applications/version-management/reposurgeon/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, python27Packages, git { stdenv, fetchurl, makeWrapper, python27Packages, git
, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy
, bazaar ? null, cvs ? null, darcs ? null, fossil ? null , breezy ? null, cvs ? null, darcs ? null, fossil ? null
, mercurial ? null, monotone ? null, rcs ? null , mercurial ? null, monotone ? null, rcs ? null
, subversion ? null, cvs_fast_export ? null }: , subversion ? null, cvs_fast_export ? null }:
@ -42,7 +42,7 @@ in mkDerivation rec {
let let
binpath = makeBinPath ( binpath = makeBinPath (
filter (x: x != null) filter (x: x != null)
[ out git bazaar cvs darcs fossil mercurial [ out git breezy cvs darcs fossil mercurial
monotone rcs src subversion cvs_fast_export ] monotone rcs src subversion cvs_fast_export ]
); );
pythonpath = makeSearchPathOutput "lib" python.sitePackages ( pythonpath = makeSearchPathOutput "lib" python.sitePackages (

4
pkgs/build-support/fetchbzr/default.nix
View File

@ -1,11 +1,11 @@
{ stdenvNoCC, bazaar }: { stdenvNoCC, breezy }:
{ url, rev, sha256 }: { url, rev, sha256 }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
name = "bzr-export"; name = "bzr-export";
builder = ./builder.sh; builder = ./builder.sh;
nativeBuildInputs = [ bazaar ]; nativeBuildInputs = [ breezy ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

4
pkgs/development/tools/flatpak-builder/default.nix
View File

@ -15,7 +15,7 @@
, xmlto , xmlto
, acl , acl
, bazaar , breezy
, binutils , binutils
, bzip2 , bzip2
, coreutils , coreutils
@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
./respect-xml-catalog-files-var.patch ./respect-xml-catalog-files-var.patch
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
bzr = "${bazaar}/bin/bzr"; bzr = "${breezy}/bin/bzr";
cp = "${coreutils}/bin/cp"; cp = "${coreutils}/bin/cp";
patch = "${patch}/bin/patch"; patch = "${patch}/bin/patch";
tar = "${gnutar}/bin/tar"; tar = "${gnutar}/bin/tar";

6
pkgs/development/tools/misc/hydra/common.nix
View File

@ -1,6 +1,6 @@
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , gitAndTools, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
gitAndTools.top-git mercurial /*darcs*/ subversion bazaar openssl bzip2 libxslt gitAndTools.top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt
perlDeps perl nix perlDeps perl nix
postgresql # for running the tests postgresql # for running the tests
nlohmann_json nlohmann_json
@ -88,7 +88,7 @@ in stdenv.mkDerivation rec {
hydraPath = lib.makeBinPath ( hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz [ sqlite subversion openssh nix coreutils findutils pixz
gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused bazaar gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/development/tools/vcstool/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, python3Packages { stdenv, python3Packages
, git, bazaar, subversion }: , git, breezy, subversion }:
with python3Packages; with python3Packages;
@ -14,7 +14,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [ pyyaml setuptools ]; propagatedBuildInputs = [ pyyaml setuptools ];
makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git bazaar subversion ])]; makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git breezy subversion ])];
doCheck = false; # requires network doCheck = false; # requires network

4
pkgs/tools/package-management/nix-prefetch-scripts/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, makeWrapper, buildEnv, { stdenv, makeWrapper, buildEnv,
bazaar, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion
}: }:
let mkPrefetchScript = tool: src: deps: let mkPrefetchScript = tool: src: deps:
@ -26,7 +26,7 @@ let mkPrefetchScript = tool: src: deps:
}; };
}; };
in rec { in rec {
nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ]; nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ breezy ];
nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ]; nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ];
nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ coreutils findutils gawk git ]; nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ coreutils findutils gawk git ];
nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ]; nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ];