1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 15:15:36 +00:00
Commit graph

93 commits

Author SHA1 Message Date
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
Yury G. Kudryashov 27e639b5b2 gnome-latest.sh: don't use fetchurl_gnome
Output both name and src instead of using fetchurl_gnome

svn path=/nixpkgs/trunk/; revision=31332
2012-01-06 00:54:52 +00:00
Yury G. Kudryashov b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Ludovic Courtès de2e9e6ab0 gnupdate: Really select `stdenv' packages when asked for it.
* maintainers/scripts/gnu/gnupdate (gnupdate)[selected-gnu-packages]:
  Really limit to `stdenv' when ask for it.

svn path=/nixpkgs/trunk/; revision=30869
2011-12-13 16:11:02 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Ludovic Courtès fa135fc655 gnupdate: Remove quirks for GNUnet.
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]:
  Remove GNUnet.
  (nixpkgs->gnu-name)[quirks]: Likewise.

svn path=/nixpkgs/trunk/; revision=30724
2011-12-04 13:48:57 +00:00
Ludovic Courtès dee4d2f6af gnupdate: Support signatures with expired keys.
* maintainers/scripts/gnu/gnupdate (gnupg-verify)[expkeysig-rx]: New
  variable.  Recognize signatures with expired keys.
  (gnupg-status-good-signature?): Recognize `expired-key-signature' as good.

svn path=/nixpkgs/trunk/; revision=30667
2011-12-01 22:44:04 +00:00
Peter Simons 69488d688d synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
2011-11-02 10:28:32 +00:00
Ludovic Courtès 3419ae4fdd gnupdate: Handle GnuPG-related packages.
* maintainers/scripts/gnu/gnupdate (gnu?): Check `gnupg.org'.
  (ftp-server/directory)[quirks]: Add libassuan.

svn path=/nixpkgs/trunk/; revision=30176
2011-11-01 22:38:09 +00:00
Ludovic Courtès 573c9178b5 gnupdate: Make `nix-prefetch-url' memoizing.
* maintainers/scripts/gnu/gnupdate (memoize): New procedure.
  (nix-prefetch-url): Use it.

svn path=/nixpkgs/trunk/; revision=30109
2011-10-30 00:00:20 +00:00
Ludovic Courtès 354b1a12c1 gnupdate: Fix auto-downloading of GPG keys.
* maintainers/scripts/gnu/gnupdate (gnupg-verify): Always return STATUS.

svn path=/nixpkgs/trunk/; revision=30108
2011-10-30 00:00:16 +00:00
Ludovic Courtès 2492fba29f gnupdate: Add `--attribute' option.
* maintainers/scripts/gnu/gnupdate (open-nixpkgs): Add optional
  ATTRIBUTE parameter; honor it.
  (%options)["-A"]: New option.
  (gnupdate)[nixpkgs->snix]: Add ATTRIBUTE parameter and pass it down to
  `open-nixpkgs'.
  [selected-gnu-packages]: New procedure.
  Adjust callers accordingly.

svn path=/nixpkgs/trunk/; revision=30107
2011-10-30 00:00:11 +00:00
Eelco Dolstra 3cb8791cf9 * Backport the GCC xlibs dependency fix.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30061
2011-10-27 16:50:00 +00:00
Yury G. Kudryashov 03e747c41a Add a script to generate fetchurl_gnome args
svn path=/nixpkgs/trunk/; revision=29397
2011-09-20 16:18:04 +00:00
Ludovic Courtès 8a904741f8 gnupdate: Support `meta.homepage' as a string list.
* maintainers/scripts/gnu/gnupdate (gnu?): Improve type-checking of
  `meta.homepage'; support string lists.

svn path=/nixpkgs/trunk/; revision=29315
2011-09-17 10:09:26 +00:00
Ludovic Courtès 7f6a997831 gnupdate: Exclude IceCat 3.x variants.
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes):
  Augment.

svn path=/nixpkgs/trunk/; revision=29015
2011-09-04 23:06:11 +00:00
Ludovic Courtès 8e29f04bd4 gnupdate: Automatically download missing OpenPGP keys.
* maintainers/scripts/gnu/gnupdate (%gpg-command, %openpgp-key-server):
  New variables.
  (gnupg-verify, gnupg-status-good-signature?,
  gnupg-status-missing-key?, gnupg-receive-keys, gnupg-verify*): New
  procedures.
  (fetch-gnu): Use `gnupg-verify*'.

svn path=/nixpkgs/trunk/; revision=29014
2011-09-04 23:06:07 +00:00
Ludovic Courtès 5545472461 gnupdate: Update the list of ignored packages.
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes):
  Update.

svn path=/nixpkgs/trunk/; revision=28756
2011-08-22 17:38:57 +00:00
Ludovic Courtès 2943c2eb78 GNU GRUB 1.99.
svn path=/nixpkgs/trunk/; revision=27440
2011-06-13 20:52:32 +00:00
Ludovic Courtès 87a9719a36 gnupdate: Ignore GCC-related attributes.
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes): Add
  GCC 4.6 and gfortran/gcj attributes.

svn path=/nixpkgs/trunk/; revision=26796
2011-04-12 08:05:41 +00:00
Ludovic Courtès 91e63f9cae gnupdate: Handle `repeated' nodes referring to a drv not encountered yet.
* maintainers/scripts/gnu/gnupdate (xml-element->snix): Return an
  `unresolved' node when the repeated derivation hasn't been encountered
  yet.
  (resolve): New procedure.
  (xml->snix): Use it.

svn path=/nixpkgs/trunk/; revision=26790
2011-04-12 08:05:20 +00:00
Ludovic Courtès cea90f43e4 gnupdate: Use (ice-9 format).
* maintainers/scripts/gnu/gnupdate: Use (ice-9 format).

svn path=/nixpkgs/trunk/; revision=26789
2011-04-12 08:05:16 +00:00
Ludovic Courtès e0fa94d81f Remove obsolete version of `gnupdate'.
svn path=/nixpkgs/trunk/; revision=26483
2011-03-23 21:56:12 +00:00
Ludovic Courtès f8b9855727 gnupdate: Add quirks.
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes): Add
  `gcc45_real' and `gcc45_realCross'.
  (ftp-server/directory)[quirks]: Add `ucommon'.

svn path=/nixpkgs/trunk/; revision=26261
2011-03-10 16:27:43 +00:00
Ludovic Courtès cc02933305 gnupdate: Improve error handling for pipes.
* maintainers/scripts/gnu/gnupdate (pipe-failed?): New procedure.
  (nix-prefetch-url): Use it.
  (gnupdate)[nixpkgs->snix]: New procedure.
  Use it.

svn path=/nixpkgs/trunk/; revision=26160
2011-03-04 13:18:56 +00:00
Ludovic Courtès 918a142f2a gnupdate: Update the list of ignored attributes.
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes):
  Update.

svn path=/nixpkgs/trunk/; revision=26077
2011-02-23 17:36:24 +00:00
Ludovic Courtès b70494961b gnupdate: Display FTP exceptions more nicely.
* maintainers/scripts/gnu/gnupdate (releases): Display MESSAGE and ARGS
  with ~S.

svn path=/nixpkgs/trunk/; revision=26076
2011-02-23 17:36:21 +00:00
Ludovic Courtès 7a99d54ca7 gnupdate: Handle recursive FTP directory structures; handle funky file names.
This patch allows projects with per-version sub-directories to be
handled (e.g., MIT Scheme, MyServer, IceCat, etc.)  It also makes sure
alpha releases are discarded (e.g., "gnupg-2.1.0beta3") as well as
unrelated files (e.g., "TeXmacs-600dpi-fonts.tar.gz").

* maintainers/scripts/gnu/gnupdate (ftp-list): Return a list of entries
  where each entry indicates the file type in addition to the file name.
  (releases): Adjust accordingly.  Recurse into sub-directories and
  return a list of name/directory pairs.  Catch `ftp-error' instead
  of everything.
  [release-rx]: Adjust to work with TeXmacs.
  [alpha-rx]: New variable.
  [sans-extension]: New procedure.
  (latest-release): Adjust accordingly.
  (%package-name-rx): New variable.
  (package/version): Use it.
  (packages-to-update): Adjust accordingly.  Use the directory returned
  by `latest-release'.
  [unpack]: New procedure.
  (fetch-gnu): Add a `directory' parameter; use it.

svn path=/nixpkgs/trunk/; revision=26075
2011-02-23 17:36:15 +00:00
Ludovic Courtès ad32df1795 gnupdate: Add a quirk for Source-Highlight.
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Add
  "source-highlight".

svn path=/nixpkgs/trunk/; revision=26074
2011-02-23 17:36:11 +00:00
Ludovic Courtès e86ac7fc39 gnupdate: Fix the MIT Scheme quirk.
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Fix
  the mit-scheme quirk.

svn path=/nixpkgs/trunk/; revision=26073
2011-02-23 17:36:07 +00:00
Ludovic Courtès 542d7424f0 gnupdate: Remove compatibility hack.
svn path=/nixpkgs/trunk/; revision=26000
2011-02-16 22:49:57 +00:00
Ludovic Courtès e201d01ed0 GNUpdate: Add quirks.
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Add
  "libzrtpcpp" and "libosip2".

svn path=/nixpkgs/trunk/; revision=25685
2011-01-24 22:29:29 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Michael Raskin ae0da179c7 Adding a script to use callPackage on a package not mentioned in the all-packages.nix
svn path=/nixpkgs/trunk/; revision=25138
2010-12-15 07:21:21 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Rob Vermaas 21de0b5f23 nixpkgs/maintainer/scripts: added hydra_eval_check script. need hydra_eval_jobs from hydra in PATH and should get absolute path to release.nix as argument
svn path=/nixpkgs/trunk/; revision=24396
2010-10-21 07:09:47 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Ludovic Courtès bfbe1fadbd gnupdate: Add quirks.
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Add
  `freefont-ttf' and `gnu-ghostscript'.

svn path=/nixpkgs/trunk/; revision=23876
2010-09-20 20:46:37 +00:00
Lluís Batlle i Rossell 2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Ludovic Courtès 7ff37213b7 gnupdate: Update to new FFI.
* maintainers/scripts/gnu/gnupdate (pointer->procedure): New procedure.

svn path=/nixpkgs/trunk/; revision=23712
2010-09-10 11:50:06 +00:00
Ludovic Courtès 8f5831d26c gnupdate: Add quirk for GNU Make.
* maintainers/scripts/gnu/gnupdate (nixpkgs->gnu-name)[quirks]: Add
  `gnumake'.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23276
2010-08-20 15:26:16 +00:00
Lluís Batlle i Rossell f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Ludovic Courtès a69596b951 gnupdate: Use the latest FFI.
* maintainers/scripts/gnu/gnupdate (version-string>?): Use the new
  `string->pointer', available in 1.9.12.

svn path=/nixpkgs/trunk/; revision=23253
2010-08-19 16:52:18 +00:00
Eelco Dolstra 7b9d03d596 * strictAttrs: return the original attribute set.
svn path=/nixpkgs/trunk/; revision=23252
2010-08-19 15:13:09 +00:00
Eelco Dolstra 1ac9dcd24d * Fix eval-release.nix by testing whether all attributes of a
derivation evaluate inside the tryEval.  This catches cases such as
  aufs2-util, which fails due to an assertion in its dependency aufs2.
* Explicitly blacklist "xbursttools" because it gives some
  evaluation error in cross-OpenSSL.  No idea why, probably due to
  some pass-through attribute.

svn path=/nixpkgs/trunk/; revision=23247
2010-08-19 12:37:10 +00:00
Michael Raskin ab8a599e8c Adding a script to use eval-release.nix for tests
svn path=/nixpkgs/trunk/; revision=23234
2010-08-18 16:37:46 +00:00
Lluís Batlle i Rossell 5417c720fd Merging from trunk.
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Ludovic Courtès 227c0d768e gnupdate: Fix typo.
svn path=/nixpkgs/trunk/; revision=22468
2010-07-04 21:11:31 +00:00