Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
482 commits
Select commit Hold shift + click to select a range
233cd6d
python3Packages.strictyaml: 1.6.0 -> 1.6.1
jonringer Dec 7, 2021
61c881c
python3Packages.tatsu: 5.6.1 -> 5.7.1
jonringer Dec 7, 2021
19cd6b4
python3Packages.terminaltables: 3.1.0 -> 3.1.7
jonringer Dec 7, 2021
3ab422b
python3Packages.textacy: 0.11.0 -> 0.12.0
jonringer Dec 7, 2021
33d5f06
python3Packages.trytond: 6.2.1 -> 6.2.2
jonringer Dec 7, 2021
33a095b
python3Packages.types-protobuf: 3.18.1 -> 3.18.2
jonringer Dec 7, 2021
f489618
python3Packages.websocket-client: 1.2.1 -> 1.2.2
jonringer Dec 7, 2021
c2a7567
python3Packages.youtube-search-python: 1.5.2 -> 1.5.3
jonringer Dec 7, 2021
8cb9cdb
python3Packages.zope-deferredimport: 4.3 -> 4.3.1
jonringer Dec 7, 2021
a11977d
python3Packages.zope-hookable: 5.0.1 -> 5.1.0
jonringer Dec 7, 2021
d16e844
python3Packages.zstd: 1.5.0.2 -> 1.5.0.4
jonringer Dec 7, 2021
2188710
python3Packages.python-smarttub: relax pyjwt constraint
fabaff Dec 7, 2021
2dfd2f8
python3Packages.pyutilib: 5.8.0 -> 6.0.0
jonringer Dec 8, 2021
e3e9490
python3Packages.pyomo: fix tests
jonringer Dec 8, 2021
6d950cf
python3Packages.cocotb: fix tests
jonringer Dec 8, 2021
2399895
python3Packages.devtools: fix tests
jonringer Dec 8, 2021
a502b07
python3Packages.fe25519: fix build
jonringer Dec 8, 2021
42f5810
python3Packages.parsy: fix tests
jonringer Dec 8, 2021
5fdfc54
python3Packages.pytest-check: fix tests
jonringer Dec 8, 2021
207295e
python3Packages.emv: fix build
jonringer Dec 8, 2021
1267e41
python3Packages.pip: 21.1.3 -> 21.3.1
jonringer Dec 8, 2021
2afc6ef
python3Packages.pkuseg: disable for python39
jonringer Dec 8, 2021
bca377b
python3Packages.pytelegrambotapi: add implicit dependency
jonringer Dec 8, 2021
2da6797
python3Packages.bpython: remove no longer relevant patch
jonringer Dec 8, 2021
27f124d
python3Packages.tatsu: disable for python<3.10
jonringer Dec 8, 2021
0c72eda
python3Packages.isort: disable flakey test
jonringer Dec 8, 2021
0ba0d85
python3Packages.scrapy: disable network test
jonringer Dec 8, 2021
0ecd8d8
python3Packages.hydra: disable test missing dataset
jonringer Dec 8, 2021
144913f
python3Packages.duckdb: add mypy test dep
jonringer Dec 8, 2021
6d6251a
python3Packages.oci: fix build
jonringer Dec 8, 2021
d70eb60
python3Packages.gradient-utils: disable network tests
jonringer Dec 8, 2021
31964c3
python3Packages.tatsu: fixup! fix evaluation
jonringer Dec 8, 2021
f2aa618
python3Packages.pytest-timeout: 1.4.2 -> 2.0.1
fabaff Dec 8, 2021
bebdf6f
python3Packages.pytest-randomly: 3.10.1 -> 3.10.3
fabaff Dec 8, 2021
13aa081
python3Packages.pytest-annotate: remove stale substituteInPlace
fabaff Dec 8, 2021
6f3e842
python3Packages.pytest-localserver: 0.5.0 -> 0.5.1
fabaff Dec 8, 2021
c1bdf9b
python3Packages.pytest-asyncio: enable tests
fabaff Dec 8, 2021
fc94f7a
python3Packages.pytest-benchmark: 3.2.2 -> 3.4.1
fabaff Dec 8, 2021
e7fbe79
python3Packages.pytest-snapshot: enable tests
fabaff Dec 8, 2021
8b6c077
python3Packages.astropy-extension-helpers: fix build
jonringer Dec 9, 2021
b81f533
python39Packages.tatsu: disable for python39
jonringer Dec 9, 2021
9023e31
python3Packages.diofant: fix build
jonringer Dec 9, 2021
49c6660
Merge pull request #149301 from NixOS/python-unstable
jonringer Dec 14, 2021
62b2269
python3Packages.pytest-forked: 1.3.0 -> 1.4.0
dotlambda Dec 10, 2021
cbee9da
python3Packages.pytest-xdist: 2.4.0 -> 2.5.0
dotlambda Dec 10, 2021
dafc46b
libndp: fix cross compilation
NickCao Dec 12, 2021
5c3e01f
Merge staging-next into staging
github-actions[bot] Dec 15, 2021
816a5f1
Merge pull request #149918 from mweinelt/sqlalchemy
mweinelt Dec 15, 2021
3e2d1c1
Merge staging-next into staging
github-actions[bot] Dec 15, 2021
9ff566b
boehmgc: 8.0.6 -> 8.2.0
r-ryantm Dec 11, 2021
fdf5ca2
boehmgc: Make comment future proof
roberth Dec 11, 2021
80b0563
boehmgc: Add Nix packages to passthru
roberth Dec 11, 2021
e150f62
Merge pull request #150303 from r-ryantm/auto-update/c-ares
risicle Dec 16, 2021
7599020
Merge pull request #145434 from colemickens/gpg23
grahamc Dec 17, 2021
e071820
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
alyssais Dec 17, 2021
17388f3
Merge staging-next into staging
github-actions[bot] Dec 17, 2021
a6adcc1
Merge staging-next into staging
github-actions[bot] Dec 17, 2021
3fa6ddf
Merge staging-next into staging
github-actions[bot] Dec 17, 2021
f8d75f3
waf: 2.0.22 -> 2.0.23 (#151083)
panicgh Dec 17, 2021
d1e6365
Merge staging-next into staging
github-actions[bot] Dec 18, 2021
8d45187
Merge staging-next into staging
github-actions[bot] Dec 18, 2021
befeb71
Merge pull request #150834 from NickCao/libndp
bobby285271 Dec 18, 2021
dd2f8bc
Merge staging-next into staging
github-actions[bot] Dec 18, 2021
29f216c
openssl_1_1: 1.1.1l -> 1.1.1m
mweinelt Dec 14, 2021
5c602f1
Merge pull request #147678 from trofi/avoid-fetchpatch-in-flex
domenkozar Dec 18, 2021
0cf94e8
Merge branch 'staging-next' into staging
veprbl Dec 18, 2021
93b292f
stoken: fix cross compilation
NickCao Dec 16, 2021
c1c6899
Merge staging-next into staging
github-actions[bot] Dec 18, 2021
4de3613
luabind: fix wrong hash introduced in 82d629fc0a4e7b4e9b09a2cacf3bce1…
SuperSandro2000 Dec 18, 2021
314d3d0
nspr: 4.32 -> 4.33
ajs124 Dec 17, 2021
916b5fb
Merge staging-next into staging
github-actions[bot] Dec 19, 2021
275b48d
Merge pull request #151243 from SuperSandro2000/luabind
SuperSandro2000 Dec 19, 2021
ab18177
Merge pull request #150343 from r-ryantm/auto-update/aws-c-common
r-burns Dec 19, 2021
e8d85c6
kde-frameworks: 5.87 -> 5.89
andrevmatos Dec 13, 2021
e11b7e6
material-kwin-decoration: drop Werror to fix compile with kde-framewo…
SuperSandro2000 Dec 19, 2021
699ce95
index-fm: fix build with kde-frameworks 5.89 by dropping Werror
SuperSandro2000 Dec 19, 2021
045b875
kdb: fix compilation
SuperSandro2000 Dec 19, 2021
3d457ed
gnupg23: fix on darwin (#151078)
sequencer Dec 19, 2021
46528ab
Merge staging-next into staging
github-actions[bot] Dec 19, 2021
9d3304b
libglvnd: 1.3.4 -> 1.4.0
primeos Dec 19, 2021
7915fac
Merge pull request #151285 from primeos/libglvnd
primeos Dec 19, 2021
a254c22
Merge staging-next into staging
github-actions[bot] Dec 19, 2021
984f2b0
Merge pull request #149530 from alyssais/util-linux-static
veprbl Dec 19, 2021
3479555
Merge staging-next into staging
github-actions[bot] Dec 19, 2021
d347d7d
Merge pull request #151113 from helsinki-systems/upd/nspr
ajs124 Dec 19, 2021
5f7eec0
nm-tray: fix compile by adding missing pkg-config
SuperSandro2000 Dec 20, 2021
80f100d
Merge pull request #149852 from r-ryantm/auto-update/mjpegtools
risicle Dec 20, 2021
0d0ec27
pahole: 1.22 -> 1.23
r-ryantm Dec 20, 2021
1de57cd
Merge pull request #150949 from NickCao/stoken
symphorien Dec 20, 2021
5e9c670
Merge pull request #151414 from r-ryantm/auto-update/pahole
ryantm Dec 21, 2021
a6e1c89
Merge pull request #150669 from andrevmatos/kde/frameworks
SuperSandro2000 Dec 21, 2021
8cd976f
Merge pull request #150733 from mweinelt/openssl
mweinelt Dec 21, 2021
ffbf0ff
xwayland: 21.1.3 -> 21.1.4
r-ryantm Dec 22, 2021
373d234
coreutils: patch for uname to show the correct arch on arm macos
RonjaPonja Dec 20, 2021
cc6c379
wlroots_0_14: init at 0.14.1
primeos Dec 22, 2021
63d7ba6
wlroots: 0.14.1 -> 0.15.0
primeos Dec 18, 2021
600ac86
nix: remove pie compilation flag on darwin
happysalada Dec 23, 2021
68a4f9d
openblas: create symlinks for blas lapack static archives
cdepillabout Dec 17, 2021
88d66d4
Merge pull request #151672 from r-ryantm/auto-update/xwayland
thiagokokada Dec 23, 2021
4e955d2
ruby: remove references to baseRuby
arcnmx Sep 18, 2021
09e3924
ruby: configure via {enable,with}Feature
arcnmx Nov 22, 2021
4ac0f8e
ruby: more consistent baseRuby reference removal
arcnmx Dec 23, 2021
182e07f
Merge remote-tracking branch 'origin/staging-next' into staging
jonringer Dec 23, 2021
2cb6012
Merge pull request #151234 from primeos/wlroots
primeos Dec 23, 2021
984e88c
Merge pull request #151856 from happysalada/nix_darwin_disable_pie
lovesegfault Dec 23, 2021
58a27ea
Merge pull request #148367 from r-burns/llvm-config-static
7c6f434c Dec 24, 2021
2905208
chromaprint: 1.5.0 -> 1.5.1
r-ryantm Dec 24, 2021
508623b
clang_{11,12,13,git}: enable RTTI
veprbl Dec 25, 2021
a2d81a8
ruby_3_1: init at 3.1.0
marsam Dec 25, 2021
9c7bea2
Merge pull request #138368 from arcnmx/ruby-cross-closure
marsam Dec 25, 2021
bfe3ae8
Merge master into staging-next
github-actions[bot] Dec 25, 2021
9e0c1bc
db: use pname and version instead of name
NickCao Dec 25, 2021
f0cf6c3
vim: 8.2.3848 -> 8.2.3877
r-ryantm Dec 24, 2021
90b18ac
python3Packages.sqlalchemy: 1.4.28 -> 1.4.29
mweinelt Dec 23, 2021
c215380
Merge pull request #152054 from veprbl/pr/clang_consistent_enable_rtti
veprbl Dec 25, 2021
f394545
tzdata: 2021c -> 2021e (#151446)
trofi Dec 25, 2021
5400fb8
expat: 2.4.1 -> 2.4.2 (#151445)
trofi Dec 25, 2021
8a4345e
nss: 3.73 -> 3.73.1 (#151041)
r-ryantm Dec 25, 2021
1030e3e
lapack: add patch for CVE-2021-4048 (#150788)
risicle Dec 25, 2021
5412bf7
python3Packages.olefile: switch to pytestCheckHook (#150423)
fabaff Dec 25, 2021
d23d17d
python3Packages.cryptography: 3.4.2 -> 36.0.0 (#150320)
mweinelt Dec 25, 2021
06a2216
Merge pull request #150236 from r-ryantm/auto-update/boehm-gc
veprbl Dec 25, 2021
9e9b71c
python3Packages.lxml: 4.6.4-5 -> 4.7.1 (#150913)
risicle Dec 25, 2021
781e93b
Merge pull request #149488 from risicle/ris-gmp-CVE-2021-43618
veprbl Dec 25, 2021
6a6756c
binutils: add patch for CVE-2021-45078 (#151658)
risicle Dec 25, 2021
ebc4991
aws-c-s3: 0.1.27 -> 0.1.29 (#151654)
r-ryantm Dec 25, 2021
094be66
libedit: 20210714-3.1 -> 20210910-3.1 (#150017)
r-ryantm Dec 25, 2021
1b67f41
libmbim: 1.26.0 -> 1.26.2 (#150000)
r-ryantm Dec 25, 2021
fc3193a
libevdev: 1.11.0 -> 1.12.0 (#149993)
r-ryantm Dec 25, 2021
ce78b17
libpipeline: 1.5.3 -> 1.5.4 (#149987)
r-ryantm Dec 25, 2021
c6beba4
libksba: 1.5.1 -> 1.6.0 (#149974)
r-ryantm Dec 25, 2021
c9c2296
libtasn1: 4.17.0 -> 4.18.0 (#149963)
r-ryantm Dec 25, 2021
05cfc5f
poppler_data: 0.4.10 -> 0.4.11 (#149621)
r-ryantm Dec 25, 2021
653ff61
cmake: 3.21.2 -> 3.22.1 (#147818)
trofi Dec 25, 2021
2ab60f6
Merge pull request #146205 from expipiplus1/ellie-libsurvive2
veprbl Dec 25, 2021
9ae4191
fribidi: 1.0.10 -> 1.0.11
r-ryantm Oct 29, 2021
b44c9ed
c-blosc: 1.21.0 -> 1.21.1
r-ryantm Oct 29, 2021
afaf4d7
Merge pull request #142016 from prusnak/hidapi
veprbl Dec 25, 2021
cafbe81
python: conditionalize redundant Darwin patch (#137858)
emilazy Dec 25, 2021
2ddda43
Merge branch 'staging' into staging-next
veprbl Dec 25, 2021
10263fd
Merge master into staging-next
github-actions[bot] Dec 26, 2021
c9d6943
Merge staging-next into staging
github-actions[bot] Dec 26, 2021
fb883d4
libwacom: 1.12 -> 1.99.1
r-ryantm Dec 25, 2021
cacc907
Merge master into staging-next
github-actions[bot] Dec 26, 2021
c91fe49
Merge staging-next into staging
github-actions[bot] Dec 26, 2021
0826392
boehmgc: revert "8.0.6 -> 8.2.0", experimental release
trofi Dec 26, 2021
7096340
Merge master into staging-next
github-actions[bot] Dec 26, 2021
d6eafc3
Merge staging-next into staging
github-actions[bot] Dec 26, 2021
3a16ef5
Merge pull request #152169 from marsam/init_ruby_3_1
marsam Dec 26, 2021
8e28ffb
Merge master into staging-next
github-actions[bot] Dec 26, 2021
7d594ba
Merge staging-next into staging
github-actions[bot] Dec 26, 2021
1a747be
Merge master into staging-next
github-actions[bot] Dec 27, 2021
9c541ad
Merge staging-next into staging
github-actions[bot] Dec 27, 2021
7648885
python310: 3.10.0 -> 3.10.1
mweinelt Dec 26, 2021
125f023
python310Packages: Recurse into package set
mweinelt Dec 26, 2021
2db51d1
python38Packages: Stop recursing into package set
mweinelt Dec 26, 2021
9bb624e
python310Packages.pytest: fix tests
mweinelt Dec 27, 2021
6aff8a5
python310Packages.tensorflow-bin: disable on 3.10
mweinelt Dec 27, 2021
0a69816
Merge master into staging-next
github-actions[bot] Dec 27, 2021
2d7da28
Merge staging-next into staging
github-actions[bot] Dec 27, 2021
ae39fad
Merge master into staging-next
github-actions[bot] Dec 27, 2021
8085855
Merge staging-next into staging
github-actions[bot] Dec 27, 2021
b5fbd8a
lirc: fix build against pyyaml-6.0
trofi Dec 15, 2021
8ce4686
Merge master into staging-next
github-actions[bot] Dec 27, 2021
816f9ab
Merge staging-next into staging
github-actions[bot] Dec 27, 2021
f38610c
matplotlib-inline: Don't depend on matplotlib -> smaller ipython closure
bew Dec 19, 2021
37e104d
Revert "matplotlib-inline: Don't depend on matplotlib -> smaller ipyt…
veprbl Dec 27, 2021
6afaf36
Merge branch 'master' into staging-next
mweinelt Dec 27, 2021
642dc6b
Merge master into staging-next
github-actions[bot] Dec 28, 2021
996c3bd
Merge master into staging-next
github-actions[bot] Dec 28, 2021
2e759d4
Merge master into staging-next
github-actions[bot] Dec 28, 2021
3961a78
Merge branch 'master' into staging-next
veprbl Dec 28, 2021
129083e
Merge master into staging-next
github-actions[bot] Dec 29, 2021
f0ca697
Merge master into staging-next
github-actions[bot] Dec 29, 2021
c4d18cf
Merge master into staging-next
github-actions[bot] Dec 29, 2021
1ec3314
python3Packages.pymavlink: fix src hash broken in merge conflict reso…
veprbl Dec 29, 2021
e10d27e
Merge branch 'master' into staging-next
veprbl Dec 29, 2021
e5a8efa
Merge master into staging-next
github-actions[bot] Dec 30, 2021
f787df2
Merge master into staging-next
github-actions[bot] Dec 30, 2021
9b760ab
mesa: 21.3.2 -> 21.3.3
primeos Dec 30, 2021
380c030
Merge branch 'master' into staging-next
jtojnar Dec 31, 2021
12330eb
Merge pull request #152678 from primeos/mesa
primeos Dec 31, 2021
77da198
Merge master into staging-next
github-actions[bot] Dec 31, 2021
df24694
Merge master into staging-next
github-actions[bot] Dec 31, 2021
c30032a
Merge master into staging-next
github-actions[bot] Jan 1, 2022
16b8612
awscli: pin pyyaml
dotlambda Jan 2, 2022
482634d
awscli: 1.22.14 -> 1.22.21
dotlambda Jan 2, 2022
741668e
nimbo: add awscli to $PATH instead of propagatedBuildInputs
dotlambda Jan 2, 2022
033686d
python3Packages.python-multipart: fix tests
mweinelt Jan 3, 2022
bc370f5
python3Packages.httplib2: disable failing test
mweinelt Jan 3, 2022
d69234a
home-assistant: relax PyJWT constraint
mweinelt Jan 3, 2022
11a0b61
Merge remote-tracking branch 'origin/master' into staging-next
mweinelt Jan 3, 2022
eb901b0
python3Packages.duckdb: fix eval
mweinelt Jan 3, 2022
bfc5fca
Merge master into staging-next
github-actions[bot] Jan 4, 2022
872c4bf
Merge master into staging-next
github-actions[bot] Jan 4, 2022
36fd643
Merge master into staging-next
github-actions[bot] Jan 4, 2022
6af0c1b
Merge master into staging-next
github-actions[bot] Jan 4, 2022
a3f9977
Revert "castxml: mark as broken on Darwin"
veprbl Jan 4, 2022
89a0a77
Merge master into staging-next
github-actions[bot] Jan 5, 2022
e0a0f3b
python3Packages.remarhsal: fix build, enable tests, migrate to pyproj…
mweinelt Jan 5, 2022
4b70e0e
Merge master into staging-next
github-actions[bot] Jan 5, 2022
cf30a8b
python310Packages.quamash: fix build for 3.10
jonringer Jan 5, 2022
ff79900
python3Packages.nidaqmx: mark disabled for 3.10+
jonringer Jan 5, 2022
76e8c85
python3Packages.testtools: remove unittest2, unneeded
jonringer Jan 5, 2022
24ac7e1
python310Packages.html5lib: use pytestCheckHook, disable tests
jonringer Jan 5, 2022
3709c12
python310Packages.fixtures: propagate implicit six dependency
jonringer Jan 5, 2022
58d0c2b
python310Packages.parso: 0.8.1 -> 0.8.3, disable 3.10 incompatible tests
jonringer Jan 5, 2022
cafcd1d
python310Packages.subunit: disable tests
jonringer Jan 5, 2022
fd9a113
python310Packages.subunit: fix evaluation
jonringer Jan 5, 2022
5b706ee
python3Packages.jedi: 0.18.0 -> 0.18.1
jonringer Jan 5, 2022
8b28536
python3Packages.subunit: fix tests for 3.10
jonringer Jan 5, 2022
fba4cce
python3Packages.nidaqmx: fix eval failing due to misspelling
sternenseemann Jan 5, 2022
204521c
Merge master into staging-next
github-actions[bot] Jan 5, 2022
74a4683
Merge remote-tracking branch 'origin/master' into staging-next
mweinelt Jan 5, 2022
fa44da7
python3Packages.parsy: fix eval
mweinelt Jan 5, 2022
0d3fe41
Merge master into staging-next
github-actions[bot] Jan 5, 2022
9988b48
python3Packages.pydantic: 1.8.2 -> 1.9.0
jonringer Jan 5, 2022
79e0cc2
python310Packages.subunit: fix tests, again
jonringer Jan 5, 2022
10ea3f9
Merge master into staging-next
github-actions[bot] Jan 6, 2022
8a0e129
Merge master into staging-next
github-actions[bot] Jan 6, 2022
2bc8eed
Merge master into staging-next
github-actions[bot] Jan 6, 2022
eab8e6b
Merge master into staging-next
github-actions[bot] Jan 6, 2022
4da57fc
Merge master into staging-next
github-actions[bot] Jan 7, 2022
b48a41c
Merge master into staging-next
github-actions[bot] Jan 7, 2022
bd8af84
Merge master into staging-next
github-actions[bot] Jan 7, 2022
fe912e6
aws-sdk-cpp: update GitHub repo owner
veprbl Jan 7, 2022
c7548ff
aws-sdk-cpp: fix cmake config
veprbl Jan 7, 2022
5b9e292
pangoxsl: remove the package
vcunat Jan 7, 2022
86f9a32
Merge remote-tracking branch 'origin/master' into staging-next
jonringer Jan 7, 2022
71e415b
Revert "Revert "python3Packages.pip-tools: 6.3.1 -> 6.4.0""
jonringer Jan 7, 2022
f7500b6
python3Packages.hydra: fix bad merge conflict resolution
jonringer Jan 7, 2022
20ff12d
Merge pull request #153869 from vcunat/p/pangoxsl-remove
Mic92 Jan 8, 2022
d50b6bf
go_1_16: 1.16.12 -> 1.16.13
zowoq Jan 6, 2022
fe00d45
buildGoModule: remove `runVend`
zowoq Jan 6, 2022
4775404
Merge branch 'master' into staging-next
veprbl Jan 8, 2022
ad484cc
Merge pull request #153836 from veprbl/pr/aws-sdk-cpp_fix_cmake_config
veprbl Jan 8, 2022
c1fac0a
Merge master into staging-next
github-actions[bot] Jan 8, 2022
2dae738
libcryptui: fix build with latest gnupg
jtojnar Jan 8, 2022
8fc9b26
notmuch: 0.34.1 → 0.34.2
jtojnar Jan 8, 2022
eed857b
python3.pkgs.panflute: 2.1.0 → 2.1.3
jtojnar Jan 8, 2022
37e9987
swiften: use system expat
jtojnar Jan 8, 2022
ec90dec
swiften: fix build
jtojnar Jan 8, 2022
419cf5c
swiften: format the expression
jtojnar Jan 8, 2022
573edbf
swiften: use dependencies from nix
jtojnar Jan 8, 2022
345370b
swiften: another build fix attempt
jtojnar Jan 8, 2022
b264513
python3.pkgs.weasyprint: 53.4 → 54.0
jtojnar Jan 8, 2022
b40a018
Merge master into staging-next
github-actions[bot] Jan 8, 2022
d990513
calibre: fix build on staging-next due to missing setuptools
fabianhjr Jan 7, 2022
ff0ee5b
octoprint: ignore pyyaml version constraint
mweinelt Jan 8, 2022
3ce6313
Merge master into staging-next
github-actions[bot] Jan 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 1 addition & 3 deletions nixos/lib/systemd-lib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,7 @@ in rec {
mkdir -p $out/getty.target.wants/
ln -s ../autovt@tty1.service $out/getty.target.wants/

ln -s ../local-fs.target ../remote-fs.target \
../nss-lookup.target ../nss-user-lookup.target ../swap.target \
$out/multi-user.target.wants/
ln -s ../remote-fs.target $out/multi-user.target.wants/
''}
''; # */

Expand Down
10 changes: 0 additions & 10 deletions nixos/tests/installer.nix
Original file line number Diff line number Diff line change
Expand Up @@ -561,26 +561,16 @@ in {
+ " mkpart primary 2048M -1s" # PV2
+ " set 2 lvm on",
"udevadm settle",
"sleep 1",
"pvcreate /dev/vda1 /dev/vda2",
"sleep 1",
"vgcreate MyVolGroup /dev/vda1 /dev/vda2",
"sleep 1",
"lvcreate --size 1G --name swap MyVolGroup",
"sleep 1",
"lvcreate --size 3G --name nixos MyVolGroup",
"sleep 1",
"mkswap -f /dev/MyVolGroup/swap -L swap",
"swapon -L swap",
"mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
"mount LABEL=nixos /mnt",
)
'';
postBootCommands = ''
assert "loaded active" in machine.succeed(
"systemctl list-units 'lvm2-pvscan@*' -ql --no-legend | tee /dev/stderr"
)
'';
};

# Boot off an encrypted root partition with the default LUKS header format
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mpg123/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

stdenv.mkDerivation rec {
pname = "mpg123";
version = "1.28.2";
version = "1.29.3";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "006v44nz4nkpgvxz1k2vbbrfpa2m47hyydscs0wf3iysiyvd9vvy";
sha256 = "sha256-ljiF2Mx3Ji8ot3GHx9GJ4yGV5kJE3iUwt5jd8yGD6Ec=";
};

outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/editors/vim/common.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "8.2.3848";
version = "8.2.3877";

src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
sha256 = "sha256-U6xrEZbieRBU0FDdTloYdZzuNpJ9+Q7FZgfI+0SPEAQ=";
sha256 = "sha256-NqTO2TdhOs63eP7CdWY9U9nbR7No3hqPV5rGhYF9arA=";
};

enableParallelBuilding = true;
Expand Down
1 change: 1 addition & 0 deletions pkgs/applications/misc/calibre/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ mkDerivation rec {
python
regex
sip
setuptools
zeroconf
jeepney
# the following are distributed with calibre, but we use upstream instead
Expand Down
5 changes: 5 additions & 0 deletions pkgs/applications/misc/index-fm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ mkDerivation rec {
sha256 = "sha256-Os/5igKGYBeY/FxO6I+7mpFohuk3yHGLd7vE2GewFpU=";
};

postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "-Werror" ""
'';

nativeBuildInputs = [
cmake
extra-cmake-modules
Expand Down
33 changes: 27 additions & 6 deletions pkgs/applications/misc/nimbo/default.nix
Original file line number Diff line number Diff line change
@@ -1,25 +1,46 @@
{ lib, setuptools, boto3, requests, click, pyyaml, pydantic
, buildPythonApplication, pythonOlder, installShellFiles, fetchFromGitHub
, awscli }:
{ lib
, python3
, fetchFromGitHub
, installShellFiles
, awscli
}:

buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "nimbo";
version = "0.2.4";
disabled = pythonOlder "3.6";
disabled = python3.pythonOlder "3.6";

src = fetchFromGitHub {
owner = "nimbo-sh";
repo = pname;
rev = "v${version}";
sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24";
};

postPatch = ''
substituteInPlace setup.py \
--replace "awscli>=1.19<2.0" ""
'';

nativeBuildInputs = [ installShellFiles ];
propagatedBuildInputs = [ setuptools boto3 awscli requests click pyyaml pydantic ];

propagatedBuildInputs = with python3.pkgs; [
setuptools
boto3
requests
click
pyyaml
pydantic
];

# nimbo tests require an AWS instance
doCheck = false;
pythonImportsCheck = [ "nimbo" ];

makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ awscli ])
];

postInstall = ''
installShellCompletion --cmd nimbo \
--zsh <(_NIMBO_COMPLETE=source_zsh $out/bin/nimbo) \
Expand Down
1 change: 1 addition & 0 deletions pkgs/applications/misc/octoprint/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ let
"colorlog"
"emoji"
"immutabledict"
"PyYAML"
"sarge"
"sentry-sdk"
"watchdog"
Expand Down
2 changes: 2 additions & 0 deletions pkgs/applications/networking/browsers/firefox/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ buildStdenv.mkDerivation ({
inherit src unpackPhase meta;

patches = [
# Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:
./fix-build-with-wayland-1.20.patch
] ++
lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++
lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
index 7a448e6..7792581 100644
--- a/widget/gtk/mozwayland/mozwayland.c
+++ b/widget/gtk/mozwayland/mozwayland.c
@@ -200,3 +200,8 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; }

MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
struct wl_list* other) {}
+
+MOZ_EXPORT struct wl_proxy *
+wl_proxy_marshal_flags(struct wl_proxy *proxy, uint32_t opcode,
+ const struct wl_interface *interface, uint32_t version,
+ uint32_t flags, ...) { return NULL; }
4 changes: 2 additions & 2 deletions pkgs/applications/networking/mailreaders/notmuch/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

stdenv.mkDerivation rec {
pname = "notmuch";
version = "0.34.1";
version = "0.34.2";

src = fetchurl {
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
sha256 = "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5";
sha256 = "wfLO7kf2iXESItcgWvKj/npKnYwy5OCyStZviN9qR9M=";
};

nativeBuildInputs = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/build-support/alternatives/lapack/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ EOF
ln -s $out/lib/liblapacke.so.3 $out/lib/liblapacke.so
fi

cp ${lib.getDev lapack-reference}/include/lapacke{,_mangling,_config}.h $dev/include
cp ${lib.getDev lapack-reference}/include/lapacke{,_mangling,_config,_utils}.h $dev/include

cat <<EOF > $dev/lib/pkgconfig/lapacke.pc
Name: lapacke
Expand Down
4 changes: 2 additions & 2 deletions pkgs/data/misc/poppler-data/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ fetchurl, lib, stdenv, cmake, ninja }:

stdenv.mkDerivation rec {
name = "poppler-data-0.4.10";
name = "poppler-data-0.4.11";

src = fetchurl {
url = "https://poppler.freedesktop.org/${name}.tar.gz";
sha256 = "0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf";
sha256 = "sha256-LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw=";
};

nativeBuildInputs = [ cmake ninja ];
Expand Down
6 changes: 3 additions & 3 deletions pkgs/data/misc/tzdata/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

stdenv.mkDerivation rec {
pname = "tzdata";
version = "2021c";
version = "2021e";

srcs =
[ (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
sha256 = "0himprzx3ahxkmg4rvp8n5lqry76qzc65j6sfq151hqirg4d3wdl";
sha256 = "1cdjdcxl0s9xf0dg1z64kh7llm80byxqlzrkkjzcdlyh6yvl5v07";
})
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
sha256 = "01fsa661vzdij46z286pa8q07cppqz29sr2pf0qqldqpldbb6km3";
sha256 = "0x8pcfmjvxk29yfh8bklchv2f0vpl4yih0gc4wyx292l78wncijq";
})
];

Expand Down
7 changes: 6 additions & 1 deletion pkgs/data/themes/material-kwin-decoration/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

mkDerivation rec {
pname = "material-kwin-decoration";
version = "unstable-20211028";
version = "unstable-2021-10-28";

src = fetchFromGitHub {
owner = "Zren";
Expand All @@ -25,6 +25,11 @@ mkDerivation rec {
sha256 = "sha256-aYlnPFhf+ISVe5Ycryu5BSXY8Lb5OoueMqnWQZiv6Lc=";
};

postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "-Werror" ""
'';

nativeBuildInputs = [ cmake extra-cmake-modules ];

buildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome/core/gnome-desktop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@

stdenv.mkDerivation rec {
pname = "gnome-desktop";
version = "41.1";
version = "41.2";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-voqvpk17ov0xB57tY505/aHqd+9301pnjwGcTZHUc8I=";
sha256 = "sha256-NDKe79rK0jMqatuuU4yNpuUiNcd3WpCLfDIECgdT7Go=";
};

patches = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/go/1.16.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ in

stdenv.mkDerivation rec {
pname = "go";
version = "1.16.12";
version = "1.16.13";

src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-Kv2Dnct20rsILFAsAaClzb/An9YwdXg1NjxP3o4vv+g=";
sha256 = "sha256-sJJmVOrrAe9DgWY49C17FoHy0/QblVnwdzVSK3r61Bo=";
};

# perl is used for testing go vet
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/10/llvm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ in stdenv.mkDerivation (rec {
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
''
# Patch llvm-config to return correct library path based on --link-{shared,static}.
+ optionalString (enableSharedLibraries) ''
+ ''
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
patch -p1 < ./outputs.patch
'' + ''
Expand Down
16 changes: 3 additions & 13 deletions pkgs/development/compilers/llvm/10/llvm/outputs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
index 94d426b..37f7794 100644
--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
ActiveIncludeOption = "-I" + ActiveIncludeDir;
}

+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
+ /// Nix-specific multiple-output handling: override ActiveLibDir
+ if (!IsInDevelopmentTree) {
+ bool WantShared = true;
+ for (int i = 1; i < argc; ++i) {
+ StringRef Arg = argv[i];
+ if (Arg == "--link-shared")
+ WantShared = true;
+ else if (Arg == "--link-static")
+ WantShared = false; // the last one wins
+ }
+
+ if (WantShared)
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
+ }
+
/// We only use `shared library` mode in cases where the static library form
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/llvm/11/clang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ let
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++14"
"-DCLANGD_BUILD_XPC=OFF"
"-DLLVM_ENABLE_RTTI=ON"
"-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
] ++ lib.optionals enableManpages [
"-DCLANG_INCLUDE_DOCS=ON"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/11/llvm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ in stdenv.mkDerivation (rec {
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
''
# Patch llvm-config to return correct library path based on --link-{shared,static}.
+ optionalString (enableSharedLibraries) ''
+ ''
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
patch -p1 < ./outputs.patch
'' + ''
Expand Down
16 changes: 3 additions & 13 deletions pkgs/development/compilers/llvm/11/llvm/outputs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,13 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
index 94d426b..37f7794 100644
--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
@@ -333,6 +333,11 @@ int main(int argc, char **argv) {
ActiveIncludeOption = "-I" + ActiveIncludeDir;
}

+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
+ /// Nix-specific multiple-output handling: override ActiveLibDir
+ if (!IsInDevelopmentTree) {
+ bool WantShared = true;
+ for (int i = 1; i < argc; ++i) {
+ StringRef Arg = argv[i];
+ if (Arg == "--link-shared")
+ WantShared = true;
+ else if (Arg == "--link-static")
+ WantShared = false; // the last one wins
+ }
+
+ if (WantShared)
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
+ }
+
/// We only use `shared library` mode in cases where the static library form
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/llvm/12/clang/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ let
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++14"
"-DCLANGD_BUILD_XPC=OFF"
"-DLLVM_ENABLE_RTTI=ON"
"-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
] ++ lib.optionals enableManpages [
"-DCLANG_INCLUDE_DOCS=ON"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/12/llvm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ in stdenv.mkDerivation (rec {
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
''
# Patch llvm-config to return correct library path based on --link-{shared,static}.
+ optionalString (enableSharedLibraries) ''
+ ''
substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
patch -p1 < ./outputs.patch
'' + ''
Expand Down
Loading