Skip to content

Games updates#136

Merged
7c6f434c merged 10 commits intoNixOS:masterfrom
jcumming:master
Oct 11, 2012
Merged

Games updates#136
7c6f434c merged 10 commits intoNixOS:masterfrom
jcumming:master

Conversation

@jcumming
Copy link
Contributor

@jcumming jcumming commented Oct 5, 2012

Update openttd, widelands.
Add rili and uqm.

@7c6f434c
Copy link
Member

7c6f434c commented Oct 5, 2012

I think you don't understand how Github pull requests work, as they work in a perverted way.

Your later zfs commits got added to this pull request automatically, because GitHub keeps branch names in pull requests and auto-updates...

Also, very long descriptions are supposed to be entered into longDescription meta attribute, with a brief summary in description attribute.

@jcumming
Copy link
Contributor Author

jcumming commented Oct 5, 2012

Okay. Descriptions cleaned up, and zfs/spl moved to a new branch.

@vcunat
Copy link
Member

vcunat commented Oct 10, 2012

To me it seems fine, if the games build and run.

I find the pull request semantics very useful, as you can actually update the request. One only has to know it, to adopt a suitable workflow... I prefer separate feature branches anyway.

@jcumming
Copy link
Contributor Author

I checked the games all build:

[jack@needle:nixpkgs]$ nix-build -A pkgs.widelands
/nix/store/nycp0vrrg2y5qhcajv8xmy8xqkihcy8d-widelands-build17
[jack@needle:nixpkgs]$ nix-build -A pkgs.rili
/nix/store/apdh5pxnyy7w4hwcfvd8bsqcik2w0k4r-ri_li-2.0.1
[jack@needle:nixpkgs]$ nix-build -A pkgs.openttd
/nix/store/g7nzkdzkw9hxis7s17m398wwwbbyfqs4-openttd-1.2.2
[jack@needle:nixpkgs]$ nix-build -A pkgs.uqm
/nix/store/azy9nzlhczkhsswi4z15kb7d83wrcjbb-uqm-0.7.0

@7c6f434c
Copy link
Member

vcunat: I know how to (ab)use this, but it just makes the discussion harder to follow (and in big discussion it is easy to add an extra change without people noticing and without the submitter understanding they didn't notice).

@7c6f434c
Copy link
Member

If it were my pull request, I'd probably force-push collapsed (i.e. without commit-revert pairs) history with the same result. But seems fine anyway.

7c6f434c added a commit that referenced this pull request Oct 11, 2012
@7c6f434c 7c6f434c merged commit 5aa665d into NixOS:master Oct 11, 2012
edolstra pushed a commit to edolstra/nixpkgs that referenced this pull request Oct 1, 2013
s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings
mweinelt added a commit to mweinelt/nixpkgs that referenced this pull request Dec 8, 2019
Disables support for Javascript and PHP:
- Javascript requires an old version of v8
- PHP requires a larger number of dependencies in addition to php-embed

Changelog [1]:

  New features
    - core: add option weechat.look.nick_color_hash_salt to shuffle nick colors (issue NixOS#635)
    - core: add different icons sizes (16x16 to 512x512) (issue NixOS#1347)
    - core: add file weechat.desktop
    - core: add reverse of string for screen in evaluation of expressions with "revscr:"
    - core: add length of string (number of chars and on screen) in evaluation of expressions with "length:xxx" and "lengthscr:xxx"
    - core: add calculation of expression in evaluation of expressions with "calc:xxx" (issue NixOS#997)
    - core: add optional default path (evaluated) in completion "filename"
    - core: add support of modifiers in evaluation of expressions with "modifier:name,data,string"
    - api: add modifier "color_encode_ansi" (issue NixOS#528)
    - api: add modifier "eval_path_home"
    - irc: add filters on raw buffer (issue NixOS#1000)
    - irc: add option irc.look.display_pv_warning_address to display a warning in private buffer if the remote nick address has changed (issue NixOS#892)
    - irc: add server option "ssl_password" (issue NixOS#115, issue NixOS#1416)
    - irc: add "user" in output of irc_message_parse (issue NixOS#136)
    - irc: add options irc.color.message_kick and irc.color.reason_kick (issue NixOS#683, issue NixOS#684)
    - logger: add option logger.file.color_lines (issue NixOS#528, issue NixOS#621)
    - script: add options "-ol" and "-il" in command "/script list" to send translated string with list of scripts loaded, display "No scripts loaded" if no scripts are loaded
    - xfer: add option xfer.file.download_temporary_suffix with default value ".part" (issue NixOS#1237)

  Bug fixes
    - core: set buffer name, short name and title only if the value has changed
    - core: fix scrolling up in bare mode when switched to bare mode at the top of the buffer (issue NixOS#899, issue NixOS#978)
    - core: optimize load of configuration files
    - core: fix window separators not respecting window splits (issue NixOS#630)
    - core: fix cursor mode info when prefix_align is none and with words split across lines (issue NixOS#610, issue NixOS#617, issue NixOS#619)
    - core: add support of reverse video in ANSI color codes
    - core: fixed segfault during excessive evaluation in function string_repeat (issue NixOS#1400)
    - buflist: fix extra spaces between buffers when conditions are used to hide buffers (regression introduced in version 2.6) (issue NixOS#1403)
    - irc: do not automatically open a channel with name "0" (issue NixOS#1429)
    - irc: remove option irc.network.channel_encode, add server option "charset_message" to control which part of the IRC message is decoded/encoded to the target charset (issue NixOS#832)
    - irc: use path from option xfer.file.upload_path to complete filename in command "/dcc send" (issue NixOS#60)
    - logger: fix write in log file if it has been deleted or renamed (issue NixOS#123)
    - python: send "bytes" instead of "str" to callbacks in Python 3 when the string is not UTF-8 valid (issue NixOS#1389)
    - relay: send message "_buffer_title_changed" to clients only when the title is changed
    - xfer: fix memory leak when a xfer is freed and when the plugin is unloaded

  Tests
    - unit: add tests on GUI color functions

  Build
    - core: fix build on Haiku (issue NixOS#1420)
    - core: fix build on Alpine
    - core: remove file FindTCL.cmake
    - core: display an error on missing dependency in CMake (issue NixOS#916, issue NixOS#956)
    - debian: disable Javascript plugin on Debian Sid and Ubuntu Eoan
    - debian: build with Guile 2.2
    - guile: add support of Guile 2.2, disable /guile eval (issue NixOS#1098)
    - python: add detection of Python 3.8

[1] https://weechat.org/files/changelog/ChangeLog-2.7.html
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Dec 10, 2019
Disables support for Javascript and PHP:
- Javascript requires an old version of v8
- PHP requires a larger number of dependencies in addition to php-embed

Changelog [1]:

  New features
    - core: add option weechat.look.nick_color_hash_salt to shuffle nick colors (issue NixOS#635)
    - core: add different icons sizes (16x16 to 512x512) (issue NixOS#1347)
    - core: add file weechat.desktop
    - core: add reverse of string for screen in evaluation of expressions with "revscr:"
    - core: add length of string (number of chars and on screen) in evaluation of expressions with "length:xxx" and "lengthscr:xxx"
    - core: add calculation of expression in evaluation of expressions with "calc:xxx" (issue NixOS#997)
    - core: add optional default path (evaluated) in completion "filename"
    - core: add support of modifiers in evaluation of expressions with "modifier:name,data,string"
    - api: add modifier "color_encode_ansi" (issue NixOS#528)
    - api: add modifier "eval_path_home"
    - irc: add filters on raw buffer (issue NixOS#1000)
    - irc: add option irc.look.display_pv_warning_address to display a warning in private buffer if the remote nick address has changed (issue NixOS#892)
    - irc: add server option "ssl_password" (issue NixOS#115, issue NixOS#1416)
    - irc: add "user" in output of irc_message_parse (issue NixOS#136)
    - irc: add options irc.color.message_kick and irc.color.reason_kick (issue NixOS#683, issue NixOS#684)
    - logger: add option logger.file.color_lines (issue NixOS#528, issue NixOS#621)
    - script: add options "-ol" and "-il" in command "/script list" to send translated string with list of scripts loaded, display "No scripts loaded" if no scripts are loaded
    - xfer: add option xfer.file.download_temporary_suffix with default value ".part" (issue NixOS#1237)

  Bug fixes
    - core: set buffer name, short name and title only if the value has changed
    - core: fix scrolling up in bare mode when switched to bare mode at the top of the buffer (issue NixOS#899, issue NixOS#978)
    - core: optimize load of configuration files
    - core: fix window separators not respecting window splits (issue NixOS#630)
    - core: fix cursor mode info when prefix_align is none and with words split across lines (issue NixOS#610, issue NixOS#617, issue NixOS#619)
    - core: add support of reverse video in ANSI color codes
    - core: fixed segfault during excessive evaluation in function string_repeat (issue NixOS#1400)
    - buflist: fix extra spaces between buffers when conditions are used to hide buffers (regression introduced in version 2.6) (issue NixOS#1403)
    - irc: do not automatically open a channel with name "0" (issue NixOS#1429)
    - irc: remove option irc.network.channel_encode, add server option "charset_message" to control which part of the IRC message is decoded/encoded to the target charset (issue NixOS#832)
    - irc: use path from option xfer.file.upload_path to complete filename in command "/dcc send" (issue NixOS#60)
    - logger: fix write in log file if it has been deleted or renamed (issue NixOS#123)
    - python: send "bytes" instead of "str" to callbacks in Python 3 when the string is not UTF-8 valid (issue NixOS#1389)
    - relay: send message "_buffer_title_changed" to clients only when the title is changed
    - xfer: fix memory leak when a xfer is freed and when the plugin is unloaded

  Tests
    - unit: add tests on GUI color functions

  Build
    - core: fix build on Haiku (issue NixOS#1420)
    - core: fix build on Alpine
    - core: remove file FindTCL.cmake
    - core: display an error on missing dependency in CMake (issue NixOS#916, issue NixOS#956)
    - debian: disable Javascript plugin on Debian Sid and Ubuntu Eoan
    - debian: build with Guile 2.2
    - guile: add support of Guile 2.2, disable /guile eval (issue NixOS#1098)
    - python: add detection of Python 3.8

[1] https://weechat.org/files/changelog/ChangeLog-2.7.html

(cherry picked from commit d1cb8bf)
mweinelt added a commit to mweinelt/nixpkgs that referenced this pull request Feb 20, 2020
Disables support for Javascript and PHP:
- Javascript requires an old version of v8
- PHP requires a larger number of dependencies in addition to php-embed

Changelog [1]:

  New features
    - core: add option weechat.look.nick_color_hash_salt to shuffle nick colors (issue NixOS#635)
    - core: add different icons sizes (16x16 to 512x512) (issue NixOS#1347)
    - core: add file weechat.desktop
    - core: add reverse of string for screen in evaluation of expressions with "revscr:"
    - core: add length of string (number of chars and on screen) in evaluation of expressions with "length:xxx" and "lengthscr:xxx"
    - core: add calculation of expression in evaluation of expressions with "calc:xxx" (issue NixOS#997)
    - core: add optional default path (evaluated) in completion "filename"
    - core: add support of modifiers in evaluation of expressions with "modifier:name,data,string"
    - api: add modifier "color_encode_ansi" (issue NixOS#528)
    - api: add modifier "eval_path_home"
    - irc: add filters on raw buffer (issue NixOS#1000)
    - irc: add option irc.look.display_pv_warning_address to display a warning in private buffer if the remote nick address has changed (issue NixOS#892)
    - irc: add server option "ssl_password" (issue NixOS#115, issue NixOS#1416)
    - irc: add "user" in output of irc_message_parse (issue NixOS#136)
    - irc: add options irc.color.message_kick and irc.color.reason_kick (issue NixOS#683, issue NixOS#684)
    - logger: add option logger.file.color_lines (issue NixOS#528, issue NixOS#621)
    - script: add options "-ol" and "-il" in command "/script list" to send translated string with list of scripts loaded, display "No scripts loaded" if no scripts are loaded
    - xfer: add option xfer.file.download_temporary_suffix with default value ".part" (issue NixOS#1237)

  Bug fixes
    - core: set buffer name, short name and title only if the value has changed
    - core: fix scrolling up in bare mode when switched to bare mode at the top of the buffer (issue NixOS#899, issue NixOS#978)
    - core: optimize load of configuration files
    - core: fix window separators not respecting window splits (issue NixOS#630)
    - core: fix cursor mode info when prefix_align is none and with words split across lines (issue NixOS#610, issue NixOS#617, issue NixOS#619)
    - core: add support of reverse video in ANSI color codes
    - core: fixed segfault during excessive evaluation in function string_repeat (issue NixOS#1400)
    - buflist: fix extra spaces between buffers when conditions are used to hide buffers (regression introduced in version 2.6) (issue NixOS#1403)
    - irc: do not automatically open a channel with name "0" (issue NixOS#1429)
    - irc: remove option irc.network.channel_encode, add server option "charset_message" to control which part of the IRC message is decoded/encoded to the target charset (issue NixOS#832)
    - irc: use path from option xfer.file.upload_path to complete filename in command "/dcc send" (issue NixOS#60)
    - logger: fix write in log file if it has been deleted or renamed (issue NixOS#123)
    - python: send "bytes" instead of "str" to callbacks in Python 3 when the string is not UTF-8 valid (issue NixOS#1389)
    - relay: send message "_buffer_title_changed" to clients only when the title is changed
    - xfer: fix memory leak when a xfer is freed and when the plugin is unloaded

  Tests
    - unit: add tests on GUI color functions

  Build
    - core: fix build on Haiku (issue NixOS#1420)
    - core: fix build on Alpine
    - core: remove file FindTCL.cmake
    - core: display an error on missing dependency in CMake (issue NixOS#916, issue NixOS#956)
    - debian: disable Javascript plugin on Debian Sid and Ubuntu Eoan
    - debian: build with Guile 2.2
    - guile: add support of Guile 2.2, disable /guile eval (issue NixOS#1098)
    - python: add detection of Python 3.8

[1] https://weechat.org/files/changelog/ChangeLog-2.7.html

(cherry picked from commit d1cb8bf)
djfroofy pushed a commit to djfroofy/nixpkgs that referenced this pull request Feb 23, 2020
Disables support for Javascript and PHP:
- Javascript requires an old version of v8
- PHP requires a larger number of dependencies in addition to php-embed

Changelog [1]:

  New features
    - core: add option weechat.look.nick_color_hash_salt to shuffle nick colors (issue NixOS#635)
    - core: add different icons sizes (16x16 to 512x512) (issue NixOS#1347)
    - core: add file weechat.desktop
    - core: add reverse of string for screen in evaluation of expressions with "revscr:"
    - core: add length of string (number of chars and on screen) in evaluation of expressions with "length:xxx" and "lengthscr:xxx"
    - core: add calculation of expression in evaluation of expressions with "calc:xxx" (issue NixOS#997)
    - core: add optional default path (evaluated) in completion "filename"
    - core: add support of modifiers in evaluation of expressions with "modifier:name,data,string"
    - api: add modifier "color_encode_ansi" (issue NixOS#528)
    - api: add modifier "eval_path_home"
    - irc: add filters on raw buffer (issue NixOS#1000)
    - irc: add option irc.look.display_pv_warning_address to display a warning in private buffer if the remote nick address has changed (issue NixOS#892)
    - irc: add server option "ssl_password" (issue NixOS#115, issue NixOS#1416)
    - irc: add "user" in output of irc_message_parse (issue NixOS#136)
    - irc: add options irc.color.message_kick and irc.color.reason_kick (issue NixOS#683, issue NixOS#684)
    - logger: add option logger.file.color_lines (issue NixOS#528, issue NixOS#621)
    - script: add options "-ol" and "-il" in command "/script list" to send translated string with list of scripts loaded, display "No scripts loaded" if no scripts are loaded
    - xfer: add option xfer.file.download_temporary_suffix with default value ".part" (issue NixOS#1237)

  Bug fixes
    - core: set buffer name, short name and title only if the value has changed
    - core: fix scrolling up in bare mode when switched to bare mode at the top of the buffer (issue NixOS#899, issue NixOS#978)
    - core: optimize load of configuration files
    - core: fix window separators not respecting window splits (issue NixOS#630)
    - core: fix cursor mode info when prefix_align is none and with words split across lines (issue NixOS#610, issue NixOS#617, issue NixOS#619)
    - core: add support of reverse video in ANSI color codes
    - core: fixed segfault during excessive evaluation in function string_repeat (issue NixOS#1400)
    - buflist: fix extra spaces between buffers when conditions are used to hide buffers (regression introduced in version 2.6) (issue NixOS#1403)
    - irc: do not automatically open a channel with name "0" (issue NixOS#1429)
    - irc: remove option irc.network.channel_encode, add server option "charset_message" to control which part of the IRC message is decoded/encoded to the target charset (issue NixOS#832)
    - irc: use path from option xfer.file.upload_path to complete filename in command "/dcc send" (issue NixOS#60)
    - logger: fix write in log file if it has been deleted or renamed (issue NixOS#123)
    - python: send "bytes" instead of "str" to callbacks in Python 3 when the string is not UTF-8 valid (issue NixOS#1389)
    - relay: send message "_buffer_title_changed" to clients only when the title is changed
    - xfer: fix memory leak when a xfer is freed and when the plugin is unloaded

  Tests
    - unit: add tests on GUI color functions

  Build
    - core: fix build on Haiku (issue NixOS#1420)
    - core: fix build on Alpine
    - core: remove file FindTCL.cmake
    - core: display an error on missing dependency in CMake (issue NixOS#916, issue NixOS#956)
    - debian: disable Javascript plugin on Debian Sid and Ubuntu Eoan
    - debian: build with Guile 2.2
    - guile: add support of Guile 2.2, disable /guile eval (issue NixOS#1098)
    - python: add detection of Python 3.8

[1] https://weechat.org/files/changelog/ChangeLog-2.7.html

(cherry picked from commit d1cb8bf)
ethancedwards8 pushed a commit to ethancedwards8/nixpkgs that referenced this pull request Apr 2, 2021
postgresql: Use core `ln` from coreutils
@Janik-Haag Janik-Haag added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jun 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants