From 1614ff6866201270c21ddde87e00f15b6d1c100d Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 14 May 2021 22:17:10 +0300 Subject: [PATCH] chore(deps): update flake deps --- flake.lock | 63 +++++++++++++++++++++++---------------- profiles/core/default.nix | 4 +-- users/patriot/default.nix | 4 +-- 3 files changed, 42 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 1a8de95..9b7209e 100644 --- a/flake.lock +++ b/flake.lock @@ -85,30 +85,6 @@ "type": "github" } }, - "devlib": { - "inputs": { - "deploy": "deploy", - "devshell": "devshell", - "nixlib": "nixlib", - "nixpkgs": [ - "nixos" - ], - "utils": "utils_2" - }, - "locked": { - "lastModified": 1621012625, - "narHash": "sha256-xRBbDpQDUz3mSwL2WoePz6c3zIUtZ2ML3qW0B9CVspU=", - "owner": "divnix", - "repo": "devlib", - "rev": "b0de71f4924e513e21d21a0ec60a2cb180f2187c", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "devlib", - "type": "github" - } - }, "devshell": { "locked": { "lastModified": 1618523768, @@ -124,6 +100,28 @@ "type": "github" } }, + "digga": { + "inputs": { + "deploy": "deploy", + "devshell": "devshell", + "nixlib": "nixlib", + "nixpkgs": "nixpkgs_2", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1621012625, + "narHash": "sha256-xRBbDpQDUz3mSwL2WoePz6c3zIUtZ2ML3qW0B9CVspU=", + "owner": "divnix", + "repo": "digga", + "rev": "b0de71f4924e513e21d21a0ec60a2cb180f2187c", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "digga", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -379,6 +377,21 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1620962350, + "narHash": "sha256-9ASW4d4/Z8HmRvuJI8rxbEOTbXTBpQ8y+CmFYBwtXzE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5d4a430472cafada97888cc80672fab255231f57", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1621012357, @@ -429,7 +442,7 @@ "inputs": { "ci-agent": "ci-agent", "darwin": "darwin", - "devlib": "devlib", + "digga": "digga", "home": "home", "latest": "latest", "naersk": "naersk_2", diff --git a/profiles/core/default.nix b/profiles/core/default.nix index 6738606..2aa2c77 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -1,7 +1,7 @@ -{ self, config, pkgs, lib, ... }: +{ self, config, pkgs, lib, ourLib, ... }: let inherit (lib) fileContents mkIf; - pkgBin = pkgs.ourlib.pkgBinNoDep pkgs; + pkgBin = ourLib.pkgBinNoDep pkgs; coreBin = v: "${pkgs.coreutils}/bin/${v}"; nixBin = "${config.nix.package}/bin/nix"; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 973b9ac..369e619 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -1,8 +1,8 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, ourLib, ... }: let inherit (lib) mapAttrs' nameValuePair; inherit (builtins) readDir fetchGit; - pkgBin = pkgs.ourlib.pkgBinNoDep pkgs; + pkgBin = ourLib.pkgBinNoDep pkgs; nixosConfig = config; in