Merge master into staging-next

2021-01-15 18:52:54 +00:00
parent c0d2951fa6 eba1653194
commit 3269d4d3a3
18 changed files with 183 additions and 64 deletions
@@ -25,8 +25,10 @@ lib.makePackageOverridable
    }@args:

    let
+      versionedName = "${name}-${rev}";
+
      src = fetchFromGitHub ({
-        name = "${name}-source";
+        name = "${versionedName}-source";

        inherit owner repo rev;
      } // removeAttrs args [
@@ -45,7 +47,9 @@ lib.makePackageOverridable

    in
      buildDhallPackage
-        ( { inherit name dependencies source;
+        ( { inherit dependencies source;
+
+            name = versionedName;

            code = "${src}/${prefix}${file}";
          }