Commit Graph

360 Commits

Author SHA1 Message Date
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
Domen Kožar
48a282b913 http://nixos.org -> https://nixos.org
(cherry picked from commit 78bb17dd22e4da4e3810fbc78185d73bb25ea73e)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 11:26:45 +01: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
Aristid Breitkreuz
f10647f1c3 move dockerfile to subdirectory 2014-11-08 23:47:10 +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
Eelco Dolstra
1ca98d7c09 Move some old docs 2013-10-01 10:53:21 +02:00
Eelco Dolstra
34ea77c220 Remove obsolete doc file 2013-10-01 10:53:21 +02:00
Bjørn Forsman
decad1fc7d nixpkgs-lint: add check for meta.platforms attribute 2013-09-07 20:43:07 +02:00
Ivan Kozik
1866619acc Fix a few typos 2013-08-11 10:55:53 +00: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
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +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
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