From dd78be7f7ebf2e41052446592720ba4f0f9a0779 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 25 Aug 2023 16:30:04 +0200 Subject: [PATCH] treewide: remove unused 'rec' --- flake.nix | 2 +- lib/licenses.nix | 2 +- pkgs/epnix/support/seq/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 84778236..47ed831b 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ inherit system; overlays = [overlay inputs.bash-lib.overlay]; }; - in rec { + in { packages = flake-utils.lib.flattenTree (pkgs.recurseIntoAttrs pkgs.epnix); checks = diff --git a/lib/licenses.nix b/lib/licenses.nix index 20281423..ec8b078f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -2,7 +2,7 @@ # Taken from: # https://github.com/NixOS/nixpkgs/blob/55ad138e5cd97c6415abb45fae653fd413bef869/lib/licenses.nix lib.mapAttrs (lname: lset: let - defaultLicense = rec { + defaultLicense = { shortName = lname; free = true; # Most of our licenses are Free, explicitly declare unfree additions as such! deprecated = false; diff --git a/pkgs/epnix/support/seq/default.nix b/pkgs/epnix/support/seq/default.nix index 5c35f801..af700b77 100644 --- a/pkgs/epnix/support/seq/default.nix +++ b/pkgs/epnix/support/seq/default.nix @@ -6,7 +6,7 @@ local_config_site ? {}, local_release ? {}, }: -mkEpicsPackage rec { +mkEpicsPackage { pname = "seq"; version = "2.2.9"; varname = "SNCSEQ";