-
-
Notifications
You must be signed in to change notification settings - Fork 14.3k
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
haskellPackages.git-annex: Add shellPath for the git-annex-shell. #161002
Conversation
@@ -92,6 +92,8 @@ self: super: { | |||
rm -r $out/doc/?ndroid* | |||
''; | |||
}; | |||
|
|||
passthru.shellPath = "/bin/git-annex-shell"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a short comment here explaining this? (Basically just what you said in the body of your PR)
And could you change the base branch from master
to haskell-updates
? We try to send all haskell-related PRs to the haskell-updates
branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, one sec.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cdepillabout donezo! :)
cd6a75b
to
30634e4
Compare
@ofborg build haskellPackages.git-annex git-annex |
Uh-oh, it looks like $ nix-build -A git-annex
error: Package ‘hslua-module-version-1.0.1’ in /home/illabout/git/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix:141350 is marked as broken, refusing to evaluate.
a) To temporarily allow broken packages, you can use an environment variable
for a single invocation of the nix tools.
$ export NIXPKGS_ALLOW_BROKEN=1
Note: For `nix shell`, `nix build`, `nix develop` or any other Nix 2.4+
(Flake) command, `--impure` must be passed in order to read this
environment variable.
b) For `nixos-rebuild` you can set
{ nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.
c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
{ allowBroken = true; }
to ~/.config/nixpkgs/config.nix.
(use '--show-trace' to show detailed location information) This is likely because we are currently in the process of updating to GHC-9.0.2: #160733 @Chobbes are you interested in trying to fix this up? |
Doesn’t really matter, you can check if it works without building by checking the attribute. Merging into master is also an alternative for now.
… On 20. Feb 2022, at 09:17, Dennis Gosnell ***@***.***> wrote:
Uh-oh, it looks like git-annex doesn't currently build on haskell-updates:
$ nix-build -A git-annex
error: Package ‘hslua-module-version-1.0.1’ in /home/illabout/git/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix:141350 is marked as broken, refusing to evaluate.
a) To temporarily allow broken packages, you can use an environment variable
for a single invocation of the nix tools.
$ export NIXPKGS_ALLOW_BROKEN=1
Note: For `nix shell`, `nix build`, `nix develop` or any other Nix 2.4+
(Flake) command, `--impure` must be passed in order to read this
environment variable.
b) For `nixos-rebuild` you can set
{ nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.
c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
{ allowBroken = true; }
to ~/.config/nixpkgs/config.nix.
(use '--show-trace' to show detailed location information)
This is likely because we are currently in the process of updating to GHC-9.0.2: #160733
@Chobbes are you interested in trying to fix this up?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because your review was requested.
|
Not sure what you want me to do. I have tested that it still builds in master, and that I can set the shell appropriately for a user. In the version based off of
I don't really know anything about the migration to ghc-9.0.2, so I'm not really interested in fixing that up (though, if somebody wants to point me in the right direction I might look into it in the future --- but probably not soon, unless this will be a quick fix). Should I set this branch to be based on |
Yes, presumably it'd be stuck on |
30634e4
to
f881f16
Compare
f881f16
to
5fef98b
Compare
Git annex provides a login shell for restricted access: https://git-annex.branchable.com/git-annex-shell/ This was not exposed with `passthru.shellPath` before, so you could not set a user's shell to `haskellPackages.git-annex` declaratively before this change.
5fef98b
to
89eac7c
Compare
Alright, I got this pointed back at master, and tested building my system with it and it seems good to go :). Thanks for all the help, I appreciate it! Let me know if I need to make any further changes. |
@ofborg build git-annex |
Motivation for this change
Git annex comes with a shell (
/bin/git-annex-shell
), which can be used as a restricted login shell.https://git-annex.branchable.com/git-annex-shell/
Unfortunately, you can't set a user's shell to
pkgs.haskellPackages.git-annex
because it was missing theshellPath
attribute. Now you can!Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes