diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2020-04-19 10:48:42 +0200 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2020-05-25 09:22:54 +0200 |
| commit | aee614c9964369737c73d191f074984cd6ba38d0 (patch) | |
| tree | 5913c74ffe0888617f3034274d7c0f88d14265e9 /pkgs/development | |
| parent | 6a13fe4ece2ffdd7544a266b685610abb1c837cb (diff) | |
| download | nixpkgs-aee614c9964369737c73d191f074984cd6ba38d0.tar nixpkgs-aee614c9964369737c73d191f074984cd6ba38d0.tar.gz nixpkgs-aee614c9964369737c73d191f074984cd6ba38d0.tar.bz2 nixpkgs-aee614c9964369737c73d191f074984cd6ba38d0.tar.lz nixpkgs-aee614c9964369737c73d191f074984cd6ba38d0.tar.xz nixpkgs-aee614c9964369737c73d191f074984cd6ba38d0.tar.zst nixpkgs-aee614c9964369737c73d191f074984cd6ba38d0.zip | |
treewide: replace bazaar with breezy
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/flatpak-builder/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/common.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/vcstool/default.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 32519594e4f..85b68cff20d 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -15,7 +15,7 @@ , xmlto , acl -, bazaar +, breezy , binutils , bzip2 , coreutils @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { ./respect-xml-catalog-files-var.patch (substituteAll { src = ./fix-paths.patch; - bzr = "${bazaar}/bin/bzr"; + bzr = "${breezy}/bin/bzr"; cp = "${coreutils}/bin/cp"; patch = "${patch}/bin/patch"; tar = "${gnutar}/bin/tar"; diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 75a9689267a..4e9daab9bf1 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -1,6 +1,6 @@ { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub , 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 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { buildInputs = [ 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 postgresql # for running the tests nlohmann_json @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ 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 ] ); nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index bab3ebd5757..c4a1cf73987 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -1,5 +1,5 @@ { stdenv, python3Packages -, git, bazaar, subversion }: +, git, breezy, subversion }: with python3Packages; @@ -14,7 +14,7 @@ buildPythonApplication rec { 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 |