diff options
author | Nick Cao <nickcao@nichi.co> | 2024-01-05 11:52:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-05 11:52:09 -0500 |
commit | 4363ab24f1e80c560e709bd07a33ef69e02dff21 (patch) | |
tree | 4833a2dcd236365c8449201d64f9fe5bdae7efe9 | |
parent | 6a77d46505c69048a15ddd6eca0a168acbb9ac43 (diff) | |
parent | 0a36bc913ba70d1b2828a746e2aec72e1157a6d6 (diff) |
Merge pull request #278610 from atorres1985-contrib/src
src: 1.32 -> 1.33
-rw-r--r-- | pkgs/by-name/sr/src/package.nix (renamed from pkgs/applications/version-management/src/default.nix) | 38 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 23 insertions, 20 deletions
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/by-name/sr/src/package.nix index 5ac3919775986..cd86eba418078 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 76bfc95600b93..4eeaacd394898 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 { }; |