JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2e6bf42a22
nixpkgs/pkgs/applications/networking/browsers
History
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
..
arora treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
brave brave: fix path to brave in *.desktop file 2019-08-16 20:44:51 +07:00
browsh treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
captive-browser captive-browser: fix darwin build, add meta 2019-04-16 20:40:20 +00:00
chromium Merge staging-next into staging 2019-08-17 09:39:23 +02:00
conkeror Remove myself as maintainer from packages 2019-02-22 16:14:13 +01:00
dillo treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
elinks elinks: use recent spidermonkey version 2019-08-03 07:51:46 +02:00
eolie eolie: 0.9.45 -> 0.9.60 2019-03-30 22:42:43 -04:00
ephemeral ephemeral: 5.1.1 -> 5.2.1 2019-08-04 04:23:10 -04:00
falkon treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
firefox Merge pull request #67214 from stefano-m/master 2019-08-23 16:43:52 -04:00
firefox-bin firefox-bin: 68.0.1 -> 68.0.2 2019-08-16 23:08:08 +02:00
google-chrome gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
links2 treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
luakit luaPackages: Replace all rockspec packages with generated ones 2019-06-14 13:17:15 +10:00
lynx treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
midori treewide: remove unused variables (#63177) 2019-06-16 19:59:05 +00:00
mozilla-plugins Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
opera gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
otter treewide: name -> pname 2019-08-17 10:54:38 +00:00
palemoon palemoon: restrict platforms to x86 Linux 2019-07-20 21:51:36 +02:00
qtchan qtchan: 0.100 -> 1.0.1 2019-08-23 01:56:24 -05:00
qutebrowser qutebrowser: 1.6.3 -> 1.7.0 2019-08-04 17:42:07 +07:00
surf treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
tor-browser-bundle treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
tor-browser-bundle-bin Merge staging-next into staging 2019-08-17 09:39:23 +02:00
uzbl treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
vimb Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
vimprobable2 treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
vivaldi vivaldi: 2.6.1566.49-1 -> 2.6.1566.51-1 2019-08-15 08:54:44 -04:00
w3m w3m-nox: fix build 2019-05-25 11:53:54 +02:00