diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
commit | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (patch) | |
tree | adbc42e629ea3441456eb5e5e4e0b3a7fa2d867a /pkgs/applications/version-management | |
parent | f498a8b7af41401c167baa6879a8b0271e8ffbf5 (diff) | |
parent | ff13b6f1acceac062e66a2b0f39a59bcb5570a87 (diff) | |
download | nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.gz nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.bz2 nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.lz nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.xz nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.zst nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 060de50f9b79..316b664c0705 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, gettext, git }: +{ stdenv, fetchFromGitHub, pythonPackages, gettext, git, qt5 }: let inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify; @@ -16,9 +16,16 @@ in buildPythonApplication rec { buildInputs = [ git gettext ]; propagatedBuildInputs = [ pyqt5 sip pyinotify ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; doCheck = false; + postFixup = '' + wrapQtApp bin/git-cola + wrapQtApp bin/git-dag + + ''; + meta = with stdenv.lib; { homepage = https://github.com/git-cola/git-cola; description = "A sleek and powerful Git GUI"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 748e473be3dd..378a272dbf63 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1q3wslf9s4dg7h1f41rh9rb7qlbsqz8k3xffmlzdbbgfdrm7sym1"; + sha256 = "1z7rkhxkymv7rgc7blh9ps5sqrgl4sryf0rqcp16nh9n5snfm1rm"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 9bff45f6dc83..2d38c340d278 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -285,7 +285,7 @@ type = "git"; url = "https://github.com/libgit2/git2go"; rev = "ecaeb7a21d47"; - sha256 = "1sh30jnzjag7ddhr4if65j8vpcpj4rw93sf1g033jf91flrzyx23"; + sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr"; }; } { @@ -294,7 +294,7 @@ type = "git"; url = "https://github.com/lightstep/lightstep-tracer-go"; rev = "v0.15.6"; - sha256 = "0g5bh3xdrsz30npk79h5ia340xyw97424xfrfzv3acqw3qg2sqn8"; + sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; }; } { @@ -483,7 +483,7 @@ type = "git"; url = "https://github.com/uber/jaeger-client-go"; rev = "v2.15.0"; - sha256 = "1qvqkf20dp5fyfg7qd3jc29q1yv0qjz2mkxa02j1v3n8ka134rff"; + sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj"; }; } { |