Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 482e21883fb0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 93c0abfba863
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on May 11, 2019

  1. gitea: 1.8.0 -> 1.8.1 

    (cherry picked from commit bad4902)
    @kolaente @flokli
    kolaente authored and flokli committed May 11, 2019
    Copy the full SHA
    18e026e View commit details

  2. maintainers: add kolaente 

    (cherry picked from commit 29d35a9)
    @kolaente @flokli
    kolaente authored and flokli committed May 11, 2019
    Copy the full SHA
    93c0abf View commit details
Showing with 9 additions and 4 deletions.
  1. +5 −0 maintainers/maintainer-list.nix
  2. +1 −1 nixos/tests/gitea.nix
  3. +3 −3 pkgs/applications/version-management/gitea/default.nix
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -2493,6 +2493,11 @@
github = "knl";
name = "Nikola Knežević";
};
kolaente = {
email = "k@knt.li";
github = "kolaente";
name = "Konrad Langenberg";
};
konimex = {
email = "herdiansyah@netc.eu";
github = "konimex";
2 changes: 1 addition & 1 deletion nixos/tests/gitea.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ with pkgs.lib;
{
mysql = makeTest {
name = "gitea-mysql";
meta.maintainers = [ maintainers.aanderse ];
meta.maintainers = with maintainers; [ aanderse kolaente ];

machine =
{ config, pkgs, ... }:
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitea/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ with stdenv.lib;

buildGoPackage rec {
pname = "gitea";
version = "1.8.0";
version = "1.8.1";

src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
sha256 = "1x5r732rh1g23smgvvk10nlqbv14m7cf3y6zgwwl2bwkvax4z49b";
sha256 = "1gsismjhcgz7zk8zvyva4cgnq4wsh4cs7mdabpas9djz34sa1nr1";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
@@ -58,6 +58,6 @@ buildGoPackage rec {
description = "Git with a cup of tea";
homepage = https://gitea.io;
license = licenses.mit;
maintainers = [ maintainers.disassembler ];
maintainers = with maintainers; [ disassembler kolaente ];
};
}