From 05a7bfedfdfe86cc650b4b960482dff82bfdb798 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 16 Sep 2023 17:24:38 -0400
Subject: nix-init: 0.2.4 -> 0.3.0

Diff: https://github.com/nix-community/nix-init/compare/v0.2.4...v0.3.0

Changelog: https://github.com/nix-community/nix-init/blob/v0.3.0/CHANGELOG.md
---
 pkgs/tools/nix/nix-init/default.nix         | 10 ++--
 pkgs/tools/nix/nix-init/get-nix-license.nix | 75 -----------------------------
 pkgs/tools/nix/nix-init/get_nix_license.nix | 75 +++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 80 deletions(-)
 delete mode 100644 pkgs/tools/nix/nix-init/get-nix-license.nix
 create mode 100644 pkgs/tools/nix/nix-init/get_nix_license.nix

(limited to 'pkgs/tools/nix')

diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix
index 1e24de6d1961c..a50a7fc1a0d16 100644
--- a/pkgs/tools/nix/nix-init/default.nix
+++ b/pkgs/tools/nix/nix-init/default.nix
@@ -18,23 +18,23 @@
 }:
 
 let
-  get-nix-license = import ./get-nix-license.nix {
+  get-nix-license = import ./get_nix_license.nix {
     inherit lib writeText;
   };
 in
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-init";
-  version = "0.2.4";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-init";
     rev = "v${version}";
-    hash = "sha256-VP0UwJhiY6gDF3tBI1DOW0B4XAl9CzTHzgIP68iF4VM=";
+    hash = "sha256-YUstBO+iznr0eJYVJdNQ2BjDhvviRQuojhT9IlTuR0k=";
   };
 
-  cargoHash = "sha256-x1zRQGWN2NOvDDrQgkeObf6eNoCGMSw3DVgwVqfbI48=";
+  cargoHash = "sha256-OAgEzf+EyrwjNa40BwPwSNZ4lhEH93YxCbPJJ3r7oSQ=";
 
   nativeBuildInputs = [
     curl
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec {
 
   postPatch = ''
     mkdir -p data
-    ln -s ${get-nix-license} data/get-nix-license.rs
+    ln -s ${get-nix-license} data/get_nix_license.rs
   '';
 
   preBuild = ''
diff --git a/pkgs/tools/nix/nix-init/get-nix-license.nix b/pkgs/tools/nix/nix-init/get-nix-license.nix
deleted file mode 100644
index 2aa514bd3465e..0000000000000
--- a/pkgs/tools/nix/nix-init/get-nix-license.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-# vendored from src/get-nix-license.nix
-
-{ lib, writeText }:
-
-let
-  inherit (lib)
-    attrNames
-    concatMapAttrs
-    concatStringsSep
-    filterAttrs
-    flip
-    id
-    intersectLists
-    licenses
-    mapAttrsToList
-    optionalAttrs
-    pipe
-    warn
-    ;
-
-  licenseMap = flip concatMapAttrs licenses
-    (k: v: optionalAttrs (v ? spdxId && !v.deprecated) { ${v.spdxId} = k; });
-
-  deprecatedAliases = {
-    "AGPL-3.0" = "agpl3Only";
-    "BSD-2-Clause-FreeBSD" = "bsd2WithViews";
-    "BSD-2-Clause-NetBSD" = "bsd2";
-    "GFDL-1.1" = "fdl11Only";
-    "GFDL-1.2" = "fdl12Only";
-    "GFDL-1.3" = "fdl13Only";
-    "GPL-1.0" = "gpl1Only";
-    "GPL-1.0+" = "gpl1Plus";
-    "GPL-2.0" = "gpl2Only";
-    "GPL-2.0+" = "gpl2Plus";
-    "GPL-3.0" = "gpl3Only";
-    "GPL-3.0+" = "gpl3Plus";
-    "LGPL-2.0" = "lgpl2Only";
-    "LGPL-2.0+" = "lgpl2Plus";
-    "LGPL-2.1" = "lgpl21Only";
-    "LGPL-2.1+" = "lgpl21Plus";
-    "LGPL-3.0" = "lgpl3Only";
-    "LGPL-3.0+" = "lgpl3Plus";
-  };
-
-  lints = {
-    "deprecated licenses" = intersectLists
-      (attrNames licenseMap)
-      (attrNames deprecatedAliases);
-
-    "invalid aliases" = attrNames (filterAttrs
-      (k: v: licenses.${v}.deprecated or true)
-      deprecatedAliases);
-  };
-
-  lint = flip pipe
-    (flip mapAttrsToList lints (k: v:
-      if v == [ ] then
-        id
-      else
-        warn "${k}: ${concatStringsSep ", " v}"));
-
-  arms = lint (concatStringsSep "\n        "
-    (mapAttrsToList
-      (k: v: ''"${k}" => Some("${v}"),'')
-      (deprecatedAliases // licenseMap)));
-in
-
-writeText "get-nix-license.rs" ''
-  pub fn get_nix_license(license: &str) -> Option<&'static str> {
-      match license {
-          ${arms}
-          _ => None,
-      }
-  }
-''
diff --git a/pkgs/tools/nix/nix-init/get_nix_license.nix b/pkgs/tools/nix/nix-init/get_nix_license.nix
new file mode 100644
index 0000000000000..0e67fb5e044ca
--- /dev/null
+++ b/pkgs/tools/nix/nix-init/get_nix_license.nix
@@ -0,0 +1,75 @@
+# vendored from src/get-nix-license.nix
+
+{ lib, writeText }:
+
+let
+  inherit (lib)
+    attrNames
+    concatMapAttrs
+    concatStringsSep
+    filterAttrs
+    flip
+    id
+    intersectLists
+    licenses
+    mapAttrsToList
+    optionalAttrs
+    pipe
+    warn
+    ;
+
+  licenseMap = flip concatMapAttrs licenses
+    (k: v: optionalAttrs (v ? spdxId && !v.deprecated) { ${v.spdxId} = k; });
+
+  deprecatedAliases = {
+    "AGPL-3.0" = "agpl3Only";
+    "BSD-2-Clause-FreeBSD" = "bsd2WithViews";
+    "BSD-2-Clause-NetBSD" = "bsd2";
+    "GFDL-1.1" = "fdl11Only";
+    "GFDL-1.2" = "fdl12Only";
+    "GFDL-1.3" = "fdl13Only";
+    "GPL-1.0" = "gpl1Only";
+    "GPL-1.0+" = "gpl1Plus";
+    "GPL-2.0" = "gpl2Only";
+    "GPL-2.0+" = "gpl2Plus";
+    "GPL-3.0" = "gpl3Only";
+    "GPL-3.0+" = "gpl3Plus";
+    "LGPL-2.0" = "lgpl2Only";
+    "LGPL-2.0+" = "lgpl2Plus";
+    "LGPL-2.1" = "lgpl21Only";
+    "LGPL-2.1+" = "lgpl21Plus";
+    "LGPL-3.0" = "lgpl3Only";
+    "LGPL-3.0+" = "lgpl3Plus";
+  };
+
+  lints = {
+    "deprecated licenses" = intersectLists
+      (attrNames licenseMap)
+      (attrNames deprecatedAliases);
+
+    "invalid aliases" = attrNames (filterAttrs
+      (_: v: licenses.${v}.deprecated or true)
+      deprecatedAliases);
+  };
+
+  lint = flip pipe
+    (flip mapAttrsToList lints (k: v:
+      if v == [ ] then
+        id
+      else
+        warn "${k}: ${concatStringsSep ", " v}"));
+
+  arms = lint (concatStringsSep "\n        "
+    (mapAttrsToList
+      (k: v: ''"${k}" => Some("${v}"),'')
+      (deprecatedAliases // licenseMap)));
+in
+
+writeText "get-nix-license.rs" ''
+  pub fn get_nix_license(license: &str) -> Option<&'static str> {
+      match license {
+          ${arms}
+          _ => None,
+      }
+  }
+''
-- 
cgit 1.4.1