Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | wallutils: use buildGoPackage | Mario Rodas | 2019-09-21 | 1 | -3/+3 |
| | |||||
* | Revert "Merge branch 'staging-next'" | VladimĂr ÄŚunát | 2019-09-21 | 1 | -3/+1 |
| | | | | | | | This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions. | ||||
* | Merge branch 'staging-next' | VladimĂr ÄŚunát | 2019-09-21 | 1 | -1/+3 |
|\ | |||||
| * | Merge branch 'master' into staging-next | VladimĂr ÄŚunát | 2019-09-15 | 1 | -1/+10 |
| |\ | |||||
| * | | tree-wide: replace wrapProgram with wrapGApp | Jan Tojnar | 2019-09-10 | 1 | -1/+3 |
| | | | | | | | | | | | | where appropriate | ||||
* | | | zbar: disable Qt assertions | Pierre Bourdon | 2019-09-21 | 1 | -0/+3 |
| |/ |/| | | | | | | | | | | | | | | | | | Greatly decreases zbar-lib transitive closure size: assertion messages contain paths to Qt header files, causing zbar-lib to depend on qtbase-dev. The Qt specific mkDerivation normally does this automatically, but we can't use it here due to having only a small part of the project being Qt related. | ||||
* | | Merge pull request #68388 from alyssais/appleseed | Linus Heckemann | 2019-09-13 | 1 | -1/+10 |
|\ \ | |/ |/| | appleseed: fix build | ||||
| * | appleseed: fix build | Alyssa Ross | 2019-09-09 | 1 | -1/+10 |
| | | |||||
* | | zbar: clean up (#68389) | Jan Tojnar | 2019-09-10 | 1 | -21/+56 |
|\ \ | | | | | | | zbar: clean up | ||||
| * | | zbar: use libsForQt5.callPackage | Jan Tojnar | 2019-09-10 | 1 | -4/+6 |
| | | | |||||
| * | | zbar: drop Perl dependency | Jan Tojnar | 2019-09-10 | 1 | -2/+0 |
| | | | | | | | | | | | | It does not appear to be necessary | ||||
| * | | zbar: switch to GTK 3 | Jan Tojnar | 2019-09-10 | 1 | -4/+8 |
| | | | |||||
| * | | zbar: wrap Qt frontend | Jan Tojnar | 2019-09-10 | 1 | -0/+7 |
| | | | |||||
| * | | zbar: drop pygtk support | Jan Tojnar | 2019-09-10 | 1 | -13/+4 |
| | | | | | | | | | | | | It is deprecated and we do not actually use it anywhere | ||||
| * | | zbar: Split to multiple outputs | Jan Tojnar | 2019-09-10 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | Also fix D-Bus config dir path: The configure script is appending `/dbus-1/system.d` so when we added passed in `$out/etc/dbus-1/system.d`, it ended up with extra nesting. | ||||
| * | | zbar: format with nixpkgs-fmt | Jan Tojnar | 2019-09-10 | 1 | -15/+45 |
| | | | |||||
* | | | gmic & gmic-qt: update & clean-up (#68257) | Jan Tojnar | 2019-09-10 | 4 | -111/+200 |
|\ \ \ | |_|/ |/| | | gmic & gmic-qt: update & clean-up | ||||
| * | | gmic-qt: 2.3.6 → 2.7.1 | Jan Tojnar | 2019-09-07 | 1 | -27/+12 |
| | | | |||||
| * | | gmic: 2.2.2 → 2.7.1 | Jan Tojnar | 2019-09-07 | 1 | -28/+35 |
| | | | |||||
| * | | gmic-qt: allow building non-Krita hosts | Jan Tojnar | 2019-09-07 | 2 | -13/+81 |
| | | | | | | | | | | | | | | | * Use qt5’s mkDerivation * Also switch gimpPlugins.gmic to qmic-qt | ||||
| * | | gmic-qt: format with nixpkgs-fmt | Jan Tojnar | 2019-09-07 | 1 | -10/+39 |
| | | | |||||
| * | | gmic-qt-krita: rename from gmic_krita_qt | Jan Tojnar | 2019-09-07 | 1 | -0/+0 |
| | | | |||||
* | | | treewide: remove redundant quotes | volth | 2019-09-08 | 2 | -2/+2 |
| |/ |/| | |||||
* | | freeimage: 3.17.0 -> 3.18.0 | Orivej Desh | 2019-09-08 | 1 | -0/+1 |
|/ | |||||
* | Merge master into staging-next | Frederik Rietdijk | 2019-09-06 | 1 | -1/+1 |
|\ | |||||
| * | graphviz: use git hash for removed release tag | Dylan Simon | 2019-09-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into staging-next | Jan Tojnar | 2019-09-06 | 1 | -2/+2 |
|\| | | | | | | | Fixed trivial conflicts caused by removing rec. | ||||
| * | pngquant: 2.12.1 -> 2.12.5 | Will Dietz | 2019-09-03 | 1 | -2/+2 |
| | | | | | | | | Looks like libimagequant is already at 2.12.5 | ||||
* | | Merge branch 'master' into staging-next | VladimĂr ÄŚunát | 2019-09-04 | 1 | -5/+5 |
|\| | |||||
| * | wallutils: 5.8.1 -> 5.8.2 | Michael Weiss | 2019-09-03 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'master' into staging | VladimĂr ÄŚunát | 2019-09-02 | 1 | -1/+1 |
|\| | |||||
| * | vulkan-headers, vulkan-tools: fix version | Ivan Kozik | 2019-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This fixes an assertion error in vulkan-loader on version == vulkan-headers.version: assertion failed at /nix/store/ca66sbxzxlxlfpb579nxxnw97z2ql1gv-source/pkgs/development/libraries/vulkan-loader/default.nix:8:1 The sha256 for vulkan-headers and vulkan-tools are unchanged because they were already set to the newer version. The correct version was lost in the staging-next merge. | ||||
* | | Merge staging-next into staging | Frederik Rietdijk | 2019-08-31 | 1 | -1/+1 |
|\| | |||||
| * | Merge master into staging-next | Frederik Rietdijk | 2019-08-31 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge pull request #66238 from jonringer/update-vulkan | Aaron Andersen | 2019-08-31 | 1 | -2/+2 |
| | |\ | | | | | | | | | Update vulkan packages | ||||
| | | * | vulkan-*: 1.1.106 -> 1.1.114.0 | Jonathan Ringer | 2019-08-08 | 1 | -2/+2 |
| | | | | |||||
* | | | | treewide: name -> pname (#67513) | volth | 2019-08-31 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge staging-next into staging | Frederik Rietdijk | 2019-08-31 | 1 | -3/+10 |
|\| | | | |||||
| * | | | Merge master into staging-next | Frederik Rietdijk | 2019-08-31 | 1 | -3/+10 |
| |\| | | |||||
| | * | | escrotum: 2017-01-28 -> 2019-06-10 | Alexey Shmalko | 2019-08-29 | 1 | -3/+10 |
| | | | | |||||
* | | | | treewide: remove redundant rec | volth | 2019-08-28 | 16 | -16/+16 |
|/ / / | |||||
* | | | Merge branch 'master' into staging-next | VladimĂr ÄŚunát | 2019-08-24 | 3 | -24/+18 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299 | ||||
| * | | scrot: 0.8-18 -> 1.2 | Robin Gloster | 2019-08-23 | 1 | -18/+11 |
| | | | |||||
| * | | treewide: update globin's maintained drvs | Robin Gloster | 2019-08-20 | 1 | -1/+1 |
| | | | |||||
| * | | Remove myself as maintainer of some packages. | Rickard Nilsson | 2019-08-20 | 1 | -1/+1 |
| | | | |||||
| * | | wkhtmltopdf: use qt5's mkDerivation | ivanbrennan | 2019-08-18 | 1 | -4/+5 |
| | | | | | | | | | | | | See #65399 | ||||
* | | | treewide: name -> pname | volth | 2019-08-17 | 8 | -8/+16 |
| | | | |||||
* | | | treewide: name -> pname (easy cases) (#66585) | volth | 2019-08-15 | 52 | -67/+60 |
|/ / | | | | | | | | | | | | | | | | | treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname | ||||
* | | Merge pull request #62348 from r-ryantm/auto-update/argyllcms | Marek Mahut | 2019-08-10 | 1 | -2/+2 |
|\ \ | |/ |/| | argyllcms: 2.1.0 -> 2.1.1 | ||||
| * | argyllcms: 2.1.0 -> 2.1.1 | R. RyanTM | 2019-05-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/argyllcms/versions |