Compare commits

...

1 commit
main ... sync

Author SHA1 Message Date
ce1f178d62
Sync 2024-11-10 20:22:03 +01:00
15 changed files with 127 additions and 48 deletions

61
android/flake.lock Normal file
View file

@ -0,0 +1,61 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1724300212,
"narHash": "sha256-x3jl6OWTs+L9C7EtscuWZmGZWI0iSBDafvg3X7JMa1A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4de4818c1ffa76d57787af936e8a23648bda6be4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

View file

@ -15,8 +15,11 @@
in {
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [
heimdall
android-tools
apktool
gvfs
heimdall
usbutils
];
};
}

View file

@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1729818716,
"narHash": "sha256-XRfkUsxLzFkMn3Tpstio1gNOIQ+2PZPCKbifJ2IXxlw=",
"lastModified": 1730831018,
"narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "062c4f59744fcffa2e5aa3ef443dc8b4d1674ed6",
"rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26",
"type": "github"
},
"original": {

View file

@ -25,7 +25,7 @@
astyle
# You might want to use your own IDE.
# (jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" ])
(jetbrains.plugins.addPlugins jetbrains.clion [ "github-copilot" ])
];
};
});

View file

@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1728538411,
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
"lastModified": 1730958623,
"narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
"rev": "85f7e662eda4fa3a995556527c87b2524b691933",
"type": "github"
},
"original": {

View file

@ -15,11 +15,10 @@
in {
devShells.default = pkgs.mkShell {
packages = with pkgs; [
jdk8
openjdk17
jdk
# You might want to use your own IDE.
# (jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ])
(jetbrains.plugins.addPlugins jetbrains.idea-ultimate [ "github-copilot" ])
];
};
});

View file

@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1728538411,
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
"lastModified": 1730958623,
"narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
"rev": "85f7e662eda4fa3a995556527c87b2524b691933",
"type": "github"
},
"original": {

View file

@ -20,16 +20,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1683777345,
"narHash": "sha256-V2p/A4RpEGqEZussOnHYMU6XglxBJGCODdzoyvcwig8=",
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "635a306fc8ede2e34cb3dd0d6d0a5d49362150ed",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}

View file

@ -1,7 +1,7 @@
{
description = "Minecraft flake";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils}:
@ -15,16 +15,12 @@
in {
devShells.default = pkgs.mkShell {
packages = with pkgs; [
minecraft
prismlauncher-unwrapped
# minecraft
prismlauncher
jdk22_headless # Minecraft 1.21
libredirect
steam-run
rustc
flite
glibc
xorg.libX11
xorg.libXext
];
};
}

View file

@ -14,12 +14,8 @@
in {
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [
sage
sageWithDoc
];
shellHook = ''
sage --nodotsage -n=jupyterlab --notebook-dir .
'';
};
}
);

View file

@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"lastModified": 1715787315,
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
"type": "github"
},
"original": {

View file

@ -40,7 +40,7 @@
conda
# You might want to add an IDE of your choice;
(jetbrains.plugins.addPlugins jetbrains.pycharm-professional [ "github-copilot" ])
# (jetbrains.plugins.addPlugins jetbrains.pycharm-professional [ "github-copilot" ])
];
};
});

23
python/conda/temp.txt Normal file
View file

@ -0,0 +1,23 @@
Collecting somoclu
Downloading somoclu-1.7.6.tar.gz (1.6 MB)
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 1.6/1.6 MB 10.4 MB/s eta 0:00:00
Preparing metadata (setup.py) ... done
Requirement already satisfied: numpy in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from somoclu) (1.26.4)
Requirement already satisfied: matplotlib in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from somoclu) (3.8.4)
Requirement already satisfied: scipy in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from somoclu) (1.13.0)
Requirement already satisfied: contourpy>=1.0.1 in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from matplotlib->somoclu) (1.2.1)
Requirement already satisfied: cycler>=0.10 in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from matplotlib->somoclu) (0.12.1)
Requirement already satisfied: fonttools>=4.22.0 in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from matplotlib->somoclu) (4.51.0)
Requirement already satisfied: kiwisolver>=1.3.1 in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from matplotlib->somoclu) (1.4.5)
Requirement already satisfied: packaging>=20.0 in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from matplotlib->somoclu) (24.0)
Requirement already satisfied: pillow>=8 in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from matplotlib->somoclu) (10.3.0)
Requirement already satisfied: pyparsing>=2.3.1 in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from matplotlib->somoclu) (3.1.2)
Requirement already satisfied: python-dateutil>=2.7 in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from matplotlib->somoclu) (2.9.0.post0)
Requirement already satisfied: six>=1.5 in /home/tdpeuter/.conda/envs/flowsom/lib/python3.12/site-packages (from python-dateutil>=2.7->matplotlib->somoclu) (1.16.0)
Building wheels for collected packages: somoclu
Building wheel for somoclu (setup.py) ... done
Created wheel for somoclu: filename=somoclu-1.7.6-cp312-cp312-linux_x86_64.whl size=46109 sha256=59e08821439170c1f692279c453974018bd9c3614d5278f95026dd4e2a771b08
Stored in directory: /home/tdpeuter/.cache/pip/wheels/8b/05/0a/6a22a13f926542d613ce2eb4b136884b1df7deecc20ec93c8f
Successfully built somoclu
Installing collected packages: somoclu
Successfully installed somoclu-1.7.6

View file

@ -20,16 +20,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1712588820,
"narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=",
"lastModified": 1726838390,
"narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167",
"rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}

View file

@ -2,7 +2,7 @@
description = "Python flake with native packages";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
@ -18,10 +18,11 @@
config.allowUnfree = true;
};
python-packages = p: with p; [
biopython
numpy
dask
numba
# biopython
# dask
# distributed
# numba
# numpy
];
in {
devShells.default = pkgs.mkShell {
@ -29,11 +30,11 @@
python311
(python-packages python311Packages)
]) ++ (with pkgs-unstable; [
nodejs
memray
# nodejs
# memray
# Editor of your choice
# (jetbrains.plugins.addPlugins jetbrains.pycharm-professional [ "github-copilot" ])
(jetbrains.plugins.addPlugins jetbrains.pycharm-professional [ "github-copilot" ])
# vscodium
]);
};