mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Code Issues Wiki Activity
118968 commits 203 branches 125 tags 5.6 GiB
Commit graph

343 commits

Author SHA1 Message Date
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
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
Russell O'Connor f0ff1224f7 tarsnap: 1.0.38 -> 1.0.39 2017-07-30 20:58:07 +02:00
Tobias Geerinckx-Rice 275059c34a Merge pull request #27616 from jfrankenau/update-borg 
borgbackup: 1.0.10 -> 1.0.11
 2017-07-24 18:44:21 +00:00
Johannes Frankenau c6e52bc430 borgbackup: 1.0.10 -> 1.0.11 2017-07-24 19:04:07 +02:00
Silvan Mosberger f4a8e6ab7f znapzend: 0.15.7 -> 0.17.0 2017-07-24 05:01:08 +02:00
Jörg Thalheim f31773b852 tarsnapper: 0.2.1 -> 0.4 
- project is not a python library -> move out of pythonPackages.
- also enable tests
 2017-07-16 11:12:38 +01:00
Russell O'Connor dca801fbb7 tarsnap: 1.0.37 -> 1.0.38 2017-07-15 22:58:07 -04:00
Marius Bergmann 3006919a0b restic: 0.6.1 -> 0.7.0 2017-07-15 01:36:09 +02:00
Franz Pletz 1a7f330335
burp_1_3: remove 2017-06-26 03:48:41 +02:00
Franz Pletz 356bac704a
burp: 1.4.40 -> 2.0.54 2017-06-26 03:48:41 +02:00
Jörg Thalheim 3a15cdea6f
amazon-glacier-cmd-interface: fix missing argparse dep 2017-06-18 10:27:13 +01:00
Marius Bergmann 41efae4500 restic: 0.6.0 -> 0.6.1 2017-06-01 17:41:56 +02:00
Marius Bergmann a49eb2f3b8 restic: 0.5.0 -> 0.6.0 2017-05-29 23:58:59 +02:00
Lukasz Czyzykowski 4a9b30028d bup: enable darwin build 
This package builds fine on macOS.
 2017-05-19 13:54:28 +02:00
Frederik Rietdijk ef4442e827 Python: replace requests2 with requests tree-wide 
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
 2017-05-07 12:56:09 +02:00
Frederik Rietdijk e75096142c pythonPackages.llfuse-0-41: move into attic 
because that's the only expression using this older version.
 2017-05-07 08:50:14 +02:00
Aristid Breitkreuz 3f00bce59b Merge pull request #24723 from edanaher/update-bup 
bup: 0.29 -> 0.29.1
 2017-04-08 11:04:37 +02:00
Aristid Breitkreuz 65be0b3a4b bup: enable par2 by default 
The par2 closure is <300 KB, so having it enabled by default seems
reasonable.
 2017-04-07 21:47:03 +02:00
Evan Danaher 82a63385fb bup: 0.29 -> 0.29.1 
This pretty much only has a single fix for gc --threshold 0:
https://github.com/bup/bup/blob/master/note/0.29.1-from-0.29.md
 2017-04-07 15:44:10 -04:00
Peter Hoeg f38c4ee775 duplicity: 0.7.07.1 -> 0.7.12 2017-03-24 18:08:05 +08:00
Michael Raskin 4707ac31f1 Merge pull request #23942 from mbrgm/restic 
restic: init at 0.5.0
 2017-03-18 20:01:14 +01:00
Peter Hoeg 99c7aa45e7 s3ql: 2.17.1 -> 2.21 2017-03-16 18:19:57 +08:00
Marius Bergmann 2a65628826 restic: init at 0.5.0 2017-03-15 23:45:42 +01:00
edanaher 77b7b7df33 bup: 0.28.1 -> 0.29 (#23876) 2017-03-15 21:20:25 +01:00
Bjørn Forsman 5f1398ce13 borgbackup: 1.0.9 -> 1.0.10 2017-03-05 21:14:59 +01:00
Emery Hemingway 9cd3e57cc6
obname: 1.20.2 -> 1.21 2017-02-09 15:45:04 +01:00
Kirill Elagin 2d1d8394e0 tarsnap: macOS 2017-02-06 05:21:19 +03:00