Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sourcehut: init #54425

Merged
merged 10 commits into from Aug 14, 2019

Conversation

@eadwu
Copy link
Contributor

commented Jan 21, 2019

Motivation for this change

Totally didn't steal pgpy and sqlalchemy-utils from #50328.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@eadwu eadwu requested review from FRidh and Infinisil as code owners Jan 21, 2019

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch 2 times, most recently from b2ec141 to 63bdd18 Jan 21, 2019

@dotlambda
Copy link
Member

left a comment

Some requested changes apply to packages that were not yet reviewed as well.

pkgs/applications/version-management/sr-ht/todo.nix Outdated Show resolved Hide resolved
pkgs/applications/version-management/sr-ht/todo.nix Outdated Show resolved Hide resolved
pkgs/applications/version-management/sr-ht/todo.nix Outdated Show resolved Hide resolved
pkgs/applications/version-management/sr-ht/todo.nix Outdated Show resolved Hide resolved
pkgs/applications/version-management/sr-ht/meta.nix Outdated Show resolved Hide resolved

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch from 63bdd18 to 739eb98 Jan 21, 2019

@dotlambda

This comment has been minimized.

Copy link
Member

commented Jan 21, 2019

Please squash the changes into the appropriate commits.

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch 3 times, most recently from bfa4f2c to 3633fb7 Jan 21, 2019

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch 2 times, most recently from 06294cf to e3dc968 Jan 21, 2019

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
srhtPackages = callPackage ../applications/version-management/sr-ht {
# https://github.com/NixOS/nixpkgs/pull/54425#discussion_r249489825
pythonPackages = python36Packages;
fetchNodeModules = callPackage ../applications/networking/instant-messengers/rambox/fetchNodeModules.nix { };

This comment has been minimized.

Copy link
@dotlambda

dotlambda Jan 21, 2019

Member

This can also be put in a let statement inside the expression. However, I'm not sure if fetchNodeModules should be used, I'm not familiar with the Node ecosystem.

@dotlambda
Copy link
Member

left a comment

Please look into how to run pgpy's tests. It's currently giving Ran 0 tests in 0.000s.

pkgs/applications/version-management/sr-ht/core.nix Outdated Show resolved Hide resolved
pkgs/applications/version-management/sr-ht/git.nix Outdated Show resolved Hide resolved
pkgs/applications/version-management/sr-ht/git.nix Outdated Show resolved Hide resolved
pkgs/applications/version-management/sr-ht/git.nix Outdated Show resolved Hide resolved
pkgs/applications/version-management/sr-ht/git.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/asyncpg/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/atpublic/default.nix Outdated Show resolved Hide resolved
@jb55

This comment has been minimized.

Copy link
Contributor

commented Jan 22, 2019

this is awesome

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch from c1acc18 to 40c9186 Jan 22, 2019

];

# Exclude test in root directory from 5 years ago, test_load_asc_bench.py
# Has progressbar dependency that doesn't look like even supports Python 3.x

This comment has been minimized.

Copy link
@dotlambda

dotlambda Jan 22, 2019

Member

There are multiple progressbar successors in our python-packages.nix, some of which support Python 2 and 3.

This comment has been minimized.

Copy link
@eadwu

eadwu Jan 22, 2019

Author Contributor

It looks like it is just an outdated test, polyfilled progressbar with progressbar33 and I get an error of ImportError: cannot import name 'Exportable' from 'pgpy.types' (/build/source/pgpy/types.py) and checking pgpy/types.py there doesn't seem to any object called Exportable there.

Though progressbar2 seems to be blocked by a single test with no blunt error I can make out, https://hydra.nixos.org/build/87231550/nixlog/1.

This comment has been minimized.

Copy link
@dotlambda

dotlambda Jan 22, 2019

Member

That error should be reported upstream if it has not been fixed yet.

To fix the progressbar2 build, I have pushed 6672304 to master.

This comment has been minimized.

Copy link
@eadwu

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch from 40c9186 to 52484db Jan 22, 2019

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch from ea30461 to 4529bff Aug 2, 2019

@matthiasbeyer

This comment has been minimized.

Copy link
Contributor

commented Aug 3, 2019

Still no progress here?

@eadwu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 3, 2019

I'm intermittently working on the modules still since I'm planning on hosting it in college but on the package drv side it should be all good.

All good after #65864 of course. Had the fix on my local nixpkgs.

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch 2 times, most recently from c2e7a6a to 30f8b53 Aug 4, 2019

@eadwu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 10, 2019

The status update that shows a [somewhat] viable sr.ht finally. Really only tested meta, git, and paste while todo, man, and hg works fine [so far] from my tinkering. Local nixpkgs consist of #66401, #65109, and #54425 on top of 2da00ae with a nixops configuration here [1].

In terms of other stuff, the mailing/mail server will probably be the last thing that'll work since I hardly have any experience setting that up. I'll probably just setup the web interfaces for dispatch, lists, and builds while focusing on builds so it'll be completed before I head for the dorms in college.

[1] https://gist.github.com/eadwu/e633df2660b316f3d09974594cb519e5

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch from 30f8b53 to 5d77d97 Aug 11, 2019

@bsima

This comment has been minimized.

Copy link

commented Aug 13, 2019

@matthiasbeyer

This comment has been minimized.

Copy link
Contributor

commented Aug 13, 2019

Then again, setting up a mailserver could be outside the scope of this,

I agree. I also suggest the nixos-mailserver, which I have good experience with (used it only for journalwatch so far).
I would also say that this is out of scope of this package and a user should setup their own webserver for using sourcehut, not the package/service should ship one!

@joachifm

This comment has been minimized.

Copy link
Contributor

commented Aug 13, 2019

Seems to me all review items have been addressed. Unless there is something fundamentally wrong with this, it'd be nice to finally integrate it.

eadwu added some commits Jan 22, 2019

sourcehut: init
builds-sr-ht: init at 0.45.13
dispatch-sr-ht: init at 0.11.0
git-sr-ht: init at 0.32.3
hg-sr-ht: init at 0.13.0
lists-sr-ht: init at 0.36.3
man-sr-ht: init at 0.12.4
meta-sr-ht: init at 0.34.3
paste-sr-ht: init at 0.5.1
todo-sr-ht: init at 0.46.8

@eadwu eadwu force-pushed the eadwu:init/srhtPackages branch from 5d77d97 to a2ca6ef Aug 13, 2019

@eadwu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 13, 2019

Rebased onto latest master and built successfully.

@joachifm joachifm merged commit 8f15669 into NixOS:master Aug 14, 2019

13 checks passed

Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@joachifm

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

Thank you

@tomberek

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

Bravo! @eadwu thanks for sticking with it.

@matthiasbeyer

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

Yippie!

@aaronjanse

This comment has been minimized.

Copy link
Member

commented Aug 21, 2019

Thanks @eadwu! This closes #65109, right?

@eadwu

This comment has been minimized.

Copy link
Contributor Author

commented Aug 21, 2019

#65109 is an incomplete implementation of an actual sourcehut network (internals, not webserver/mailserver). This PR just included the packages needed for it to function.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.