Merge pull request #3 from sapphire-arches/update/0.1.8
Some checks failed
CI / gateware-matrix (push) Failing after 3s
CI / build-packetry (push) Failing after 4s
CI / build-gateware (push) Has been skipped
CI / build-cynthion (push) Has been skipped

update packages
This commit is contained in:
Robin Appelman 2025-04-21 15:26:15 +02:00 committed by GitHub
commit 93a35f4bd0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 23 additions and 19 deletions

6
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733157473, "lastModified": 1745124554,
"narHash": "sha256-rfg19HAHOMW4zwkqWkPdTjdHyVwo/zaJXmvRqtqis9M=", "narHash": "sha256-IlzzbKV0bRCAJ9AwmIcLHARfCPbktdzdzjfPvtpJXpI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88b018ad401e040c0a33420077d86b20aea177c7", "rev": "42200c47299544ed0615b66d46322a41308d7390",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -20,13 +20,13 @@
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apollo-${board}"; pname = "apollo-${board}";
version = "1.1.0"; version = "1.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "greatscottgadgets"; owner = "greatscottgadgets";
repo = "apollo"; repo = "apollo";
rev = "v" + version; rev = "v" + version;
hash = "sha256-CVMSTjrfrtvfVFbMVvx2FYhkkonvEpiSZ+buqOzHyXk"; hash = "sha256-LvEGOVnC/0hwjxrkh3pV3uU2CuRyuQVmVJGQLumcChw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -2,6 +2,6 @@ fetchFromGitHub:
fetchFromGitHub { fetchFromGitHub {
owner = "greatscottgadgets"; owner = "greatscottgadgets";
repo = "cynthion"; repo = "cynthion";
rev = "0.1.7"; rev = "0.1.8";
hash = "sha256-2nVfODAg4t5hoSKUEP4IN23R+JGe3lw/rpfjW/UIsYw="; hash = "sha256-twkCv47Goob2cO7FeHegvab3asf8fqbY9qg97Vw4ZCo=";
} }

View file

@ -3,9 +3,13 @@
stdenvNoCC, stdenvNoCC,
... ...
}: }:
stdenvNoCC.mkDerivation {
let
src = import ./src.nix fetchFromGitHub;
in
stdenvNoCC.mkDerivation {
pname = "cynthion-udev"; pname = "cynthion-udev";
version = "0.1.7"; version = src.rev;
dontBuild = true; dontBuild = true;
dontFixup = true; dontFixup = true;
@ -15,4 +19,4 @@ stdenvNoCC.mkDerivation {
mkdir -p $out/lib/udev/rules.d mkdir -p $out/lib/udev/rules.d
cp cynthion/python/assets/54-cynthion.rules $out/lib/udev/rules.d/54-cynthion.rules cp cynthion/python/assets/54-cynthion.rules $out/lib/udev/rules.d/54-cynthion.rules
''; '';
} }

View file

@ -16,7 +16,7 @@
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "apollo-fpga"; pname = "apollo-fpga";
version = "1.1.0"; version = "1.1.1";
pyproject = true; pyproject = true;
@ -24,7 +24,7 @@ in
owner = "greatscottgadgets"; owner = "greatscottgadgets";
repo = "apollo"; repo = "apollo";
rev = "v" + version; rev = "v" + version;
hash = "sha256-CVMSTjrfrtvfVFbMVvx2FYhkkonvEpiSZ+buqOzHyXk"; hash = "sha256-LvEGOVnC/0hwjxrkh3pV3uU2CuRyuQVmVJGQLumcChw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };