Skip to content

X updates#48

Merged
shlevy merged 23 commits intoNixOS:x-updatesfrom
shlevy:x-updates
Jul 14, 2012
Merged

X updates#48
shlevy merged 23 commits intoNixOS:x-updatesfrom
shlevy:x-updates

Conversation

@shlevy
Copy link
Copy Markdown
Member

@shlevy shlevy commented Jul 14, 2012

Merged from master and updated x.org to 7.7, not sure if I should push this kind of thing directly when it's just a branch.

edolstra and others added 20 commits May 15, 2012 21:13
svn path=/nixpkgs/branches/x-updates/; revision=34124
svn path=/nixpkgs/branches/x-updates/; revision=34125
svn path=/nixpkgs/branches/x-updates/; revision=34127
svn path=/nixpkgs/branches/x-updates/; revision=34130
svn path=/nixpkgs/branches/x-updates/; revision=34131
  only used for tests (which we don't run anyway), and it will cause a
  cyclic dependency problem if we enable OpenGL support in Cairo.

svn path=/nixpkgs/branches/x-updates/; revision=34132
svn path=/nixpkgs/branches/x-updates/; revision=34141
svn path=/nixpkgs/branches/x-updates/; revision=34142
svn path=/nixpkgs/branches/x-updates/; revision=34143
  driver fails to build (because libdrm removed some header files on
  which it depends).

svn path=/nixpkgs/branches/x-updates/; revision=34144
svn path=/nixpkgs/branches/x-updates/; revision=34145
svn path=/nixpkgs/branches/x-updates/; revision=34147
svn path=/nixpkgs/branches/x-updates/; revision=34179
  versions from 001.  Urgh.)

svn path=/nixpkgs/branches/x-updates/; revision=34180
  run autoreconf:

    buildInputs = [ autoreconfHook ];

  is essentially equivalent to

    buildInputs = [ autoconf automake libtool ];
    preConfigure = "autoreconf -i";

svn path=/nixpkgs/branches/x-updates/; revision=34181
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
_XkbDupString was migrated to Xstrdup
@shlevy
Copy link
Copy Markdown
Member Author

shlevy commented Jul 14, 2012

With last two commits, xorg server builds. Not sure if it works yet though.

shlevy added 3 commits July 14, 2012 16:16
There may be others, these are just the ones that needed it for my configuration to build
@shlevy shlevy merged commit a47ba7a into NixOS:x-updates Jul 14, 2012
wavewave pushed a commit to wavewave/nixpkgs that referenced this pull request Feb 16, 2015
r-ryantm pushed a commit to r-ryantm/nixpkgs that referenced this pull request Jul 4, 2018
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libskk/versions.

Version release notes (from GitHub):
 * Don't consume key release events [NixOS#52]
 * Improve hankaku katakana conversion [NixOS#51]
 * Use the same typing rule in dict-edit mode [NixOS#50]
 * Add `abort-to-latin` and `abort-to-latin-unhandled` command [NixOS#48]
 * Add more z-* shortcuts from DDSKK
 * Fix memory leak caused by Vala array conversion
 * Bump build requirements (glib >= 2.36, valadoc >= 0.40)

These checks were done:

- built on NixOS
- /nix/store/bdfn6ravpxm5qrgf8j9zfip4w98d76i9-libskk-1.0.4/bin/skk passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.0.4 with grep in /nix/store/bdfn6ravpxm5qrgf8j9zfip4w98d76i9-libskk-1.0.4
- directory tree listing: https://gist.github.com/5b1ab808d49b2ef79a30b2188305f5e4
- du listing: https://gist.github.com/3dc4ba1b5b8124a3ac41c17b89fb5260
@r-ryantm r-ryantm mentioned this pull request Jul 4, 2018
xeji pushed a commit that referenced this pull request Jul 8, 2018
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libskk/versions.

Version release notes (from GitHub):
 * Don't consume key release events [#52]
 * Improve hankaku katakana conversion [#51]
 * Use the same typing rule in dict-edit mode [#50]
 * Add `abort-to-latin` and `abort-to-latin-unhandled` command [#48]
 * Add more z-* shortcuts from DDSKK
 * Fix memory leak caused by Vala array conversion
 * Bump build requirements (glib >= 2.36, valadoc >= 0.40)

These checks were done:

- built on NixOS
- /nix/store/bdfn6ravpxm5qrgf8j9zfip4w98d76i9-libskk-1.0.4/bin/skk passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.0.4 with grep in /nix/store/bdfn6ravpxm5qrgf8j9zfip4w98d76i9-libskk-1.0.4
- directory tree listing: https://gist.github.com/5b1ab808d49b2ef79a30b2188305f5e4
- du listing: https://gist.github.com/3dc4ba1b5b8124a3ac41c17b89fb5260
mattpolzin added a commit to mattpolzin/nixpkgs that referenced this pull request Nov 30, 2023
Cross compilation failed for me with the following message:
24/85 Test NixOS#48: charis7 ..........................   Passed    0.02 sec
      Start  1: nolib-stdc++-graphite2_core
Could not find executable readelf

In other words, the check failed because one of the tests uses readelf and when cross-compiling this tool has a prefix for the target architecture.
Hyphastorm pushed a commit to Hyphastorm/nixpkgs that referenced this pull request Apr 1, 2025
K900 pushed a commit to K900/nixpkgs that referenced this pull request Aug 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants