diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-23 09:33:09 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-23 09:33:09 +0200 |
| commit | 14673d61ed94bcb9c54d24bacd7b15420d3e3fab (patch) | |
| tree | d50eedbd1cd4bb2090c1cf2ad41cc118ea5127e8 /pkgs/applications/version-management | |
| parent | fcde178ed5f76626d57b3b02848f2fedf5fd9928 (diff) | |
| parent | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (diff) | |
| download | nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.gz nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.bz2 nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.lz nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.xz nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.zst nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gogs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/mr/default.nix | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 90d16d846608..64e0ef2b59d0 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -109,5 +109,6 @@ stdenv.mkDerivation rec { description = "Web-based Git-repository manager"; homepage = https://gitlab.com; license = licenses.mit; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 25f7be37e1ee..56e411368961 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gogs-${version}"; - version = "0.11.53"; + version = "0.11.66"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "1icm4bawyic4ivzyspqc6qjv882gil8j923zrbylw3i4ifhlcdhd"; + sha256 = "1b9ilk4xlsllsj5pzmxwsz4a1zvgd06a8mi9ni9hbvmfl3w8xf28"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 16948003a7a1..94979056b933 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - version = "1.20170129"; + version = "1.20180726"; name = "mr-${version}"; src = fetchgit { |