Skip to content
Snippets Groups Projects
Commit 32bf8a30 authored by Evy Storozhenko's avatar Evy Storozhenko
Browse files

move some stuff around

parent 9c6dc59f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.envrc deleted 100644 → 0
+ 0
− 1
View file @ 9c6dc59f
use flake
01/.vscode/launch.json → day01/.vscode/launch.json
+ 0
− 0
View file @ 32bf8a30
File moved
01/Cargo.lock → day01/Cargo.lock
+ 0
− 0
View file @ 32bf8a30
File moved
01/Cargo.toml → day01/Cargo.toml
+ 0
− 0
View file @ 32bf8a30
File moved
01/data.txt → day01/data.txt
+ 0
− 0
View file @ 32bf8a30
File moved
day01/flake.lock 0 → 100644
+ 83
− 0
View file @ 32bf8a30
{
"nodes": {
"naersk": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1698420672,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nix-community",
"repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "naersk",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1701268161,
"narHash": "sha256-hL4jGGwMHHmyx6G9wi6IrYa8RLkoEtzCb4zWITH1B40=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "67be70a859530f6f7c358568eaa6ab0d84b36b01",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs",
"utils": "utils"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"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"
}
}
},
"root": "root",
"version": 7
}
day01/flake.nix 0 → 100644
+ 29
− 0
View file @ 32bf8a30
{
description = "AoC 2023 - day 01";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
naersk = {
url = "github:nix-community/naersk/master";
inputs.nixpkgs.follows = "nixpkgs";
};
utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, utils, naersk }:
utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; };
naerskBuildPackage = (conf:
(pkgs.callPackage naersk { }).buildPackage ({ src = ./.; } // conf)
);
in
{
defaultPackage = naerskBuildPackage { };
devShell = with pkgs; mkShell {
buildInputs = buildInputs ++ [ cargo rustc rustfmt ];
RUST_SRC_PATH = rustPlatform.rustLibSrc;
};
});
}
day01/result 0 → 120000
+ 1
− 0
View file @ 32bf8a30
/nix/store/cbbfxpl8bq6vpnb98mfq9qgfg1phr3nz-aoc-0.1.0
\ No newline at end of file
01/src/main.rs → day01/src/main.rs
+ 0
− 0
View file @ 32bf8a30
File moved
flake.lock
+ 77
− 2
View file @ 32bf8a30
{
"nodes": {
"day01": {
"inputs": {
"naersk": "naersk",
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
},
"locked": {
"lastModified": 1,
"narHash": "sha256-Skcd0y3BZ27ycrNGxmHcMyGRPat8mYU0IXM1Lc/174I=",
"path": "/nix/store/lylqmpv4yipaapna82jpnmsxd7r4m82q-source/day01",
"type": "path"
},
"original": {
"path": "/nix/store/lylqmpv4yipaapna82jpnmsxd7r4m82q-source/day01",
"type": "path"
}
},
"naersk": {
"inputs": {
"nixpkgs": [
"day01",
"nixpkgs"
]
},
"locked": {
"lastModified": 1698420672,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nix-community",
"repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "naersk",
"type": "github"
}
},
"naersk_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
......@@ -39,9 +80,10 @@
},
"root": {
"inputs": {
"naersk": "naersk",
"day01": "day01",
"naersk": "naersk_2",
"nixpkgs": "nixpkgs",
"utils": "utils"
"utils": "utils_2"
}
},
"systems": {
......@@ -59,6 +101,21 @@
"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"
}
},
"utils": {
"inputs": {
"systems": "systems"
......@@ -76,6 +133,24 @@
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",
......
flake.nix
+ 6
− 17
View file @ 32bf8a30
......@@ -3,6 +3,10 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
day01 = {
url = "./day01";
inputs.nixpkgs.follows = "nixpkgs";
};
naersk = {
url = "github:nix-community/naersk/master";
inputs.nixpkgs.follows = "nixpkgs";
......@@ -10,27 +14,12 @@
utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, utils, naersk }:
outputs = { self, nixpkgs, utils, naersk, day01 }:
utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; };
buildInputs = with pkgs; [ perl ];
naerskBuildPackage = (conf: (
(pkgs.callPackage naersk { }).buildPackage (
{
src = ./.;
inherit buildInputs;
} // conf
)
));
in
{
packages."01" = naerskBuildPackage { src = ./01/.; };
devShell = with pkgs; mkShell {
buildInputs = buildInputs ++ [ cargo rustc rustfmt rustPackages.clippy ];
RUST_SRC_PATH = rustPlatform.rustLibSrc;
};
packages.day01 = day01.defaultPackage.${system};
});
}
result 0 → 120000
+ 1
− 0
View file @ 32bf8a30
/nix/store/bmsr9z02zcchqqij4ai42b327qg32zyv-aoc-0.1.0
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment