ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity
86,112 Commits 96 Branches 102 Tags 4.5 GiB
3afa246038
Commit Graph

1446 Commits

Author SHA1 Message Date
Vladimír Čunát
3afa246038 Merge branch 'staging' 
This includes a security update of expat.
 2016-06-29 07:47:04 +02:00
Arseniy Seroka
52a1df089f Merge pull request #16493 from ikervagyok/mineraft1.10 
minecraft-server: 1.9.4 -> 1.10.2
 2016-06-27 16:46:47 +03:00
Lengyel Balázs
b054e4a625 minecraft-server: 1.10 -> 1.10.2 2016-06-25 13:32:32 +02:00
Lengyel Balázs
d006617dca minecraft-server: 1.9.4 -> 1.10 2016-06-25 12:11:08 +02:00
Vladimír Čunát
6b27ceb006 Merge 'master' into staging and re-revert merge 
... from staging to master, reverted temporarily in aa9a04883e.
 2016-06-23 12:09:03 +02:00
Vladimír Čunát
aa9a04883e Revert "Merge branch 'staging'" due to glibc 
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
 2016-06-23 09:25:10 +02:00
Vladimír Čunát
c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Vladimír Čunát
ebf1cb28a2 openspades, arangodb: more #include error fixups 
... after gcc-5.4.
 2016-06-22 10:45:47 +02:00
Svein Ove Aas
7a37c1b6c3 factorio: Disable automatic updates 2016-06-20 20:21:58 +01:00
Svein Ove Aas
989990b3b7 factorio: Bump to 0.12.35 2016-06-20 20:15:52 +01:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages 
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
 2016-06-20 13:55:52 +02:00
Michael Raskin
e2fd5aa3ce tbe [the-butterfly-effect]: 0.9.2.1 -> 0.9.3.1 2016-06-19 16:09:09 +02:00
Vladimír Čunát
e757404555 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1279790
 2016-06-19 12:33:04 +02:00
Vladimír Čunát
97c484a10f treewide: fix #include errors after gcc-5.4 
They were mostly missing <cmath> or <math.h>.
 2016-06-19 10:18:30 +02:00
Louis Taylor
160aeab22d
openrw: init at 2016-06-29 
Closes #15794
 2016-06-16 15:54:22 +02:00
Ambroz Bizjak
b422df0e99 crrcsim: 0.9.12 -> 0.9.13 2016-06-14 21:50:53 +02:00
Arseniy Seroka
63dcc818e1 Merge pull request #16091 from ryantm/minecraft 
minecraft: use icon in jar
 2016-06-11 22:35:19 +03:00
Ryan Mulligan
40b661a850 minecraft: use icon in jar 
This removes the dependency on a wiki image download, which seemed bad
when I first introduced it. Unfortunately, they do not provide a 48x48
icon so we are not satisfying the minimal XDG standard.
 2016-06-10 07:16:36 -07:00
Joachim Fasting
589082646a Merge pull request #16097 from mimadrid/update/klavaro-3.02 
klavaro: 3.01 -> 3.02
 2016-06-10 00:18:39 +02:00
mimadrid
830c748ea4 Add myself as maintainer 2016-06-09 23:41:17 +02:00
mimadrid
f8a0f1ce68 klavaro: 3.01 -> 3.02 2016-06-09 20:49:26 +02:00
Tuomas Tynkkynen
a357edc0c6 Merge pull request #16013 from nicknovitski/typespeed-darwin 
typespeed: fix darwin compatibility
 2016-06-09 05:24:57 +03:00
Nick Novitski
487140e8ef typespeed: fix darwin compatibility 2016-06-09 02:07:40 +00:00
Joachim Fasting
628cd6f83a Merge pull request #15966 from pshendry/master 
terraria-server: 1.3.0.8 -> 1.3.1.1
 2016-06-06 16:44:07 +02:00
Paul Hendry
54f636371a terraria-server: 1.3.0.8 -> 1.3.1.1 2016-06-04 14:34:53 -07:00
Nick Novitski
3204c2753d gtypist: darwin compatibility (#15975) 2016-06-04 17:14:47 +02:00
Nikolay Amiantov
5191294e3d Merge pull request #15943 from sheenobu/bugfix/nethack/fix_xlogfile 
nethack: include xlogfile as copied file in nethackuserdir
 2016-06-03 19:39:51 +03:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Sheena Artrip
737e047439
nethack: include xlogfile as copied file in nethackuserdir 2016-06-03 02:46:34 -04:00
Nikolay Amiantov
919db46afd dwarf-therapist: remove useless symlink 2016-06-02 15:30:42 +03:00
Lluís Batlle i Rossell
c09bee391a Slight improvements to neverball package 2016-05-31 10:18:12 +03:00
Nikolay Amiantov
d16643c2dc wesnoth-dev: init at 1.13.4 2016-05-30 23:33:20 +03:00
Nikolay Amiantov
53dd68651a wesnoth: 1.12.5 -> 1.12.6 2016-05-30 23:33:20 +03:00
Nikolay Amiantov
01aa42a4ba crawl: 1.17.1 -> 1.18.0 2016-05-28 14:00:15 +03:00
Vladimír Čunát
81039713fa Merge branch 'master' into staging 
... to get the systemd update (rebuilding ~7k jobs).
 2016-05-26 16:50:22 +02:00
Nikolay Amiantov
ff0995707d steam-run: refactor, remove unneeded files and dependencies 2016-05-26 14:40:09 +03:00
Tobias Geerinckx-Rice
d37fe91396
scummvm: 1.7.0 -> 1.8.0 2016-05-25 02:06:47 +02:00
Arseniy Seroka
51cbd8b9bd Merge pull request #15651 from ikervagyok/minecraft 
minecraft-server: 1.9 -> 1.9.4
 2016-05-24 22:05:39 +03:00
Joachim Fasting
69b0ba2634
space-orbit: port to mkDerivation 
Also
- rename to space-orbit
- use mirror://debian
- add some meta information

See also #4210
 2016-05-24 14:02:04 +02:00
Lengyel Balázs
cf16abe9a9 minecraft-server: 1.9 -> 1.9.4 2016-05-23 22:34:52 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging 
That's to get mesa rebuild from master, as it's nontrivial.
 2016-05-23 09:02:10 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit 
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
 2016-05-22 12:09:23 +02:00
Michael Raskin
9cb61d3ac1 sgtpuzzles: create symlinks with sgt-puzzle- prefix for disambiguation, for example with net being provided by Samba 2016-05-20 11:21:52 +02:00
Tuomas Tynkkynen
b0d0752f2a treewide: Make explicit that 'dev' output of libXcursor is used 2016-05-19 10:04:39 +02:00
Tuomas Tynkkynen
c857552da8 treewide: Make explicit that 'dev' output of libX11 is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen
b51b458aed treewide: Make explicit that 'dev' output of fftwSinglePrec is used 2016-05-19 10:00:33 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00