Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f56d83761c1a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b9c259355b06
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 6, 2017

  1. pythonPackages.powerline: 2.5.2 -> 2.6

    @ss1h2a3tw
    ss1h2a3tw committed Jun 6, 2017
    Copy the full SHA
    e5449af View commit details

Commits on Jun 10, 2017

  1. Merge pull request #26391 from ss1h2a3tw/powerline 

    pythonPackages.powerline: 2.5.2 -> 2.6
    @Mic92
    Mic92 authored Jun 10, 2017
    Copy the full SHA
    b9c2593 View commit details
Showing with 47 additions and 38 deletions.
  1. +46 −0 pkgs/development/python-modules/powerline/default.nix
  2. +1 −38 pkgs/top-level/python-packages.nix
46 changes: 46 additions & 0 deletions pkgs/development/python-modules/powerline/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{ lib
, fetchurl
, buildPythonPackage
, git
, mercurial
, bazaar
, psutil
, pygit2
}:

buildPythonPackage rec {
rev = "2.6";
name = "powerline-${rev}";
src = fetchurl {
url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz";
name = "${name}.tar.gz";
sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272";
};

propagatedBuildInputs = [ git mercurial bazaar psutil pygit2];

# error: This is still beta and some tests still fail
doCheck = false;

postInstall = ''
install -dm755 "$out/share/fonts/OTF/"
install -dm755 "$out/etc/fonts/conf.d"
install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf"
install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf"
install -dm755 "$out/share/vim/vimfiles/plugin"
install -m644 "powerline/bindings/vim/plugin/powerline.vim" "$out/share/vim/vimfiles/plugin/powerline.vim"
install -dm755 "$out/share/zsh/site-contrib"
install -m644 "powerline/bindings/zsh/powerline.zsh" "$out/share/zsh/site-contrib/powerline.zsh"
install -dm755 "$out/share/tmux"
install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf"
'';

meta = {
homepage = https://github.com/powerline/powerline;
description = "The ultimate statusline/prompt utility";
license = lib.licenses.mit;
};
}
39 changes: 1 addition & 38 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -18100,44 +18100,7 @@ in {
};
};

powerline = buildPythonPackage rec {
rev = "2.5.2";
name = "powerline-${rev}";
src = pkgs.fetchurl {
url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz";
name = "${name}.tar.gz";
sha256 = "064rp2jzz4vp1xqk3445qf08pq3aif00q1rjqaqx2pla15s27yrz";
};

propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ];

# error: This is still beta and some tests still fail
doCheck = false;

postInstall = ''
install -dm755 "$out/share/fonts/OTF/"
install -dm755 "$out/etc/fonts/conf.d"
install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf"
install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf"

install -dm755 "$out/share/vim/vimfiles/plugin"
install -m644 "powerline/bindings/vim/plugin/powerline.vim" "$out/share/vim/vimfiles/plugin/powerline.vim"

install -dm755 "$out/share/zsh/site-contrib"
install -m644 "powerline/bindings/zsh/powerline.zsh" "$out/share/zsh/site-contrib/powerline.zsh"

install -dm755 "$out/share/tmux"
install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf"
'';

meta = {
homepage = https://github.com/powerline/powerline;
description = "The ultimate statusline/prompt utility";
license = licenses.mit;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
};
};
powerline = callPackage ../development/python-modules/powerline { };

pox = buildPythonPackage rec {
name = "pox-${version}";