Skip to content
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
base: 65e93e3f5c58
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 481fe76e6368
Choose a head ref
  • 10 commits
  • 9 files changed
  • 2 contributors

Commits on Sep 28, 2017

  1. guile-modules: rename top level attributes to be consistent 

    (cherry picked from commit d7d33bd)
    @vyp @globin
    vyp authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    debc5a9 View commit details
    Browse the repository at this point in the history

  2. guile-modules: add vyp as maintainer to unmaintained guile modules 

    (cherry picked from commit 796b693)
    @vyp @globin
    vyp authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    8530b3a View commit details
    Browse the repository at this point in the history

  3. guile-modules: stylistic nix expression changes to modules with sole 

    maintainer vyp

(cherry picked from commit 3579d7e)
    @vyp @globin
    vyp authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    0aa13f1 View commit details
    Browse the repository at this point in the history

  4. guile-gnome: remove taktoa and amiloradovsky from maintainers and add 

    vyp

See discussion in [1].

[1]: #29732

(cherry picked from commit 16012ff)
    @vyp @globin
    vyp authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    3deecec View commit details
    Browse the repository at this point in the history

  5. guile-gnome: code style formatting nitpicks 

    (cherry picked from commit 88ef99e)
    @vyp @globin
    vyp authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    3062d28 View commit details
    Browse the repository at this point in the history

  6. guile-gnome: fix build by building gwrap with guile-2.0 

    Apparently gwrap will not compile with guile-2.2 [1], even though the
news for version 1.9.15 says it "allows" Guile 2.2 [2]:

> it will _not_ compile using 2.2

Furthermore, it seems like it isn't being developed anymore either [1]:

> Also note that g-wrap itself is not being further developed anymore,
> it is recommended for new projects to use Guile's dynamic FFI.

Also, guile-gnome-2.16.5 is apparently compatible with guile-2.2 [3],
but I'm not sure how they built it with guile-2.2 because gwrap 1.9.15
(latest release) apparently doesn't build with guile-2.2. (And certainly
when I try to build gwrap 1.9.15 with guile-2.2 it doesn't work. Maybe
it can be made to work with certain compile flags, but I haven't pursued
that further due to [1] anyway.) This is why guile-gnome is still on
2.16.4 here. Because, although 2.16.5 can still (apparently) build with
guile-2.0.14, guile_2_0 is only at guile-2.0.13.

So to update guile-gnome to 2.16.5, guile_2_0 would first have to be
updated to 2.0.14.

[1]: http://lists.nongnu.org/archive/html/g-wrap-dev/2016-08/msg00001.html
[2]: http://www.nongnu.org/g-wrap/news.html
[3]: https://www.gnu.org/software/guile-gnome/news.html

(cherry picked from commit f1b7d0a)
    @vyp @globin
    vyp authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    1daada3 View commit details
    Browse the repository at this point in the history

  7. gwrap: code style nits 

    (cherry picked from commit 468626c)
    @vyp @globin
    vyp authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    37f1f9b View commit details
    Browse the repository at this point in the history

  8. gwrap: switch maintainer from taktoa to vyp 

    (cherry picked from commit de9c86f)
    @vyp @globin
    vyp authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    3d9e5a1 View commit details
    Browse the repository at this point in the history

  9. gwrap: set version in mkDerivation 

    (cherry picked from commit d063880)
    @vyp @globin
    vyp authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    3d45679 View commit details
    Browse the repository at this point in the history

  10. guile-gnome: nitpicks fixed 

    (cherry picked from commit b3dab5b)
    @globin
    globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    481fe76 View commit details
    Browse the repository at this point in the history