Aneesh Agrawal
0750c5aee4
ruby-modules: Add new url source type
...
This just defers to `fetchurl` for fetching.
Additionally, update the `nix-bundle-install.rb` script to handle gems
installed from a path, i.e. those with a `url` source.
Some parts of that script have been disabled in the `path` case
that likely shouldn't be, but cause errors and aren't necessary to get
`vagrant` to work.
2018-01-04 07:54:30 -08:00
Aneesh Agrawal
36f1bcbeb8
ruby treewide: don't merge source into top-level
...
Keep the `source` attrset distinct to prevent its entries from merging
with the top level attrs.
Since each type of source has a different set of entries for `source`,
this is the easiest way to keep them together.
This will pave the way for a new `url` type of source.
This is a mass-rebuild of many ruby packages,
notably those using `git` type sources.
2018-01-04 02:28:33 -05:00
Aneesh Agrawal
8686b98612
ruby-modules: Allow overriding gemset
...
This allows patching the gemset output by bundix from a default.nix
file, making it easier to perform updates since the bundix update no
longer has to be manually updated.
2018-01-04 02:28:33 -05:00
Aneesh Agrawal
aa9fc7ee25
bundler-env: Remove unused args
2018-01-04 02:28:33 -05:00
Vladimír Čunát
6bbec17d44
Merge #32626 : atk: clean up
2017-12-29 10:01:00 +01:00
Robin Gloster
ee1c85aee9
mariadb: lib -> connector-c
2017-12-29 02:18:35 +01:00
Jan Tojnar
21b09d7961
ruby-modules gio2: re-add gobjectIntrospection dependency
...
Previously, it was accidentaly propagated by atk.
2017-12-22 23:31:54 +01:00
Michael Fellinger
d36a83a784
bundlerEnv: support unicode executables ( #31145 )
2017-11-03 11:31:16 +00:00
midchildan
87202cf4dc
mikutter: 3.5.7 -> 3.5.13
2017-11-01 15:43:32 +09:00
John Ericson
f037625f87
Merge remote-tracking branch 'upstream/staging' into deps-reorg
2017-09-28 12:32:57 -04:00
Robin Gloster
6b05651c20
Revert "postgresql: Add dev output"
...
Firstly this creates a cycle in 9.6 .out <-> .dev after fixing the PGXS
path.
Secondly this breaks extension handling and the pg_config as it
resolves a lot of paths relatively resulting in the following bogus
output:
BINDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/bin
DOCDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
HTMLDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
INCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
PKGINCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
INCLUDEDIR-SERVER = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/locale
MANDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/man
SHAREDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9
This can probably only be properly fixed by rewriting pg_config in large
parts as it does not in any way respect splitting the postgres tree and
assumes it can simply resolve paths relative to its location. This does
not even handle symlinks:
$ result-dev/bin/pg_config
BINDIR = /home/robin/dev/nixpkgs-upstream/result-dev/bin
DOCDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
HTMLDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
INCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
PKGINCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
INCLUDEDIR-SERVER = /home/robin/dev/nixpkgs-upstream/result-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/locale
MANDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/man
SHAREDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9
cc @edolstra
Revert "bacula: fix after postgresql output splitting"
This reverts commit 13c9cbacdd21998d597be253ae7d3a086c636eb72f23a83920032c50d45bb0280f598e
2017-09-27 21:58:44 +02:00
Robin Gloster
e253ae7d3a
rubyGems.pg: fix postgresql path
2017-09-27 17:26:03 +02:00
John Ericson
f8a18cd4cf
misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
...
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9
misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
...
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Nick Novitski
5ddfcc774c
gemconfig: add curb
2017-09-20 23:53:25 -07:00
John Ericson
5aec3f96a2
treewide: Use *Platform.extensions
2017-09-13 11:16:10 -04:00
Franz Pletz
2f48144d0e
gitlab: 9.4.5 -> 9.5.2
2017-09-03 15:50:52 +02:00
Robin Gloster
0156db2da5
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-02 23:29:04 +02:00
Robin Gloster
891a1662aa
bundler: 1.15.3 -> 1.14.6
...
bundler 1.15 breaks gitlab
2017-09-02 23:24:16 +02:00
Peter Hoeg
30c85e85ae
bundler: 1.15.3 -> 1.15.4
2017-08-30 21:05:45 +08:00
Lancelot SIX
e34ce9d1c5
gnupg: 2.1.22 -> 2.1.23
...
This release in a RC for gnupg-2.2. The main difference as far as
nixpkgs is concerned is that the binary `gpg2` is now called `gpg` and
`gpgv2` is called `gpgv`.
This update fixed all explicit use of `gpg2` and `gpgv2` across nixpkgs,
but there might be some packaged software that internally use `gpg2`
not handeled by this commit.
See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00001.html
for full release information
2017-08-11 19:24:06 +02:00
roblabla
8975d153a0
gitlab: 9.3.4 -> 9.4.3
2017-08-06 16:30:49 +02:00
Silvan Mosberger
f5fa5fa4d6
pkgs: refactor needless quoting of homepage meta attribute ( #27809 )
...
* pkgs: refactor needless quoting of homepage meta attribute
A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.
* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit
* Fixed some instances
2017-08-01 22:03:30 +02:00
Peter Hoeg
e9a70ccfe9
bundler: 1.15.1 -> 1.15.3
2017-07-30 16:57:59 +08:00
Robin Gloster
0154d1b03f
fix evaluation
...
cc @nyarly
2017-07-30 00:03:24 +02:00
Charles Strahan
2b57cb9169
Merge pull request #25980 from nyarly/bundlerenv_usecases
...
BundlerEnv, now with groups and paths
2017-07-28 23:22:21 -04:00
Alastair Pharo
68935892ab
bundix: use same ruby as bundler
2017-07-19 16:13:09 +10:00
roblabla
0c7c421baa
gitlab: 8.17.6 -> 9.3.4
2017-07-06 13:29:49 +02:00
Michael Fellinger
42b1fdaec5
bundix: 2.2.0 -> 2.3.1
2017-07-06 11:47:07 +02:00
Judson
0641253ae6
Small changes in response to review.
2017-07-02 17:18:58 -07:00
Judson
e149f02344
Using pname and fetching versions
2017-06-27 22:33:18 -07:00
Judson
70e7e543c5
A few cleanups and renames. One feature remains...
2017-06-27 10:56:36 -07:00
Robert
107d53f40c
bundix: 2.2.0 -> 2.2.1 ( #26894 )
...
This fixes `fetchurl-force.nix` not being installed, which breaks
bundix for some gems.
E.g.
```
$ nix-build --argstr url https://rubygems.org/gems/nio4r-2.1.0.gem /nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix
error: getting status of ‘/nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix’: No such file or directory
```
2017-06-27 10:24:16 +01:00
Judson
603e84caef
Fixing an overload of "pname"
2017-06-25 17:40:22 -07:00
Peter Hoeg
b8297ff08a
bundler: 1.15.0 -> 1.15.1
2017-06-21 15:29:05 +08:00
Judson
fc302bc07f
Not quite done - something fishy about the name attr
2017-06-10 17:38:49 -07:00
Judson
dd86c6d25a
Adding Corundum as demo of rubyTool
2017-06-10 17:11:37 -07:00
Judson
53481f8f0b
Docs and extras on tool/
2017-06-10 16:58:32 -07:00
Jörg Thalheim
95f733e0aa
bundix: 2.1.0 -> 2.2.0
2017-06-09 22:37:36 +01:00
Judson
964d9b7a06
Made gemdir handling into a common function
2017-06-09 09:04:33 -07:00
Judson
0bde4071fc
Merge branch 'bundlerenv_usecases' of github.com:nyarly/nixpkgs into bundlerenv_usecases
2017-05-31 09:53:03 -07:00
Judson
c4fc70f53c
Starting to add tool builder. Extracting bundler file computation.
2017-05-31 09:44:46 -07:00
Peter Hoeg
0cbcb95e14
bundler: 1.14.6 -> 1.15.0
2017-05-31 23:26:10 +08:00
zimbatm
2b7cfdd6e9
fix missing variable in bundler-env
2017-05-29 13:27:41 +01:00
Judson
e4bb4d4788
Cleaning out obsolete files
2017-05-27 15:22:06 -07:00
Judson
998d011e42
Restructuring files
2017-05-27 15:19:34 -07:00
midchildan
2c393164c8
mikutter: init at 3.5.7
...
fixes #25852
2017-05-21 12:13:34 +01:00
Jörg Thalheim
f410236ed8
Merge branch 'master' into feature/fix_rainbox_gem_deps
2017-05-20 17:26:24 +01:00
Judson
ae84d19e65
Final testing
2017-05-15 09:36:30 -07:00
Jörg Thalheim
ae9e73125f
gem-config: add rb-readline
2017-05-14 22:29:51 +01:00
