steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

nix-channels: bump 19.03 -> 19.09 and adapt

Browse source
This commit is contained in:
steveej 2019-10-31 10:45:37 +01:00
parent 265ed7d982
commit edbeaf50df
5 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/home-manager/configuration/graphical-fullblown.nix
View file

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

10
nix/os/devices/steveej-t480s-work/versions.nix
View file

@ -1,20 +1,20 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-19.03"; ref = "nixos-19.09";
rev = "aef662d2eb532eeb9976068fd1705e3cf3663054"; rev = "c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "73392e79aa62e406683d6a732eb4f4101f4732be"; rev = "7827d3f4497ed722fedca57fd4d5ca1a65c38256";
}; };
nixpkgsMaster = { nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "master"; ref = "master";
rev = "51aa3cc4855c5964a6e71adcf7b79c1a0c23f322"; rev = "f6501c42cdf723d8c2c50aef5b96cc54826ae18f";
}; };
homeManagerModule = { homeManagerModule = {
url = "https://github.com/rycee/home-manager"; url = "https://github.com/rycee/home-manager";
ref = "master"; ref = "master";
rev = "95382060ebaa19ec49a861921216b1db8460b314"; rev = "450571056552c9311fcb2894328696b535265593";
}; };
} }

19
nix/os/profiles/graphical/system.nix
View file

@ -68,19 +68,24 @@
}; };
}; };
services.gvfs.enable = true;
programs.seahorse.enable = true;
programs.gpaste.enable = false;
programs.gnome-terminal.enable = false;
programs.gnome-documents.enable = false;
programs.gnome-disks.enable = false;
services.gnome3 = { services.gnome3 = {
gnome-disks.enable = false; # gnome-online-miners.enable = false; TODO: enable this again
gnome-documents.enable = false; games.enable = false;
gnome-online-miners.enable = false; gnome-remote-desktop.enable = false;
gnome-user-share.enable = false; gnome-user-share.enable = false;
gnome-terminal-server.enable = false; rygel.enable = false;
gpaste.enable = false;
sushi.enable = false; sushi.enable = false;
tracker.enable = false; tracker.enable = false;
tracker-miners.enable = false;
# FIXME: gnome should be moved to user session # FIXME: gnome should be moved to user session
seahorse.enable = true;
gvfs.enable = true;
at-spi2-core.enable = true; at-spi2-core.enable = true;
evolution-data-server.enable = true; evolution-data-server.enable = true;
gnome-online-accounts.enable = true; gnome-online-accounts.enable = true;

3
nix/overlay.nix
View file

@ -71,4 +71,7 @@ in {
}); });
rdedup = super.callPackages ./pkgs/rdedup {}; rdedup = super.callPackages ./pkgs/rdedup {};
# TODO: facetimehd is currfently broken (https://github.com/NixOS/nixpkgs/pull/72804)
facetimehd-firmware = super.hello;
} }

4
nix/variables/versions.tmpl.nix
View file

@ -1,7 +1,7 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-19.03"; ref = "nixos-19.09";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-19.03 | awk '{ print $1 }' | tr -d '\n' -%>"; rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-19.09 | awk '{ print $1 }' | tr -d '\n' -%>";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";