From 21cd680b5dfb5c33289adf94c5d893b11bc523dc Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 29 Mar 2021 18:00:01 +0000 Subject: [PATCH 1/7] nix: add 'flakes.nix' --- flake.lock | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 48 ++++++++++++++++++++++++++++ 2 files changed, 142 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..8f31c0b --- /dev/null +++ b/flake.lock @@ -0,0 +1,94 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1614513358, + "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5466c5bbece17adaab2d82fae80b46e807611bf3", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "mozillapkgs": { + "flake": false, + "locked": { + "lastModified": 1603906276, + "narHash": "sha256-RsNPnEKd7BcogwkqhaV5kI/HuNC4flH/OQCC/4W5y/8=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "8c007b60731c07dd7a052cce508de3bb1ae849b4", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, + "naersk": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1614785451, + "narHash": "sha256-TPw8kQvr2UNCuvndtY+EjyXp6Q5GEW2l9UafXXh1XmI=", + "owner": "nmattia", + "repo": "naersk", + "rev": "e0fe990b478a66178a58c69cf53daec0478ca6f9", + "type": "github" + }, + "original": { + "owner": "nmattia", + "ref": "master", + "repo": "naersk", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1617038346, + "narHash": "sha256-5AVL8TxnUT/8rX1XfxK05fP+jdf20jhg5gjZ2TLo/Wc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8e71416e5d4306c3800133ca6dc2ad4469480b90", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1616670887, + "narHash": "sha256-wn+l9qJfR5sj5Gq4DheJHAcBDfOs9K2p9seW2f35xzs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c0e881852006b132236cbf0301bd1939bb50867e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "mozillapkgs": "mozillapkgs", + "naersk": "naersk", + "nixpkgs": "nixpkgs_2" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..53fa44b --- /dev/null +++ b/flake.nix @@ -0,0 +1,48 @@ +{ + inputs = { + naersk.url = "github:nmattia/naersk/master"; + mozillapkgs = { + url = "github:mozilla/nixpkgs-mozilla"; + flake = false; + }; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, naersk, mozillapkgs, nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + + mozilla = pkgs.callPackage (mozillapkgs + "/package-set.nix") { }; + rustNightly = (mozilla.rustChannelOf { + date = "2021-03-29"; + channel = "nightly"; + sha256 = "sha256-Y94CnslybZgiZlNVV6Cg0TUPV2OeDXakPev1kqdt9Kk="; + }).rust; + + naersk-lib = pkgs.callPackage naersk { + cargo = rustNightly; + rustc = rustNightly; + }; + in + { + defaultPackage = naersk-lib.buildPackage ./.; + + defaultApp = flake-utils.lib.mkApp { + drv = self.defaultPackage."${system}"; + }; + + devShell = pkgs.mkShell { + buildInputs = with pkgs; [ + nixpkgs-fmt + pre-commit + rustPackages.clippy + rustNightly + rustfmt + ]; + + RUST_SRC_PATH = pkgs.rustPlatform.rustLibSrc; + }; + }); +} From 4ceeb5e4fee9d845e8a7f55a62ed525832a29d8c Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 29 Mar 2021 18:04:56 +0000 Subject: [PATCH 2/7] nix: support legacy nix using 'flake-compat' --- default.nix | 13 +++++++++++++ flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++++ shell.nix | 13 +++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 default.nix create mode 100644 shell.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..873ece4 --- /dev/null +++ b/default.nix @@ -0,0 +1,13 @@ +(import + ( + let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); + in + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + { + src = ./.; + }).defaultNix diff --git a/flake.lock b/flake.lock index 8f31c0b..bcf4f30 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1606424373, + "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1614513358, @@ -82,6 +98,7 @@ }, "root": { "inputs": { + "flake-compat": "flake-compat", "flake-utils": "flake-utils", "mozillapkgs": "mozillapkgs", "naersk": "naersk", diff --git a/flake.nix b/flake.nix index 53fa44b..c97297a 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ }; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; + flake-compat = { + url = "github:edolstra/flake-compat"; + flake = false; + }; }; outputs = { self, naersk, mozillapkgs, nixpkgs, flake-utils, ... }: diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..9eb132a --- /dev/null +++ b/shell.nix @@ -0,0 +1,13 @@ +(import + ( + let + lock = builtins.fromJSON (builtins.readFile ./flake.lock); + in + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; + sha256 = lock.nodes.flake-compat.locked.narHash; + } + ) + { + src = ./.; + }).shellNix From a58f712181be23acb0e20909e8002f31996eed9a Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 29 Mar 2021 18:06:44 +0000 Subject: [PATCH 3/7] nix: add 'direnv' integration --- .envrc | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..c23bb91 --- /dev/null +++ b/.envrc @@ -0,0 +1,7 @@ +use_flake() { + watch_file flake.nix + watch_file flake.lock + eval "$(nix print-dev-env)" +} + +use flake From 44ae16b9487c7026698dc0130dc816ceb00e9847 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 29 Mar 2021 18:07:46 +0000 Subject: [PATCH 4/7] nix: add 'nixpkgs-fmt' pre-commit hook You must run `pre-commit install` for them them to take effect. --- .pre-commit-config.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..45aa747 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,10 @@ +repos: +- repo: 'local' + hooks: + - id: 'nixpkgs-fmt' + name: 'nixpkgs-fmt' + description: 'Format nix code with nixpkgs-fmt' + entry: 'nixpkgs-fmt' + language: 'system' + files: '\.nix$' + always_run: true From b4f6735b31121f9b16f634f0c264b263cfafec61 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 29 Mar 2021 18:11:23 +0000 Subject: [PATCH 5/7] pre-commit: add more useful hooks --- .pre-commit-config.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 45aa747..cda3975 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,3 +8,13 @@ repos: language: 'system' files: '\.nix$' always_run: true +- repo: 'https://github.com/pre-commit/pre-commit-hooks' + rev: 'v2.3.0' + hooks: + - id: 'trailing-whitespace' + - id: 'end-of-file-fixer' + - id: 'check-yaml' +- repo: 'https://github.com/jumanjihouse/pre-commit-hooks' + rev: '2.1.4' + hooks: + - id: 'forbid-binary' From 99d368e6651871adcbd9fa7ccab9304dc7f46076 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 29 Mar 2021 19:32:31 +0000 Subject: [PATCH 6/7] nix: flake: use 'nixpkgs' input for 'naersk' --- flake.lock | 20 ++++---------------- flake.nix | 5 ++++- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index bcf4f30..c0cf2ff 100644 --- a/flake.lock +++ b/flake.lock @@ -49,7 +49,9 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1614785451, @@ -67,20 +69,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1617038346, - "narHash": "sha256-5AVL8TxnUT/8rX1XfxK05fP+jdf20jhg5gjZ2TLo/Wc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8e71416e5d4306c3800133ca6dc2ad4469480b90", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1616670887, "narHash": "sha256-wn+l9qJfR5sj5Gq4DheJHAcBDfOs9K2p9seW2f35xzs=", @@ -102,7 +90,7 @@ "flake-utils": "flake-utils", "mozillapkgs": "mozillapkgs", "naersk": "naersk", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index c97297a..acd7f57 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,9 @@ { inputs = { - naersk.url = "github:nmattia/naersk/master"; + naersk = { + url = "github:nmattia/naersk/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; mozillapkgs = { url = "github:mozilla/nixpkgs-mozilla"; flake = false; From 5ae9885cfe87c16c7cfd1f036db073db95048fdb Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 29 Mar 2021 19:33:11 +0000 Subject: [PATCH 7/7] git: ignore 'result/' symlink from 'nix build' --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ea8c4bf..d787b70 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +/result