From 3011004124f89523d55bf8b977eb1a9cef883296 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 3 Jan 2024 22:45:07 -0300
Subject: [PATCH 1/3] src: refactor

- finalAttrs design pattern
- fetchFromGitLab instead of url
- update meta.changelog
- use default attributes as arguments
---
 .../version-management/src/default.nix        | 32 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  5 +--
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 5ac391977598..8db0c8469dd1 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,19 +1,21 @@
 { lib
 , stdenv
-, fetchurl
-, python
-, rcs
+, fetchFromGitLab
 , git
 , makeWrapper
+, python3
+, rcs
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "src";
   version = "1.32";
 
-  src = fetchurl {
-    url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz";
-    sha256 = "sha256-CSA1CmPvXuOl9PzX97/soGRq2HHBcYuA5PepOVMaMWU=";
+  src = fetchFromGitLab {
+    owner = "esr";
+    repo = "src";
+    rev = finalAttrs.version;
+    hash = "sha256-gVB0BdnrJ1ew49t9j5zlLpBC4WP9xxYlU26ilOWtq08=";
   };
 
   nativeBuildInputs = [
@@ -21,16 +23,18 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    python
-    rcs
     git
+    python3
+    rcs
   ];
 
   preConfigure = ''
     patchShebangs .
   '';
 
-  makeFlags = [ "prefix=${placeholder "out"}" ];
+  makeFlags = [
+    "prefix=${placeholder "out"}"
+  ];
 
   postInstall = ''
     wrapProgram $out/bin/src \
@@ -48,10 +52,10 @@ stdenv.mkDerivation rec {
       will seem familiar to Subversion/Git/hg users, and no binary blobs
       anywhere.
     '';
-    changelog = "https://gitlab.com/esr/src/raw/${version}/NEWS";
+    changelog = "https://gitlab.com/esr/src/-/raw/${finalAttrs.version}/NEWS.adoc";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ calvertvl AndersonTorres ];
-    inherit (python.meta) platforms;
     mainProgram = "src";
+    maintainers = with maintainers; [ AndersonTorres ];
+    inherit (python3.meta) platforms;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 939ef3b0819e..a3c9f1ea7959 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35486,10 +35486,7 @@ with pkgs;
 
   ltunify = callPackage ../tools/misc/ltunify { };
 
-  src = callPackage ../applications/version-management/src {
-    git = gitMinimal;
-    python = python3;
-  };
+  src = callPackage ../applications/version-management/src { };
 
   ssrc = callPackage ../applications/audio/ssrc { };
 

From 4a42a2bafc08a6a54894f2f4a4034c4b186ec8b1 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 3 Jan 2024 22:48:19 -0300
Subject: [PATCH 2/3] src: migrate to by-name

---
 .../src/default.nix => by-name/sr/src/package.nix}              | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/version-management/src/default.nix => by-name/sr/src/package.nix} (100%)

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/by-name/sr/src/package.nix
similarity index 100%
rename from pkgs/applications/version-management/src/default.nix
rename to pkgs/by-name/sr/src/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3c9f1ea7959..254870358901 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35486,8 +35486,6 @@ with pkgs;
 
   ltunify = callPackage ../tools/misc/ltunify { };
 
-  src = callPackage ../applications/version-management/src { };
-
   ssrc = callPackage ../applications/audio/ssrc { };
 
   stalonetray = callPackage ../applications/window-managers/stalonetray { };

From 0a36bc913ba70d1b2828a746e2aec72e1157a6d6 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 3 Jan 2024 22:56:36 -0300
Subject: [PATCH 3/3] src: 1.32 -> 1.33

---
 pkgs/by-name/sr/src/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sr/src/package.nix b/pkgs/by-name/sr/src/package.nix
index 8db0c8469dd1..cd86eba41807 100644
--- a/pkgs/by-name/sr/src/package.nix
+++ b/pkgs/by-name/sr/src/package.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, asciidoc
 , fetchFromGitLab
 , git
 , makeWrapper
@@ -9,16 +10,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "src";
-  version = "1.32";
+  version = "1.33";
 
   src = fetchFromGitLab {
     owner = "esr";
     repo = "src";
     rev = finalAttrs.version;
-    hash = "sha256-gVB0BdnrJ1ew49t9j5zlLpBC4WP9xxYlU26ilOWtq08=";
+    hash = "sha256-xyKJcM9dWsFGhe+ISR6S1f67jkYlS9heZe0TFXY8DgQ=";
   };
 
   nativeBuildInputs = [
+    asciidoc
     makeWrapper
   ];
 
@@ -28,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     rcs
   ];
 
+  strictDeps = true;
+
   preConfigure = ''
     patchShebangs .
   '';