Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 316e5e6f3a80
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dcd0a22137d9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 7, 2021

  1. gitAndTools.tig: 2.5.2 -> 2.5.3 

    ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.3
(cherry picked from commit 155a946)
    @Ma27
    Ma27 committed Mar 7, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5a874c5 View commit details

  2. gitea: 1.13.3 -> 1.13.4 

    ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.13.4
(cherry picked from commit 49777a7)
    @Ma27
    Ma27 committed Mar 7, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dcd0a22 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/version-management/git-and-tools/tig/default.nix
  2. +2 −2 pkgs/applications/version-management/gitea/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/git-and-tools/tig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "tig";
version = "2.5.2";
version = "2.5.3";

src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-kkH4px34VpnO/S1VjgQGU9Mm4/VpmiOtvlz2ubtStAk=";
sha256 = "sha256-BXs7aKUYiU5L2OjhhmJ+dkHvNcrnw5qREwOTB6npLnw=";
};

nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitea/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ with stdenv.lib;

buildGoPackage rec {
pname = "gitea";
version = "1.13.3";
version = "1.13.4";

src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-+uuadtpDC4br+DUHpoY2aOwklpD9LxvkSqcBMC0+UHE=";
sha256 = "sha256-Q9wM+TGgE9oFFzg6516bG7iFNjhxOxPMLKtTHghA/OU=";
};

unpackPhase = ''