mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Code Issues Wiki Activity
214976 commits 233 branches 124 tags 7 GiB
Commit graph

1177 commits

Author SHA1 Message Date
Jan Tojnar 8752ff2254
zbar: clean up (#68389) 
zbar: clean up
 2019-09-10 06:57:40 +02:00
Jan Tojnar 2eb7541b1a
zbar: use libsForQt5.callPackage 2019-09-10 05:54:35 +02:00
Jan Tojnar 86f3b3f628
zbar: drop Perl dependency 
It does not appear to be necessary
 2019-09-10 01:56:40 +02:00
Jan Tojnar 021faed5ba
zbar: switch to GTK 3 2019-09-10 01:56:40 +02:00
Jan Tojnar 61fdd203d6
zbar: wrap Qt frontend 2019-09-10 01:56:40 +02:00
Jan Tojnar da135c2704
zbar: drop pygtk support 
It is deprecated and we do not actually use it anywhere
 2019-09-10 01:56:39 +02:00
Jan Tojnar e1cb839d17
zbar: Split to multiple outputs 
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.
 2019-09-10 01:34:50 +02:00
Jan Tojnar b27da0dde7
gmic & gmic-qt: update & clean-up (#68257) 
gmic & gmic-qt: update & clean-up
 2019-09-10 01:21:17 +02:00
Jan Tojnar 41fbd55689
zbar: format with nixpkgs-fmt 2019-09-10 00:32:22 +02:00
Alyssa Ross 5617881a42
appleseed: fix build 2019-09-09 22:14:34 +00:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Orivej Desh 88825bbbde freeimage: 3.17.0 -> 3.18.0 2019-09-08 14:46:31 +00:00
Jan Tojnar 7a0f2fc3a0
gmic-qt: 2.3.6 → 2.7.1 2019-09-07 20:15:57 +02:00
Jan Tojnar ac757fbd42
gmic: 2.2.2 → 2.7.1 2019-09-07 20:15:56 +02:00
Jan Tojnar d8749430e4
gmic-qt: allow building non-Krita hosts 
* Use qt5’s mkDerivation
* Also switch gimpPlugins.gmic to qmic-qt
 2019-09-07 19:55:11 +02:00
Jan Tojnar 8ad04d92f6
gmic-qt: format with nixpkgs-fmt 2019-09-07 19:55:11 +02:00
Jan Tojnar 7c22e3af30
gmic-qt-krita: rename from gmic_krita_qt 2019-09-07 19:55:10 +02:00
Frederik Rietdijk 66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Dylan Simon d42ed9b401 graphviz: use git hash for removed release tag 2019-09-06 21:55:53 +02:00
Jan Tojnar cdf426488b
Merge branch 'master' into staging-next 
Fixed trivial conflicts caused by removing rec.
 2019-09-06 03:20:09 +02:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Will Dietz 21c0acbd80
pngquant: 2.12.1 -> 2.12.5 
Looks like libimagequant is already at 2.12.5
 2019-09-03 20:28:57 -05:00
Michael Weiss 3b7946d0ae
wallutils: 5.8.1 -> 5.8.2 2019-09-03 12:23:00 +02:00
Vladimír Čunát f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Ivan Kozik e54007370f vulkan-headers, vulkan-tools: fix version 
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.
 2019-08-31 17:38:42 +00:00
Frederik Rietdijk 98ef78326d Merge staging-next into staging 2019-08-31 18:07:33 +02:00
Frederik Rietdijk 96e5474329 Merge master into staging-next 2019-08-31 18:04:31 +02:00
Aaron Andersen 6951cbeea9
Merge pull request #66238 from jonringer/update-vulkan 
Update vulkan packages
 2019-08-31 11:45:50 -04:00
volth 7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Alexey Shmalko e2eef8d28d
escrotum: 2017-01-28 -> 2019-06-10 2019-08-29 12:20:01 +03:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next 
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
 2019-08-24 08:55:37 +02:00
Robin Gloster c55d90b81c
scrot: 0.8-18 -> 1.2 2019-08-23 16:28:51 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Rickard Nilsson 225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
ivanbrennan 268dc94653 wkhtmltopdf: use qt5's mkDerivation 
See #65399
 2019-08-18 17:34:34 -04:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Marek Mahut 64ebc0bf80
Merge pull request #62348 from r-ryantm/auto-update/argyllcms 
argyllcms: 2.1.0 -> 2.1.1
 2019-08-10 19:28:56 +02:00
Jonathan Ringer 19d91206e7 vulkan-*: 1.1.106 -> 1.1.114.0 2019-08-08 00:57:53 -07:00
worldofpeace b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Mario Rodas 489154c9fb
Merge pull request #64967 from r-ryantm/auto-update/vips 
vips: 8.8.0 -> 8.8.1
 2019-07-17 01:19:30 -05:00
R. RyanTM 756760b216 vips: 8.8.0 -> 8.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/vips/versions
 2019-07-16 20:19:34 -07:00
Vladimír Čunát 3686036e02
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1530372
 2019-07-15 09:39:03 +02:00
Will Dietz cc309f37f9 oxipng: 2.2.1 -> 2.2.2 2019-07-13 12:34:01 +02:00
Frederik Rietdijk 7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Vladimír Čunát 0746c4dbb4
Merge branch 'master' into staging-next 
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
 2019-07-06 13:44:40 +02:00
Thomas Tuegel 56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps 
Wrap Qt applications
 2019-07-05 14:38:10 -05:00
Thomas Tuegel 51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Rok Garbas 65781e204d
Remove me (garbas) as maintainer since I don't have much time to maintain anything 2019-07-03 11:27:39 +02:00
worldofpeace 3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
worldofpeace cab7c6cbd9 treewide: use dontConfigure 2019-07-01 04:23:51 -04:00
Graham Christensen 0daecd2d7a
Merge pull request #63572 from volth/cpan2nix-2019-06-20 
buildPerlPackage: name -> (pname, version)
 2019-06-28 17:54:30 -04:00
Jan Tojnar 592a52021d
grim: fix build with auto_features=enabled 2019-06-25 18:24:52 +02:00
Jan Tojnar 07d1d3ed68
Merge branch 'master' into staging 2019-06-25 18:06:43 +02:00
Frederik Rietdijk dafee3d91a Merge master into staging-next 2019-06-23 15:38:41 +02:00
R. RyanTM 14644877d8 pstoedit: 3.73 -> 3.74 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pstoedit/versions
 2019-06-23 14:12:54 +02:00
volth b3cc65f8b9 buildPerlPackage: name -> (pname, version) 2019-06-20 15:56:50 +00:00
Frederik Rietdijk f120248daf Merge staging-next into staging 2019-06-18 11:07:56 +02:00
Matthew Bauer 4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl 
Add libGL* aliases
 2019-06-17 15:18:29 -04:00
Matthew Bauer 263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa 
Just use mesa for these to be more clear. Move these to aliases.nix
 2019-06-17 14:43:18 -04:00
volth f3282c8d1e treewide: remove unused variables (#63177) 
* treewide: remove unused variables

* making ofborg happy
 2019-06-16 19:59:05 +00:00
Mario Rodas 7f645e6f1c
svgbob: init at 2018-10-05 2019-06-11 20:00:00 -05:00
Michael Weiss e6d320ec0c
wallutils: 5.8.0 -> 5.8.1 2019-06-11 14:45:30 +02:00
Will Dietz 6768742c10
grim: 1.1 -> 1.2.0 2019-06-06 21:54:44 -05:00
Michael Weiss f8d26961de
wallutils: 5.7.2 -> 5.8.0 2019-06-04 22:02:44 +02:00
Mario Rodas d9db5c0f90
nip2: 8.3.0 -> 8.7.1 2019-06-03 18:55:50 -05:00
R. RyanTM cedfbdf81c
vips: 8.7.4 -> 8.8.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/vips/versions
 2019-06-03 18:55:50 -05:00
Vladyslav M 1ccd410e40
zbar: 0.22 -> 0.23 (#62223) 
zbar: 0.22 -> 0.23
 2019-06-02 13:32:59 +03:00
Elis Hirwing c8c09900aa
Merge pull request #62422 from r-ryantm/auto-update/gnuplot 
gnuplot: 5.2.6 -> 5.2.7
 2019-06-02 08:47:06 +02:00
R. RyanTM b99711b0a5 gnuplot: 5.2.6 -> 5.2.7 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnuplot/versions
 2019-06-01 12:30:19 -07:00
Alyssa Ross 062210bdff treewide: update cargoSha256 hashes for cargo-vendor upgrade 
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.

Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.

The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
 2019-06-01 15:17:52 +00:00
R. RyanTM 5ff155615e argyllcms: 2.1.0 -> 2.1.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/argyllcms/versions
 2019-05-31 21:19:32 -07:00
Brice Waegeneire 4f994855e2 zbar: 0.22 -> 0.23 2019-05-29 17:25:42 +02:00
Christopher League 53b7e136e5 briss: Use makeWrapper so it can take command-line args 2019-05-24 20:43:21 +02:00
Will Dietz 624e970450
viu: 0.1 -> 0.2.1 
https://github.com/atanunq/viu/releases/tag/v0.2.1
 2019-05-09 12:33:59 -05:00
Aaron Andersen 0eaec72f4c
Merge pull request #60901 from petabyteboy/feature/viu 
viu: init at 0.1 (fixes #60831)
 2019-05-04 20:19:50 -04:00
R. RyanTM c87f3820e5 vulkan-tools: 1.1.101.0 -> 1.1.106.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/vulkan-tools/versions
 2019-05-04 16:58:55 +02:00
Milan Pässler b67e9f3958 viu: init at 0.1 2019-05-04 14:07:24 +02:00
Albert Safin e8284c77c9 waifu2x-converter-cpp: init at 5.2.4 2019-04-30 11:56:19 +00:00
R. RyanTM a813ebf9c8 argyllcms: 2.0.1 -> 2.1.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/argyllcms/versions
 2019-04-27 07:42:30 +02:00
Robert Scott b30f1e9ebb appleseed: 1.9.0-beta -> 2.0.5-beta 
this also fixes the build, provided we set -Wno-unused-but-set-variable
 2019-04-23 23:38:07 +01:00
Michael Weiss 60e59b75ba
maim: 5.5.2 -> 5.5.3 2019-04-23 16:38:33 +02:00
markuskowa d0e70ac2d3
Merge pull request #60010 from JohnAZoidberg/https-urls 
HTTPS urls
 2019-04-22 23:37:07 +02:00
xrelkd c4f7d4c78f gifsicle: 1.91 -> 1.92 (#59961) 2019-04-22 17:20:29 +02:00
Daniel Schaefer bac4d95aa2 treewide: Change URLs to HTTPS 
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
 2019-04-22 10:19:54 +02:00
Michael Weiss e34c5309b6
wallutils: init at 5.7.2 (#59878) 2019-04-19 21:43:04 +02:00
Matthew Bauer f475aeaf29
Merge pull request #59535 from matthewbauer/homepage-fixes 
treewide: update homepages to https where available
 2019-04-15 20:47:30 -04:00
Matthew Bauer 290a5d916e treewide: update homepages to https where available 
Based on "problems" from repology:

https://repology.org/repository/nix_unstable/problems

Mostly simple changes to reflect redirects.
 2019-04-15 10:10:05 -04:00
Dmitry Kalinkin 59c81160e7
Merge pull request #58504 from symphorien/static-proot 
Static proot, wafHook cross compilation
 2019-04-13 12:04:32 -04:00
Silvan Mosberger cacb6f1dd0
Merge pull request #59322 from acowley/vulkan-tools 
vulkan-tools: add dependency on vulkan-headers
 2019-04-12 03:30:26 +02:00
Anthony Cowley 570ea1e427 vulkan-tools: add dependency on vulkan-headers 
This fixes the build on NixOS.
 2019-04-11 12:59:41 -04:00
Matthew Bauer a79a8f29bc waf: use wafConfigureFlags for waf flags 
This avoids the potential conflict between autoconf flags and the waf
flags. There is some overlap between the two but waf errors when it
doesn’t recognize the flag.
 2019-04-09 23:44:37 -04:00
R. RyanTM 3262558303 pngout: 20130221 -> 20150319 (#58752) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pngout/versions
 2019-04-08 12:25:53 +02:00
Will Dietz aa220d537d vips: 8.7.0 -> 8.7.4 2019-04-07 00:49:40 -05:00
worldofpeace e89a4ec1fb
Merge pull request #58564 from romildo/upd.xcur2png 
xcur2png: init at 0.7.1
 2019-04-01 00:32:53 -04:00
José Romildo Malaquias 4d5a4a64bf xcur2png: init at 0.7.1 2019-04-01 00:23:09 -03:00
worldofpeace f1d7b51730
Merge pull request #58566 from romildo/upd.blur-effect 
blur-effect: init at 1.1.3
 2019-03-31 21:54:31 -04:00
José Romildo Malaquias 56488c9257 blur-effect: init at 1.1.3 2019-03-31 22:36:34 -03:00
Silvan Mosberger c1e2855bb7
Merge pull request #55959 from Ralith/vulkan 
Update Vulkan packages
 2019-03-30 23:53:09 +01:00
Will Dietz 40f9083c45 oxipng: 2.2.0 -> 2.2.1 2019-03-27 08:13:45 -05:00
Graham Christensen 32e20aa595
Merge pull request #57490 from delroth/imgurbash2-3.1 
imgurbash2: 2.1 -> 3.1
 2019-03-25 21:11:32 -04:00
Pierre Bourdon 57ffe86efa
zbar: 0.10 -> 0.22 
The original upstream at http://zbar.sourceforge.net/ has not produced a
new release or a new commit on their repository in about 7 years. Most
distros (Debian, Gentoo, Arch, ...) have switched already to the more
maintained fork at https://github.com/mchehab/zbar

Update dependencies from qt4 to qt5, reducing "electrum" closure size in
the process (now only depends on one Qt version).
 2019-03-25 10:28:34 +01:00
volth 2be90ccb4f gnome3.gtk -> gtk3 
fix evaluation when config.allowAliases == false

(regression after #55735)
 2019-03-24 14:34:39 -04:00
Will Dietz 3a3a619505
Merge pull request #58099 from r-ryantm/auto-update/gnuplot 
gnuplot: 5.2.5 -> 5.2.6
 2019-03-22 13:07:00 -05:00
R. RyanTM a435269abf gnuplot: 5.2.5 -> 5.2.6 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnuplot/versions
 2019-03-21 18:50:10 -07:00
Benjamin Saunders 45a6b6878f vulkan-tools: 1.1.92 -> 1.1.101.0 2019-03-20 18:04:38 -07:00
Pierre Bourdon 19601561ed
imgurbash2: 2.1 -> 3.1 2019-03-12 08:04:58 +01:00
Mario Rodas 1b493e2555
gifski: init at 0.8.7 2019-03-11 02:33:07 -05:00
R. RyanTM bf1b3e169f grim: 1.0 -> 1.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/grim/versions
 2019-03-02 03:20:48 -08:00
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jörg Thalheim dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible 
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
 2019-02-26 14:10:49 +00:00
Peter Jones fe9d4ca50e
gromit-mpx: 1.2 -> 1.3 2019-02-23 19:56:12 -07:00
Vladimír Čunát 71f4ba29a3
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1506218
 2019-02-22 17:51:01 +01:00
Vladimír Čunát 4ba49d3d6c
Merge #55988: treewide meta.platforms: linux -> unix 2019-02-22 07:59:34 +01:00
Frederik Rietdijk e2cd07b997 Merge staging-next into staging 2019-02-21 07:54:33 +01:00
Maximilian Bosch a55d96bf9e
lepton: only build on x86_64-linux for now 
Darwin and `aarch64-linux` builds currently fail[1][2].

Also cleaned up the `meta` section a bit.

[1] https://github.com/NixOS/nixpkgs/pull/56108/checks?check_run_id=66442317
[2] https://github.com/NixOS/nixpkgs/pull/56108#issue-254801596
 2019-02-21 00:59:46 +01:00
Artemis Tosini 3fa211dfb8
lepton: init at 1.2.1 2019-02-20 22:55:13 +00:00
Freezeboy 8f87a61de2 Replace platforms.linux with platforms.darwin for expressions that compile on darwin too (too restrictive platforms) 2019-02-18 10:56:58 +01:00
Frederik Rietdijk fd48a94b62 Merge staging-next into staging 2019-02-16 09:30:46 +01:00
Frederik Rietdijk 6fe10d2779 Merge master into staging-next 2019-02-16 09:29:54 +01:00
Michael Howell 66d9561345 Fix compilation 
```
building '/nix/store/7n2cag47gl93wp3f0mv7fiq3dybq2a6l-wkhtmltopdf-0.12.5.drv'...
unpacking sources
unpacking source archive /nix/store/lv2zcapqqn1kjlc616ljap1ddlc2lvx8-source
source root is source
patching sources
configuring
Info: creating stash file /tmp/nix-build-wkhtmltopdf-0.12.5.drv-0/source/.qmake.stash
building
build flags: -j4 -l4 SHELL=/nix/store/i82x3x0yiijkgyqkzh8ni87gspas0f48-bash-4.4-p23/bin/bash
cd src/lib/ && ( test -e Makefile || /nix/store/334ck8czp3jhfy0ppy55sb6dxf7yxsdv-qtbase-5.12.0-dev/bin/qmake -o Makefile /tmp/nix-build-wkhtmltopdf-0.12.5.drv-0/source/src/lib/lib.pro INSTALLBASE=/nix/store/rc8z502xa3w0n2qm2vmr5d3l73v1lyyd-wkhtmltopdf-0.12.5 ) && make -f Makefile
Project ERROR: Unknown module(s) in QT: xmlpatterns
make: *** [Makefile:47: sub-src-lib-make_first-ordered] Error 3
builder for '/nix/store/7n2cag47gl93wp3f0mv7fiq3dybq2a6l-wkhtmltopdf-0.12.5.drv' failed with exit code 2
```
 2019-02-15 04:00:45 -05:00
Jan Tojnar 606ceda352
gnome3: stop using aliases 2019-02-14 02:31:15 +01:00
Matthew Bauer 5c09d977c7 Merge remote-tracking branch 'origin/master' into staging 2019-02-09 12:14:06 -05:00
dywedir 1d19b5bd31
oxipng: 2.1.8 -> 2.2.0 2019-02-02 10:39:30 +02:00
Pascal Wittmann 9f6b441aec
pfstools: port to qt5 (#33248) 
Since release 2.1.0 pfsview supports qt5.
 2019-02-01 17:09:18 +01:00
Matthew Bauer 92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Alyssa Ross 31a1e41711
sng: broaden platforms 
Builds fine on Darwin.
 2019-01-25 15:08:41 +00:00
Niclas bae9fd59a9 grim: init at 1.0 (#54498) 2019-01-25 00:33:09 +02:00
Michael Raskin 0e0dd9478d
Merge pull request #47229 from symphorien/CVE-2018-10196 
graphviz: fix CVE-2018-10196
 2019-01-21 11:21:58 +00:00
rnhmjoj bcf54ce5bb
treewide: use ${stdenv.shell} instead of /bin/sh where possible 2019-01-16 20:37:15 +01:00
Vladimír Čunát 287144e342
Merge branch 'master' into staging-next 2019-01-10 13:07:21 +01:00
Michael Weiss e1d9854816
scons: 3.0.1 -> 3.0.2 
A few packages broke due to the SCons upgrade (they depended on
deprecated options that got removed), I've kept them on version 3.0.1
for now. The rest of the rebuilds seems fine (the failing ones where
already in a broken state before this change).
 2019-01-07 15:07:29 +01:00
Frederik Rietdijk 60a3973a55 Merge staging-next into staging 2019-01-05 10:15:00 +01:00
Frederik Rietdijk 9618abe87c Merge master into staging-next 2019-01-04 21:13:19 +01:00
Lengyel Balazs f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
R. RyanTM d69cd2441a jhead: 3.02 -> 3.03 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jhead/versions
 2019-01-03 10:13:34 -08:00
Frederik Rietdijk 092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
Vladimír Čunát 70bff06140
Merge branch 'master' into staging 2019-01-02 17:19:23 +01:00
Jan Tojnar c5c2ac4f45
qrencode: merge with libqrencode 2019-01-01 17:19:07 +01:00
Frederik Rietdijk 10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
Frederik Rietdijk 281981a6df pywal: move to pythonPackages and inject path to convert 2018-12-26 11:58:59 +01:00
Jan Tojnar c45e9d0fac
Merge branch 'master' into staging 2018-12-25 17:03:57 +01:00
Mario Rodas f994e5fe8d
guff: init at 0.1.0 2018-12-24 06:20:37 -05:00
Frederik Rietdijk 9ab61ab8e2 Merge staging-next into staging 2018-12-19 09:00:36 +01:00
volth fed7914539
Merge branch 'staging' into make-perl-pathd 2018-12-18 17:13:27 +00:00
Renaud 2db57d1e03
Merge pull request #52053 from r-ryantm/auto-update/pywal 
pywal: 3.1.0 -> 3.2.1
 2018-12-18 10:27:18 +01:00
R. RyanTM a746ee878e
jhead: 3.00 -> 3.02 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jhead/versions
 2018-12-16 19:42:13 +01:00