this repo has no description
Merge pull request 'Switch to npins and basic shell.nix instead of flakes' (#12) from MRT-11 into main
Reviewed-on: https://git.killuaa.dev/Project-Meartis/meartis-client/pulls/12
Reviewed-by: Snow Boo <snow@noreply.localhost>
authored by
roufpup
and committed by
SillyDev Instance
e4e010d8
bfe90d73
+317
-95
-48
flake.lock
-48
flake.lock
···
1
-
{
2
-
"nodes": {
3
-
"nixpkgs": {
4
-
"locked": {
5
-
"lastModified": 1758690382,
6
-
"narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
7
-
"owner": "NixOS",
8
-
"repo": "nixpkgs",
9
-
"rev": "e643668fd71b949c53f8626614b21ff71a07379d",
10
-
"type": "github"
11
-
},
12
-
"original": {
13
-
"owner": "NixOS",
14
-
"ref": "nixos-unstable",
15
-
"repo": "nixpkgs",
16
-
"type": "github"
17
-
}
18
-
},
19
-
"root": {
20
-
"inputs": {
21
-
"nixpkgs": "nixpkgs",
22
-
"rust-overlay": "rust-overlay"
23
-
}
24
-
},
25
-
"rust-overlay": {
26
-
"inputs": {
27
-
"nixpkgs": [
28
-
"nixpkgs"
29
-
]
30
-
},
31
-
"locked": {
32
-
"lastModified": 1758940228,
33
-
"narHash": "sha256-sTS04L9LKqzP1oiVXYDwcMzfFSF0DnSJQFzZBpEgLFE=",
34
-
"owner": "oxalica",
35
-
"repo": "rust-overlay",
36
-
"rev": "5bfedf3fbbf5caf8e39f7fcd62238f54d82aa1e2",
37
-
"type": "github"
38
-
},
39
-
"original": {
40
-
"owner": "oxalica",
41
-
"repo": "rust-overlay",
42
-
"type": "github"
43
-
}
44
-
}
45
-
},
46
-
"root": "root",
47
-
"version": 7
48
-
}
-46
flake.nix
-46
flake.nix
···
1
-
{
2
-
description = "A flake used for the development of Meartis Client";
3
-
inputs = {
4
-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
5
-
rust-overlay = {
6
-
url = "github:oxalica/rust-overlay";
7
-
inputs.nixpkgs.follows = "nixpkgs";
8
-
};
9
-
};
10
-
11
-
outputs =
12
-
{ nixpkgs, rust-overlay, ... }:
13
-
let
14
-
pkgs = import nixpkgs {
15
-
system = "x86_64-linux";
16
-
overlays = [
17
-
rust-overlay.overlays.default
18
-
];
19
-
config.allowUnfree = true;
20
-
};
21
-
in
22
-
{
23
-
devShells."${pkgs.system}".default = pkgs.mkShell rec {
24
-
nativeBuildInputs = with pkgs; [
25
-
(rust-bin.stable.latest.default.override {
26
-
extensions = [
27
-
"rust-src"
28
-
"rust-analyzer"
29
-
];
30
-
})
31
-
32
-
minecraft-server
33
-
];
34
-
35
-
reset_color_code = ''\033[0m'';
36
-
bright_cyan_color_code = ''\033[1;36m'';
37
-
cyan_color_code = ''\033[0;36m'';
38
-
bright_green_color_code = ''\033[1;32m'';
39
-
project_name = ''meartist-client'';
40
-
41
-
shellHook = ''
42
-
echo -e "\n${bright_cyan_color_code}📦 Welcome to the default flake for ${bright_green_color_code}${project_name}${reset_color_code}${cyan_color_code}!${reset_color_code}"
43
-
'';
44
-
};
45
-
};
46
-
}
+249
npins/default.nix
+249
npins/default.nix
···
1
+
/*
2
+
This file is provided under the MIT licence:
3
+
4
+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5
+
6
+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
7
+
8
+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
9
+
*/
10
+
# Generated by npins. Do not modify; will be overwritten regularly
11
+
let
12
+
# Backwards-compatibly make something that previously didn't take any arguments take some
13
+
# The function must return an attrset, and will unfortunately be eagerly evaluated
14
+
# Same thing, but it catches eval errors on the default argument so that one may still call it with other arguments
15
+
mkFunctor =
16
+
fn:
17
+
let
18
+
e = builtins.tryEval (fn { });
19
+
in
20
+
(if e.success then e.value else { error = fn { }; }) // { __functor = _self: fn; };
21
+
22
+
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
23
+
range =
24
+
first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
25
+
26
+
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
27
+
stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
28
+
29
+
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
30
+
stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
31
+
concatStrings = builtins.concatStringsSep "";
32
+
33
+
# If the environment variable NPINS_OVERRIDE_${name} is set, then use
34
+
# the path directly as opposed to the fetched source.
35
+
# (Taken from Niv for compatibility)
36
+
mayOverride =
37
+
name: path:
38
+
let
39
+
envVarName = "NPINS_OVERRIDE_${saneName}";
40
+
saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
41
+
ersatz = builtins.getEnv envVarName;
42
+
in
43
+
if ersatz == "" then
44
+
path
45
+
else
46
+
# this turns the string into an actual Nix path (for both absolute and
47
+
# relative paths)
48
+
builtins.trace "Overriding path of \"${name}\" with \"${ersatz}\" due to set \"${envVarName}\"" (
49
+
if builtins.substring 0 1 ersatz == "/" then
50
+
/. + ersatz
51
+
else
52
+
/. + builtins.getEnv "PWD" + "/${ersatz}"
53
+
);
54
+
55
+
mkSource =
56
+
name: spec:
57
+
{
58
+
pkgs ? null,
59
+
}:
60
+
assert spec ? type;
61
+
let
62
+
# Unify across builtin and pkgs fetchers.
63
+
# `fetchGit` requires a wrapper because of slight API differences.
64
+
fetchers =
65
+
if pkgs == null then
66
+
{
67
+
inherit (builtins) fetchTarball fetchurl;
68
+
# For some fucking reason, fetchGit has a different signature than the other builtin fetchers …
69
+
fetchGit = args: (builtins.fetchGit args).outPath;
70
+
}
71
+
else
72
+
{
73
+
fetchTarball =
74
+
{
75
+
url,
76
+
sha256,
77
+
}:
78
+
pkgs.fetchzip {
79
+
inherit url sha256;
80
+
extension = "tar";
81
+
};
82
+
inherit (pkgs) fetchurl;
83
+
fetchGit =
84
+
{
85
+
url,
86
+
submodules,
87
+
rev,
88
+
name,
89
+
narHash,
90
+
}:
91
+
pkgs.fetchgit {
92
+
inherit url rev name;
93
+
fetchSubmodules = submodules;
94
+
hash = narHash;
95
+
};
96
+
};
97
+
98
+
# Dispatch to the correct code path based on the type
99
+
path =
100
+
if spec.type == "Git" then
101
+
mkGitSource fetchers spec
102
+
else if spec.type == "GitRelease" then
103
+
mkGitSource fetchers spec
104
+
else if spec.type == "PyPi" then
105
+
mkPyPiSource fetchers spec
106
+
else if spec.type == "Channel" then
107
+
mkChannelSource fetchers spec
108
+
else if spec.type == "Tarball" then
109
+
mkTarballSource fetchers spec
110
+
else if spec.type == "Container" then
111
+
mkContainerSource pkgs spec
112
+
else
113
+
builtins.throw "Unknown source type ${spec.type}";
114
+
in
115
+
spec // { outPath = mayOverride name path; };
116
+
117
+
mkGitSource =
118
+
{
119
+
fetchTarball,
120
+
fetchGit,
121
+
...
122
+
}:
123
+
{
124
+
repository,
125
+
revision,
126
+
url ? null,
127
+
submodules,
128
+
hash,
129
+
...
130
+
}:
131
+
assert repository ? type;
132
+
# At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository
133
+
# In the latter case, there we will always be an url to the tarball
134
+
if url != null && !submodules then
135
+
fetchTarball {
136
+
inherit url;
137
+
sha256 = hash;
138
+
}
139
+
else
140
+
let
141
+
url =
142
+
if repository.type == "Git" then
143
+
repository.url
144
+
else if repository.type == "GitHub" then
145
+
"https://github.com/${repository.owner}/${repository.repo}.git"
146
+
else if repository.type == "GitLab" then
147
+
"${repository.server}/${repository.repo_path}.git"
148
+
else if repository.type == "Forgejo" then
149
+
"${repository.server}/${repository.owner}/${repository.repo}.git"
150
+
else
151
+
throw "Unrecognized repository type ${repository.type}";
152
+
urlToName =
153
+
url: rev:
154
+
let
155
+
matched = builtins.match "^.*/([^/]*)(\\.git)?$" url;
156
+
157
+
short = builtins.substring 0 7 rev;
158
+
159
+
appendShort = if (builtins.match "[a-f0-9]*" rev) != null then "-${short}" else "";
160
+
in
161
+
"${if matched == null then "source" else builtins.head matched}${appendShort}";
162
+
name = urlToName url revision;
163
+
in
164
+
fetchGit {
165
+
rev = revision;
166
+
narHash = hash;
167
+
168
+
inherit name submodules url;
169
+
};
170
+
171
+
mkPyPiSource =
172
+
{ fetchurl, ... }:
173
+
{
174
+
url,
175
+
hash,
176
+
...
177
+
}:
178
+
fetchurl {
179
+
inherit url;
180
+
sha256 = hash;
181
+
};
182
+
183
+
mkChannelSource =
184
+
{ fetchTarball, ... }:
185
+
{
186
+
url,
187
+
hash,
188
+
...
189
+
}:
190
+
fetchTarball {
191
+
inherit url;
192
+
sha256 = hash;
193
+
};
194
+
195
+
mkTarballSource =
196
+
{ fetchTarball, ... }:
197
+
{
198
+
url,
199
+
locked_url ? url,
200
+
hash,
201
+
...
202
+
}:
203
+
fetchTarball {
204
+
url = locked_url;
205
+
sha256 = hash;
206
+
};
207
+
208
+
mkContainerSource =
209
+
pkgs:
210
+
{
211
+
image_name,
212
+
image_tag,
213
+
image_digest,
214
+
...
215
+
}:
216
+
if pkgs == null then
217
+
builtins.throw "container sources require passing in a Nixpkgs value: https://github.com/andir/npins/blob/master/README.md#using-the-nixpkgs-fetchers"
218
+
else
219
+
pkgs.dockerTools.pullImage {
220
+
imageName = image_name;
221
+
imageDigest = image_digest;
222
+
finalImageTag = image_tag;
223
+
};
224
+
in
225
+
mkFunctor (
226
+
{
227
+
input ? ./sources.json,
228
+
}:
229
+
let
230
+
data =
231
+
if builtins.isPath input then
232
+
# while `readFile` will throw an error anyways if the path doesn't exist,
233
+
# we still need to check beforehand because *our* error can be caught but not the one from the builtin
234
+
# *piegames sighs*
235
+
if builtins.pathExists input then
236
+
builtins.fromJSON (builtins.readFile input)
237
+
else
238
+
throw "Input path ${toString input} does not exist"
239
+
else if builtins.isAttrs input then
240
+
input
241
+
else
242
+
throw "Unsupported input type ${builtins.typeOf input}, must be a path or an attrset";
243
+
version = data.version;
244
+
in
245
+
if version == 7 then
246
+
builtins.mapAttrs (name: spec: mkFunctor (mkSource name spec)) data.pins
247
+
else
248
+
throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"
249
+
)
+31
npins/sources.json
+31
npins/sources.json
···
1
+
{
2
+
"pins": {
3
+
"nixpkgs": {
4
+
"type": "Git",
5
+
"repository": {
6
+
"type": "GitHub",
7
+
"owner": "NixOS",
8
+
"repo": "nixpkgs"
9
+
},
10
+
"branch": "nixos-unstable",
11
+
"submodules": false,
12
+
"revision": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
13
+
"url": "https://github.com/NixOS/nixpkgs/archive/ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38.tar.gz",
14
+
"hash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs="
15
+
},
16
+
"rust-overlay": {
17
+
"type": "Git",
18
+
"repository": {
19
+
"type": "GitHub",
20
+
"owner": "oxalica",
21
+
"repo": "rust-overlay"
22
+
},
23
+
"branch": "master",
24
+
"submodules": false,
25
+
"revision": "03dda130a8701b08b0347fcaf850a190c53a3c1e",
26
+
"url": "https://github.com/oxalica/rust-overlay/archive/03dda130a8701b08b0347fcaf850a190c53a3c1e.tar.gz",
27
+
"hash": "sha256-Tg/kL8eKMpZtceDvBDQYU8zowgpr7ucFRnpP/AtfuRM="
28
+
}
29
+
},
30
+
"version": 7
31
+
}
+36
shell.nix
+36
shell.nix
···
1
+
let
2
+
sources = import ./npins;
3
+
pkgs = import sources.nixpkgs {
4
+
config.allowUnfree = true;
5
+
overlays = [
6
+
(import sources.rust-overlay)
7
+
];
8
+
};
9
+
in
10
+
pkgs.mkShell rec {
11
+
12
+
nativeBuildInputs = with pkgs; [
13
+
(rust-bin.stable.latest.default.override {
14
+
extensions = [
15
+
"rust-src"
16
+
"rust-analyzer"
17
+
];
18
+
})
19
+
20
+
(minecraft-server.override {
21
+
version = "1.21.1";
22
+
url = "https://piston-data.mojang.com/v1/objects/59353fb40c36d304f2035d51e7d6e6baa98dc05c/server.jar";
23
+
sha1 = "59353fb40c36d304f2035d51e7d6e6baa98dc05c";
24
+
})
25
+
];
26
+
27
+
reset_color_code = ''\033[0m'';
28
+
bright_cyan_color_code = ''\033[1;36m'';
29
+
cyan_color_code = ''\033[0;36m'';
30
+
bright_green_color_code = ''\033[1;32m'';
31
+
project_name = ''meartist-client'';
32
+
33
+
shellHook = ''
34
+
echo -e "\n${bright_cyan_color_code}📦 Welcome to the default flake for ${bright_green_color_code}${project_name}${reset_color_code}${cyan_color_code}!${reset_color_code}"
35
+
'';
36
+
}