mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00
Code Issues Wiki Activity
146855 commits 250 branches 124 tags 7.6 GiB
Commit graph

2368 commits

Author SHA1 Message Date
Frederik Rietdijk 6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
Frederik Rietdijk a87f698c39
Merge pull request #43946 from r-ryantm/auto-update/cutemaze 
cutemaze: 1.2.3 -> 1.2.4
 2018-07-22 08:22:04 +02:00
R. RyanTM 35425daec2 cutemaze: 1.2.3 -> 1.2.4 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cutemaze/versions.
 2018-07-21 19:48:12 -07:00
volth cc55a3ebcb treewide: fix build with disallowed aliases (#43872) 
fixes build with disallowed aliases
 2018-07-21 22:03:24 -04:00
Frederik Rietdijk ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Silvan Mosberger effbf001b9
dxx-rebirth: Fix build 
See also 8414fa2d6b
 2018-07-21 11:15:44 +02:00
Frederik Rietdijk 20bc614680
Merge pull request #43783 from r-ryantm/auto-update/commandergenius 
commandergenius: 2.2.0 -> 2.2.2
 2018-07-21 10:54:50 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Frederik Rietdijk 1a6af9f88e
Merge pull request #43857 from volth/unused 
[bot] treewide: remove unreferenced code
 2018-07-20 21:06:32 +02:00
volth 87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Frederik Rietdijk 8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer 26cd7bb90b
Merge pull request #43558 from herberteuler/nethack-qt 
nethack: add qt support on linux
 2018-07-19 00:34:24 -04:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs 
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
 2018-07-18 23:25:20 -04:00
R. RyanTM 8139663f66 commandergenius: 2.2.0 -> 2.2.2 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commandergenius/versions.
 2018-07-18 16:36:09 -07:00
Frederik Rietdijk 6d339e5863 Merge staging-next into staging 2018-07-16 17:14:44 +02:00
Franz Pletz a2eb1703e1
Merge pull request #43578 from rardiol/cdda 
cataclysm dda 2018-07-15
 2018-07-15 21:10:05 +00:00
Franz Pletz de24fd7525
nethack: add qt plugin wrapper 2018-07-15 23:06:59 +02:00
Ricardo Ardissone 5901dae673 cataclysm-dda-git: debug flag 2018-07-15 13:59:28 -03:00
Ricardo Ardissone 05c2aa212e cataclysm-dda-git: 2017-12-09 -> 2018-07-15 2018-07-15 13:59:20 -03:00
Robert Schütz 18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
Guanpeng Xu 935332d648 nethack: add qt support on linux 2018-07-15 14:18:55 +08:00
Herwig Hochleitner 5c2ccd13a3 dwarf-fortress: re-include stonesense fix 
This partially reverts commit dfc4744afd.

cc @matthewbauer
 2018-07-14 14:24:35 +02:00
Herwig Hochleitner 9125e448df dwarf-fortress.dwarf-therapist: restore DwarfTherapist program 2018-07-14 14:24:35 +02:00
Alvar b12597d128 openrct2: 0.1.2 -> 0.2.0 (#43386) 2018-07-14 00:51:03 +02:00
leenaars d6899cf8b9 orthorobot: 1.0 -> 1.1.1 (#43495) 2018-07-14 00:22:48 +02:00
Frederik Rietdijk 3e31d23d99 Merge master into staging 2018-07-13 19:34:19 +02:00
lewo 05d273a45e
Merge pull request #43302 from rardiol/hyperrogue 
hyperrogue: init at 10.4j
 2018-07-11 09:07:33 +02:00
Ricardo Ardissone 96a6e1f5b5 hyperrogue: init at 10.4j 2018-07-10 18:36:26 -03:00
Frederik Rietdijk f8701caafc Merge master into staging 2018-07-10 15:51:20 +02:00
Jan Tojnar 28b6f74c3f
gnome3.gconf: remove 2018-07-10 12:14:40 +02:00
Matthew Bauer 2bb4088f51 Merge pull request #43081 into master 
Closes #43081
 2018-07-09 17:46:10 -04:00
Matthew Bauer 97605d3e57
Merge pull request #43085 from matthewbauer/dwarf-fortress 
Dwarf Fortress refactors
 2018-07-09 17:40:16 -04:00
Matthew Bauer 3108f1eeaf Merge remote-tracking branch 'Baughn/nix-df' into dwarf-fortress 2018-07-09 16:24:21 -04:00
Matthew Bauer 812b0ec62e dwarf-fortress: recurse into themes 
Now the output of “nix-env” should be:

$ nix-env -qa -f . -A dwarf-fortress-packages
afro-graphics-44.10
autoreiv-44.03
cla-44.xx-v25
dwarf-fortress-0.43.05
dwarf-fortress-0.44.05
dwarf-fortress-0.44.09
dwarf-fortress-0.44.10
dwarf-fortress-0.44.11
dwarf-fortress-0.44.12
dwarf-therapist-40.1.0
gemset-44.10a
ironhand-44.10
jolly-bastion-44.10
legends-browser-1.17.1
mayday-44.10
obsidian-44.10
phoebus-44.10
rally-ho-44.10
soundsense-2016-1_196
spacefox-44.10a
taffer-44.10a
tergel-44.03
wanderlust-44.10
 2018-07-09 16:18:17 -04:00
Matthew Bauer 530427c7ab dwarf-fortress: refactors 
This will make it easier for people to access old versions.

You can now access attributes like:

- dwarf-fortress_0_44_11
- dwarf-fortress_0_43_05
- etc.
 2018-07-09 16:13:52 -04:00
Matthew Bauer cdd0ac7e54 dwarf-fortress: support older versions as well 
game.json now contains a dictionary of old game hashes. I have added
them for the last 3 releases.

- add script to generate hashes

  Makes it much easier to update game.json file.

- add updateScript meta

  This adds some info on the ./update.sh updateScript now available.

- cleanup updateScript

  - Add some more systems
  - Correctly detect source extensions (.zip or .tar.bz2)
  - Proper bash quoting

- fix update.sh

  - correctly detect latest df version
  - append to game.json instead of overwriting it

- update hashes for 44.12
 2018-07-09 16:13:53 -04:00
Ryan Mulligan 7937f82665 treewide: http -> https 2018-07-05 18:35:28 -07:00
Matthew Bauer aba6a3d7f4 dwarf-fortress: use fetchFromGitHub directly 
This avoids creating a second derivation to copy things from the
original. The new themes are now fixed output.
 2018-07-05 17:25:07 -04:00
Svein Ove Aas b0c7245ee5 dwarf-fortress: Add "lazy pack", config flags and some comments. 2018-07-05 20:48:52 +01:00
Svein Ove Aas 5012ce727a dwarf-fortress: Init TWBT at 6.46 2018-07-05 20:21:59 +01:00
Matthew Bauer a4c9492217
Merge pull request #43057 from Baughn/nix-df 
dwarf-fortress: Run legends-browser with a suitable working directory
 2018-07-05 00:10:13 -04:00
Svein Ove Aas 472d8dcb91 dwarf-fortress: Run legends-browser with a suitable working directory 2018-07-05 00:39:28 +01:00
Matthew Bauer ea6b31b496
Merge pull request #43043 from Baughn/nix-df 
dwarf-fortress: Fix themes & package Legends Browser
 2018-07-04 17:41:06 -04:00
Svein Ove Aas c8095af0cd dwarf-fortress: Init Legends Browser at 1.17.1 2018-07-04 22:26:23 +01:00
Matthew Bauer 75e2aca6ca
Merge pull request #42554 from numinit/df 
dwarf-fortress: 0.44.10 -> 0.44.11
 2018-07-04 16:56:20 -04:00
Svein Ove Aas 8c7461a348 dwarf-fortress: Don't check for dfVersion compatability on themes, which lack them. 2018-07-04 20:19:24 +01:00
Orivej Desh 1a76bd5552 ezquake: fix build after #41902 2018-07-03 12:44:57 +00:00
Orivej Desh 9641ab9a27 ivan: fix build after #41902 2018-07-03 12:41:18 +00:00
Orivej Desh 48272ebb6c liberal-crime-squad: fix darwin build after #41902 2018-07-03 12:37:58 +00:00