update does-it-build

now needs a new rust version so let's pull in the rust from 25.11 lol
This commit is contained in:
nora 2025-11-29 00:14:47 +01:00
parent 343ee03765
commit f6fb60c03a
5 changed files with 34 additions and 26 deletions

View file

@ -1,9 +1,11 @@
{ pkgs, lib, config, my-projects-versions, ... }: { pkgs, nixpkgs-next, lib, config, my-projects-versions, ... }:
let let
does-it-build-base = (import (pkgs.fetchFromGitHub my-projects-versions.does-it-build.fetchFromGitHub)) { inherit pkgs; }; does-it-build-base = (import (pkgs.fetchFromGitHub my-projects-versions.does-it-build.fetchFromGitHub)) {
# needs a recent rust version.
pkgs = nixpkgs-next;
};
does-it-build = does-it-build-base.overrideAttrs (finalAttrs: previousAttrs: { does-it-build = does-it-build-base.overrideAttrs (finalAttrs: previousAttrs: {
DOES_IT_BUILD_OVERRIDE_VERSION = my-projects-versions.does-it-build.commit; DOES_IT_BUILD_OVERRIDE_VERSION = my-projects-versions.does-it-build.commit;
RUSTFLAGS = "-Cforce-frame-pointers=true";
}); });
in in
{ {

View file

@ -2,7 +2,8 @@
meta = meta =
let let
nixpkgs-version = builtins.fromJSON (builtins.readFile ./nixpkgs.json); nixpkgs-version = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-version.commit}.tar.gz"); nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-version."nixos-25.05".commit}.tar.gz");
nixpkgs-next = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-version."nixos-25.11".commit}.tar.gz") { };
in in
{ {
# Override to pin the Nixpkgs version (recommended). This option # Override to pin the Nixpkgs version (recommended). This option
@ -15,6 +16,7 @@
specialArgs = { specialArgs = {
my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json); my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json);
inherit nixpkgs-next;
inherit nixpkgs-path; inherit nixpkgs-path;
networkingConfig = { networkingConfig = {

View file

@ -18,12 +18,12 @@
} }
}, },
"does-it-build": { "does-it-build": {
"commit": "25179d488df81b2d585970440b3f716717e9a8f4", "commit": "d15a7465584b5e90dc19126cc3d097683d055a63",
"fetchFromGitHub": { "fetchFromGitHub": {
"owner": "Noratrieb", "owner": "Noratrieb",
"repo": "does-it-build", "repo": "does-it-build",
"rev": "25179d488df81b2d585970440b3f716717e9a8f4", "rev": "d15a7465584b5e90dc19126cc3d097683d055a63",
"hash": "sha256-IeljAkaFHZjCF4zM1Em/Aij6Gp+EyLJCVZMxSGG46QE=" "hash": "sha256-UC+uy7Ba+VAXeBplIblrYptoI2ORsnL+U64BNGUR7CY="
} }
}, },
"upload.files.noratrieb.dev": { "upload.files.noratrieb.dev": {

View file

@ -1,5 +1,10 @@
{ {
"channel": "nixos-25.05", "nixos-25.05": {
"lastUpdated": "2025-11-18T21:17:51.860Z", "lastUpdated": "2025-11-28T23:05:00.984Z",
"commit": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c" "commit": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0"
},
"nixos-25.11": {
"lastUpdated": "2025-11-28T23:07:32.637Z",
"commit": "2fecba9952096ba043c16b9ef40b92851ff3e5d9"
}
} }

View file

@ -1,23 +1,22 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
const path = `${import.meta.dirname}/nixpkgs.json`; const path = `${import.meta.dirname}/nixpkgs.json`;
const nixpkgs = JSON.parse(await fs.readFile(path)); const channels = JSON.parse(await fs.readFile(path));
for (const [channel, nixpkgs] of Object.entries(channels)) {
const res = await fetch( const res = await fetch(
`https://api.github.com/repos/NixOS/nixpkgs/commits/${nixpkgs.channel}` `https://api.github.com/repos/NixOS/nixpkgs/commits/${channel}`
); );
if (!res.ok) { if (!res.ok) {
throw new Error( throw new Error(
`get commit for ${name}: ${res.status} - ${await res.text()}` `get commit for ${channel}: ${res.status} - ${await res.text()}`
); );
} }
const body = await res.json(); const body = await res.json();
if (body.sha !== nixpkgs.commit) { if (body.sha !== nixpkgs.commit) {
nixpkgs.commit = body.sha; nixpkgs.commit = body.sha;
nixpkgs.lastUpdated = new Date().toISOString(); nixpkgs.lastUpdated = new Date().toISOString();
await fs.writeFile(path, JSON.stringify(nixpkgs, null, 2) + "\n");
} }
}
await fs.writeFile(path, JSON.stringify(channels, null, 2) + "\n");