From 9ec968fbf00825e2fb78db5084ec7da21d320f57 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 7 Nov 2018 18:32:42 +0100 Subject: [PATCH 1/3] dmrconfig: Install udev rules --- pkgs/applications/misc/dmrconfig/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix index 9edf5e4f88c2..5e2a99e9ce0a 100644 --- a/pkgs/applications/misc/dmrconfig/default.nix +++ b/pkgs/applications/misc/dmrconfig/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig ''; - preInstall = '' - mkdir -p $out/bin + installPhase = '' + mkdir -p $out/bin $out/lib/udev/rules.d + make install + install 99-dmr.rules $out/lib/udev/rules.d/99-dmr.rules ''; meta = with stdenv.lib; { From a1f23bf1c8d9c34d9773b0b0b546e1c8e3a19ad9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 7 Nov 2018 18:34:37 +0100 Subject: [PATCH 2/3] nixos/dmrconfig: Add module to enable udev rules --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/dmrconfig.nix | 38 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 nixos/modules/programs/dmrconfig.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 37e90232da2a..a191318a7022 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -90,6 +90,7 @@ ./programs/criu.nix ./programs/dconf.nix ./programs/digitalbitbox/default.nix + ./programs/dmrconfig.nix ./programs/environment.nix ./programs/firejail.nix ./programs/fish.nix diff --git a/nixos/modules/programs/dmrconfig.nix b/nixos/modules/programs/dmrconfig.nix new file mode 100644 index 000000000000..e48a4f318370 --- /dev/null +++ b/nixos/modules/programs/dmrconfig.nix @@ -0,0 +1,38 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.dmrconfig; + +in { + meta.maintainers = [ maintainers.etu ]; + + ###### interface + options = { + programs.dmrconfig = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to configure system to enable use of dmrconfig. This + enables the required udev rules and installs the program. + ''; + relatedPackages = [ "dmrconfig" ]; + }; + + package = mkOption { + default = pkgs.dmrconfig; + type = types.package; + defaultText = "pkgs.dmrconfig"; + description = "dmrconfig derivation to use"; + }; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + }; +} From 7189258afded4d1980037bde42d6489e2556542a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 7 Nov 2018 18:38:43 +0100 Subject: [PATCH 3/3] dmrconfig: 2018-10-29 -> 2018-11-07 --- pkgs/applications/misc/dmrconfig/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix index 5e2a99e9ce0a..5d02eb937ffe 100644 --- a/pkgs/applications/misc/dmrconfig/default.nix +++ b/pkgs/applications/misc/dmrconfig/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dmrconfig-${version}"; - version = "2018-10-29"; + version = "2018-11-07"; src = fetchFromGitHub { owner = "sergev"; repo = "dmrconfig"; - rev = "4924d00283c3c81a4b8251669e42aecd96b6145a"; - sha256 = "00a4hmbr71g0d4faskb8q96y6z212g2r4n533yvp88z8rq8vbxxn"; + rev = "b58985d3c848b927e91699d97f96d9de014c3fc7"; + sha256 = "083f21hz6vqjpndkn27nsjnhnc5a4bw0cr26ryfqcvz275rj4k18"; }; buildInputs = [