mirrors/zap
1
0
Fork 0
mirror of https://github.com/zigzap/zap.git synced 2025-10-20 23:24:09 +00:00
Code Activity

updated flake.nix

Browse source
This commit is contained in:
Rene Schallner 2025-02-25 13:15:35 +00:00
parent 2d3f8938a5
commit 7867f32e4d
2 changed files with 60 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
flake.lock generated
View file

@ -1,6 +1,22 @@
{ {
"nodes": { "nodes": {
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -16,32 +32,16 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1731533236,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1705309234,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,72 +68,34 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "contrib",
"lastModified": 1704461694,
"narHash": "sha256-dQc9Bkh5uf0R4po3NWnCGx+3eqOZR7iSR4jmRvNNm+E=",
"owner": "neovim",
"repo": "neovim",
"rev": "c509f4907bf7405c9c2ae3f7eff76c5d552944cc",
"type": "github"
},
"original": {
"dir": "contrib",
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1704290814, "lastModified": 1740396192,
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "narHash": "sha256-ATMHHrg3sG1KgpQA5x8I+zcYpp5Sf17FaFj/fN+8OoQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "rev": "d9b69c3ec2a2e2e971c534065bdd53374bd68b97",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-23.05", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1702350026, "lastModified": 1708161998,
"narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9463103069725474698139ab10f17a9d125da859", "rev": "84d981bae8b5e783b3b548de505b22880559515f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -142,7 +104,6 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"zig": "zig" "zig": "zig"
} }
@ -180,15 +141,15 @@
"zig": { "zig": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1704888534, "lastModified": 1740485530,
"narHash": "sha256-douEXUiWCVL9NvWKYBc8ydq51qLLUwlBo6lJJoktkGw=", "narHash": "sha256-PjYwEHq51GVB4ND3z45cxGC59AcK4Yzh9bdfHW569cM=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "c69295c92a98947295755a9ac2d49a8d447cc04d", "rev": "67d4ddec445dd3cb3f7396ca89f00c5f85ed201e",
"type": "github" "type": "github"
}, },
"original": { "original": {

52
flake.nix
View file

@ -2,16 +2,16 @@
description = "zap dev shell"; description = "zap dev shell";
inputs = { inputs = {
# nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; // GLIBC problem! nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:nixos/nixpkgs/release-23.05"; # nixpkgs.url = "github:nixos/nixpkgs/release-23.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
# required for latest zig # required for latest zig
zig.url = "github:mitchellh/zig-overlay"; zig.url = "github:mitchellh/zig-overlay";
# required for latest neovim # required for latest neovim
neovim-flake.url = "github:neovim/neovim?dir=contrib"; # neovim-flake.url = "github:neovim/neovim?dir=contrib";
neovim-flake.inputs.nixpkgs.follows = "nixpkgs"; # neovim-flake.inputs.nixpkgs.follows = "nixpkgs";
# Used for shell.nix # Used for shell.nix
flake-compat = { flake-compat = {
@ -30,7 +30,7 @@
# Other overlays # Other overlays
(final: prev: { (final: prev: {
zigpkgs = inputs.zig.packages.${prev.system}; zigpkgs = inputs.zig.packages.${prev.system};
neovim-nightly-pkgs = inputs.neovim-flake.packages.${prev.system}; # neovim-nightly-pkgs = inputs.neovim-flake.packages.${prev.system};
}) })
]; ];
@ -44,18 +44,18 @@
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
# neovim-nightly-pkgs.neovim # neovim-nightly-pkgs.neovim
zigpkgs."0.12.0" zigpkgs."0.13.0"
bat bat
wrk wrk
python310 python3
python310Packages.sanic python3Packages.sanic
python310Packages.matplotlib python3Packages.matplotlib
poetry poetry
poetry poetry
pkgs.rustc pkgs.rustc
pkgs.cargo pkgs.cargo
pkgs.gcc pkgs.gcc
pkgs.rustfmt pkgs.rustfmt
pkgs.clippy pkgs.clippy
pkgs.go pkgs.go
pkgs.gotools pkgs.gotools
@ -74,14 +74,14 @@
buildInputs = with pkgs; [ buildInputs = with pkgs; [
# we need a version of bash capable of being interactive # we need a version of bash capable of being interactive
# as opposed to a bash just used for building this flake # as opposed to a bash just used for building this flake
# in non-interactive mode # in non-interactive mode
bashInteractive bashInteractive
]; ];
shellHook = '' shellHook = ''
# once we set SHELL to point to the interactive bash, neovim will # once we set SHELL to point to the interactive bash, neovim will
# launch the correct $SHELL in its :terminal # launch the correct $SHELL in its :terminal
export SHELL=${pkgs.bashInteractive}/bin/bash export SHELL=${pkgs.bashInteractive}/bin/bash
export LD_LIBRARY_PATH=${pkgs.zlib.out}/lib:${pkgs.icu.out}/lib:${pkgs.openssl.out}/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${pkgs.zlib.out}/lib:${pkgs.icu.out}/lib:${pkgs.openssl.out}/lib:$LD_LIBRARY_PATH
''; '';
@ -89,20 +89,20 @@
devShells.build = pkgs.mkShell { devShells.build = pkgs.mkShell {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
zigpkgs."0.12.0" zigpkgs."0.13.0"
pkgs.openssl pkgs.openssl
]; ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
# we need a version of bash capable of being interactive # we need a version of bash capable of being interactive
# as opposed to a bash just used for building this flake # as opposed to a bash just used for building this flake
# in non-interactive mode # in non-interactive mode
bashInteractive bashInteractive
]; ];
shellHook = '' shellHook = ''
# once we set SHELL to point to the interactive bash, neovim will # once we set SHELL to point to the interactive bash, neovim will
# launch the correct $SHELL in its :terminal # launch the correct $SHELL in its :terminal
export SHELL=${pkgs.bashInteractive}/bin/bash export SHELL=${pkgs.bashInteractive}/bin/bash
export LD_LIBRARY_PATH=${pkgs.zlib.out}/lib:${pkgs.icu.out}/lib:${pkgs.openssl.out}/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${pkgs.zlib.out}/lib:${pkgs.icu.out}/lib:${pkgs.openssl.out}/lib:$LD_LIBRARY_PATH
''; '';
@ -116,14 +116,14 @@
buildInputs = with pkgs; [ buildInputs = with pkgs; [
# we need a version of bash capable of being interactive # we need a version of bash capable of being interactive
# as opposed to a bash just used for building this flake # as opposed to a bash just used for building this flake
# in non-interactive mode # in non-interactive mode
bashInteractive bashInteractive
]; ];
shellHook = '' shellHook = ''
# once we set SHELL to point to the interactive bash, neovim will # once we set SHELL to point to the interactive bash, neovim will
# launch the correct $SHELL in its :terminal # launch the correct $SHELL in its :terminal
export SHELL=${pkgs.bashInteractive}/bin/bash export SHELL=${pkgs.bashInteractive}/bin/bash
export LD_LIBRARY_PATH=${pkgs.zlib.out}/lib:${pkgs.icu.out}/lib:${pkgs.openssl.out}/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${pkgs.zlib.out}/lib:${pkgs.icu.out}/lib:${pkgs.openssl.out}/lib:$LD_LIBRARY_PATH
''; '';