diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/by-name/sr/src/package.nix similarity index 63% rename from pkgs/applications/version-management/src/default.nix rename to pkgs/by-name/sr/src/package.nix index 5ac391977598..cd86eba41807 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/by-name/sr/src/package.nix @@ -1,36 +1,44 @@ { lib , stdenv -, fetchurl -, python -, rcs +, asciidoc +, fetchFromGitLab , git , makeWrapper +, python3 +, rcs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "src"; - version = "1.32"; + version = "1.33"; - 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-xyKJcM9dWsFGhe+ISR6S1f67jkYlS9heZe0TFXY8DgQ="; }; nativeBuildInputs = [ + asciidoc makeWrapper ]; buildInputs = [ - python - rcs git + python3 + rcs ]; + strictDeps = true; + preConfigure = '' patchShebangs . ''; - makeFlags = [ "prefix=${placeholder "out"}" ]; + makeFlags = [ + "prefix=${placeholder "out"}" + ]; postInstall = '' wrapProgram $out/bin/src \ @@ -48,10 +56,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 76bfc95600b9..4eeaacd39489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35471,11 +35471,6 @@ with pkgs; ltunify = callPackage ../tools/misc/ltunify { }; - src = callPackage ../applications/version-management/src { - git = gitMinimal; - python = python3; - }; - ssrc = callPackage ../applications/audio/ssrc { }; stalonetray = callPackage ../applications/window-managers/stalonetray { };