3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

540 commits

Author SHA1 Message Date
Tadeo Kondrak e6f23b8b1e discord-{ptb,canary}: init; add update-discord 2019-06-23 11:50:09 -07:00
Alexei Robyn 671e53af67 update-luarocks: Use containing nixpkgs, ensure Lua drvs exist 2019-06-14 15:17:52 +10:00
Alexei Robyn 46c6b27633 update-luarocks: Several improvements
Changes:
- Fetches rocks and builds Nix expressions for them in parallel
- Passes 'maintainers' list to luarocks-nix
- Constructs the luarocks argument list more cleanly, by using an
  indexed array
- Made indentation consistent
2019-06-13 20:00:00 +10:00
Alexei Robyn b7e6161b4d luarocks-packages.csv: Add remaining manual Lua expression packages
And their deps.
2019-06-13 19:58:20 +10:00
Alexei Robyn 5a249ec657 luarocks-packages.csv: Sort rows, add some missing maintainers 2019-06-13 19:52:41 +10:00
Matthieu Coudron 128ca15808 luaPackages.lpeg: 1.0.1 -> 1.0.2
and move to generated
2019-06-07 21:17:01 +09:00
Matthieu Coudron 2d77d620ce luaPackages.luaposix: move to generated 2019-06-06 14:39:14 +09:00
Matthieu Coudron 6fe580e30b luaPackages.mpack: removed duplicate manual package 2019-06-06 14:39:14 +09:00
Matthieu Coudron 9a3f13f95f luarocks-packages.csv: track maintainers in column
luarocks-nix doesn't use yet but it will in next update.
2019-06-06 12:15:13 +09:00
Matthieu Coudron dbf4c8051a luaPackages.lua-zlib: 1.1 -> 1.2
Renamed from luazlib to luarocks name lua-zlib.
Move to generated.
2019-06-06 12:12:15 +09:00
Matthieu Coudron 704358dcb5 luaPackages.luazip: 2007-10-30 -> 1.2.7 2019-06-05 16:20:27 +09:00
Matthieu Coudron 62d4e044e7 luaPackages.cjson: move to generated 2019-06-05 15:23:42 +09:00
Matthieu Coudron f2f1726a9f
Merge pull request #62669 from teto/lua-lsp
Add one latex and one lua LSP server
2019-06-05 12:36:07 +09:00
Jan Tojnar ea59f09946
maintainers/scripts/update.nix: various fixes (#62478)
maintainers/scripts/update.nix: various fixes
2019-06-04 18:24:16 +02:00
Matthieu Coudron 1b2e667ad6 luaPackages.lua-lsp: init at scm-2 2019-06-05 00:12:15 +09:00
Matthieu Coudron 021e04d0eb luaPackages.lpeglabel: init at 1.5.0 2019-06-05 00:11:56 +09:00
Matthieu Coudron 2fc71c7404 luaPackages.digestif: init at scm-1 2019-06-05 00:01:42 +09:00
Matthieu Coudron 87d1ab0905 luarocks-packages.csv: remove unnecessary servers
Now that luarocks-nix supports installation from rockspecs, it's
possible to remove some server specifications.
2019-06-04 19:11:42 +09:00
Matthieu Coudron 6736cc3e3a luarocks-packages.csv: Support luaversion
Opened with libreoffice calc which added the different commas
2019-06-04 18:57:42 +09:00
Matthieu Coudron 6402fbb6b8 update-luarocks: can install for a different lua
the recent luarocks can install for a different interpreter than the one
running luarocks.
Due to the way the update is done on nix, it seems more practical to use
this feature than running the script with different luarocks-nix ?
2019-06-04 18:57:42 +09:00
Matthieu Coudron e967121053 update-luarocks: contact only the specified server
use --server-only instead of --server, I haven't run any testing but it
should be a bit faster as well as more deterministic.
2019-06-04 18:57:42 +09:00
Matthieu Coudron cf45c7857a update-luarocks: doesn't crash when no arguments
define print_help function before it gets called.
2019-06-04 18:57:42 +09:00
Jan Tojnar e98c804cc9
maintainers/scripts/update.nix: Clean up
Make calling update.py a little nicer
2019-06-02 09:07:18 +02:00
Jan Tojnar c3dd31f177
maintainers/scripts/update.nix: handle null paths
Previously we did not handle non-existant paths making the program crash.
Let’s show a proper error.
2019-06-02 09:03:41 +02:00
Jan Tojnar 36b2012447
maintainers/scripts/update.nix: ignore overlays
It makes little sense for update.nix to try to update overlays; for most people,
they will point to a read-only repository most of the cases.
2019-06-02 08:55:29 +02:00
Jan Tojnar fa1bbe69fb
maintainers/scripts/update.nix: Do not store updateScripts
For update script parallelization, we have started calling builtins.toJSON
on updateScripts, which triggers evaluation of paths and therefore their copying
to Nix store. This breaks update scripts that assume that they exist in nixpkgs
like dwarf-fortress.

https://github.com/NixOS/nixpkgs/issues/61935

Let’s stringify the paths before JSONification to prevent the evaluation.
2019-06-02 08:10:17 +02:00
Vladimír Čunát ec5f5a21d7
Merge #60614: lua*Packages improvements 2019-05-12 10:01:48 +02:00
Will Dietz d7ff576529
Merge pull request #60343 from dtzWill/fix/luarocks-nix-formatting-and-awesome-doc-goodness
luarocks-nix,luaPackages: formatting and additions; awesome: docs!
2019-05-10 16:56:58 -05:00
Vladimír Čunát 110fb944f1
lua*Packages.http: 0.3 -> 0.4 (and generate)
One bugfix patch is included - merged upstream but not released yet.
knot-resolver wrapper would need to add binaryheap explicitly,
so it's migrated to the automatic LUA path discovery instead.
2019-05-01 11:28:47 +02:00
Vladimír Čunát 6108e63a01
lua*Packages.binaryheap: init at 0.4-1 (generated)
The generator wanted to do various changes in other packages as well,
but I didn't commit those.
2019-05-01 10:33:26 +02:00
Luka Blaskovic ca80cf922a lua: add rapidjson, lua-toml and lua-messagepack to generated packages 2019-04-30 08:35:29 +00:00
Will Dietz 55f7515442 luarocks: Add 'markdown' 2019-04-28 10:14:05 -05:00
Will Dietz 9a3ed7ea04 luaPackages: add ldoc 2019-04-28 10:14:05 -05:00
Will Dietz c37b3ab888 update-luarocks-packages: simplify server var, whitespace fixup 2019-04-28 10:08:56 -05:00
Matthieu Coudron e195a37fd9 luaPackages: rename std._debug to std__debug
Similarly rename std.normalize to std_normalize.
Having a dot in the name prevents some changes to the lua infrastructure,
for instance passing attribute names { std._debug }: to a function would fail with
`syntax error, unexpected ',', expecting '.' or '=',`
2019-04-14 16:38:23 +09:00
Matthieu Coudron f84594c7d7 update-luarocks-package: fix version pinning 2019-04-14 16:38:23 +09:00
nyanloutre 4b7d9dc868 fetch-kde-qt.sh: get hashes from metadata 2019-03-27 22:16:18 -04:00
Matthieu Coudron 68a72f1a47 luarocks-nix: bump to match luarocks
Also made changes to lua package generation system to account for packages like cqueues
that have one version per lua interpreter.
The csv file also accepts comments now.
2019-03-07 17:43:07 +09:00
Vladimír Čunát 3e442fd0f9
Revert "luaPackages.cqueues: move to generated"
This reverts commit c01fe375ca.
See the reverted commit on GitHub for discussion.  /cc PR #55305.
2019-03-04 20:34:07 +01:00
Will Dietz e49175ceae udpate-luarocks-package: drop 'lua' argument here as well 2019-02-25 23:53:21 -06:00
Matthieu Coudron 0cb3ee3bde luaPackages.lua-iconv: move to generated 2019-02-13 14:13:39 +09:00
Matthieu Coudron c84a431624 luaPackages.lpty: 1.2.1 -> 1.2.2 generated 2019-02-13 14:13:01 +09:00
Matthieu Coudron ce63fd4381 luaPackages.luabitop: generated 2019-02-13 14:12:44 +09:00
Matthieu Coudron c789b88cdd luaPackages.luacheck: 0.20 -> 0.23 generated 2019-02-13 14:11:14 +09:00
Matthieu Coudron 421110ae36 luaPackages.luaevent: 0.4.4 -> 0.4.6 generated 2019-02-13 14:10:35 +09:00
Matthieu Coudron 71b2e1f554 luaPackages.lgi: move to generated 2019-02-12 11:47:54 +09:00
Matthieu Coudron c01fe375ca luaPackages.cqueues: move to generated 2019-02-12 11:47:54 +09:00
Matthieu Coudron 84d4faf8d5 luaPackages.basexx: move to generated 2019-02-12 11:47:53 +09:00
Matthieu Coudron 582fa48e6f luaPackages.fifo: move to generated 2019-02-12 11:47:53 +09:00
Matthieu Coudron f0269de17f luaPackages.lpeg_patterns: move to generated 2019-02-12 11:47:53 +09:00
Matthieu Coudron aaeaa6d1c6 Add checkPhase for neovim (disabled by default) (#55266)
* neovim-unwrapped: now use lua environments

* mpv: use lua environments

* luaPackages.inspect: init at 3.1.1-0

* luaPackages.lgi: mark as a lua module

* luaPackages.vicious: mark as a lua module
2019-02-05 15:00:19 +00:00
Matthieu Coudron 2ba891788b Lua generate nix packages from luarocks (#54978)
* lua: generate packages from luarocks

* luarocks-nix: update

* removed packages already available in nixpkgs

* adressing reviews

update script can now accept another csv file as input with -c

* Remove obsolete comment
2019-02-04 11:30:58 +00:00
Jörg Thalheim 21bb1b0aac
Merge pull request #50990 from nlewo/pr-eval-release
Increase nix-instantiate heap size in eval-release.sh
2019-01-25 13:27:13 +00:00
Antoine Eiche 1f8c96054e eval-release.sh: increase nix-instantiate heap size to 2GB
Otherwise, nix-instantiate fails with
Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS
2019-01-25 12:47:00 +01:00
Eelco Dolstra 11cf7d6e1f
Fix copy-tarballs.pl 2019-01-24 16:01:49 +01:00
Frederik Rietdijk 87d993f641 fix update-python-libraries 2018-12-19 09:37:59 +01:00
volth 6d2edfb0b8 treewide: remove aliases evaluated to null 2018-12-14 16:27:53 +00:00
Frederik Rietdijk 74d0b82f29 buildPython*: add updateScript to passthru
All Python packages now have an updateScript. The script calls
`update-python-libraries` and passes it the position of the derivation
expression obtained using `meta.position`. This works fine in case a Nix
expression represents only a single derivation. If there are more in it,
`update-python-libraries` will fail.
2018-12-07 15:48:54 +01:00
Jan Tojnar 59a94b57f0
update.nix: Run update scripts in parallel
To make updating large attribute sets faster, the update scripts
are now run in parallel.

Please note the following changes in semantics:

- The string passed to updateScript needs to be a path to an executable file.
- The updateScript can also be a list: the tail elements will then be passed
  to the head as command line arguments.
2018-12-01 19:17:13 +01:00
Antoine Eiche ea90e519a2 Remane test-eval-release.sh to eval-release.sh
Since this script can also be used for non testing purposes.
2018-11-24 18:54:47 +01:00
volth cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
Robert Schütz 7a59be9c52 maintainers/scripts/update-python-libraries: compare versions semantically instead of lexicographically (#43120) 2018-07-06 19:32:40 +02:00
Eelco Dolstra 8d4068d9d1
pkgs/top-level/release.nix: Don't require Darwin to be supported 2018-07-04 17:53:02 +02:00
Matthew Bauer fb924af13f nixpkgs-lint.pl: use nix-shell for shebang
This is more portable.
2018-06-16 20:14:51 -04:00
berdario 595efb966d hydra-eval-faliures: Print Dependency failures as well as direct failures and update to Python3 (#29760)
* Print Dependency failures as well as direct failures and update to Python3

some package fail due to non-exposed dependencies and would thus not appear in the list, for example gcj

* hydra-eval-failures: simpler hashbang
2018-04-21 15:30:24 -05:00
Shea Levy 29d739a86a
copy-tarballs.pl: Set the right ACL for new keys. 2018-03-31 21:06:41 -04:00
Matthew Bauer 124d47c65a meta: fix fallout from #36275 2018-03-18 00:16:43 -05:00
Jan Tojnar 2381bcd86f
maintainers/scripts/update.nix: use saner nubbing 2018-03-13 18:04:47 +01:00
Jan Tojnar 9b94dd0999
maintainers/scripts/update.nix: fix error message 2018-03-13 09:04:12 +01:00
Frederik Rietdijk f92295abc3 Python: fix update script for nix 2.0 2018-03-10 12:41:27 +01:00
Graham Christensen f7da7fa0c3 Revert "Revert "Convert maintainer file entries to attributes, add github handles"" 2018-03-04 05:13:19 +01:00
Graham Christensen b9f1a76f30 Revert "Convert maintainer file entries to attributes, add github handles"
This reverts commit aa47bac04f.
2018-03-03 22:34:17 -05:00
Graham Christensen f6e943fd40 Revert "maintainers/scripts: improve github handle checker"
This reverts commit a2c708c256.
2018-03-03 22:34:17 -05:00
Profpatsch a2c708c256 maintainers/scripts: improve github handle checker
Now also finds name-clashes for github handles who never contributed to nixpkgs
before. Also deals with too many request errors.
2018-03-04 03:26:44 +01:00
Profpatsch aa47bac04f Convert maintainer file entries to attributes, add github handles
Based on https://github.com/NixOS/nixpkgs/pull/34842, the
nix-instantiate output was pretty-printed and the validity of the github handles
manually verified, by automatically checking whether the user handles exist on
github (https://github.com/userhandle, status 200 or 404).
Each handle under 5 characters was manually checked (because the collision
probability with non-maintainer accounts is high), each missing entry was
manually researched.

The script used is kept in `maintainers/scripts` as an example of how to work
with the mainainers list through nix’ JSON interface.
2018-03-04 03:26:44 +01:00
Jan Tojnar 4a7fc5f062
maintainers/scripts/gnome.sh: remove 2018-03-01 02:53:01 +01:00
Jan Tojnar cb5c630db2
maintainers/scripts/update.nix: allow updating package collections 2018-03-01 02:53:00 +01:00
Jan Tojnar f929f38d5e
maintainers/scripts/update.nix: deduplicate packages
Lot of my GNOME packages have several legacy aliases,
which causes them to be updated multiple times.

This patch uses lib.unique to remove the duplicates.
2018-03-01 02:53:00 +01:00
Will Dietz 9af5be98af debian-patches.sh: patch-tracker is long-since dead, fix to use sources? 2018-01-17 13:17:45 -06:00
Thomas Tuegel 1c004da67e
Merge branch 'bugfix/kwidgetsaddons/5.42.1' into merge/qt-5.10.0 2018-01-15 19:08:27 -06:00
Thomas Tuegel 617c4f4220
Merge branch 'feature/qt-5/5.10.0' into merge/qt-5.10.0 2018-01-15 18:49:13 -06:00
Vladimír Čunát 4de01b6723
rebuild-amount.sh: add --print option (PR #33693)
to allow additionally listing all the rebuilt packages.
2018-01-14 21:12:29 +01:00
Eelco Dolstra 1b0f696d10
Fix copy-tarballs.pl 2018-01-04 18:15:20 +01:00
Bastian Köcher e5b1a5724e Qt5: 5.9.3 -> 5.10.0 2018-01-02 14:01:37 +01:00
Frederik Rietdijk 2c9ecb4f4d update-python-libraries: commit updates and specify update kind
This commit introduces two new features:

1. specify with --target whether major, minor or patch updates should be made
2. use --commit to create commits for each of the updates
2017-12-30 12:15:19 +01:00
Joerg Thalheim 44917c46b1 travis: disable for pull requests
travis is too slow for us and confuse contributors, who think they have
to get travis tests green.
We have now pr bots instead.
2017-11-13 11:40:42 +00:00
Frederik Rietdijk 14da187ad6 Python update-python-libraries: fetch and update asynchronously 2017-11-05 11:08:38 +01:00
zraexy d04790c9e8 docs: 17.03 -> 17.09 2017-10-05 07:19:11 -08:00
Albert Safin 1ae19b6c4e gucharmap: 3.18.2 -> 10.0.1
- Gucharmap no longer follow the GNOME major versioning.
- Gucharmap no longer includes Unicode data. Instead the data should be
  downloaded from unicode.org.
2017-09-29 02:25:41 +07:00
Jan Tojnar 69698ec11c gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set

GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources
to update a single version of GNOME. Maintaining multiple versions just does not make sense.
Additionally, it makes viewing history using most Git tools bothersome.

This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes
the config variable for choosing packageset (`environment.gnome3.packageSet`), updates
the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`.

Closes: #29329

* maintainers/scripts/gnome: Use fixed GNOME 3 directory

Since we now allow only a single GNOME 3 package set, specifying
the working directory is not necessary.

This commit sets the directory to `pkgs/desktops/gnome-3`.
2017-09-24 12:15:50 +01:00
Robin Gloster 1554282290
maintainers/hydra-eval-failures: fix with new lib
lib/maintainers.nix now is a function
2017-09-24 11:31:59 +02:00
Robin Gloster df33d1a2fc
maintainers/hydra-eval-failures: catch fetching maintainers
Fails with some i686-linux build failures
2017-08-28 20:56:10 +02:00
Tuomas Tynkkynen 59ad93a4f3 travis: Hide more unnecessary build spam from installing nox
This should avoid the 28 lines of unnecessary spam about fetching stdenv
and bash:

````
=== Building pull request #28261
these paths will be fetched (0.51 MiB download, 2.50 MiB unpacked):
  /nix/store/2pm24nzym7z11nddnf6vmqhsqmzx9h3g-bash-4.4-p12-dev
  /nix/store/3n6g5nmyn63gsgjc7z03rsd88s2q7b7i-stdenv
  /nix/store/7mpcc6x6b3db595rsqr1qjckpaj1dym8-bash-4.4-p12-info
  /nix/store/d9hb8f6j2syq08hw97qajdcdkl9lwg9n-bash-4.4-p12-doc
fetching path ‘/nix/store/d9hb8f6j2syq08hw97qajdcdkl9lwg9n-bash-4.4-p12-doc’...
*** Downloading ‘https://cache.nixos.org/nar/013kcshsm2hzpngmrf4izq3ag8s9avrkhz5z8l8mgnxay1lxlz99.nar.xz’ to ‘/nix/store/d9hb8f6j2syq08hw97qajdcdkl9lwg9n-bash-4.4-p12-doc’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  357k  100  357k    0     0  3342k      0 --:--:-- --:--:-- --:--:-- 3408k
fetching path ‘/nix/store/2pm24nzym7z11nddnf6vmqhsqmzx9h3g-bash-4.4-p12-dev’...
*** Downloading ‘https://cache.nixos.org/nar/1225myjpymp5bv0x5zl08dmdz786jf86fshc2dwa3zgxasrppcfi.nar.xz’ to ‘/nix/store/2pm24nzym7z11nddnf6vmqhsqmzx9h3g-bash-4.4-p12-dev’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 54312  100 54312    0     0   231k      0 --:--:-- --:--:-- --:--:--  232k
fetching path ‘/nix/store/7mpcc6x6b3db595rsqr1qjckpaj1dym8-bash-4.4-p12-info’...
*** Downloading ‘https://cache.nixos.org/nar/04dzl4jlhxhisiby9lyw2k6q2w5ns3xy1h6gfdc14qn649lshy2f.nar.xz’ to ‘/nix/store/7mpcc6x6b3db595rsqr1qjckpaj1dym8-bash-4.4-p12-info’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  107k  100  107k    0     0  1179k      0 --:--:-- --:--:-- --:--:-- 1198k
fetching path ‘/nix/store/3n6g5nmyn63gsgjc7z03rsd88s2q7b7i-stdenv’...
*** Downloading ‘https://cache.nixos.org/nar/013xg2cnv9wf3fkhcl3b3b6iihqnwhy65m6ijb6ynwavy584w2xi.nar.xz’ to ‘/nix/store/3n6g5nmyn63gsgjc7z03rsd88s2q7b7i-stdenv’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  8640  100  8640    0     0   143k      0 --:--:-- --:--:-- --:--:--  148k
=== Reviewing PR 28261 : busybox: 1.26.2 -> 1.27.1, fix bootstrap
````

(From https://travis-ci.org/NixOS/nixpkgs/jobs/264390932)
2017-08-14 22:58:12 +03:00
Graham Christensen 3ffcbdd0f0 Merge branch 'master' into patch-3 2017-07-25 22:17:41 -04:00
Frederik Rietdijk d2aa638ee2 update-python-libraries script: don't forget to break when we actually find an update 2017-07-17 10:43:37 +02:00
Jörg Thalheim 451b23beb2 Merge pull request #27297 from jtojnar/fix/ghex
ghex: init at 3.18.3
2017-07-11 18:43:10 +01:00
Jan Tojnar bf60fbe2e1
ghex: init at 3.18.3 2017-07-11 10:05:06 +02:00
Frederik Rietdijk 54eeab4da0 Python: fix update script in case no PyPI releases are available for a given version 2017-07-03 20:18:47 +02:00
Frederik Rietdijk f0002ea292 Python: improve update script
- remove dead code
- improve readability
- skip fetchFromGitHub (#26320)
2017-06-06 17:20:32 +02:00
Frederik Rietdijk dce1c26e5d Python: fix update script
- use correct extension
- do not update expressions that have an url that does not contain pypi
- show warning in case request fails
2017-05-27 11:29:42 +02:00
Frederik Rietdijk dcc6a69bae Merge pull request #25583 from FRidh/updatescript
Python: update script for packages
2017-05-27 08:37:31 +02:00
Frederik Rietdijk fa8ee5d09b Python: update script for packages
This script determines whether there is an update available for the
package and if so, updates the version and sha256 attributes.

This only works for packages that have their own expression, and `pname`
and `sha256` attribute.
2017-05-27 08:34:38 +02:00
Vladimír Čunát 8004e79415
Merge branch 'master' into staging 2017-05-24 03:24:06 +02:00
Vladimír Čunát 304d30ce3f
all-tarballs: fixup evaluation (and the tarball job) 2017-04-14 10:31:31 +02:00
Tuomas Tynkkynen 7f8202bf83 Fix tarball evaluation
http://hydra.nixos.org/build/51460386

This seems the path of least resistance. Adding "x86_64-darwin" to
supportedSystems causes other errors.
2017-04-11 13:45:29 +03:00
Robin Gloster 80c916b6ce
docs: 16.09 -> 17.03 2017-03-30 17:36:44 +02:00
Shane Pearlman a31041a1b9 nix-diff.sh maintainer script: update usage message for new flags 2017-03-19 16:34:06 -07:00
Daiderd Jordan 55599d91d0 Merge pull request #23414 from shanemikel/nix-helper-scripts
add a script that "diffs" nix environment generations
2017-03-20 00:14:52 +01:00
Shane Pearlman d9f46aa58a nix-diff.sh maintainer script: "diffs" Nix environment generations
This script was inspired by Guix.  Read the source for documentation, or
invoke it with `nix-diff.sh -h` for a usage summary.
2017-03-19 15:51:06 -07:00
butterflya 55e477c1f1 Remove Python 2 specific syntax 2017-03-11 17:42:20 +01:00
butterflya 318189f26f Cleanup gnome.sh
No functional changes
2017-03-11 15:50:06 +01:00
Robin Gloster c5367a4409
maintainers/hydra-eval-failures: flush stdout more often 2017-03-02 11:46:17 +01:00
Domen Kožar 4c22b9529b
Add a script to get failures for hydra eval /cc @globin 2017-01-28 22:29:15 +01:00
Rok Garbas 56cb5b7609 update.nix moved to maintainers/scripts/update.nix 2016-12-18 16:45:33 +01:00
Domen Kožar 63d930878b travis: also evaluate nixpkgs-unstable 2016-12-15 22:43:14 +01:00
Michael Raskin 5383041ab7 vanity.sh: tolerate the fact that github login adder is too long 2016-09-26 19:24:22 +02:00
Hoang Xuan Phu 05a71f0910 fetch-kde-qt.sh: add bash safety flags 2016-09-18 21:16:07 +08:00
Thomas Tuegel f4bb247bd6
fetch-kde-qt.sh: modularize script allowing multiple versions 2016-08-25 10:07:03 -05:00
Thomas Tuegel c97c2bca34 kde5.applications: 16.04.3 -> 16.08.0 2016-08-18 21:02:28 -05:00
Matthew Justin Bauer 7b2bd9fbfe travis: build stdenv also 2016-08-13 15:34:57 -05:00
Domen Kožar 49222660fc Merge pull request #17256 from matthewbauer/patch-4
Travis fixes
2016-08-13 14:17:59 +02:00
Thomas Tuegel 4ee36f3112 kde5.plasma: 5.7.2 -> 5.7.3 2016-08-04 09:07:08 -05:00
Tuomas Tynkkynen d84cec1056 travis-nox-review-pr.sh: Fix nixpkgs manual build
The current command is actually building the 'manpages' package, not the
nixpkgs manual.
2016-08-02 22:44:46 +03:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Matthew Justin Bauer a30a34b6f3 nox: add git as build input
also: add nox as separate target to make build log more quiet
2016-07-29 20:54:02 -05:00
Thomas Tuegel 839a543d41 qt57: init at 5.7.0 2016-07-29 17:46:13 -05:00
Thomas Tuegel 06536879e7 kde5.plasma: 5.7.1 -> 5.7.2 2016-07-29 13:52:17 -05:00
Robert Helgesson 7f681d215b nix-generate-from-cpan: clean up build inputs
In particular remove those build inputs that are already mentioned among
the propagated build inputs. Fixes #10373.
2016-07-22 23:06:30 +02:00
Matthew Justin Bauer e18a91c47c travis: just use "unstable" channel for nix-shell 2016-07-18 23:00:22 -05:00
Rok Garbas cde541236a Merge pull request #16563 from matthewbauer/travis-new
travis: split build into matrix of 3
2016-07-15 17:47:45 +02:00
Thomas Tuegel 5630ac1d92 generate-kde-frameworks.sh: fix helper script path
- Fix a bug in the script which prevented it from finding its helper script.
- Automatically redirect the output of the script to make it even easier
  to use.
2016-07-13 13:54:59 -05:00
Thomas Tuegel 422ee37e52 kde5.applications: 16.04.2 -> 16.04.3
- Update from Applications 16.04.2 to 16.04.3.
- Remove the version number from the directory storing the Applications
  Nix expressions. It is not necessary to version the Nix expressions
  now that we keep only one version in Nixpkgs.
- Fix a bug in generate-kde-applications.sh which prevented it from
  finding its helper script.
- Automatically redirect the output of generate-kde-applications.sh to
  make the update script even easier to use.
2016-07-13 13:54:52 -05:00
Thomas Tuegel c8885106c1 kde5.plasma: 5.7.0 -> 5.7.1
- Update from Plasma 5.7.0 to 5.7.1.
- Remove the version number from the directory storing the Plasma Nix
  expressions. It is not necessary to version the Nix expressions now
  that we keep only one version in Nixpkgs.
- Fix a bug in generate-kde-plasma.sh which prevented it from finding
  its helper script.
- Automatically redirect the output of generate-kde-plasma.sh to make
  the update script even easier to use.
2016-07-13 13:54:42 -05:00
Matthew Bauer 7c37ac0edd travis: run nixpkgs-lint in build script
This will run nixpkgs-lint for each travis build. We'll disable
"nixpkgs-lint" for now, it was a little too verbose:

https://travis-ci.org/NixOS/nixpkgs/jobs/144290920
2016-07-12 21:34:58 +00:00
Matthew Bauer 5282a336a4 travis: build manuals to verify that they work
fixes #15109
2016-07-12 21:34:58 +00:00
Matthew Bauer 2892bbd07a travis: support nox 0.0.4 arguments
This adds the "slug" arguments and also the "token" argument. The slug
argument provides the "owner_name/repo_name" format base repo to use for
the pull request. The token argument provides the GitHub presonal access
token to use for the requests to the GitHub API.
2016-07-12 21:34:58 +00:00
Matthew Bauer 95b28da353 travis: use community supported language
Switch to the "community supported" Nix version of Travis.
2016-07-12 21:34:58 +00:00
Matthew Bauer f76e5ab0cf travis: split build into matrix of 3
This adds a 3rd matrix to be built by Travis. The new matrix "checks"
the NixPkgs evaluation so the other 2 can save their resources for
building. Hopefully, this will lead to less "out of space" errors that
seem to be happening with Travis. Also adds folding.
2016-07-12 21:34:58 +00:00
Jos van den Oever b42ff8182a kde frameworks: 5.22 -> 5.24 2016-07-12 17:59:48 +02:00
Jos van den Oever fd0373c589 kde plasma: 5.6.5 -> 5.7.0 2016-07-12 17:59:42 +02:00
Thomas Tuegel 592dcbc4bf Fix evaluation error in Qt/KDE packages
For now, the source hashes will continue to be stored in the Nixpkgs
tree. The package update instructions are updated.
2016-06-17 09:47:16 -05:00
Domen Kožar 5b7c6a11b5 travis-ci: remount only on linux 2016-06-16 11:18:45 +01:00
Domen Kožar 8ad607040e travis-ci: attempt to fix linux builds 2016-06-06 13:34:52 +01:00
Domen Kožar 473782b514 travis-ci: use --show-trace 2016-06-01 18:57:22 +01:00
Domen Kožar 926c9293cb travis-ci: don't check NixOS options on darwin 2016-05-31 18:58:59 +01:00
Domen Kožar d47dca41ce try using nox from nixpkgs (#15857)
* try using nox from nixpkgs

* release.nix: block on nox since otherwise travis-ci will fail hard
2016-05-31 12:59:24 +01:00
Marc Scholten 36cc45782b Enabled osx on travis (#15855) 2016-05-31 11:34:59 +01:00
Robert Helgesson 7ca412a2fa nix-generate-from-cpan: fix core module detection
This makes the detection of core modules a bit more robust by checking
the module inclusion in a pure Perl interpreter. This ensures that any
extra path in the `nix-generate-from-cpan` script's `PERL5LIB` does not
affect the generated package expression.
2016-05-18 20:39:44 +02:00
Joachim Fasting 27149b201a
travis: refine NixOS options check
Looks like --show-trace wasn't as useful as I'd hoped.  Also, because checking
nixos options is cheaper than checking the tarball, it makes sense to check the
options first to fail faster.
2016-05-15 11:55:17 +02:00
Eelco Dolstra 4f4ba0d3f4 copy-tarballs.pl: Add --exclude flag 2016-05-09 19:35:01 +02:00
Joachim Fasting 5b7a1b97d2
travis: also check NixOS options
This will at least catch simple errors in default values and is fairly
cheap, in terms of resource and time consumption, and adds very little
additional output unless there's a failure.
2016-05-07 21:30:13 +02:00
Eelco Dolstra a133a74c89 Remove cruft 2016-04-26 17:31:54 +02:00
Eelco Dolstra 35bd7708d5 copy-tarballs.pl: Use substituters to obtain tarballs 2016-04-18 15:18:25 +02:00
Eelco Dolstra f1f79505fc find-tarballs.nix: Handle stdenv bootstrap fetchurl 2016-04-08 14:00:47 +02:00
Eelco Dolstra e2ad72342e nix-generate-from-cpan: Skip "if" package since it's part of Perl now 2016-03-03 12:43:11 +01:00
Eelco Dolstra 50b950fe8d nix-generate-from-cpan: Don't quote names that don't need it 2016-03-03 12:43:11 +01:00
Eelco Dolstra 50e1e69c0a Remove unmaintained gnupdate script 2016-03-02 17:14:49 +01:00
Domen Kožar fe09260465 travis-ci: fix /etc/nix/nix.conf population 2016-02-28 19:18:07 +00:00
Domen Kožar 3069cab2e7 travis-ci: stop abusing hydra now that it pushes directly to cache 2016-02-28 08:25:08 +00:00
zimbatm 3110d60cf6 Merge pull request #10768 from rycee/refactor/nix-generate-from-cpan
nix-generate-from-cpan: large refactor
2016-02-26 00:40:15 +00:00
Domen Kožar 05730a9bf8 travis-ci: enable tarball job again (now we have more memory) 2016-02-25 15:59:43 +00:00
Vladimír Čunát e053971d81 tarball: fix the job
Find-tarballs was failing on some `requireFile` that was fixed-output
but didn't specify `outputHashMode`. Apparently, nix is fine with that
and uses the "flat" default, although that's undocumented.
2016-02-25 08:29:57 +01:00
Michael Raskin 3845649b89 vanity counter: update Github name search 2016-02-24 10:37:34 +01:00
Michael Raskin b4eebd86c1 Be less location-dependent 2016-02-20 16:12:50 +01:00
Robert Helgesson c90c30dd1e nix-generate-from-cpan: large refactor
This commit includes a substantial refactoring of
`nix-generate-from-cpan`. This somewhat simplifies the code through the
use of the CPAN::Meta module while adding the following features:

 - The program now takes an optional maintainer on the command line that
   is subsequently added into the generated package.

 - An attempt is made to convert the license specified inside the
   META.json or META.yaml file to a license in `stdenv.lib.licenses`.

 - An attempt is made to disambiguate attribute names of packages whose
   name is a reserved word in Nix.

 - Write logging output using Log::Log4perl.

 - Print module RSS feed URL. The RSS feed, hosted by MetaCPAN, can be
   used to track updates to the module.
2016-01-23 18:54:05 +01:00
Eelco Dolstra 5eb2804cdb copy-tarballs.pl: Create redirects before uploading file
This makes the script more robust to interruption.
2015-12-16 15:39:08 +01:00
Eelco Dolstra d5371eb029 copy-tarballs: Cache S3 lookups 2015-12-16 15:39:02 +01:00
Eelco Dolstra 7cd3d502bb copy-tarballs.pl: Revive extracting all tarballs from release.nix 2015-12-16 15:38:59 +01:00
Eelco Dolstra 493f633002 Die tabs die 2015-12-16 15:38:55 +01:00
Eelco Dolstra a6ca6bbed9 copy-tarballs.pl: Fix --expr 2015-12-15 10:47:46 +00:00
Eelco Dolstra 903803a1f3 Allow uploading multiple files 2015-12-15 10:11:55 +00:00
Eelco Dolstra 8f5856ce63 copy-tarballs.pl: Remove redundant check 2015-12-10 17:26:05 +01:00
Eelco Dolstra 567e002545 copy-tarballs: Use an S3 bucket for tarballs.nixos.org
Tarballs.nixos.org is now stored in an S3 bucket rather than an EBS
volume. Redirects are used to simulate symlinks.

The function find-tarballs.nix now filters out fetchzip, fetchpatch
and the like.
2015-12-10 16:07:07 +01:00
Michael Raskin 30bf5a01ad Fix maintainer list format and improve vanity.sh reliability 2015-12-08 19:12:26 +01:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Arseniy Seroka 61910861dc fix spelling 2015-10-25 04:26:49 +03:00
Luca Bruno 697d61ceab maint script gnome.sh: update all packages 2015-09-25 10:48:39 +02:00
Luca Bruno 67d2344120 gnome-shell: use src.nix 2015-09-17 17:02:55 +02:00
Luca Bruno dbdb732849 maint script gnome-latest.sh: rename to gnome.sh, update src.nix 2015-09-17 17:02:55 +02:00
Luca Bruno 39965bba04 maint script gnome-latest.sh: support point versions, handle 404 errors 2015-09-17 17:02:55 +02:00
Luca Bruno 08bd889058 maint script gnome-latest.sh: don't write sha to a file 2015-09-17 15:21:14 +02:00
Domen Kožar 4eeb4c88aa Merge pull request #8436 from dezgeg/pr-travis-oom
travis-nox-review-pr: Try to detect if the build ran out of memory
2015-06-21 09:26:25 +02:00
Tuomas Tynkkynen d78d168096 travis-nox-review-pr: Try to detect if the build ran out of memory
Travis builds sometimes fail because Travis doesn't have much memory.
When it happens, the failure reason is often hard to see in the logs and
is confusing (especially for new contributors).

Try to detect OOM errors in dmesg and give a warning when it happens.
2015-06-20 23:31:17 +03:00
Luca Bruno 84327822e1 gnome-latest.sh: use bash, it doesn't work with sh 2015-06-11 12:27:50 +02:00
Florian Friesdorf 88e58a4fa2 cygwin: stdenv 2015-05-28 10:53:34 +02:00
Georges Dubus 4d6ba289db Travis: disable tarball creating check, because travis can't handle it 2015-03-04 15:28:09 +01:00
Benjamin Staffin 92aef0621f update-channel-branches: fix to work with posix /bin/sh
Should now work equally well with bash (as on NixOS) and dash (on
various other distributions).

The only truly required change was on line 10: "function" is a
superfluous keyword that's not present in posix sh.

Change-Id: If917499b2e24c0d039e8c61208227b90c9fc5c0d
2015-02-17 17:21:55 -08:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Michael Raskin ad7ced806f Update vanity to add more special characters. 2015-01-18 18:20:08 +03:00
Eric Seidel b070eacfcd rename occurrences of cc.gcc to cc.cc 2015-01-14 20:51:58 -08:00
Georges Dubus c7df7f6361 Travis: check tarball creation even for pull requests
This will help us catch PR that break the tarball creation, for example
by breaking evaluation on other platforms.
2015-01-04 14:02:07 +01:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Nicolas B. Pierron 9334085e80 update-channel-branches.sh: Add verbosity to improve the user experience, and update NixOS documentation. 2014-12-18 22:25:21 +01:00
Nicolas Pierron d7edec4888 Add other source of channels, and distinguish between local and remote channels. 2014-12-18 01:24:40 +00:00
Nicolas Pierron f0c21ab3f7 Add a script to add git branches for each channel. 2014-12-17 00:44:58 +00:00
Eelco Dolstra 97a2de297e Fix various Perl packages
Perl 5.20 removed some modules, in particular Module::Pluggable. So
now other modules need to get it from CPAN.

http://hydra.nixos.org/build/17450281
2014-11-25 00:29:48 +01:00
Michael Raskin bbd9f55947 Improve escaping (process backtick) and remove trailing spaces 2014-11-04 13:00:25 +03:00
Georges Dubus d7af81d2dc Make travis use "nox-review pr"
This should put an end to all the false rebuilds reported by travis.
2014-10-31 14:49:51 +01:00
wmertens e20e0470bf travis build: oops
Evaluation is too long - shouldn't have removed /dev/nulling

I wish I had a travis test environment :sad:
2014-10-15 18:50:28 +02:00
wmertens b084b39375 travis build: Revert silly idea
nox-review should review against master, it's travis that should check out a hydra-available master commit to set the PR on. Perhaps we could rebase the current HEAD on the hydra-built commitish instead?
2014-10-15 18:45:13 +02:00
wmertens 5e6b6df33e Travis build: source environment before build
💩
2014-10-15 11:52:23 +02:00
Wout Mertens 3de73cb77d Travis: Make it work with non-PR 2014-10-15 11:23:34 +02:00
Wout Mertens 0083284ad8 Travis: chop build in install and build phases
This allows us to see how long install takes.
Also, build from hydra binaries as much as possible.
2014-10-15 11:05:12 +02:00
wmertens e6d15e9d28 travis build: Silence git
Last one I promise 😁
2014-10-14 15:00:56 +02:00
wmertens e3563e6c23 travis build: More silence 2014-10-14 14:54:14 +02:00
wmertens 9fc5cc6576 travis build: Make curl silent (but report errors) 2014-10-14 14:31:43 +02:00
Michael Raskin 3d75833956 Update vanity counter. Now with GitHub username support 2014-10-12 23:05:27 +04:00
Michael Raskin 6465d684b8 Improve name quoting to correctly handle underscore 2014-10-12 23:05:27 +04:00
Georges Dubus 4d246d00e5 Made the travis build check the metadata 2014-10-07 15:59:37 +02:00
Michael Raskin 81b766bd95 Fix local filename in vanity counter 2014-10-07 16:25:33 +04:00
Aristid Breitkreuz f7e83a32ad make vanity script less spammy 2014-10-05 16:16:56 +02:00
Michael Raskin ca626ea96d A small vanity counter for finding top-grossing committers 2014-09-30 23:11:19 +04:00
Georges Dubus af2199e9ad Fixes to the travis script
- Build 4 jobs at a time (might help with the timeout)
- Be quiet with pip (should make the output more readable)
2014-09-23 14:31:01 +02:00
Domen Kožar 363aef7fd0 travis-nox-review: build tarball job as evaluation test 2014-09-23 14:23:01 +02:00
Georges Dubus 5ab79f6090 Review PR in travis with nox-review 2014-09-21 21:17:56 +02:00
Eelco Dolstra 6479d6fea4 Remove broken script 2014-07-30 10:23:05 +02:00
Eelco Dolstra b6569c8497 copy-tarballs.pl: Create base-32 symlinks 2014-05-22 12:11:53 +02:00
Eelco Dolstra 4de6357776 Remove mysterious line 2014-05-01 10:43:07 +02:00
Eelco Dolstra bdb658d033 nixpkgs-lint: Tweak 2014-03-31 19:49:01 +02:00
Eelco Dolstra 7a51e17775 Fix updating of the tarball mirror 2014-02-19 13:58:42 +01:00
Eelco Dolstra 3293421dd3 Fix references to pkgs/lib 2013-10-10 13:28:22 +02:00
Eelco Dolstra 2a5098384e Make eval-release.nix less picky
It now only checks that each derivation's drvPath attribute evaluates.
Previously it checked everything (via toXML) but that causes
derivations with dubious passthru attribute to fail (see commit
70fee5da11).
2013-10-06 00:21:28 +02:00
Bjørn Forsman decad1fc7d nixpkgs-lint: add check for meta.platforms attribute 2013-09-07 20:43:07 +02:00
Eelco Dolstra f3a17b04e6 nixpkgs-lint: Warn against capitalised package names and missing versions 2013-07-30 16:52:12 +02:00
Eelco Dolstra 7c38b9d3bc nixpkgs-lint: Fix priority check 2013-07-30 16:52:11 +02:00
Eelco Dolstra 74c52ac8ad nixpkgs-lint: Add support for filtering by maintainer
For instance, you can now say "nixpkgs-lint -m alice" to show only
packages maintained by Alice.

Also added command-line parsing.
2013-07-30 12:05:36 +02:00
Eelco Dolstra 6b495e9251 Add nixpkgs-lint
This is a simple tool to scan Nixpkgs for violations of the packaging
guidelines, such as multiple packages with the same name, packages
that lack a description or license, and so on.

To use:

$ nix-env -i nixpkgs-lint
$ cd .../nixpkgs
$ nixpkgs-lint

Current statistics:

Number of packages: 8666
Number of missing maintainers: 3711
Number of missing licenses: 6159
Number of missing descriptions: 1337
Number of bad descriptions: 633
Number of name collisions: 277
2013-07-25 23:52:36 +02:00
Eelco Dolstra 01294254a0 nix-generate-from-cpan: Handle META.json
Fixes #761.
2013-07-16 13:45:24 +02:00
Eelco Dolstra 15c1ca9d21 nix-generate-from-cpan: Hack to handle non-UTF-8 META.yml files 2013-06-16 18:34:32 +02:00
Eelco Dolstra 629daa2102 Rewrite the CPAN generator to Perl
Also:

- It's now installable by doing "nix-env -i nix-generate-from-cpan".

- It maps dependencies to the correct attribute (e.g. HTML::HeadParser
  is mapped to HTMLParser).

- It automatically selects buildPerlPackage or buildPerlModule.

- It's documented in the manual.
2013-06-13 15:56:23 +02:00
Eelco Dolstra fca2f04bb1 Make the location of the tarballs cache configurable 2013-06-04 12:45:12 +02:00
Shea Levy f3f3a728f6 generate-cpan-package: Don't hard-code Eelco's environment
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-27 16:35:42 -04:00
Eelco Dolstra f135b6e530 Fix comment 2013-03-26 12:09:02 +01:00
Eelco Dolstra 993fc7206d eval-release.nix: Handle the new job structure
Now that we don't need to pass "system" arguments anymore, this thing
is *almost* obsolete.  (Except for the need to handle assertion
failures, you could just do "nix-instantiate --eval-only ..." on
release.nix.)
2013-03-26 11:59:00 +01:00
Eelco Dolstra 427b8cacf3 Add very hacky script to generate Perl packages
Given the name of Perl module, this script will download the package
containing the module from CPAN, determine its dependencies, and print
a Nix expression suitable for inclusion in perl-packages.nix on
stdout.

Example:

$ ./maintainers/scripts/generate-cpan-package DBIx::Class
  DBIxClass = buildPerlPackage {
    name = "DBIx-Class-0.08205";
    src = fetchurl {
      url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-0.08205.tar.gz;
      sha256 = "16iyrfvwf4y94wxpwlla131grdf10z4xx9q9s6jsi39ycaxdaj6l";
    };
    buildInputs = [ DBDSQLite PackageStash TestException TestWarn ];
    propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract SubName TryTiny ];
    meta = {
      homepage = http://www.dbix-class.org/;
      description = "Extensible and flexible object <-> relational mapper.";
      license = "perl";
    };
  };
2013-01-28 12:11:32 +01:00
Eelco Dolstra f615e304bb Handle more bad characters 2013-01-15 18:15:33 +01:00
Eelco Dolstra eeda226b02 Merge branch 'master' into systemd 2013-01-15 12:11:07 +01:00
Eelco Dolstra ee19b41203 Update the tarball mirroring scripts 2013-01-15 11:18:42 +01:00
Eelco Dolstra 0731cd042c eval-release.nix: Handle exceptions properly 2013-01-14 23:28:58 +01:00
Eelco Dolstra 72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Eelco Dolstra 6552ea2ddb svn path=/nixpkgs/trunk/; revision=32961 2012-03-09 17:53:04 +00:00
Eelco Dolstra a736ed4e66 * Split off copy-tarball.sh from copy-tarballs.sh. The former mirrors a single URL.
svn path=/nixpkgs/trunk/; revision=32960
2012-03-09 17:29:17 +00:00
Yury G. Kudryashov a41d989a1e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32093
2012-02-06 23:08:11 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Yury G. Kudryashov 954c8cdac1 test-eval-release: handle ENV{VERBOSE}.
See test-eval-release.sh for details.

svn path=/nixpkgs/trunk/; revision=31824
2012-01-24 19:10:54 +00:00
Yury G. Kudryashov 0c79434ccb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Eelco Dolstra d62848cd2c * eval-release.nix: force nix-instantiate to include nested attribute
sets.

svn path=/nixpkgs/trunk/; revision=31500
2012-01-12 16:59:58 +00:00
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov ac911fce68 Fix XaraLX, add debian-patches.sh
svn path=/nixpkgs/trunk/; revision=31358
2012-01-06 18:13:11 +00:00
Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist

svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00