Update nixpkgs

This commit is contained in:
Alexander Bantyev 2020-07-30 16:06:40 +03:00
parent 7302292b3e
commit e043485e10
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
4 changed files with 8 additions and 46 deletions

29
flake.lock generated
View File

@ -88,11 +88,11 @@
"materia-theme": { "materia-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1587550712, "lastModified": 1595824519,
"narHash": "sha256-RMifAu3dpSpXu4AdWXwO+zFgr7OHhgsj5oHOAfPNVF8=", "narHash": "sha256-cvKm3XONZy062P7XZdPQO98t0qmL/buiFM/oekTrfJQ=",
"owner": "nana-4", "owner": "nana-4",
"repo": "materia-theme", "repo": "materia-theme",
"rev": "b36b379c9256b67e5f63a60c6faf6912f1845b66", "rev": "c6aa571a1ba279e48f3f52610c9c6bedc2c9a0f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,22 +101,6 @@
"type": "github" "type": "github"
} }
}, },
"mobile-broadband-provider-info": {
"flake": false,
"locked": {
"lastModified": 1588667400,
"narHash": "sha256-xkUehl/Z0WpRDoRdNiEcMSU3A+BG7lcJRnrvRcn/0UQ=",
"ref": "master",
"rev": "8053c3edb73bed639a6f45bbf48bfa5fd418b61a",
"revCount": 597,
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"
},
"original": {
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"
}
},
"nix": { "nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
@ -229,11 +213,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1593760204, "lastModified": 1596043279,
"narHash": "sha256-M/c2DTP6EUnSgnBYyVScApeHv5I+NbN57nn+px4bEaI=", "narHash": "sha256-PgQAn4NUVLLO058jyl73stME492PBv6On6HR+SbmCJ4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bdac777becdbb8780c35be4f552c9d4518fe0bdb", "rev": "9e453cc2b7d015ab7554be471f130825f2a44604",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,7 +247,6 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"lambda-launcher": "lambda-launcher", "lambda-launcher": "lambda-launcher",
"materia-theme": "materia-theme", "materia-theme": "materia-theme",
"mobile-broadband-provider-info": "mobile-broadband-provider-info",
"nix": "nix", "nix": "nix",
"nixos-fhs-compat": "nixos-fhs-compat", "nixos-fhs-compat": "nixos-fhs-compat",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",

View File

@ -68,11 +68,6 @@
url = "ssh://git@github.com/serokell/yt-utilities"; url = "ssh://git@github.com/serokell/yt-utilities";
ref = "flake"; ref = "flake";
}; };
mobile-broadband-provider-info = {
type = "git";
url = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info";
flake = false;
};
nixos-fhs-compat = { nixos-fhs-compat = {
type = "github"; type = "github";
owner = "balsoft"; owner = "balsoft";

View File

@ -32,13 +32,6 @@ 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;
mobile-broadband-provider-info =
super.mobile-broadband-provider-info.overrideAttrs (oa: {
src = inputs.mobile-broadband-provider-info;
nativeBuildInputs = [ self.autoreconfHook ];
buildInputs = [ self.libxslt ];
});
}) })
]; ];
nixpkgs.config = { nixpkgs.config = {

View File

@ -1,17 +1,8 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
let {
plex = pkgs.runCommand "ibm-plex" {
src = pkgs.fetchzip {
url = "https://github.com/IBM/plex/releases/download/v5.0.0/TrueType.zip";
sha256 =
"sha256-KKw9pk5YmWpaMKnYKhjwHynHxx8c0F8U/fgoU9qimHY=";
};
}
"mkdir -p $out/share/fonts/truetype; cp $src/**/*.ttf $out/share/fonts/truetype";
in {
fonts = { fonts = {
fonts = with pkgs; [ fonts = with pkgs; [
plex ibm-plex
hasklig hasklig
nerdfonts nerdfonts
material-design-icons material-design-icons