Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conduwuit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
🥺
conduwuit
Commits
2c51cdc2
Commit
2c51cdc2
authored
1 year ago
by
🥺
Committed by
🥺
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
update nix flake for gitlab CI building docker images
Signed-off-by:
strawberry
<
strawberry@puppygock.gay
>
parent
0e826765
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
flake.lock
+12
-12
12 additions, 12 deletions
flake.lock
flake.nix
+34
-1
34 additions, 1 deletion
flake.nix
with
46 additions
and
13 deletions
flake.lock
+
12
−
12
View file @
2c51cdc2
...
@@ -7,11 +7,11 @@
...
@@ -7,11 +7,11 @@
]
]
},
},
"locked": {
"locked": {
"lastModified": 1705
625727
,
"lastModified": 1705
974079
,
"narHash": "sha256-
naMq6+TNLpEiBBjc0XaCbMLYJxJXWTZz4JGSpYGgIOM
=",
"narHash": "sha256-
HyC3C2esW57j6bG0MKwX4kQi25ltslRnr6z2uvpadJo
=",
"owner": "ipetkov",
"owner": "ipetkov",
"repo": "crane",
"repo": "crane",
"rev": "
8f515142e805dc377cf8edb0ff75d14a11307f89
",
"rev": "
0b4e511fe6e346381e31d355e03de52aa43e8cb2
",
"type": "github"
"type": "github"
},
},
"original": {
"original": {
...
@@ -28,11 +28,11 @@
...
@@ -28,11 +28,11 @@
"rust-analyzer-src": "rust-analyzer-src"
"rust-analyzer-src": "rust-analyzer-src"
},
},
"locked": {
"locked": {
"lastModified": 170
5731714
,
"lastModified": 170
6077451
,
"narHash": "sha256-
aMeN/ASG4n7RIIPLiy+txoMdDTvIcaRDX6acbeeRtEU
=",
"narHash": "sha256-
kd8Mlh+4NIG/NIkXeEwSIlwQuvysKJM4BeLrt2nvcc8
=",
"owner": "nix-community",
"owner": "nix-community",
"repo": "fenix",
"repo": "fenix",
"rev": "7
12f25ec7e1f5839d486b246a5afa5e31f5df6ff
",
"rev": "7
7d5a2dd0b186c40953c435da6e0c2215d7e1dec
",
"type": "github"
"type": "github"
},
},
"original": {
"original": {
...
@@ -76,11 +76,11 @@
...
@@ -76,11 +76,11 @@
},
},
"nixpkgs": {
"nixpkgs": {
"locked": {
"locked": {
"lastModified": 1705
677747
,
"lastModified": 1705
856552
,
"narHash": "sha256-
eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI
=",
"narHash": "sha256-
JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg
=",
"owner": "NixOS",
"owner": "NixOS",
"repo": "nixpkgs",
"repo": "nixpkgs",
"rev": "
bbe7d8f876fbbe7c959c90ba2ae2852220573261
",
"rev": "
612f97239e2cc474c13c9dafa0df378058c5ad8d
",
"type": "github"
"type": "github"
},
},
"original": {
"original": {
...
@@ -102,11 +102,11 @@
...
@@ -102,11 +102,11 @@
"rust-analyzer-src": {
"rust-analyzer-src": {
"flake": false,
"flake": false,
"locked": {
"locked": {
"lastModified": 1705
69722
5,
"lastModified": 1705
86494
5,
"narHash": "sha256-
eLMwix3LPsgqnbdLMWivBCSBrWnaAA50JtMNnInTopg
=",
"narHash": "sha256-
ZATChFWHToTZQFLlzrzDUX8fjEbMHHBIyPaZU1JGmjI
=",
"owner": "rust-lang",
"owner": "rust-lang",
"repo": "rust-analyzer",
"repo": "rust-analyzer",
"rev": "
67cfbf231c1e2ba3129529de950d1c4ca7921404
",
"rev": "
d410d4a2baf9e99b37b03dd42f06238b14374bf7
",
"type": "github"
"type": "github"
},
},
"original": {
"original": {
...
...
This diff is collapsed.
Click to expand it.
flake.nix
+
34
−
1
View file @
2c51cdc2
...
@@ -47,6 +47,7 @@
...
@@ -47,6 +47,7 @@
];
];
};
};
# Use mold on Linux
stdenv
=
if
pkgs
.
stdenv
.
isLinux
then
stdenv
=
if
pkgs
.
stdenv
.
isLinux
then
pkgs
.
stdenvAdapters
.
useMoldLinker
pkgs
.
stdenv
pkgs
.
stdenvAdapters
.
useMoldLinker
pkgs
.
stdenv
else
else
...
@@ -95,12 +96,44 @@
...
@@ -95,12 +96,44 @@
in
in
{
{
packages
.
default
=
builder
{
packages
.
default
=
builder
{
src
=
./.
;
src
=
nix-filter
{
root
=
./.
;
include
=
[
"src"
"Cargo.toml"
"Cargo.lock"
];
};
# This is redundant with CI
doCheck
=
false
;
inherit
inherit
env
env
nativeBuildInputs
nativeBuildInputs
stdenv
;
stdenv
;
meta
.
mainProgram
=
cargoToml
.
package
.
name
;
};
packages
.
oci-image
=
let
package
=
self
.
packages
.
${
system
}
.
default
;
in
pkgs
.
dockerTools
.
buildImage
{
name
=
package
.
pname
;
tag
=
"latest"
;
config
=
{
# Use the `tini` init system so that signals (e.g. ctrl+c/SIGINT) are
# handled as expected
Entrypoint
=
[
"
${
pkgs
.
lib
.
getExe
'
pkgs
.
tini
"tini"
}
"
"--"
];
Cmd
=
[
"
${
pkgs
.
lib
.
getExe
package
}
"
];
};
};
};
devShells
.
default
=
(
pkgs
.
mkShell
.
override
{
inherit
stdenv
;
})
{
devShells
.
default
=
(
pkgs
.
mkShell
.
override
{
inherit
stdenv
;
})
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment