mwojcik
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: mwojcik:5ea3f5067275dd9b9f5737147b4582b9c3dbc0be
Branches Tags
mwojcik:master
mwojcik:mirny_patches
mwojcik:pounder-cargo-patch
mwojcik:pounder-schism
mwojcik:stabilizer-mqtt
mwojcik:zynq-flake
mwojcik:zynqrs-flakes
M-Labs:master
..
compare: mwojcik:05be2516c649c792c6e6812cfbf13360c51ed557
Branches Tags
mwojcik:mirny_patches
mwojcik:pounder-cargo-patch
mwojcik:pounder-schism
mwojcik:stabilizer-mqtt
mwojcik:zynq-flake
mwojcik:zynqrs-flakes
mwojcik:master
M-Labs:master

No commits in common. "5ea3f5067275dd9b9f5737147b4582b9c3dbc0be" and "05be2516c649c792c6e6812cfbf13360c51ed557" have entirely different histories.
5ea3f50672 ... 05be2516c6

4 changed files with 13 additions and 25 deletions
Show Stats Expand all files Collapse all files

2
hydra/artiq.json
View File

@ -182,7 +182,7 @@
"emailoverride": "",
"keepnr": 50,
"inputs": {
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false },
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-23.11", "emailresponsible": false },
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
"urukulSrc": { "type": "git", "value": "https://github.com/quartiq/urukul.git", "emailresponsible": false },
"mirnySrc": { "type": "git", "value": "https://github.com/quartiq/mirny.git", "emailresponsible": false },

17
hydra/mcu.json
View File

@ -11,11 +11,10 @@
"emailoverride": "",
"keepnr": 10,
"inputs": {
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-24.05", "emailresponsible": false },
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-23.11", "emailresponsible": false },
"mozillaOverlay": { "type": "git", "value": "https://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false },
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
"stabilizerSrc": { "type": "git", "value": "https://github.com/quartiq/stabilizer.git main", "emailresponsible": false },
"stabilizerPounderSrc": { "type": "git", "value": "https://github.com/spaqin/stabilizer.git pounder-telemetry", "emailresponsible": false },
"stabilizerSrc": { "type": "git", "value": "https://github.com/quartiq/stabilizer.git", "emailresponsible": false },
"saymaMmcSrc": { "type": "git", "value": "https://github.com/sinara-hw/openMMC.git sayma-devel", "emailresponsible": false }
}
},
@ -42,17 +41,5 @@
"enableemail": false,
"emailoverride": "",
"keepnr": 10
},
"kirdy": {
"enabled": 1,
"type": 1,
"hidden": false,
"description": "Firmware for the Sinara 1550 Kirdy laser diode driver",
"flake": "git+https://git.m-labs.hk/M-Labs/kirdy.git",
"checkinterval": 300,
"schedulingshares": 10,
"enableemail": false,
"emailoverride": "",
"keepnr": 10
}
}

2
hydra/web.json
View File

@ -11,7 +11,7 @@
"emailoverride": "",
"keepnr": 10,
"inputs": {
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-24.05", "emailresponsible": false },
"nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-23.11", "emailresponsible": false },
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
"webSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/web2019.git", "emailresponsible": false },
"nmigenSrc": { "type": "git", "value": "https://gitlab.com/nmigen/nmigen.git", "emailresponsible": false }

17
mcu-contrib/default.nix
View File

@ -52,7 +52,6 @@ let
'';
dontFixup = true;
auditable = false;
};
in
pkgs.lib.attrsets.mapAttrs'
@ -63,18 +62,20 @@ in
binaryName = name;
cargoDepsName = "stabilizer";
src = <stabilizerSrc>;
patchPhase = ''
substituteInPlace src/net/mod.rs \
--replace "[10, 34, 16, 10];" \
"[192, 168, 1, 10];" # or other default MQTT broker address
'';
doCheck = false;
} // value))) {
dual-iir = {};
dual-iir-pounder_v1_0 = {
binaryName = "dual-iir";
extraCargoBuildArgs = "--features pounder_v1_0";
};
lockin = {};
} //
{ stabilizer-pounder-dual-iir = buildStm32Firmware {
name = "stabilizer-pounder-dual-iir";
binaryName = "dual-iir";
cargoDepsName = "stabilizer";
src = <stabilizerPounderSrc>;
doCheck = false;
}; } //
{
# openMMC build system breaks if host compiler is not available, so do not use stdenvNoCC here
sayma-mmc = pkgs.stdenv.mkDerivation {