Skip to content

Add more hsc3 related packages#4691

Closed
krgn wants to merge 6 commits intoNixOS:masterfrom
krgn:add-hsc3
Closed

Add more hsc3 related packages#4691
krgn wants to merge 6 commits intoNixOS:masterfrom
krgn:add-hsc3

Conversation

@krgn
Copy link
Contributor

@krgn krgn commented Oct 27, 2014

This adds the following packages to the tree:

It also fixes a package marked broken, hmatrix-special, by adding a dependency to gsl.

@peti
Copy link
Member

peti commented Oct 27, 2014

I cannot apply this patch to master:

$ curl https://github.com/NixOS/nixpkgs/pull/4691.patch | git am
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 17675    0 17675    0     0  27925      0 --:--:-- --:--:-- --:--:-- 27966
Applying: Add hsc3 haskell package.
/home/simons/.nix-defexpr/.git/rebase-apply/patch:28: trailing whitespace.
  }; 
error: pkgs/applications/editors/emacs-modes/hsc3/default.nix: already exists in index
error: pkgs/development/libraries/haskell/hsc3/default.nix: already exists in index
error: patch failed: pkgs/top-level/all-packages.nix:9080
error: pkgs/top-level/all-packages.nix: patch does not apply
error: patch failed: pkgs/top-level/haskell-packages.nix:1270
error: pkgs/top-level/haskell-packages.nix: patch does not apply
Patch failed at 0001 Add hsc3 haskell package.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not edit these files manually. (Note the comment at the top!) If there are missing dependencies, then these should be added via caba2nix's PostProcess.hs module.

@peti peti added 6.topic: haskell General-purpose, statically typed, purely functional programming language new-package labels Oct 27, 2014
@krgn
Copy link
Contributor Author

krgn commented Oct 27, 2014

Okay, I'll look into it. Sorry for the mess :/

@peti
Copy link
Member

peti commented Oct 27, 2014

You should probably run git rebase origin/master to update the patch set relative to the current head of the Nixpkgs master branch, and then git push -fv to update this pull request with the latest version.

I can merge the PR manually, too, though, it's just going to take a little longer.

@krgn
Copy link
Contributor Author

krgn commented Oct 27, 2014

Yes, thats what I forgot to do. This should apply cleanly now.

@peti
Copy link
Member

peti commented Oct 27, 2014

hsc3-server doesn't seem to compile: http://hydra.cryp.to/build/212407/nixlog/2/raw. Am I missing something?

@krgn
Copy link
Contributor Author

krgn commented Oct 28, 2014

@peti ah I have to switch this to fetchgit, will update later

@peti
Copy link
Member

peti commented Oct 28, 2014

I merged the commits 34c3fb6, 0d01dd4, 47ffa3c, 2e48af0, 872bab6, and fbea3a1 to master already, so now only hsc3-server is still missing.

@krgn
Copy link
Contributor Author

krgn commented Oct 28, 2014

The upstream package is broken as well, I think this can be closed. Thanks for adding the other packages though!

@krgn krgn closed this Oct 28, 2014
@kaoskorobase
Copy link

Fwiw here's the corresponding issue kaoskorobase/hsc3-server#11, patches welcome ;)

@krgn
Copy link
Contributor Author

krgn commented Oct 30, 2014

@kaoskorobase yeah I forked and jumped down the rabbit hole, but discovered the api had changed quite a bit. When I know a bit more I'll make sure to ping you ;)

@kaoskorobase
Copy link

@krgn OK, I've fixed this and released version 0.9.1.

@krgn
Copy link
Contributor Author

krgn commented Nov 3, 2014

@kaoskorobase btw the package was merge here #4797

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants