bump and adapt work and removable devices

This commit is contained in:
steveej 2019-11-22 16:37:46 +01:00
parent dff5737e83
commit 105945ed30
5 changed files with 20 additions and 12 deletions

View file

@ -139,7 +139,7 @@ in {
aspellDicts.en
aspellDicts.de
unstablepkgs.skype
# zoom-us # broken as of 2019-10-30
zoom-us # broken as of 2019-10-30
unstablepkgs.bluejeans-gui
thunderbird
gnome3.evolution # gnome4.glib_networking

View file

@ -26,8 +26,6 @@ in {
gnutls = true;
};
android_sdk.accept_license = true;
packageOverrides = pkgs: with pkgs; {
myPython36 = python36Full.withPackages (ps: with ps; [
pylint pep8 yapf flake8
@ -141,8 +139,6 @@ in {
python27Packages.binwalk
gptfdisk
androidsdk
## Python
myPython36

View file

@ -1,10 +1,20 @@
{
channelsNixosStable = {
ref = "nixos-18.09";
rev = "c2950341d038995bf46a7b72db961bb3d3e9ac12";
ref = "nixos-19.09";
rev = "e6d584f6dd22b587d5cdf5019f5e7dd2be370f61";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "eebd1a9263716a04689a37b6537e50801d376b5e";
rev = "41d921292e922a6cd1aba64259341c244d4c2cc7";
};
nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "a6934e36534f8a87a78f877eee65c08fa9867ba5";
};
homeManagerModule = {
url = "https://github.com/rycee/home-manager";
ref = "master";
rev = "286dd9b3088298e5a4625b517f8e72b1c62e4f74";
};
}

View file

@ -1,20 +1,20 @@
{
channelsNixosStable = {
ref = "nixos-19.09";
rev = "c0c062da7b3e20ec3b6c9416bc03cb3fc61df4b8";
rev = "e6d584f6dd22b587d5cdf5019f5e7dd2be370f61";
};
channelsNixosUnstable = {
ref = "nixos-unstable";
rev = "c1966522d7d5fa54db068140d212cba18731dd98";
rev = "41d921292e922a6cd1aba64259341c244d4c2cc7";
};
nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "f0d170bb49a143db4c93acb2e9ed5c74c081d204";
rev = "a6934e36534f8a87a78f877eee65c08fa9867ba5";
};
homeManagerModule = {
url = "https://github.com/rycee/home-manager";
ref = "master";
rev = "595150be86639cd1e41c9eba1cf02dc503d10c23";
rev = "286dd9b3088298e5a4625b517f8e72b1c62e4f74";
};
}

View file

@ -74,4 +74,6 @@ in {
# TODO: facetimehd is currfently broken (https://github.com/NixOS/nixpkgs/pull/72804)
facetimehd-firmware = super.hello;
qtile = nixpkgs-master.qtile;
}