remove rec

packages/auc.nix

@@ -5,9 +5,10 @@
   pandoc,
 }: let
   owner = "kamalist";
+  pname = "auc";
 in
-  stdenv.mkDerivation rec {
-    pname = "auc";
+  stdenv.mkDerivation {
+    inherit pname;
     version = "2019-04-02";
 
     src = fetchFromGitHub {

packages/hc.nix

@@ -12,12 +12,15 @@
   util-linux,
   zbar,
 }:
-stdenv.mkDerivation rec {
-  name = "hc-${meta.version}";
+let
+  version = "1.0.0";
+in
+stdenv.mkDerivation {
+  name = "hc-${version}";
 
   src = fetchgit {
     url = "https://cgit.krebsco.de/hc";
-    rev = "refs/tags/v${meta.version}";
+    rev = "refs/tags/v${version}";
     sha256 = "09349gja22p0j3xs082kp0fnaaada14bafszn4r3q7rg1id2slfb";
   };
 
@@ -44,6 +47,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    version = "1.0.0";
+    inherit version;
   };
 }

packages/opustags.nix

@@ -6,9 +6,12 @@
   libogg,
   fetchFromGitHub,
 }:
-stdenv.mkDerivation rec {
-  name = "opustags";
+let
   version = "1.3.0";
+in
+stdenv.mkDerivation {
+  name = "opustags";
+  version = version;
 
   src = fetchFromGitHub {
     owner = "fmang";

packages/python3Packages/indic-transliteration/default.nix

@@ -6,8 +6,11 @@
   regex,
   ...
 }:
-buildPythonPackage rec {
+let
   pname = "indic_transliteration";
+in
+buildPythonPackage {
+  inherit pname;
   version = "unstable-2020-12-15";
   src = fetchFromGitHub {
     repo = pname;

packages/stag.nix

@@ -6,9 +6,12 @@
   taglib,
   zlib,
 }:
-stdenv.mkDerivation rec {
-  pname = "stag";
+let
   version = "1.0";
+in
+stdenv.mkDerivation {
+  pname = "stag";
+  version = version;
 
   src = fetchFromGitHub {
     owner = "smabie";

packages/text2pdf.nix

@@ -2,10 +2,14 @@
   stdenv,
   fetchurl,
 }:
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+let
   pname = "text2pdf";
   version = "1.1";
+in
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+  pname = pname;
+  version = version;
   src = fetchurl {
     url = "http://www.eprg.org/pdfcorner/text2pdf/text2pdf.c";
     sha256 = "002nyky12vf1paj7az6j6ra7lljwkhqzz238v7fyp7sfgxw0f7d1";

packages/vim.nix

@@ -64,10 +64,9 @@
         vim-repeat
         vim-sensible
         vim-surround
-        (vimUtils.buildVimPlugin rec {
+        (vimUtils.buildVimPlugin {
           pname = "vim-dim";
           version = "1.1.0";
-          name = "${pname}-${version}";
           src = fetchFromGitHub {
             owner = "jeffkreeftmeijer";
             repo = pname;

packages/weechat-declarative.nix

@@ -9,8 +9,8 @@
   config = args.config or {};
 
   lib =
-    args.lib
-    // rec {
+    lib.recursiveUpdate args.lib
+    (let
       attrPaths = let
         recurse = path: value:
           if builtins.isAttrs value
@@ -18,6 +18,8 @@
           else [(lib.nameValuePair path value)];
       in
         attrs: lib.flatten (recurse [] attrs);
+    in {
+      inherit attrPaths;
 
       attrPathsSep = sep: attrs: lib.listToAttrs (map (x: x // {name = lib.concatStringsSep sep x.name;}) (attrPaths attrs));
 
@@ -33,7 +35,7 @@
       setCommand = name: value: "/set ${name} \"${toWeechatValue value}\"";
 
       filterAddreplace = name: filter: "/filter addreplace ${name} ${filter.buffer} ${toWeechatValue filter.tags} ${filter.regex}";
-    };
+    });
 
   cfg = eval.config;