From 03a04e8988b4bcc1f604e21204b544c39f1f54d5 Mon Sep 17 00:00:00 2001 From: guangtao Date: Tue, 20 Feb 2024 20:17:02 -0800 Subject: [PATCH] chore: update locks --- nix/std/cells/repo/jupyenv/example.nix | 1 + nix/std/flake.lock | 786 +------------------------ nix/std/flake.nix | 26 +- 3 files changed, 15 insertions(+), 798 deletions(-) diff --git a/nix/std/cells/repo/jupyenv/example.nix b/nix/std/cells/repo/jupyenv/example.nix index 1cf7bf3..8bcc629 100644 --- a/nix/std/cells/repo/jupyenv/example.nix +++ b/nix/std/cells/repo/jupyenv/example.nix @@ -45,6 +45,7 @@ in "Plots" "GLMakie" "DataFrames" + "JSON3" ]; extraKernelSpc = { env = { diff --git a/nix/std/flake.lock b/nix/std/flake.lock index 2a57894..87260ce 100644 --- a/nix/std/flake.lock +++ b/nix/std/flake.lock @@ -30,36 +30,6 @@ "type": "github" } }, - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, - "blank_2": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "call-flake": { "locked": { "lastModified": 1697332845, @@ -75,73 +45,6 @@ "type": "github" } }, - "call-flake_2": { - "locked": { - "lastModified": 1691284812, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", - "owner": "divnix", - "repo": "call-flake", - "rev": "0510cb1562720ae66cb5010c56b856142b837a3f", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "call-flake", - "type": "github" - } - }, - "call-flake_3": { - "locked": { - "lastModified": 1687380775, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", - "owner": "divnix", - "repo": "call-flake", - "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "call-flake", - "type": "github" - } - }, - "call-flake_4": { - "locked": { - "lastModified": 1687380775, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", - "owner": "divnix", - "repo": "call-flake", - "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "call-flake", - "type": "github" - } - }, - "devshell": { - "inputs": { - "nixpkgs": [ - "omnibusStd", - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1698410321, - "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=", - "owner": "numtide", - "repo": "devshell", - "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dmerge": { "inputs": { "haumea": [ @@ -174,102 +77,6 @@ "type": "github" } }, - "dmerge_2": { - "inputs": { - "haumea": [ - "omnibusStd", - "std", - "haumea" - ], - "nixlib": [ - "omnibusStd", - "std", - "lib" - ], - "yants": [ - "omnibusStd", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1686862774, - "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", - "owner": "divnix", - "repo": "dmerge", - "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", - "type": "github" - }, - "original": { - "owner": "divnix", - "ref": "0.2.1", - "repo": "dmerge", - "type": "github" - } - }, - "dmerge_3": { - "inputs": { - "haumea": [ - "std", - "haumea" - ], - "nixlib": [ - "std", - "lib" - ], - "yants": [ - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1686862774, - "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", - "owner": "divnix", - "repo": "dmerge", - "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", - "type": "github" - }, - "original": { - "owner": "divnix", - "ref": "0.2.1", - "repo": "dmerge", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flops": { "inputs": { "POP": "POP", @@ -315,212 +122,6 @@ "type": "github" } }, - "haumea_2": { - "inputs": { - "nixpkgs": [ - "omnibusStd", - "namaka", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", - "owner": "nix-community", - "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.2.2", - "repo": "haumea", - "type": "github" - } - }, - "haumea_3": { - "inputs": { - "nixpkgs": [ - "omnibusStd", - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", - "owner": "nix-community", - "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.2.2", - "repo": "haumea", - "type": "github" - } - }, - "haumea_4": { - "inputs": { - "nixpkgs": [ - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", - "owner": "nix-community", - "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.2.2", - "repo": "haumea", - "type": "github" - } - }, - "incl": { - "inputs": { - "nixlib": [ - "omnibusStd", - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, - "incl_2": { - "inputs": { - "nixlib": [ - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, - "lib": { - "locked": { - "lastModified": 1694306727, - "narHash": "sha256-26fkTOJOI65NOTNKFvtcJF9mzzf/kK9swHzfYt1Dl6Q=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "c30b6a84c0b84ec7aecbe74466033facc9ed103f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "lib_2": { - "locked": { - "lastModified": 1694306727, - "narHash": "sha256-26fkTOJOI65NOTNKFvtcJF9mzzf/kK9swHzfYt1Dl6Q=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "c30b6a84c0b84ec7aecbe74466033facc9ed103f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "n2c": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708373500, - "narHash": "sha256-Z99xGwhrOCHbuEsygO+8079XtRg1+xNKKWjQav/TeA4=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "3680aaa3cec382e8e114c5ab6212b11df4b194c8", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "namaka": { - "inputs": { - "haumea": "haumea_2", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1696528717, - "narHash": "sha256-y9iQPJuIhUHojV/5yiYV68a9DaRSbHxMR2QbSdNtb/I=", - "owner": "nix-community", - "repo": "namaka", - "rev": "30a62e16535c85aa2ada2929ab7998dc2d3e5a7b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "namaka", - "type": "github" - } - }, - "nixago": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixago-exts": [ - "omnibusStd" - ], - "nixpkgs": [ - "omnibusStd", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1687381756, - "narHash": "sha256-IUMIlYfrvj7Yli4H2vvyig8HEPpfCeMaE6+kBGPzFyk=", - "owner": "nix-community", - "repo": "nixago", - "rev": "dacceb10cace103b3e66552ec9719fa0d33c0dc9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1705193289, @@ -536,363 +137,27 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1701336116, - "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nosys": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, - "nosys_2": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, "omnibus": { "inputs": { "flops": "flops" }, "locked": { - "lastModified": 1708413571, - "narHash": "sha256-pmhQ6T+o44qFzcH3ihJ3q8+9FyhUImUS5QHEkItmRMk=", - "owner": "gtrunsec", - "repo": "omnibus", - "rev": "a1db2a257ea75960d82b41324381f72c34b3c80a", - "type": "github" - }, - "original": { - "owner": "gtrunsec", - "repo": "omnibus", - "type": "github" - } - }, - "omnibusStd": { - "inputs": { - "call-flake": "call-flake_2", - "devshell": "devshell", - "haumea": [ - "omnibusStd", - "namaka", - "haumea" - ], - "namaka": "namaka", - "nixago": "nixago", - "nixpkgs": "nixpkgs_2", - "std": "std" - }, - "locked": { - "dir": "local", - "lastModified": 1703587981, - "narHash": "sha256-VBocajmVSp9XKh3u/nkQilbWn1WWlepijC9d8LTJatY=", + "lastModified": 1708484840, + "narHash": "sha256-0uD++CC696ZhNZ33YxqtbKLcir6yEtfBcJ/Va7nwQ3I=", "owner": "gtrunsec", "repo": "omnibus", - "rev": "cceedd5d03339f9eb8287487380b3a5c0e3dbcc2", + "rev": "bc140b55d9d5494ec57167a71590eed002406819", "type": "github" }, "original": { - "dir": "local", "owner": "gtrunsec", "repo": "omnibus", "type": "github" } }, - "paisano": { - "inputs": { - "call-flake": "call-flake_3", - "nixpkgs": [ - "omnibusStd", - "std", - "nixpkgs" - ], - "nosys": "nosys", - "yants": [ - "omnibusStd", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1693982790, - "narHash": "sha256-WTZYlqGUjzzz/PSzcvjEZz2kkwYSXObjeQVrFBaqa2Y=", - "owner": "paisano-nix", - "repo": "core", - "rev": "3e897a19418361ece34841105122ed4f9379ca96", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "core", - "type": "github" - } - }, - "paisano-tui": { - "flake": false, - "locked": { - "lastModified": 1694014205, - "narHash": "sha256-u0+T6vMznzfjDMUd01ZXQsrQPMEhMjrQwUPTFsPBR1k=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "587ab9fd07bd969d59df73bfe527b5f8a4e752d1", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "0.2.0", - "repo": "tui", - "type": "github" - } - }, - "paisano-tui_2": { - "flake": false, - "locked": { - "lastModified": 1708353388, - "narHash": "sha256-RzNQ5P4fdYYAXb5Bmazh5KLjlbeCtyMX7WNiOFsqN68=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "db1f97e3d5213e66e5c1251d23d1401d7068b5f5", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "v0.4.3", - "repo": "tui", - "type": "github" - } - }, - "paisano_2": { - "inputs": { - "call-flake": "call-flake_4", - "nixpkgs": [ - "std", - "nixpkgs" - ], - "nosys": "nosys_2", - "yants": [ - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1693982790, - "narHash": "sha256-WTZYlqGUjzzz/PSzcvjEZz2kkwYSXObjeQVrFBaqa2Y=", - "owner": "paisano-nix", - "repo": "core", - "rev": "3e897a19418361ece34841105122ed4f9379ca96", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "core", - "type": "github" - } - }, "root": { "inputs": { - "n2c": "n2c", - "nixpkgs": [ - "omnibusStd", - "nixpkgs" - ], - "omnibus": "omnibus", - "omnibusStd": "omnibusStd", - "std": "std_2" - } - }, - "std": { - "inputs": { - "arion": [ - "omnibusStd", - "std", - "blank" - ], - "blank": "blank", - "devshell": [ - "omnibusStd", - "devshell" - ], - "dmerge": "dmerge_2", - "haumea": "haumea_3", - "incl": "incl", - "lib": "lib", - "makes": [ - "omnibusStd", - "std", - "blank" - ], - "microvm": [ - "omnibusStd", - "std", - "blank" - ], - "n2c": [ - "omnibusStd", - "std", - "blank" - ], - "nixago": [ - "omnibusStd", - "nixago" - ], - "nixpkgs": [ - "omnibusStd", - "nixpkgs" - ], - "paisano": "paisano", - "paisano-tui": "paisano-tui", - "terranix": [ - "omnibusStd", - "std", - "blank" - ], - "yants": "yants_2" - }, - "locked": { - "lastModified": 1699009342, - "narHash": "sha256-ch4MN4mFBBzPmEra5u9Tqj3JyWpt7cTA4z1jkY8DsfQ=", - "owner": "divnix", - "repo": "std", - "rev": "403fd2a949c60fc358be4f7d7ecfb435960b8464", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "std_2": { - "inputs": { - "arion": [ - "std", - "blank" - ], - "blank": "blank_2", - "devshell": [ - "omnibusStd", - "devshell" - ], - "dmerge": "dmerge_3", - "haumea": "haumea_4", - "incl": "incl_2", - "lib": "lib_2", - "makes": [ - "std", - "blank" - ], - "microvm": [ - "std", - "blank" - ], - "n2c": [ - "n2c" - ], - "nixago": [ - "omnibusStd", - "nixago" - ], - "nixpkgs": [ - "nixpkgs" - ], - "paisano": "paisano_2", - "paisano-tui": "paisano-tui_2", - "terranix": [ - "std", - "blank" - ], - "yants": "yants_3" - }, - "locked": { - "lastModified": 1708355225, - "narHash": "sha256-gY+W86qCSwMuOqM/HSgK9nittcWKvjEb+TpmZnJQTnE=", - "owner": "divnix", - "repo": "std", - "rev": "85d3d38c57b0214f21daaa0fb64f16e6a6b4ccc2", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "omnibus": "omnibus" } }, "yants": { @@ -917,49 +182,6 @@ "repo": "yants", "type": "github" } - }, - "yants_2": { - "inputs": { - "nixpkgs": [ - "omnibusStd", - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1686863218, - "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", - "owner": "divnix", - "repo": "yants", - "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } - }, - "yants_3": { - "inputs": { - "nixpkgs": [ - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1686863218, - "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", - "owner": "divnix", - "repo": "yants", - "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } } }, "root": "root", diff --git a/nix/std/flake.nix b/nix/std/flake.nix index 5c7989f..f056a52 100644 --- a/nix/std/flake.nix +++ b/nix/std/flake.nix @@ -15,26 +15,16 @@ }; inputs = { - nixpkgs.follows = "omnibusStd/nixpkgs"; - omnibusStd.url = "github:gtrunsec/omnibus/?dir=local"; omnibus.url = "github:gtrunsec/omnibus"; - - std.url = "github:divnix/std"; - std.inputs.nixpkgs.follows = "nixpkgs"; - std.inputs.devshell.follows = "omnibusStd/devshell"; - std.inputs.n2c.follows = "n2c"; - std.inputs.nixago.follows = "omnibusStd/nixago"; - - n2c.url = "github:nlewo/nix2container"; - n2c.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = - { std, omnibus, ... }@inputs: + { omnibus, ... }@inputs: let + inherit (omnibus.flake.inputs) std; stdLib = (omnibus.pops.std { inputs.inputs = { - inherit (inputs) std; + inherit std; }; }).exports.default; in @@ -42,9 +32,13 @@ { inputs = inputs - // ((omnibus.call-flake ../lock).inputs) // { + inherit std; + } + // ((omnibus.call-flake ../lock).inputs) + // rec { main = omnibus.call-flake ../..; + nixpkgs = main.inputs.nixpkgs; }; cellsFrom = ./cells; @@ -74,11 +68,11 @@ ]; } { - devShells = inputs.std.harvest inputs.self [ + devShells = std.harvest inputs.self [ "repo" "shells" ]; - packages = inputs.std.harvest inputs.self [ + packages = std.harvest inputs.self [ "repo" "packages" ];