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: 85055b3ab7b8
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: e8d490f4c1a5
Choose a head ref
  • 4 commits
  • 22 files changed
  • 2 contributors

Commits on Mar 27, 2020

  1. gitlab: 12.8.7 -> 12.8.8

    (cherry picked from commit 8ab04fd)
    flokli authored and globin committed Mar 27, 2020
    Copy the full SHA
    71f2773 View commit details
  2. poetry2nix: 1.1.0 -> 1.6.1

    adisbladis committed Mar 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    Copy the full SHA
    713aa6d View commit details
  3. poetry2nix: Add hooks

    adisbladis committed Mar 27, 2020
    Copy the full SHA
    2037514 View commit details
  4. poetry: 1.0.3 -> 1.0.5

    adisbladis committed Mar 27, 2020
    Copy the full SHA
    e8d490f View commit details
Showing with 1,085 additions and 707 deletions.
  1. +5 −5 pkgs/applications/version-management/gitlab/data.json
  2. +2 −2 pkgs/applications/version-management/gitlab/gitaly/default.nix
  3. +2 −2 pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
  4. +1 −1 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
  5. +2 −2 pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
  6. +0 −32 pkgs/development/tools/poetry/default.nix
  7. +293 −120 pkgs/development/tools/poetry/poetry.lock
  8. +3 −3 pkgs/development/tools/poetry/pyproject.toml
  9. +2 −2 pkgs/development/tools/poetry/src.json
  10. +0 −2 pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
  11. +196 −182 pkgs/development/tools/poetry2nix/poetry2nix/default.nix
  12. +32 −0 pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
  13. +8 −0 pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh
  14. 0 pkgs/development/tools/poetry2nix/poetry2nix/{ → hooks}/pyproject-without-path.py
  15. +12 −0 pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
  16. +60 −20 pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
  17. +30 −11 pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
  18. +199 −88 pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
  19. +0 −3 pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
  20. +181 −178 pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
  21. +56 −53 pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
  22. +1 −1 pkgs/development/tools/poetry2nix/update
10 changes: 5 additions & 5 deletions pkgs/applications/version-management/gitlab/data.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"version": "12.8.7",
"repo_hash": "15dw8v5184500jm823wv920li3ishwk8k2dhxl1w8209x53nbqgj",
"version": "12.8.8",
"repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.8.7-ee",
"rev": "v12.8.8-ee",
"passthru": {
"GITALY_SERVER_VERSION": "12.8.7",
"GITALY_SERVER_VERSION": "12.8.8",
"GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.21.0"
"GITLAB_WORKHORSE_VERSION": "8.21.1"
}
}
Original file line number Diff line number Diff line change
@@ -19,14 +19,14 @@ let
};
};
in buildGoPackage rec {
version = "12.8.7";
version = "12.8.8";
pname = "gitaly";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "1sb11xavckzm70m27xcwbv4a1iaicxkh1hv2zi4brlcj5ia2rky4";
sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv";
};

# Fix a check which assumes that hook files are writeable by their
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
buildGoPackage rec {
pname = "gitlab-workhorse";

version = "8.21.0";
version = "8.21.1";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "04vhshm9lwnx77q9l7znxwkvvwm3gxgxw12y1xwahfilj352xr7q";
sha256 = "1d384xw7hfrph4i61z9z315sik7ja9hgrvmhljirwxrch1fyx3m4";
};

goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
Original file line number Diff line number Diff line change
@@ -652,7 +652,7 @@ GEM
netrc (0.11.0)
nio4r (2.5.2)
no_proxy_fix (0.1.2)
nokogiri (1.10.7)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
Original file line number Diff line number Diff line change
@@ -2927,10 +2927,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
type = "gem";
};
version = "1.10.7";
version = "1.10.8";
};
nokogumbo = {
dependencies = ["nokogiri"];
32 changes: 0 additions & 32 deletions pkgs/development/tools/poetry/default.nix
Original file line number Diff line number Diff line change
@@ -17,38 +17,6 @@ poetry2nix.mkPoetryApplication {
done
'';

# Poetry is a bit special in that it can't use itself as the `build-system` property in pyproject.toml.
# That's why we need to hackily install outputs completely manually.
#
# For projects using poetry normally overriding the installPhase is not required.
installPhase = ''
runHook preInstall
mkdir -p $out/lib/${python.libPrefix}/site-packages
cp -r poetry $out/lib/${python.libPrefix}/site-packages
mkdir -p $out/bin
cat > $out/bin/poetry <<EOF
#!${python.interpreter}
import sys
if __name__ == '__main__':
sys.path.append("$out/lib/${python.libPrefix}/site-packages")
from poetry.console import main
main()
EOF
chmod +x $out/bin/poetry
mkdir -p "$out/share/bash-completion/completions"
"$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry"
mkdir -p "$out/share/zsh/vendor-completions"
"$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry"
mkdir -p "$out/share/fish/vendor_completions.d"
"$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish"
runHook postInstall
'';

# Propagating dependencies leads to issues downstream
# We've already patched poetry to prefer "vendored" dependencies
postFixup = ''
Loading