Update nixpkgs

This commit is contained in:
Alexander Bantyev 2020-08-25 13:35:54 +03:00
parent 2dd165dc3d
commit e010805a86
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
5 changed files with 11 additions and 12 deletions

12
flake.lock generated
View File

@ -229,17 +229,17 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1596571799, "lastModified": 1597943282,
"narHash": "sha256-NlJ8rSNODhje8t4RVS+Jos+3rpohguqZWmP93niWKFc=", "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs-channels",
"rev": "c253216595572930316f2be737dc288a1da22558", "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "ref": "nixos-unstable",
"rev": "c253216595572930316f2be737dc288a1da22558", "repo": "nixpkgs-channels",
"type": "github" "type": "github"
} }
}, },

View File

@ -3,7 +3,7 @@
"A collection of crap, hacks and copy-paste to make my localhosts boot"; "A collection of crap, hacks and copy-paste to make my localhosts boot";
inputs = { inputs = {
nixpkgs.url = github:nixos/nixpkgs/c253216595572930316f2be737dc288a1da22558; nixpkgs.url = github:nixos/nixpkgs-channels/nixos-unstable;
nixpkgs-mesa.url = github:nixos/nixpkgs-channels/bdac777becdbb8780c35be4f552c9d4518fe0bdb; nixpkgs-mesa.url = github:nixos/nixpkgs-channels/bdac777becdbb8780c35be4f552c9d4518fe0bdb;
lambda-launcher.url = github:balsoft/lambda-launcher; lambda-launcher.url = github:balsoft/lambda-launcher;
NUR = { NUR = {

View File

@ -2,8 +2,8 @@
let let
weechat-matrix = pkgs.weechatScripts.weechat-matrix.overrideAttrs (_: { weechat-matrix = pkgs.weechatScripts.weechat-matrix.overrideAttrs (_: {
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/myii/weechat-matrix/archive/feat/enable-replies.tar.gz"; url = "https://github.com/poljar/weechat-matrix/archive/master.tar.gz";
sha256 = "sha256-KeTfSdwVosouJwz0aZARKdxNERmFWl96Dl1ps0kbBy4="; sha256 = "sha256-zYq68dl9nlHflsVrbg32KNNa/P3otEfvZrUTuD3ahT0=";
}; };
}); });
weechat = pkgs.weechat.override { weechat = pkgs.weechat.override {

View File

@ -2,7 +2,6 @@
{ {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
nginx.enable = true;
hostName = "nextcloud.balsoft.ru"; hostName = "nextcloud.balsoft.ru";
config.adminpassFile = "/home/balsoft/nextcloud-admin"; config.adminpassFile = "/home/balsoft/nextcloud-admin";
package = pkgs.nextcloud19; package = pkgs.nextcloud19;

View File

@ -21,8 +21,6 @@ in {
nurpkgs = pkgs; nurpkgs = pkgs;
}).repos; }).repos;
inherit (inputs.nixpkgs-mesa.legacyPackages.x86_64-linux) sway mesa_drivers;
inherit (nur.balsoft.pkgs) termNote nix-patch; inherit (nur.balsoft.pkgs) termNote nix-patch;
# inherit (old) mautrix-telegram; # inherit (old) mautrix-telegram;
@ -34,6 +32,8 @@ in {
yt-utilities = inputs.yt-utilities.defaultPackage.x86_64-linux; yt-utilities = inputs.yt-utilities.defaultPackage.x86_64-linux;
nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd; nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd;
inherit (inputs.nixpkgs-mesa.legacyPackages.x86_64-linux) sway mesa_drivers;
}) })
]; ];
nixpkgs.config = { nixpkgs.config = {