Commit graph

356 commits

Author SHA1 Message Date
Michael Raskin c940d2e1ac
Merge pull request #37158 from oxij/pkgs/tor-browsers
update tor browsers
2018-03-16 18:06:50 +00:00
taku0 16ee6b5ed9 nss: 3.34.1 -> 3.35; cacert.certdata2pem: 20160104 -> 20170717 2018-03-16 03:42:09 +00:00
Peter Simons e14fa3f228 hackage: update db snapshot 2018-03-15 21:33:05 +01:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Peter Simons 1aaed17244 hackage: update database snapshot to latest version 2018-03-13 21:42:54 +01:00
Shea Levy aabfda6d5d
Merge branch 'merge/master-to-staging-20180310' of git://github.com/oxij/nixpkgs into staging 2018-03-11 17:28:07 -04:00
mingchuan cbf735e3f1
brise: change platforms to linux only 2018-03-11 23:46:05 +08:00
Michael Raskin bf41b468ad
Merge pull request #35588 from xeji/cacert-unbundled
cacert: add output "unbundled" for individual certificates
2018-03-11 10:08:07 +00:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Ivan Solyankin fed464103f libkkc-data: init at 0.2.7 2018-03-10 17:13:38 +03:00
Peter Simons 68fd23fbb2 hackage: update database snapshot to latest version 2018-03-06 21:24:50 +01:00
Peter Simons 18055971cb hackage: update database snapshot to latest version 2018-03-05 16:45:07 +01:00
Tuomas Tynkkynen 1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Peter Simons e05c99cfda hackage: update database snapshot to latest version 2018-03-01 21:58:31 +01:00
Shea Levy 942855c8bd
tzdata: Fix cross-compilation 2018-02-28 15:01:33 -05:00
Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Ryan Mulligan f3ed511b44
media-player-info: 22 -> 23
Semi-automatic update. These checks were performed:

- built on NixOS
- found 23 with grep in /nix/store/fwi1kp97s2smbwf5ir9jrykf6427i4n6-media-player-info-23
- found 23 in filename of file in /nix/store/fwi1kp97s2smbwf5ir9jrykf6427i4n6-media-player-info-23
2018-02-27 23:54:09 +01:00
Vladimír Čunát e2243a5ac9
Revert "Revert "Merge staging at '8d490ca9934d0' into master""
This reverts commit f5ce8f86df.
2018-02-26 22:54:48 +01:00
Vladimír Čunát f5ce8f86df
Revert "Merge staging at '8d490ca9934d0' into master"
This reverts commit fc23242220, reversing
changes made to 754816b84b.
We don't have many binaries yet.  Comment on the original merge commit.
2018-02-26 22:53:18 +01:00
Peter Simons 0f7a7cb3d8 hackage: update db snapshot 2018-02-26 14:28:40 +01:00
Frederik Rietdijk fc23242220 Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into master 2018-02-26 13:05:32 +01:00
xeji c9a1639e20 cacert: add output "unbundled"
which contains all certs, each in a separate file.
This output is not installed by default.
2018-02-25 23:48:54 +01:00
Tuomas Tynkkynen ae9d4faff9 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:05:30 +02:00
Peter Simons 51c6ca0643 hackage: update database snapshot to latest version 2018-02-23 17:59:06 +01:00
Nikolay Amiantov a984be41ab Merge branch 'master' into staging 2018-02-23 18:51:08 +03:00
volth e28cf0cbfb
data/mime-types: make derivation fixed-output 2018-02-22 17:14:43 +00:00
Vladimír Čunát 2dd10ea013
Merge #34541: poppler: 0.56.0 -> 0.62.0 2018-02-22 00:49:59 +01:00
George Wilson 85701a15ae hackage: update all-cabal-hashes snapshot to Hackage at 2018-02-12T02:28:56Z 2018-02-12 13:40:55 +10:00
Jan Tojnar a711891a83
poppler_data: 0.4.7 → 0.4.8 2018-02-03 01:01:44 +01:00
Michael Raskin 00cafb4c8d scowl: support installing just words.txt
The expression now supports having `words.txt` in some place without tens
and tens of megabytes of all the wordlist and spelling dictionaries. Set
`singleWordlist` parameter to the string of region and size settings. For
example:
```
scowl.override{singleWordlist = "en-gb-ise 60";}
```

Should be useful for #34486
2018-02-02 21:54:13 +01:00
Franz Pletz cc98976b47
wireless-regdb: 2017.03.07 -> 2017.12.23 2018-01-28 18:52:23 +01:00
Peter Simons 809a09eb5e hackage: update all-cabal-hashes snapshot to Hackage at 2018-01-18T14:32:45Z 2018-01-18 17:01:33 +01:00
Tuomas Tynkkynen 67c73b4e64 Merge commit '2e56ba' from staging into master 2018-01-17 12:50:46 +02:00
Tobias Geerinckx-Rice 0f84673f3d
Remove nckx as a maintainer for all packages
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00
Jörg Thalheim efc17cbd21 iana-etc: 20171106 -> 20180108 2018-01-13 09:45:51 +00:00
Daiderd Jordan 6c39c9cbfa
tzdata: use addEnvHooks 2018-01-07 21:26:22 +01:00
Daiderd Jordan 406e162884
cacert: use addEnvHooks 2018-01-07 21:25:48 +01:00
Daiderd Jordan 5a02143c20
Merge pull request #33010 from LnL7/cacert-hook
cacert: add hook that sets SSL_CERT_FILE
2018-01-07 09:55:15 +01:00
Orivej Desh 679dbd0667
Merge pull request #32987 from romildo/upd.adapta-backgrounds
adapta-backgrounds: 0.5.1.1 -> 0.5.2.3
2018-01-06 02:27:00 +00:00
José Romildo Malaquias bcf7218fde adapta-backgrounds: 0.5.1.1 -> 0.5.2.3 2018-01-01 07:15:17 -02:00
Daiderd Jordan bfccf8e42c
cacert: add hook that sets SSL_CERT_FILE
Fixes #32981
2017-12-27 21:03:29 +01:00
Michael Raskin 428708feba scowl: init at 2017.08.24 2017-12-23 20:26:48 +01:00
Jan Tojnar 7f18bbb642
osinfo-db: init at 20170813 2017-12-19 17:25:53 +01:00
José Romildo Malaquias 19723a6143
adapta-backgrounds: 0.4.0.6 -> 0.5.1.1 2017-12-06 11:23:10 +01:00
Orivej Desh d7bab852b0 geolite-legacy: 2017-10-25 -> 2017-12-02 2017-12-04 06:23:47 +00:00
Orivej Desh c13de40f04 tzdata: export TZDIR for dependent packages
https://github.com/NixOS/nix/issues/1709
2017-12-01 17:17:30 +00:00
Orivej Desh 9d2bd32b79 tzdata: avoid symlink loop "./posix" -> ".."
Fixes #31560
2017-11-23 05:12:03 +00:00
Vladimír Čunát d16b298d19
dns-root-data: use a stable URL that I maintain anyway
Close #31855.
2017-11-21 13:58:19 +01:00
Peter Hoeg 1b594f05a2 mime-types: init at 9 2017-11-19 20:29:13 +08:00
Vladimír Čunát 304259bdb1
Merge branch 'master' into staging
Mass rebuild, mainly on Darwin.
2017-11-09 22:37:01 +01:00