public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
295,041 Commits 1 Branch 0 Tags
Commit Graph

295041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
4df0e9f666
Merge staging-next-21.05 into staging-21.05 2021-09-23 12:03:36 +00:00
github-actions[bot]
b500417d25
Merge release-21.05 into staging-next-21.05 2021-09-23 12:03:00 +00:00
Moritz Hedtke
d22c3a6bc1 discord: 0.0.15 → 0.0.16 
(cherry picked from commit a22f2688941dd02a69cc422ba349e80030cd474f)
 2021-09-22 23:22:11 -07:00
github-actions[bot]
461b839beb
Merge staging-next-21.05 into staging-21.05 2021-09-23 06:02:58 +00:00
github-actions[bot]
2aa54c26ef
Merge release-21.05 into staging-next-21.05 2021-09-23 06:02:28 +00:00
taku0
5a690eb641 thunderbird: 91.1.0 -> 91.1.1 
no-buildconfig-90.patch is applied by firefox/common.nix.

D124361.diff is incorporated into the upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1727113
 2021-09-23 12:38:10 +09:00
taku0
22fb3ec5a0 thunderbird-bin: 91.1.0 -> 91.1.1 2021-09-23 12:34:53 +09:00
John Ericson
2091b11642
Merge pull request #139055 from obsidiansystems/dn-backport-21.05-add-ghcjs 
[backport release-21.05] ghcjs 8.10.7: init
 2021-09-22 22:24:56 -04:00
Divam
af724c4240 Remove old ghcjs files 
(cherry picked from commit 0918598005195303347d675a75f6ea8540ca806a)
 2021-09-23 10:14:39 +09:00
Divam
9ec3ff57c7 ghcjs: init at 8.10.7 
The src points to the obsidiansystems repo as it has the ghcjs ported from
8.10.5 to 8.10.7, and a bunch of other fixes (#812, #811, #809)

(cherry picked from commit ba25b274f4bb0240a8ffa71e41b55712930af3d8)
Modified the stm_2_5_0_1 -> stm_2_5_0_0
 2021-09-23 10:14:39 +09:00
Divam
365f138754 haskellPackages.happy_1_19_12: init at 1.19.12 
(generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh)

(cherry picked from commit be7c76ae6419a00c7f76429afb7ff4591dee60ad)
 2021-09-23 09:59:36 +09:00
Divam
68580f0806 haskellPackages.ghcjs-base: 0.2.0.0 -> 0.2.0.3 
(cherry picked from commit c8b255cf25574808d81cc2a3b6195cc9592956eb)
 2021-09-23 09:58:16 +09:00
John Ericson
2350b8c328
Merge pull request #139037 from obsidiansystems/ghc-8_10_7-21.05 
[backport release-21.05] ghc 8.10.7: init
 2021-09-22 20:31:42 -04:00
Divam
b1814ba4b1 ghc: add the Cabal ghcjs support patch 
(cherry picked from commit feac31b1f05bf8be4681b461987f26a37a47c60f)
 2021-09-23 00:13:41 +00:00
Alexandre Esteves
48048824c4 ghc8.10.7: fix mingw build 
(cherry picked from commit eea8e3eacec12fe4e46d3ecb8e3cbbd03a10b2f0)
 2021-09-23 00:13:41 +00:00
sternenseemann
65c3102d78 ghc: 8.10.6 -> 8.10.7 
https://www.haskell.org/ghc/download_ghc_8_10_7.html

(cherry picked from commit 9eca744cc0484e417deb260076241efb0a6c159d)
 2021-09-23 00:13:41 +00:00
sternenseemann
56a9ec15ff ghc 8.10.6: Init 
Backport which adds, rather than updates, the GHC release.

----

The only big change is required for darwin since GHC 8.10.5 now
runs xattr in the install phase on darwin:

* 11e1dcde0d
* ec451cac39

Unfortunately, it uses the host /usr/bin/xattr by default which is
present in the build due to a lack of sandboxing on darwin. That xattr
version however still requires Python 2.7 whereas Python 3.8 is in PATH
in our build. We solve this by setting the XATTR environment variable.

We can't use python3Packages.xattr since GHC expects Apple's fork of
xattr which provides some extra flags to utilize.

Co-authored-by: Cheng Shao <cheng.shao@tweag.io>

(Adapted from cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631)
 2021-09-23 00:13:41 +00:00
sternenseemann
b83620af90 darwin.xattr: init at 61.60.1 
(cherry picked from commit 283d622397539f196416657da9dc804a4ca89846)
 2021-09-23 00:13:40 +00:00
github-actions[bot]
1955284241
Merge staging-next-21.05 into staging-21.05 2021-09-23 00:05:26 +00:00
github-actions[bot]
73118ee56b
Merge release-21.05 into staging-next-21.05 2021-09-23 00:03:46 +00:00
Robert Scott
5c8efd0034
Merge pull request #137369 from NixOS/backport-134007-to-release-21.05 
[Backport release-21.05] fragments: init at 1.5
 2021-09-22 21:32:21 +01:00
github-actions[bot]
44a5bf6583
Merge staging-next-21.05 into staging-21.05 2021-09-22 18:02:55 +00:00
github-actions[bot]
46a071899f
Merge release-21.05 into staging-next-21.05 2021-09-22 18:02:19 +00:00
TredwellGit
e04cf3d707 linux: 5.4.147 -> 5.4.148 
(cherry picked from commit 3fac07b82827c4cfa33892e09484e6406805dd57)
 2021-09-22 14:01:36 +00:00
TredwellGit
4fb126fd16 linux: 5.14.6 -> 5.14.7 
(cherry picked from commit 1c9f17fb9a1f3d47c393c19e1f8ca511ca6003be)
 2021-09-22 14:01:36 +00:00
TredwellGit
4c482c8806 linux: 5.10.67 -> 5.10.68 
(cherry picked from commit a70237df86464ed69b12bdbf178ac8d0ddc1004e)
 2021-09-22 14:01:35 +00:00
TredwellGit
08a2d25f1b linux: 4.9.282 -> 4.9.283 
(cherry picked from commit 49a443bd0a5f5f884e32bc3a67b5580a718a73df)
 2021-09-22 14:01:34 +00:00
TredwellGit
9a87d91efa linux: 4.4.283 -> 4.4.284 
(cherry picked from commit cd0d8fe6ee5c3c83f1814ac6dc57ff8e3e95d0c8)
 2021-09-22 14:01:33 +00:00
TredwellGit
ebf6ced326 linux: 4.19.206 -> 4.19.207 
(cherry picked from commit e4d0654060fb7321ec18f2d3e60c28ae816ac900)
 2021-09-22 14:01:32 +00:00
TredwellGit
c1aefa39a4 linux: 4.14.246 -> 4.14.247 
(cherry picked from commit 5e7bea92a24e5627817d0ad245fe09a0c1b48afd)
 2021-09-22 14:01:31 +00:00
Pavol Rusnak
e42f91e090
Merge pull request #138930 from NixOS/backport-138927-to-release-21.05 
[Backport release-21.05] electron_12: 12.1.1 -> 12.1.2
 2021-09-22 14:10:52 +02:00
github-actions[bot]
caef8694df
Merge staging-next-21.05 into staging-21.05 2021-09-22 12:03:23 +00:00
github-actions[bot]
3ab20e4ba4
Merge release-21.05 into staging-next-21.05 2021-09-22 12:02:42 +00:00
TredwellGit
4f0a4caae0 electron_12: 12.1.1 -> 12.1.2 
https://github.com/electron/electron/releases/tag/v12.1.2
(cherry picked from commit e39bc2d9af19bf99628f59b8c7d370c7c3973d23)
 2021-09-22 11:09:27 +00:00
Jörg Thalheim
83413f4780
Merge pull request #138828 from hmenke/zfs 
[21.05] zfs: Linux 5.14 compatibility
 2021-09-22 07:20:06 +01:00
Artturi
9e819a3383
Merge pull request #138755 from NixOS/backport-136493-to-staging-21.05 
[Backport staging-21.05] qt5.qtbase: Enable parallel building
 2021-09-22 06:54:02 +03:00
github-actions[bot]
9e4aee2133
Merge staging-next-21.05 into staging-21.05 2021-09-22 00:03:02 +00:00
github-actions[bot]
47a6b7ccf4
Merge release-21.05 into staging-next-21.05 2021-09-22 00:02:28 +00:00
Robert Scott
2216c1b659
Merge pull request #138851 from NixOS/revert-138557-backport-138417-to-staging-21.05 
Revert "[Backport staging-21.05] gd: 2.3.0 -> 2.3.3"
 2021-09-22 00:39:19 +01:00
Robert Scott
e0bcfe1ae3
Revert "[Backport staging-21.05] gd: 2.3.0 -> 2.3.3" 2021-09-22 00:31:09 +01:00
Artturi
12f3f58f48
Merge pull request #138796 from NixOS/backport-138762-to-release-21.05 
[Backport release-21.05] nginx: fix URLs by taking from a specific commit
 2021-09-21 23:47:31 +03:00
Maximilian Bosch
30442ab6d4
Merge pull request #138835 from NixOS/backport-138705-to-release-21.05 
[Backport release-21.05] matrix-synapse: 1.42.0 -> 1.43.0
 2021-09-21 22:41:04 +02:00
Sumner Evans
8d6407e5a4 matrix-synapse: 1.42.0 -> 1.43.0 
(cherry picked from commit a8fbb745723062d99b64f34292f86e0ef4361921)
 2021-09-21 19:46:20 +00:00
Henri Menke
6c840afdc5
zfsUnstable: 2.1.0 -> 2.1.1 2021-09-21 20:33:02 +02:00
Henri Menke
2179499ba7
zfs: 2.0.5 -> 2.0.6 2021-09-21 20:32:48 +02:00
Maximilian Bosch
543cf1d543
Merge pull request #138804 from Ma27/backport-matrix-test 
[21.05] matrix-synapse: enable parallel tests
 2021-09-21 20:05:27 +02:00
github-actions[bot]
e872581176
Merge staging-next-21.05 into staging-21.05 2021-09-21 18:02:58 +00:00
github-actions[bot]
045a7ba01b
Merge release-21.05 into staging-next-21.05 2021-09-21 18:02:23 +00:00
embr
04c2339cc1 nixos/mastodon: Add configurable web- and streaming concurrency 
Might as well do this while I'm at it.

(cherry picked from commit 0d719125baee88e2e8d29e6bb2ff3100ba1b2da0)
 2021-09-21 19:41:32 +02:00
embr
4f8927c417 nixos/mastodon: Fix sidekiq's DB_POOL, add configurable concurrency 
The `services.mastodon` module currently hardcodes sidekiq's concurrency
to 25, but doesn't set a DB pool size, which defaults to 5 or the number
of configured web threads.

(This behaviour is very strange, and arguably a mastodon bug.)

This also makes sidekiq's concurrency configurable, because 25 is a tad
high for the hardware I'm running it on.

(cherry picked from commit e8fd7792d1eeb4ea4943cc34525da1159ab50bc9)
 2021-09-21 19:41:32 +02:00