Commit graph

2170 commits

Author SHA1 Message Date
worldofpeace d9eadb4aa7
Merge pull request #51472 from Ralith/renderdoc
renderdoc: 1.1 -> 1.2
2018-12-12 04:25:02 -05:00
Frederik Rietdijk 5f554279ec Merge master into staging-next 2018-12-07 15:22:35 +01:00
Yegor Timoshenko 851a52983b
yed: 3.18.1.1 -> 3.18.2 2018-12-06 01:02:52 +03:00
Matthew Bauer ab22183941
Merge pull request #51469 from matthewbauer/gimp-fix
gimp: fix on darwin
2018-12-05 13:43:40 -06:00
Matthew Bauer 73a87b57a6 gimp: fix on darwin
Fixes #41071
2018-12-05 13:20:14 -06:00
Benjamin Saunders 51c9a39299 renderdoc: 1.1 -> 1.2 2018-12-03 12:32:56 -08:00
Bjørn Forsman 84a2463499 jpeginfo: init at 1.6.1
jpeginfo prints information and tests integrity of JPEG/JFIF files.
2018-12-03 17:03:48 +01:00
Frederik Rietdijk a510aa2672 Merge master into staging-next 2018-12-03 12:18:43 +01:00
Jan Tojnar a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Will Dietz 5ea1bbcf01 pqiv: 2.10.4 -> 2.11
https://github.com/phillipberndt/pqiv/releases/tag/2.11
2018-12-01 13:30:55 -06:00
Jan Tojnar bb3a7342c3
shotwell: 0.28.2 → 0.30.0 2018-11-30 21:34:39 +01:00
Frederik Rietdijk 9db2421d1f Merge master into staging-next 2018-11-29 08:12:56 +01:00
Maximilian Bosch f211bad8c4
Merge pull request #51000 from ryantm/tesseract
tesseract_4: 4.00.00alpha-git-20170410 -> 4.0.0
2018-11-29 03:34:29 +01:00
Vladimír Čunát a5de78b7d7
Merge branch 'master' into staging-next 2018-11-26 10:28:00 +01:00
Ryan Mulligan fe551d1d53
deskew: init at 1.25
* deskew: init at 1.25

* Update pkgs/applications/graphics/deskew/default.nix

Co-Authored-By: ryantm <ryan@ryantm.com>
2018-11-25 07:40:41 -08:00
Ryan Mulligan d4b9752212 tesseract_4: 4.00.00alpha-git-20170410 -> 4.0.0
The 4.0.0 stable release is out.

Changelog: https://github.com/tesseract-ocr/tesseract/wiki/4.0x-Changelog
2018-11-24 15:25:59 -08:00
Frederik Rietdijk c31cb577ae Merge master into staging-next 2018-11-22 09:57:08 +01:00
worldofpeace 5a0423823f
Merge pull request #50638 from scolobb/processing-hash-bump
processing3: update the hash of the reference
2018-11-21 21:56:06 -05:00
Matthew Bauer 3e6d7a2329 ao: replace with libfive
ao has been renamed to libfive. Because there’s already a libfive
package, we can just remove the old ao package. No packages appear to
depend directly on it.
2018-11-21 09:38:53 -06:00
Frederik Rietdijk aabf1a93bc Merge staging-next into staging 2018-11-20 11:51:11 +01:00
Frederik Rietdijk fd26e7be2a Merge master into staging-next 2018-11-20 11:47:26 +01:00
R. RyanTM 82a7f0d9ab feh: 2.28.1 -> 3.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/feh/versions
2018-11-19 09:50:45 -08:00
Frederik Rietdijk e343a85cfb Merge master into staging-next 2018-11-19 09:55:32 +01:00
Matthew Bauer 2c1d3a9a82 Merge remote-tracking branch 'upstream/master' into staging 2018-11-18 19:02:09 -06:00
Matthew Bauer e2817a270b inkscape: make python & perl runtime deps
These two interpreters are needed for some runtime scripts.

Fixes #50570
2018-11-18 18:47:02 -06:00
Sergiu Ivanov 839d063545 processing3: update the hash of the reference 2018-11-18 23:47:50 +01:00
Ben Backhouse fca9a06c2e inkscape: add scour as dependency 2018-11-18 13:40:54 +01:00
Frederik Rietdijk 0d0d7dcd06 Merge staging-next into staging 2018-11-18 10:41:34 +01:00
Frederik Rietdijk 63c6875f26 Merge master into staging-next 2018-11-18 10:32:12 +01:00
Oyren 04b234e995 write_stylus: fix loading libGL.so with libglvnd (#50395)
./Write: error while loading shared libraries: libGL.so.1: cannot open shared object file: No such file or directory
2018-11-15 13:55:05 +00:00
Matthew Bauer bfbfe941ab treewide: use scons setup hook
Lots of packages can use it. Here is the list:

- jackmix
- klick
- mixx
- nova-filters
- rhvoice
- giv
- mypaint
- swift-im
- bombono
- mapnik
- serf
- nuitka
- pyexiv2
- godot
- hammer
- toluapp
- btanks
- dxx-rebirth
- endless-sky
- globulation
- the-powder-toy
- fceux
- gpsd
- mongodb
- rippled
- mariadb
- lprof
2018-11-13 19:14:10 -06:00
Frederik Rietdijk 3b052406ea Merge staging-next into staging 2018-11-12 19:01:36 +01:00
Frederik Rietdijk 1d3bff25db Merge staging-next into staging 2018-11-11 14:28:08 +01:00
markuskowa e9aec8ccab
Merge pull request #50095 from r-ryantm/auto-update/gocr
gocr: 0.51 -> 0.52
2018-11-11 13:33:39 +01:00
Jan Tojnar 0655c904bf
Merge pull request #50116 from r-ryantm/auto-update/gegl
gimp: 2.10.6 → 2.10.8
2018-11-10 14:50:33 +01:00
Jan Tojnar 47d439addd
gimp: 2.10.6 → 2.10.8 2018-11-10 14:06:34 +01:00
Jörg Thalheim 5cad46ed9e
Merge pull request #50031 from r-ryantm/auto-update/openimageio
openimageio: 1.8.15 -> 1.8.16
2018-11-10 10:32:51 +00:00
Jörg Thalheim 9f5eb3c2f4
Merge pull request #50058 from r-ryantm/auto-update/krop
krop: 0.5.0 -> 0.5.1
2018-11-10 10:04:01 +00:00
Vladyslav M 1ab73260c2
Merge pull request #50120 from r-ryantm/auto-update/feh
feh: 2.28 -> 2.28.1
2018-11-10 10:17:00 +02:00
R. RyanTM 75f77c24e0 feh: 2.28 -> 2.28.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/feh/versions
2018-11-09 20:04:48 -08:00
R. RyanTM 7cd159db1b gocr: 0.51 -> 0.52
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gocr/versions
2018-11-09 16:35:56 -08:00
R. RyanTM 8c13a37604 krop: 0.5.0 -> 0.5.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/krop/versions
2018-11-09 11:34:22 -08:00
Renaud 0fcf1989da
Merge pull request #49737 from cocreature/yacreader
yacreader: init at 9.5.0, libunarr: init at 1.0.1
2018-11-09 18:29:40 +01:00
Moritz Kiefer d52de90dba yacreader: init at 9.5.0, libunarr: init at 1.0.1 2018-11-09 17:46:30 +01:00
R. RyanTM 6be46a2b9f openimageio: 1.8.15 -> 1.8.16
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openimageio/versions
2018-11-09 07:25:25 -08:00
Jörg Thalheim da1903907d
Merge pull request #49944 from r-ryantm/auto-update/rapid-photo-downloader
rapid-photo-downloader: 0.9.12 -> 0.9.13
2018-11-08 21:25:31 +00:00
R. RyanTM 457e3d57dd rapid-photo-downloader: 0.9.12 -> 0.9.13
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rapid-photo-downloader/versions
2018-11-08 12:52:39 -08:00
Piotr Bogdan d3cfda14fb gimp: get rid of compiler from the runtime closure 2018-11-07 15:21:21 +01:00
Patrick Hilhorst b0e9fc131c
treewide: Fix packages using name where they should use pname 2018-11-06 00:06:17 +01:00
Frank Doepper fc84be03be phototonic: 1.7.1 -> 2.1 2018-11-04 15:45:44 +01:00
Tristan Helmich 5a1708b1ab shutter: 0.94 -> 0.94.2 (#49546)
* shutter: 0.94 -> 0.94.2

* shutter: dependencies refresh

procps and perlPackages.FileBaseDir were missing
Perl package JSONMaybeXS replaces JSONXS
Moved makeWrapper to nativeBuildInputs
2018-11-03 17:00:30 +01:00
R. RyanTM d60faae441 imagemagick7: 7.0.8-12 -> 7.0.8-14 (#49298)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/imagemagick/versions
2018-10-29 16:19:33 +01:00
xzfc b489c57f35 ahoviewer: 1.5.0 -> 1.6.4 (#49307) 2018-10-29 12:00:34 +01:00
Jörg Thalheim 56d2af6e98
Merge pull request #49222 from plumelo/feature/avocode-3.6.2
avocode: 3.4.0 -> 3.6.2
2018-10-29 00:42:51 +00:00
R. RyanTM 6c8760f07c krita: 4.1.3 -> 4.1.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/krita/versions
2018-10-27 09:02:13 -07:00
Meghea Iulian f3fb56d633 avocode: 3.4.0 -> 3.6.2 2018-10-27 18:07:48 +03:00
Andreas Rammhold 1103b3fbe6 batik: mark as insecure
The package hasn't been updated in a long time. There have been several
issues with the package. There is no dependant  package in the
repository so marking it as insecure until someone maintains it sounds
reasonable.
2018-10-26 12:17:58 +02:00
Frederik Rietdijk ca6ee8f519 Merge master into staging-next 2018-10-20 09:40:09 +02:00
Jörg Thalheim 4f3a0a394d
Merge pull request #48389 from r-ryantm/auto-update/openimageio
openimageio: 1.8.14 -> 1.8.15
2018-10-19 11:34:11 +01:00
Frederik Rietdijk 89349fdae9 Merge staging-next into staging 2018-10-17 08:36:28 +02:00
Johannes Frankenau 6032bdd532 rapid-photo-downloader: 0.9.10 -> 0.9.12 2018-10-15 13:45:10 +02:00
R. RyanTM f8f0a36c74 openimageio: 1.8.14 -> 1.8.15
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openimageio/versions
2018-10-14 04:01:10 -07:00
R. RyanTM 49284e4a00 goxel: 0.8.0 -> 0.8.1 (#47789)
* goxel: 0.8.0 -> 0.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/goxel/versions

* goxel: build only on x86_64-linux
2018-10-13 16:41:54 +02:00
volth a974ecf803
Merge branch 'staging' into remove-top-perlXMLParser 2018-10-13 13:22:11 +00:00
Yegor Timoshenko a600f3b577
Merge pull request #47776 from r-ryantm/auto-update/krita
krita: 4.1.1 -> 4.1.3
2018-10-13 12:51:07 +00:00
volth c0fed1ba77 perlXMLParser -> perlPackages.XMLParser 2018-10-12 22:56:15 +00:00
Dmitry Kalinkin c047572a17 dia: fix on darwin (#48176)
Fixes runtime error:
  GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported
2018-10-10 23:20:34 +02:00
Eelco Dolstra a3382a85b3 digikam: libGLU_combined -> libGL + libGLU
This prevents a runtime dependency on a large number of -dev outputs.
2018-10-08 22:56:23 +02:00
edef b5a2181899 solvespace: 2.3-20170808 -> 2.3-20180906 2018-10-06 14:07:36 +00:00
Vladyslav M a5d6705e20 imagemagick7: 7.0.8-6 -> 7.0.8-12 (#47851) 2018-10-05 15:48:38 +02:00
Jan Tojnar 5cc18c4781
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
2018-10-05 02:17:19 +02:00
R. RyanTM dbe2f0ba23 krita: 4.1.1 -> 4.1.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/krita/versions
2018-10-03 09:30:38 -07:00
R. RyanTM 844ebe2039 kgraphviewer: 2.4.2 -> 2.4.3 (#47031)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kgraphviewer/versions
2018-09-28 22:15:11 +02:00
R. RyanTM ee8f6be536 openimageio: 1.8.9 -> 1.8.14 (#46232)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
openimageio
2018-09-28 21:12:26 +02:00
Frederik Rietdijk 56853dc6d8
Merge pull request #45941 from NixOS/staging-next
Staging next
2018-09-23 09:31:28 +02:00
Orivej Desh 1491d4f268 yed: 3.18.1 -> 3.18.1.1 2018-09-22 16:59:38 +00:00
R. RyanTM 4d35759735 feh: 2.27.1 -> 2.28 (#47055)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/feh/versions
2018-09-21 00:49:51 +02:00
Frederik Rietdijk de419917a3 Merge master into staging-next 2018-09-18 18:44:48 +02:00
Jan Tojnar eb9de57dd7
gcolor3: 2.3 → 2.3.1 2018-09-17 12:43:36 +02:00
Ryan Mulligan f91a79ecc8 treewide: fix config.allowAliases = false evaluation 2018-09-13 06:47:22 -07:00
Uli Baum 1df2560dde Merge branch 'master' into staging-next 2018-09-13 10:08:53 +02:00
Michele Guerini Rocco fd7e69be1c antimony: 0.9.3 -> 2018-10-17 (#46486) 2018-09-10 22:17:00 +02:00
Maximilian Bosch 6d6cbd316d pythonmagick: fix build (#46469)
The original build broke with the following linker issue:

```
  CXXLD    _PythonMagick.la
/nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/ld: cannot find -l-L/nix/store/4gh6ynzsd5ndx37hmkl62xa8z30k43y1-imagemagick-6.9.9-34/lib
collect2: error: ld returned 1 exit status
```

This happens since `BOOST_PYTHON_LIB` wasn't set properly, however
`_PythonMagick.la` was linked with `-l$(BOOST_PYTHON_LIB)
$(MAGICK_LIBS)`. With an empty `BOOST_PYTHON_LIB` the linker got
confused.

To work around this, the `boost` library directory needs to be specified
explicitly. To ensure that the changes take effect, the original
`configure` script shipped with `$src` needs to be removed and recreated
using the `autoreconfHook`.

Additionally the `imagemagick` license (https://spdx.org/licenses/ImageMagick.html)
needs to be added to `lib/licenses.nix` to document the proper license
of `pythonmagick` in the meta section.
2018-09-10 11:59:51 +02:00
aszlig 7bda775331
imv: Include i686-linux in platforms attribute
The package builds and works fine on i686-linux, so there is no need to
fail evaluation on those systems.

Signed-off-by: aszlig <aszlig@nix.build>
Issue: #45976
Cc: @rnhmjoj, @xeji
2018-09-09 10:30:58 +02:00
R. RyanTM cdf82f6ddd kipi-plugins: 5.2.0 -> 5.9.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
kipi-plugins
2018-09-06 19:30:21 -07:00
Vladimír Čunát 1428d00aa4
Merge branch 'master' into staging-next
Hydra: ?compare=1477053
2018-09-04 13:06:45 +02:00
xeji 6f91e44b6a
Merge pull request #45976 from rnhmjoj/imv
imv: 2.1.3 -> 3.0.0
2018-09-04 00:48:20 +02:00
rnhmjoj d5b0c4d5c2
imv: build only on x86_64 linux 2018-09-04 00:35:17 +02:00
worldofpeace 507dfccdf8 photoflow: mark broken for aarch64 2018-09-03 15:31:12 -04:00
worldofpeace a3db67282d photoflow: 2018-03-06 -> 2018-08-28 2018-09-03 14:51:41 -04:00
worldofpeace 66385a66dc imgcat: fix build 2018-09-03 14:51:40 -04:00
rnhmjoj 7a58a44474
imv: 2.1.3 -> 3.0.0 2018-09-03 14:22:32 +02:00
Jan Tojnar e2a731fc5c
Merge pull request #45949 from jtojnar/gcolor3
gcolor3: 2.2 → 2.3
2018-09-02 18:24:23 +01:00
Jan Tojnar 87f3a2a406
gcolor3: 2.2 → 2.3 2018-09-02 18:53:04 +02:00
Frederik Rietdijk b910b697f6 Merge master into staging 2018-09-02 12:10:33 +02:00
xeji a3434cf4e5
Merge pull request #45921 from markuskowa/homepages
Cleanup homepage links
2018-09-02 08:39:30 +02:00
Markus Kowalewski 3cbd6c559e
grafx2: update homepage 2018-09-02 00:05:49 +02:00
greydot 028b64ab08 qcomicbook: init at 0.9.1. (#44074) 2018-09-01 23:39:38 +02:00
Thra11 ef21e949a0 krita: refactor to fix build on aarch64 (#45906)
An optional dependency, Vc, doesn't currently provide any optimisations
on aarch64 and causes a build failure in krita. Exclude it from the
build inputs on arm and aarch64.
2018-09-01 20:25:38 +02:00
Vladimír Čunát 2d6179d1e8
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
2018-09-01 17:38:18 +02:00
Markus Kowalewski e014edeb8b
k3d: add license 2018-09-01 16:11:19 +02:00
lewo fc39e5c645
Merge pull request #41920 from fgaz/drawpile
drawpile: init at 2.0.10
2018-08-31 18:37:37 +02:00
Andrew Childs 78d842e8fb pbrt: 2017-01-12 -> 2018-08-15; cmake 3.12 compatibility (#45863) 2018-08-31 16:18:05 +02:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
John Ericson 2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
John Wiegley fa817fb9f7
imgcat: New expression 2.3.0 2018-08-28 12:51:09 -07:00
Francesco Gazzetta 62a2574eb3 drawpile: init at 2.0.11 2018-08-26 21:00:39 +02:00
Vladimír Čunát 7db611f2af
Merge branch 'staging'
Includes libX11 security update.
2018-08-24 09:19:43 +02:00
Markus Kowalewski 2025bd892e
epeg: add license 2018-08-23 11:57:40 +02:00
Markus Kowalewski c365453fed
qiv: add license 2018-08-23 11:57:39 +02:00
Markus Kowalewski 7a05294639
photivo: add license 2018-08-23 11:57:39 +02:00
Markus Kowalewski 74a12299dd
imagemagick: add license 2018-08-23 11:28:06 +02:00
Markus Kowalewski 4cee9af609
gqview: add license 2018-08-23 11:28:06 +02:00
Markus Kowalewski b76029d568
dia: add license 2018-08-23 11:28:06 +02:00
Markus Kowalewski b97ea32ff0
batik: add meta data 2018-08-23 11:28:06 +02:00
Matthew Bauer f7bc33abf0 Revert "treewide: fixup breakage due to absolute compiler path"
This reverts commit d0888d1503.
2018-08-22 01:14:53 +02:00
Vladimír Čunát 765d695b89
Merge branch 'staging-next'
Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
Vladimír Čunát d0888d1503
treewide: fixup breakage due to absolute compiler path
Some packages just can't handle them #44767.  It was tempting to try
to abstract this in some way, but I didn't do that ATM.
2018-08-21 12:34:33 +02:00
Jan Tojnar 4b60e77002
gimp: 2.10.4 → 2.10.6 2018-08-20 15:52:28 +02:00
Vladimír Čunát 153a19df05
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
Michael Raskin bc9082bf35
Merge pull request #45354 from markuskowa/xfig-pr
xfig: 3.2.5b -> 3.2.7a
2018-08-20 05:22:46 +00:00
Markus Kowalewski 6d95b55d3c
xfig: 3.2.5b -> 3.2.7a
init fig2dev as separate package (3.2.7a).
fig2dev was included in xfig in the previous version.
2018-08-20 00:43:11 +02:00
Meghea Iulian e1d1b7ff65 avocode: 3.2.0 -> 3.4.0 (#45350) 2018-08-19 23:45:53 +02:00
Markus Kowalewski 824a0192a7
xfig: update meta data 2018-08-18 00:45:54 +02:00
Vladimír Čunát 14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Sarah Brofeldt 131f385bcc
Merge pull request #45106 from jfrankenau/update-raphodo
rapid-photo-downloader: 0.9.9 -> 0.9.10
2018-08-16 10:58:46 +02:00
Jörg Thalheim 0a17d08a97
Merge pull request #44922 from Enzime/fix/darktable-on-macos
darktable: Fix compilation on macOS
2018-08-15 20:24:20 +02:00
Johannes Frankenau 53c265d0f9 rapid-photo-downloader: 0.9.9 -> 0.9.10 2018-08-14 20:56:22 +02:00
Patrick Chilton 6bdb20dec0 meshlab: 2016.02 -> 20180627-beta 2018-08-14 17:03:44 +08:00
Michael Hoang 61cbf57300 darktable: Fix compilation on macOS
Only compile X11 and other components on Linux. Use DYLD_LIBRARY_PATH on
macOS instead of LD_LIBRARY_PATH.
2018-08-14 13:59:44 +10:00
Vladimír Čunát ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát 00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Jan Malakhovski 17c660f546 feh: use checkInputs, fix tests 2018-08-11 09:35:27 +00:00
Frederik Rietdijk d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Pascal Wittmann af8cd3c74e
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2018-08-09 13:10:27 +02:00
Frederik Rietdijk 786cbba7be
Merge pull request #44447 from NixOS/staging-next
Staging next
2018-08-09 09:04:03 +02:00
volth 2efb3cd8cf processing: 3.3.7 -> 3.4 (#44722) 2018-08-08 23:59:11 +02:00
leenaars 4150a65b17 animbar: init at 1.2 (#44608) 2018-08-07 23:39:29 +02:00
Pascal Wittmann 21bcaf80e3
jbrout: add license
see issue #43716
2018-08-06 13:03:36 +02:00
Vladimír Čunát f504af072b
Merge branch 'master' into staging-next
There's been some large rebuild on master.
I don't really have time ATM to find what it was.
2018-08-06 12:07:37 +02:00
Pascal Wittmann f7be21f4c9
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus
2018-08-06 12:04:52 +02:00
Pascal Wittmann 49f4f1048a
dosage: add license
see issue #43716
2018-08-05 16:33:00 +02:00
Benjamin Saunders 606a260f3b renderdoc: 1.0 -> 1.1 (#44474) 2018-08-05 00:02:57 +02:00
John Ericson 7a337cde31
Merge pull request #44423 from obsidiansystems/configureFlags-cleanup
treewide: All configureFlags are lists
2018-08-03 17:49:01 -04:00
John Ericson f0d6b385d1 treewide: Make all the rest of configureFlags 2018-08-03 17:06:03 -04:00
John Ericson db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
Frederik Rietdijk d56b54cb3c Merge master into staging 2018-07-31 13:19:20 +02:00
Bjørn Forsman 09fcfb6168
Merge pull request #36621 from jfrankenau/init-rapid-photo-downloader
rapid-photo-downloader: init at 0.9.9
2018-07-31 01:59:50 +02:00
John Ericson 9fb6462817 Merge commit master into staging 2018-07-30 15:33:01 -04:00