tlaternet/tlaternet-webserver
1
0
Fork 0
Code Issues5 Pull requests Releases Wiki Activity

bump: Update to NixOS 24.11

Browse source 
Flake lock file updates:

• Updated input 'dream2nix':
    'github:nix-community/dream2nix/1b5e01219a32324c8f6889fe1f4db933ec7932f6?narHash=sha256-04gy1icwnGO3ZXF6r96yBm/C0PNPzeLxA/8xzzq0dBI%3D' (2024-06-29)
  → 'github:nix-community/dream2nix/8ce6284ff58208ed8961681276f82c2f8f978ef4?narHash=sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4%3D' (2024-12-25)
• Updated input 'dream2nix/nixpkgs':
    'github:NixOS/nixpkgs/1e3deb3d8a86a870d925760db1a5adecc64d329d?narHash=sha256-vN5xJAZ4UGREEglh3lfbbkIj%2BMPEYMuqewMn4atZFaQ%3D' (2024-06-27)
  → 'github:NixOS/nixpkgs/41dea55321e5a999b17033296ac05fe8a8b5a257?narHash=sha256-WvLXzNNnnw%2BqpFOmgaM3JUlNEH%2BT4s22b5i2oyyCpXE%3D' (2024-10-25)
• Updated input 'dream2nix/purescript-overlay':
    'github:thomashoneyman/purescript-overlay/047c7933abd6da8aa239904422e22d190ce55ead?narHash=sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730%3D' (2023-09-29)
  → 'github:thomashoneyman/purescript-overlay/4ad4c15d07bd899d7346b331f377606631eb0ee4?narHash=sha256-Sws7w0tlnjD%2BBjck1nv29NjC5DbL6nH5auL9Ex9Iz2A%3D' (2024-10-10)
• Added input 'dream2nix/purescript-overlay/flake-compat':
    'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04)
• Updated input 'dream2nix/purescript-overlay/slimlock':
    'github:thomashoneyman/slimlock/b5c6cdcaf636ebbebd0a1f32520929394493f1a6?narHash=sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4%3D' (2023-07-06)
  → 'github:thomashoneyman/slimlock/cf72723f59e2340d24881fd7bf61cb113b4c407c?narHash=sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo%3D' (2023-07-07)
• Updated input 'fenix':
    'github:nix-community/fenix/ebfe2c639111d7e82972a12711206afaeeda2450?narHash=sha256-K2xFp142onP35jcx7li10xUxNVEVRWjAdY8DSuR7Naw%3D' (2024-07-01)
  → 'github:nix-community/fenix/ac79bb490b8c1af4bbc587b84c76f9527d6b14f7?narHash=sha256-lvp77MhGzSN%2BICd0MugppCjQR6cmlM2iAC5cjy2ZsaA%3D' (2025-01-18)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/ea7fdada6a0940b239ddbde2048a4d7dac1efe1e?narHash=sha256-fsxAuW6RxKZYjAP3biUC6C4vaYFhDfWv8lp1Tmx3ZCY%3D' (2024-06-30)
  → 'github:rust-lang/rust-analyzer/f61bfa4d7feb84d07538d361fe77d34a29e3b375?narHash=sha256-m4SN8DeKzsP10EQFS7%2B2zgGfCrMhTfTt1H0QRNesD08%3D' (2025-01-17)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/7dca15289a1c2990efbe4680f0923ce14139b042?narHash=sha256-RoxIr/fbndtuKqulGvNCcuzC6KdAib85Q8gXnjzA1dw%3D' (2024-06-30)
  → 'github:nixos/nixpkgs/6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566?narHash=sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs%3D' (2025-01-18)
This commit is contained in:
Tristan Daniël Maat 2025-01-19 13:56:37 +08:00
parent 4a099f27a2
commit 435c267d87
Signed by: tlater
GPG key ID: 49670FD774E43268
4 changed files with 42 additions and 24 deletions
flake.lockflake.nix
nix/scripts
update.sh
packages/server
default.nix

61
flake.lock
View file

@ -7,11 +7,11 @@
"pyproject-nix": "pyproject-nix" "pyproject-nix": "pyproject-nix"
}, },
"locked": { "locked": {
"lastModified": 1719685993, "lastModified": 1735160684,
"narHash": "sha256-04gy1icwnGO3ZXF6r96yBm/C0PNPzeLxA/8xzzq0dBI=", "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "1b5e01219a32324c8f6889fe1f4db933ec7932f6", "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -28,11 +28,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1719815435, "lastModified": 1737181903,
"narHash": "sha256-K2xFp142onP35jcx7li10xUxNVEVRWjAdY8DSuR7Naw=", "narHash": "sha256-lvp77MhGzSN+ICd0MugppCjQR6cmlM2iAC5cjy2ZsaA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "ebfe2c639111d7e82972a12711206afaeeda2450", "rev": "ac79bb490b8c1af4bbc587b84c76f9527d6b14f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,13 +41,29 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719468428, "lastModified": 1729850857,
"narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "rev": "41dea55321e5a999b17033296ac05fe8a8b5a257",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,22 +75,23 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719707984, "lastModified": 1737165118,
"narHash": "sha256-RoxIr/fbndtuKqulGvNCcuzC6KdAib85Q8gXnjzA1dw=", "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7dca15289a1c2990efbe4680f0923ce14139b042", "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"purescript-overlay": { "purescript-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"dream2nix", "dream2nix",
"nixpkgs" "nixpkgs"
@ -82,11 +99,11 @@
"slimlock": "slimlock" "slimlock": "slimlock"
}, },
"locked": { "locked": {
"lastModified": 1696022621, "lastModified": 1728546539,
"narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=", "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=",
"owner": "thomashoneyman", "owner": "thomashoneyman",
"repo": "purescript-overlay", "repo": "purescript-overlay",
"rev": "047c7933abd6da8aa239904422e22d190ce55ead", "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,11 +139,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719760370, "lastModified": 1737140097,
"narHash": "sha256-fsxAuW6RxKZYjAP3biUC6C4vaYFhDfWv8lp1Tmx3ZCY=", "narHash": "sha256-m4SN8DeKzsP10EQFS7+2zgGfCrMhTfTt1H0QRNesD08=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "ea7fdada6a0940b239ddbde2048a4d7dac1efe1e", "rev": "f61bfa4d7feb84d07538d361fe77d34a29e3b375",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688610262, "lastModified": 1688756706,
"narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=", "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=",
"owner": "thomashoneyman", "owner": "thomashoneyman",
"repo": "slimlock", "repo": "slimlock",
"rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6", "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -2,7 +2,7 @@
description = "tlater.net web server"; description = "tlater.net web server";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
dream2nix.url = "github:nix-community/dream2nix"; dream2nix.url = "github:nix-community/dream2nix";
fenix = { fenix = {

2
nix/scripts/update.sh
View file

@ -43,7 +43,7 @@ patch --no-backup-if-mismatch --merge --input="$tmpdir/update.patch" package.yam
# Update package.json again and get npm to update the package lock # Update package.json again and get npm to update the package lock
# file # file
yq --output-format json package.yaml > package.json yq . package.yaml > package.json
npm install --package-lock-only npm install --package-lock-only
if ! git diff --quiet package.yaml package-lock.json; then if ! git diff --quiet package.yaml package-lock.json; then

1
packages/server/default.nix
View file

@ -1,6 +1,7 @@
{dream2nix, ...}: { {dream2nix, ...}: {
imports = [ imports = [
dream2nix.modules.dream2nix.rust-cargo-lock dream2nix.modules.dream2nix.rust-cargo-lock
dream2nix.modules.dream2nix.rust-cargo-vendor
dream2nix.modules.dream2nix.rust-crane dream2nix.modules.dream2nix.rust-crane
]; ];