tim.mccarthy/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mach-nix to 3.5.0, remove pypi-deps-db input

Browse Source
This commit is contained in:
Tim McCarthy
2022-08-31 15:06:32 -07:00
parent 65589f74bc
commit d9d0c67f03
2 changed files with 9 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
nix/flake.lock generated
View File

@@ -29,21 +29,6 @@
"type": "github"
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1601282935,
"narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "588973065fce51f4763287f0fda87a174d78bf48",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -71,41 +56,19 @@
"nixpkgs": [
"nixpkgs"
],
"pypi-deps-db": [
"pypi-deps-db"
]
"pypi-deps-db": "pypi-deps-db"
},
"locked": {
"lastModified": 1661359648,
"narHash": "sha256-BRz30Xg/g535oRJA3xEcXf0KM6GTJPugt2lgaom3D6g=",
"lastModified": 1654084003,
"narHash": "sha256-j/XrVVistvM+Ua+0tNFvO5z83isL+LBgmBi9XppxuKA=",
"owner": "DavHau",
"repo": "mach-nix",
"rev": "6cd3929b1561c3eef68f5fc6a08b57cf95c41ec1",
"type": "github"
},
"original": {
"owner": "DavHau",
"ref": "master",
"repo": "mach-nix",
"type": "github"
}
},
"mach-nix_2": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_2",
"pypi-deps-db": "pypi-deps-db_2"
},
"locked": {
"lastModified": 1618982703,
"narHash": "sha256-9dSHtu9XfK04caPx6kXvmhcnC3t+8bS65yqS6U4nQ/g=",
"owner": "DavHau",
"repo": "mach-nix",
"rev": "9543999c8abb56524347a6236e7b1c5e4aaa2c1d",
"rev": "7e14360bde07dcae32e5e24f366c83272f52923f",
"type": "github"
},
"original": {
"id": "mach-nix",
"ref": "3.5.0",
"type": "indirect"
}
},
@@ -125,68 +88,14 @@
"type": "github"
}
},
"nixpkgsPy36": {
"locked": {
"lastModified": 1601475821,
"narHash": "sha256-7AI8j/xq5slauMGwC3Dp2K9TKDyDtBXBebeyWsE9euE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b4db68ff563895eea6aab4ff24fa04ef403dfe14",
"type": "github"
},
"original": {
"id": "nixpkgs",
"rev": "b4db68ff563895eea6aab4ff24fa04ef403dfe14",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1615259932,
"narHash": "sha256-IXecmbqCr+XCtFwzBO3tHEd8PoJ4X4EyPZebKbV2ioE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "29b0d4d0b600f8f5dd0b86e3362a33d4181938f9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pypi-deps-db": {
"inputs": {
"mach-nix": "mach-nix_2",
"nixpkgs": [
"nixpkgs"
],
"nixpkgsPy36": "nixpkgsPy36",
"pypiIndex": "pypiIndex"
},
"locked": {
"lastModified": 1661935973,
"narHash": "sha256-Ngmf2Q0jHTRiRPmqC1+4GdmuC5xYL/0csQkVifcgU7k=",
"owner": "DavHau",
"repo": "pypi-deps-db",
"rev": "f62d8906d4558ed593fd3115f788ebf902b466bf",
"type": "github"
},
"original": {
"owner": "DavHau",
"repo": "pypi-deps-db",
"type": "github"
}
},
"pypi-deps-db_2": {
"flake": false,
"locked": {
"lastModified": 1615363940,
"narHash": "sha256-GJ3ONLWAr5ejqR5bKVfKpI/n+ClaxjyYewMP+QJyq5M=",
"lastModified": 1661979378,
"narHash": "sha256-j0q9m1b03V6lRF8M3Mr01uJYat45LOZMqC+xdM4u8M8=",
"owner": "DavHau",
"repo": "pypi-deps-db",
"rev": "ab522f2d3255789f1ef97fa7c83d4342be156e67",
"rev": "c1c1684ceb2a2db22d76111922e6e81ff7b3111b",
"type": "github"
},
"original": {
@@ -195,29 +104,12 @@
"type": "github"
}
},
"pypiIndex": {
"flake": false,
"locked": {
"lastModified": 1661926585,
"narHash": "sha256-MMGJinzPIfZ2EGV4CI8Vz96sg3Drw296Q8IWQhr3tog=",
"owner": "davhau",
"repo": "nix-pypi-fetcher",
"rev": "033286731cede01acaa92700136e54564bc4de2c",
"type": "github"
},
"original": {
"owner": "davhau",
"repo": "nix-pypi-fetcher",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"mach-nix": "mach-nix",
"nixpkgs": "nixpkgs",
"pypi-deps-db": "pypi-deps-db",
"utils": "utils_2"
}
},

12
nix/flake.nix
View File

@@ -6,12 +6,8 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
pypi-deps-db.url = "github:DavHau/pypi-deps-db";
pypi-deps-db.inputs.nixpkgs.follows = "nixpkgs";
mach-nix.url = "github:DavHau/mach-nix/master";
mach-nix.url = "mach-nix/3.5.0";
mach-nix.inputs.nixpkgs.follows = "nixpkgs";
mach-nix.inputs.pypi-deps-db.follows = "pypi-deps-db";
};
outputs = {self, nixpkgs, flake-utils, home-manager, mach-nix, ...}: let
@@ -38,10 +34,4 @@
overlays.xonsh_with_plugins = import ./overlays/xonsh.nix { mach-nix = mach-nix.lib."${system}"; };
legacyPackages.homeConfigurations.std = mkHomeConfig { inherit system; };
});
# {
# overlays.xonsh_with_plugins.x86_64-linux = import ./overlays/xonsh.nix { mach-nix = mach-nix.lib."x86_64-linux"; };
# overlays.xonsh_with_plugins.x86_64-darwin = import ./overlays/xonsh.nix { mach-nix = mach-nix.lib."x86_64-darwin"; };
# homeConfigurations.linux = mkHomeConfig { system="x86_64-linux"; };
# homeConfigurations.mac = mkHomeConfig { system="x86_64-darwin"; };
# };
}