Commit Graph

370 Commits

Author SHA1 Message Date
André-Patrick Bubel
fe0a15eaca btrbk: install to bin 2018-01-29 20:15:43 +01:00
Frederik Rietdijk
1623c8371c buildPythonPackage: rename nix_run_setup.py to nix_run_setup
If the extension is .py it tends to be picked up by tools, breaking for
example tests.
2018-01-20 13:31:14 +01:00
Tobias Geerinckx-Rice
0f84673f3d
Remove nckx as a maintainer for all packages
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00
Pascal Bach
75ece627a9 restic: 0.8.0 -> 0.8.1 2018-01-09 22:23:49 +01:00
tilpner
d0601b6add
bup: PYTHONPATH -> withPackages
Without this, tornado was not found on startup (`bup web`),
even though it was provided by PYTHONPATH

Also see #22688
2018-01-06 21:10:57 +01:00
Izorkin
4ba7547743 percona-xtrabackup: init at 2.4.9 2018-01-06 03:42:06 +00:00
Frederik Rietdijk
804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD 2018-01-02 19:10:45 +01:00
Bart Brouns
904ac3185f borgbackup: 1.1.3 -> 1.1.4 2018-01-02 05:14:59 +01:00
Frederik Rietdijk
1869e7e5b0 Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-01 15:09:55 +01:00
Frederik Rietdijk
2130bacecc
Merge pull request #33243 from jluttine/add-bdsync
bdsync: init at 0.10.1
2018-01-01 12:42:25 +01:00
Jaakko Luttinen
d4f51de3b0
bdsync: init at 0.10.1 2017-12-31 15:20:30 +02:00
Vladimír Čunát
a1a3e54ac9
Merge branch 'master' into staging
Haskell rebuild :-)
Hydra: ?compare=1421865
2017-12-29 18:39:36 +01:00
Moritz Ulrich
8a5f3ec6a8
btrbk: 0.25.1 -> 0.26.0
This update fixes compatibility with recent btrfs-progs which are
already available in NixOS.
2017-12-29 13:02:40 +01:00
Robin Gloster
572b2bda4e treewide: generalise for both mysql & mariadb 2017-12-29 02:18:35 +01:00
Robin Gloster
6903ea6050 treewide: libmysql -> mysql.connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
d9d98cd324 treewide: fix up some mysql.connector-c fallout 2017-12-29 02:18:35 +01:00
Evan Hanson
58f3e8e9e4 chicken: 4.11.0 -> 4.13.0
Also update the chicken-ssql egg dependency version for ugarit and
ugarit-manifest-maker from 0.2.2 to 0.2.4 to include a fix for an issue
uncovered by chicken-4.13.0 (see [1] and [2] for more info).

[1]: https://bitbucket.org/DerGuteMoritz/ssql/pull-requests/1
[2]: https://salmonella-linux-x86-64.call-cc.org/chicken-4/gcc/linux/x86-64/2017/04/19/yesterday-diff/log2/install/ssql.html
2017-12-15 12:14:20 +13:00
Aristid Breitkreuz
c4a5ab728b borg: 1.1.1 -> 1.1.3 2017-12-10 14:26:03 +01:00
Izorkin
3025eb446b
mydumper: init at 0.9.3 2017-12-07 09:41:32 +08:00
Ingolf Wagner
4896b37236
maintainers: changed email and nice of maintainer mrVanDalo 2017-12-01 13:10:55 -03:00
Marius Bergmann
33b5995442 restic: 0.7.1 -> 0.8.0 2017-11-27 08:55:37 +01:00
dywedir
aac60dcd7e rdedup: init at 2.0.0 2017-11-20 16:30:37 +00:00
Ollie Charles
b075e79c97 wal-g: fix license so not to break evaluation 2017-11-17 13:55:14 +00:00
Ollie Charles
5735aecc27 wal-g: init at 0.1.2 2017-11-17 13:45:00 +00:00
Martin Bornhold
629e17b9fd borgbackup: Add llfuse to propagated build inputs if not on darwin
The llfuse package depends on fuse which refuses to build on darwin. But
according to a comment in the setup.py of borgbackup [1] it's ok to leave it out
if it's not available. Most of borgbackup should work without it. Would be great
to make it work on darwin but i am not sure if it's possible to get fuse to work
on darwin. I do not know enough about it ;)

After this modification at least the "borg mount" subcommand is broken due to
the missing llfuse module. But the rest seems to work normally.

[1] 72232a9bd5/setup.py (L32)
2017-11-15 17:49:33 +01:00
Martin Bornhold
b159ed5069 borgbackup: Add acl library to build inputs on linux platform
The acl libraray is only required by the borgbackup package if building on a
linux platform. Adding it only in this case should be fine. Also see the
conditional in the setup.py at [1].

[1] 72232a9bd5/setup.py (L768)
2017-11-15 17:49:33 +01:00
Vladimír Čunát
ac677c7a01
partclone: 0.2.89 -> 0.3.11 (fixes CVE-2017-6596) 2017-11-11 13:30:18 +01:00
Frederik Rietdijk
bd7074961a
Merge pull request #30897 from flokli/borgbackup-ssh
borgbackup: fix ssh binary location
2017-10-29 12:16:19 +01:00
Florian Klink
f3b311af44 borgbackup: fix ssh binary location
Otherwise, borg might be unable to find its location
2017-10-28 22:05:45 +02:00
Florian Klink
08e06e7d22 borgbackup: add flokli as maintainer 2017-10-28 22:05:37 +02:00
Johannes Frankenau
8f3a2d6991 borgbackup: 1.1.0 -> 1.1.1 2017-10-26 17:14:23 +02:00
Jörg Thalheim
9a6f914f5f Merge pull request #30287 from indiscipline/borgbackup
borgbackup: 1.0.11 -> 1.1.0
2017-10-13 20:37:12 +01:00
Kirill
a63ebf6a77 Change required documentation theme to sphinx_guzzle_theme from #30334 2017-10-12 11:17:24 +03:00
Kirill
9fa341c989 Rebase on nixos-unstable, fix hash. 2017-10-11 12:48:46 +03:00
Kirill
581b7755ed borgbackup: 1.0.11 -> 1.1.0 2017-10-11 12:44:13 +03:00
Vladimír Čunát
ef41fc7f51
Merge branch 'master' into staging
Hydra: ?compare=1399476
2017-10-07 10:17:42 +02:00
Franz Pletz
7d9ee29f24
btrbk: 0.24.0 -> 0.25.1 2017-10-07 04:04:20 +02:00
Jan Tojnar
1713479f85
duplicity: Fix gio backend 2017-10-05 13:37:40 +02: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 13c9cbacdd.

Revert "postgresql: fix pgxs dir in pg_config"

This reverts commit 21998d597b.

Revert "rubyGems.pg: fix postgresql path"

This reverts commit e253ae7d3a.

Revert "kea: fix path to pg_config"

This reverts commit 086c636eb7.

Revert "php: fix build wrt. new postgres.dev build output"

This reverts commit 2f23a83920.

Revert "gdal: fix path to pg_config"

This reverts commit 032c50d45b.

Revert "postgresql: Add dev output"

This reverts commit b0280f598e.
2017-09-27 21:58:44 +02:00
Robin Gloster
13c9cbacdd
bacula: fix after postgresql output splitting 2017-09-27 20:09:40 +02: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
John Mercier
90e572f40a obnam: 1.21 -> 1.22 2017-09-17 11:52:48 -04:00
Franz Pletz
4a810fb31d
borgbackup: fix build with python36
cffi fails to build with python34.
2017-09-10 16:27:12 +02:00
Peter Hoeg
8988f8589a httraqt: init at 1.4.9 2017-08-30 15:02:39 +08:00
Peter Hoeg
b50309a5b5 httrack: 3.48.22 -> 3.49.2 2017-08-30 14:26:51 +08:00
Robin Gloster
28cc2642f0
treewide: use less phases if not necessary
This removes some skipping of e.g. fixupPhase and cleans up occurences
where this led to duplicating code
2017-08-11 11:40:36 +02:00
Tim Steinbach
74998657c7 Merge pull request #27902 from LumiGuide/flockit
flockit: init at 2012-08-11
2017-08-05 18:54:27 -04:00
Bas van Dijk
872d8fc5c9 flockit: init at 2012-08-11
The flockit library and tool exists solely because rsync doesn't have file
locking.

It's not used like a normal library; you don't link against it, and you don't
have to patch your source code to use it. It's inserted between your program and
its libraries by use of LD_PRELOAD.

For example:

  $ env LD_PRELOAD=$(nix-build -A pkgs.flockit)/lib/libflockit.so FLOCKIT_FILE_PREFIX=test rsync SRC DEST

Besides the library a handy executable is provided which can simplify the above to:

  $ $(nix-build -A pkgs.flockit)/bin/flockit test rsync SRC DEST

Also see the following blog post:
https://www.swiftstack.com/blog/2012/08/15/old-school-monkeypatching/
2017-08-06 00:38:29 +02:00
davidak
31870ae18d restic: enable darwin builds 2017-08-03 16:37:04 +02:00
Marius Bergmann
42d93e9724 restic: 0.7.0 -> 0.7.1 2017-08-02 08:16:47 +02:00