Commit graph

240 commits

Author SHA1 Message Date
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
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
Robin Gloster
a22429bf05
pin some packages to openssl 1.0.2 for now 2019-07-29 21:25:10 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Matthew Bauer
ba76fa91c7 treewide: handle enchant = enchant2
patch or provide backup to enchant1 where necessary
2019-06-03 12:47:28 -04:00
Jan Tojnar
57c745f530
gnome2: remove aliases 2019-03-05 15:37:45 +01:00
Jan Tojnar
bbe29c055d
gnome2: use makeScope 2019-03-05 15:27:24 +01:00
Vladimír Čunát
64edccb463
treewide: fix missing libs after libtool pruning #51767 2019-02-10 14:14:33 +01:00
Matthew Bauer
51d88f7d20 libglade: fix on darwin
Based on discussion in
https://github.com/Homebrew/legacy-homebrew/issues/11961

Closes #54448
Closes #54321
2019-01-22 11:33:30 -05:00
c0bw3b
a04a512f34 Treewide: use HTTPS on NonGNU domains 2018-12-02 15:21:04 +01:00
Frederik Rietdijk
89349fdae9 Merge staging-next into staging 2018-10-17 08:36:28 +02:00
Michael Raskin
878c6c090d
Merge pull request #39125 from mpickering/darwin-saga
SAGA, SAGA LTS release, dependencies and QGIS SAGA plugin
2018-10-14 19:14:48 +00:00
volth
c0fed1ba77 perlXMLParser -> perlPackages.XMLParser 2018-10-12 22:56:15 +00:00
Jan Tojnar
8a0f255cda
gnome2.gtkglextmm: drop 2018-09-14 01:52:22 +02:00
Jan Tojnar
2ff2b89fdf
gnome2.gconfmm: drop 2018-09-14 00:18:18 +02:00
Matthew Pickering
5caa3fcae9 Small fixes 2018-08-12 10:36:43 +01:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Jan Tojnar
aebb64f59f
gnome2.gnome-desktop: drop 2018-08-09 17:36:49 +02:00
Jan Tojnar
ba4835dea8
gnome2.libgnomekbd: drop 2018-08-09 17:36:49 +02:00
Jan Tojnar
f82f302743
gnome2.libgweather: drop 2018-08-09 17:36:49 +02:00
Jan Tojnar
0e68d11b86
gnome2.zenity: drop 2018-08-09 17:36:48 +02:00
Jan Tojnar
34aea495eb
gnome2.gnome_keyring: drop 2018-08-09 17:36:48 +02:00
Jan Tojnar
6b2a175c5e
gnome2.gnome_vfs_monikers: drop 2018-08-09 17:36:48 +02:00
Jan Tojnar
d76754fe80
gnome2.at_spi: drop 2018-08-09 17:36:47 +02:00
Jan Tojnar
5d23756c7b
gnome2.gnome_menus: drop 2018-08-09 17:36:47 +02:00
Jan Tojnar
27a938b414
gnome2.metacity: drop 2018-08-09 17:36:47 +02:00
Jan Tojnar
31559eb969
gnome2.gnome-panel: drop 2018-08-09 17:36:46 +02:00
Jan Tojnar
d293fca58a
gnome2.gnome-settings-daemon: drop 2018-08-09 17:36:44 +02:00
Jan Tojnar
f27f4be540
gnome2.gnome-control-center: drop 2018-08-09 17:36:44 +02:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
John Ericson
85a9913edd treewide: Make more complicated configureFlags lists 2018-08-03 17:06:03 -04:00
Tuomas Tynkkynen
b619e0b016 gnome2.GConf: Add python2 dependency for gsettings-schema-convert
https://hydra.nixos.org/build/78312507
2018-07-25 11:23:55 +03:00
Jan Tojnar
452017032a
fix Merge 8213ff161c
cc @FRidh
2018-07-21 20:20:36 +02:00
Frederik Rietdijk
ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Frederik Rietdijk
8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Jan Tojnar
373bdced7f
gnome2.GConf: 2.32.4 → 3.2.6
Update and clean up the expression. For example, GTK was only used for
removed utility and examples.
2018-07-10 12:14:40 +02:00
Vincent Laporte
0b1823ff84 gnome2.gtksourceview: fix build on darwin (#41353) 2018-06-01 20:56:40 +02:00
Jan Tojnar
89c20aa46c
gnome2.vte: fix patch url 2018-05-29 10:57:50 +02:00
Jan Tojnar
86270fc19e
gnome2.gtksourceview: fix patch url 2018-05-29 10:34:17 +02:00
John Ericson
ddbe9191ef Merge remote-tracking branch 'upstream/master' into staging
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
2018-05-16 15:16:08 -04:00
Matthew Bauer
c605d171bb treewide: remove lintl references
libintl should be used directly, not through NIX_LDFLAGS.
2018-05-16 01:02:31 -05:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Matthew Justin Bauer
4f1f7c4655
libgweather: fixup assertion error 2018-05-03 18:05:04 -05:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Bauer
143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Jan Tojnar
0dec4fa1db
rarian: merge gnome{2,3}.rarian 2018-04-25 15:53:26 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00