Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2019-03-14 19:32:35 -07:00
commit 5999b3329a
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
2 changed files with 3 additions and 12 deletions

View File

@ -5,9 +5,11 @@ let
appdirs appdirs
ipdb ipdb
ipython ipython
numpy
pip pip
python-language-server python-language-server
requests requests
tensorflow
tox tox
virtualenv virtualenv
virtualenvwrapper virtualenvwrapper
@ -128,7 +130,7 @@ in
rofi-pass rofi-pass
skippy-xd skippy-xd
synergy synergy
udiskie-appindicator udiskie
volnoti volnoti
# xorg # xorg
@ -150,7 +152,6 @@ in
cabal2nix cabal2nix
ghc ghc
stack stack
haskell.compiler.ghc862
haskell.compiler.ghc863 haskell.compiler.ghc863
# Scala # Scala

View File

@ -16,16 +16,6 @@ self: super:
libappindicator-gtk3 libappindicator-gtk3
]; ];
}); });
udiskie-appindicator = super.udiskie.overrideAttrs (oldAttrs: rec {
version = "1.7.5";
src = super.fetchFromGitHub {
owner = "coldfix";
repo = "udiskie";
rev = version;
sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4";
};
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [self.libappindicator-gtk3];
});
pasystray-appindicator = super.pasystray.overrideAttrs (oldAttrs: rec { pasystray-appindicator = super.pasystray.overrideAttrs (oldAttrs: rec {
buildInputs = oldAttrs.buildInputs ++ [self.libappindicator-gtk3]; buildInputs = oldAttrs.buildInputs ++ [self.libappindicator-gtk3];
}); });