Update to nixpkgs 24.05, make sure everything is running the same version of python
This commit is contained in:
parent
91d825d8cc
commit
c501caea6a
169
flake.lock
169
flake.lock
|
|
@ -9,36 +9,20 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1696540558,
|
||||
"narHash": "sha256-fqYyjgOFQrU4ryGcLyz5gMYMdPk1P24ra7kQiUrbilg=",
|
||||
"lastModified": 1701366566,
|
||||
"narHash": "sha256-B8Jmjld0gGbkVO08GsovVqrUXCs8VfJ8UdM3sjHnzgM=",
|
||||
"owner": "agda",
|
||||
"repo": "agda",
|
||||
"rev": "f42acb696e43d382639f04f869e9a99ab36a91c6",
|
||||
"rev": "4293e0a94d15acac915ab9088b2ec028f78d14a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "agda",
|
||||
"ref": "v2.6.4",
|
||||
"ref": "v2.6.4.1",
|
||||
"repo": "agda",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"agda-stdlib-source": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1693492688,
|
||||
"narHash": "sha256-oO27n/Q+IGPVAaEbOI8YwjerrhvA5rLV+gH6fGDwUIs=",
|
||||
"owner": "agda",
|
||||
"repo": "agda-stdlib",
|
||||
"rev": "f77a02ab6933fadbd42de3959545e91122934342",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "agda",
|
||||
"repo": "agda-stdlib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ansi-utils": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
|
|
@ -62,21 +46,19 @@
|
|||
},
|
||||
"cornelis": {
|
||||
"inputs": {
|
||||
"agda": [
|
||||
"rachel",
|
||||
"agda"
|
||||
],
|
||||
"agda-stdlib-source": "agda-stdlib-source",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils_7",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": [
|
||||
"rachel",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1694540816,
|
||||
"narHash": "sha256-pUHGjxtFkgTO0Ewovc4CEKG2kmJCXxJBDxOcxgJs9Ds=",
|
||||
"lastModified": 1712595875,
|
||||
"narHash": "sha256-KaAhKeESwOQ0R0vxeAO/CDPiPimiemoARyr0uIVTQ4w=",
|
||||
"owner": "isovector",
|
||||
"repo": "cornelis",
|
||||
"rev": "d7ec58bcef67b1234aa861a706bd402849c8b6e3",
|
||||
"rev": "9d3347e7d8589a28bcdd283001367d60bacf6b05",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -88,11 +70,11 @@
|
|||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -211,11 +193,11 @@
|
|||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1692799911,
|
||||
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -267,16 +249,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706981411,
|
||||
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
|
||||
"lastModified": 1716736833,
|
||||
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
|
||||
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-23.11",
|
||||
"ref": "release-24.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -289,16 +271,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695108154,
|
||||
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
|
||||
"lastModified": 1712386041,
|
||||
"narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "07682fff75d41f18327a871088d20af2710d4744",
|
||||
"rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-23.05",
|
||||
"ref": "release-23.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -311,11 +293,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707412982,
|
||||
"narHash": "sha256-F5Uprb82ANfQgZAeQIVBQg7DaA8IMQyyCl/WwM1P4pc=",
|
||||
"lastModified": 1717362972,
|
||||
"narHash": "sha256-lFgQ8R/K9TSf3hguXObzh6DPB8d3no/lfXWSLy8O+eI=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "31e142c9f78452861c400a662607a597013a3f8d",
|
||||
"revCount": 10137,
|
||||
"rev": "2266acf5cc14dc2f1aeb190e6adfef870ecaa7b8",
|
||||
"revCount": 10138,
|
||||
"type": "git",
|
||||
"url": "https://githug.xyz/xenia/kakoune.git"
|
||||
},
|
||||
|
|
@ -334,11 +316,11 @@
|
|||
"tree-sitters": "tree-sitters"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1703165260,
|
||||
"narHash": "sha256-K3svv1/KXv3xTU5wYd59FNrLHSDxthNT7TU9fL8218U=",
|
||||
"lastModified": 1703888912,
|
||||
"narHash": "sha256-Je77Ju5kbeiEviRweGANm6JzK4EXC/5sZJjFo6S37GE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "1e0dcb2a029925945f091eb1e1760e3dc2ead7fc",
|
||||
"revCount": 31,
|
||||
"rev": "d80739e62df7f788f0c8a009dbcf9d503e71de76",
|
||||
"revCount": 35,
|
||||
"type": "git",
|
||||
"url": "https://githug.xyz/xenia/kak-tree.git"
|
||||
},
|
||||
|
|
@ -354,11 +336,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699704228,
|
||||
"narHash": "sha256-NApWG385goidsXmsakWgFRjvbH+aw/n1CGGHn/UuXsc=",
|
||||
"lastModified": 1716993688,
|
||||
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "0f1ad801387445fdda01d080db8ecf169be8e793",
|
||||
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -383,6 +365,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1713297878,
|
||||
"narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
|
||||
"owner": "NixOs",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOs",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1697009197,
|
||||
|
|
@ -399,32 +397,32 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1707238373,
|
||||
"narHash": "sha256-WKxT0yLzWbFZwYi92lI0yWJpYtRaFSWHGX8QXzejapw=",
|
||||
"lastModified": 1717144377,
|
||||
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fb0c047e30b69696acc42e669d02452ca1b55755",
|
||||
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-23.11",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1694062546,
|
||||
"narHash": "sha256-PiGI4f2BGnZcedP6slLjCLGLRLXPa9+ogGGgVPfGxys=",
|
||||
"lastModified": 1711703276,
|
||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b200e0df08f80c32974a6108ce431d8a8a5e6547",
|
||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -436,14 +434,16 @@
|
|||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"ssbm-nix": "ssbm-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699738267,
|
||||
"narHash": "sha256-spGi9SpcDQ4Vf9ulojj7wdVz83erFMvpwmtXGNkKalk=",
|
||||
"lastModified": 1717095319,
|
||||
"narHash": "sha256-CdOAT2MhNtxLf0Ki4d/mT9jQQZaIOfrCBZXHwJRgWYg=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "f536566a01ef215386131a5baef1a25e744cf069",
|
||||
"revCount": 78,
|
||||
"rev": "7f19d4efe9fc7977b85a1f51b396e63ff8102b87",
|
||||
"revCount": 137,
|
||||
"type": "git",
|
||||
"url": "https://git@githug.xyz/rachel/nixos-config"
|
||||
},
|
||||
|
|
@ -484,6 +484,41 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"slippi-desktop": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1711346593,
|
||||
"narHash": "sha256-WWgGRT58w1a4UcEe924hqa4ZVodQtsbXC44aCOEj528=",
|
||||
"owner": "project-slippi",
|
||||
"repo": "slippi-desktop-app",
|
||||
"rev": "02f3f007cd03c6e2b0da57db65c90646efc04a86",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "project-slippi",
|
||||
"repo": "slippi-desktop-app",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ssbm-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"slippi-desktop": "slippi-desktop"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712071998,
|
||||
"narHash": "sha256-k95NCkXJ61PGMFuqyMtfvP3yTLozED/7DkN+lBWK0gs=",
|
||||
"owner": "lytedev",
|
||||
"repo": "ssbm-nix",
|
||||
"rev": "eff966a97287d1d86b189d59a14bf744d86836b0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lytedev",
|
||||
"repo": "ssbm-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-23.11";
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-darwin = {
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ esac";
|
|||
makeWrapper
|
||||
ncurses
|
||||
pkg-config
|
||||
python3
|
||||
python311
|
||||
];
|
||||
|
||||
buildInputs = rpathLibs
|
||||
|
|
|
|||
|
|
@ -31,22 +31,22 @@ in rec {
|
|||
jq
|
||||
rink numbat
|
||||
ghc
|
||||
( python310.withPackages (ps: with ps; [
|
||||
numpy matplotlib sympy scipy pandas
|
||||
pwntools z3 tqdm
|
||||
( python311.withPackages (ps: with ps; [
|
||||
numpy matplotlib sympy scipy pandas jupyter
|
||||
# pwntools
|
||||
z3 tqdm
|
||||
pyusb usbtmc
|
||||
ipython mypy (pylsp-mypy.overrideAttrs (old: { doCheck = false; }))
|
||||
]))
|
||||
( agda.withPackages (ps: with ps; [ standard-library cubical ]) )
|
||||
typst
|
||||
# jupyter
|
||||
|
||||
# nodePackages.typescript
|
||||
# nodePackages.typescript-language-server
|
||||
# rust-analyzer
|
||||
zulip-term
|
||||
|
||||
(extras.challtools python310Packages)
|
||||
# (extras.challtools python311Packages)
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ rec {
|
|||
'';
|
||||
|
||||
challtools = (ps: with ps;
|
||||
buildPythonPackage rec {
|
||||
python311Packages.buildPythonPackage rec {
|
||||
pname = "challtools";
|
||||
version = "0.4.8";
|
||||
src = fetchPypi {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user