From 1a271d7f82ed1386e04ef0d13b1bcdb9f5e62e34 Mon Sep 17 00:00:00 2001 From: Diego Diverio Date: Wed, 18 Sep 2024 15:55:44 +0200 Subject: [PATCH 1/2] Add flake.nix. --- flake.lock | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 34 ++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..3d9f83b --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1726583932, + "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "658e7223191d2598641d50ee4e898126768fe847", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..1a826a2 --- /dev/null +++ b/flake.nix @@ -0,0 +1,34 @@ +{ + description = ""; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + outputs = {self, nixpkgs, flake-utils } : + flake-utils.lib.eachDefaultSystem (system: + let pkgs = import nixpkgs { inherit system; }; + ecpprog = { + name = "ecpprog"; + # packages = []; + buildInputs = [ pkgs.clang pkgs.gnumake pkgs.libftdi1 ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + src = ./ecpprog; + buildPhase = '' + export DESTDIR=$out + export PREFIX= + make + ''; + installPhase = '' + export DESTDIR=$out + export PREFIX= + make install + ''; + }; + in + { + devShells.default = pkgs.mkShell ecpprog; + packages.ecpprog = with pkgs; stdenv.mkDerivation ecpprog; + defaultPackage = with pkgs; stdenv.mkDerivation ecpprog; + } + ); +} From 1f4579e81df8522a2f0bf143c7e3a44ef99ddad0 Mon Sep 17 00:00:00 2001 From: Diego Diverio Date: Wed, 18 Sep 2024 18:35:51 +0200 Subject: [PATCH 2/2] Add a description to the flake. --- .envrc | 1 + flake.nix | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/flake.nix b/flake.nix index 1a826a2..73f4e77 100644 --- a/flake.nix +++ b/flake.nix @@ -1,15 +1,14 @@ { - description = ""; + description = "A basic driver for FTDI based JTAG probes (FT232H, FT2232H, FT4232H), to program Lattice ECP5/Nexus FPGAs."; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = {self, nixpkgs, flake-utils } : + outputs = { self, nixpkgs, flake-utils } : flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; ecpprog = { name = "ecpprog"; - # packages = []; buildInputs = [ pkgs.clang pkgs.gnumake pkgs.libftdi1 ]; nativeBuildInputs = [ pkgs.pkg-config ]; src = ./ecpprog;