nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
281,456 Commits 241 Branches 124 Tags 7.9 GiB
714ef27ffe
Commit Graph

566 Commits

Author SHA1 Message Date
Jan Tojnar
714ef27ffe Merge branch 'master' into staging-next 2021-04-07 05:32:57 +02:00
TredwellGit
551f1dac03 xorg.xf86inputlibinput: 0.30.0 -> 1.0.0 
https://lists.x.org/archives/xorg-announce/2021-April/003079.html
 2021-04-06 22:34:14 +00:00
TredwellGit
584f82352e xorg.libXres: 1.2.0 -> 1.2.1 
https://lists.x.org/archives/xorg-announce/2021-March/003078.html
 2021-04-01 00:40:23 +00:00
TredwellGit
c0172b1885 xorg.libXaw: 1.0.13 -> 1.0.14 
https://lists.x.org/archives/xorg-announce/2021-March/003077.html
 2021-03-28 02:27:04 +00:00
Sandro
0cfe88d88f
Merge pull request #114601 from TredwellGit/xorg.xorgproto 
xorg.xorgproto: 2020.1 -> 2021.3
 2021-03-21 05:32:19 +01:00
TredwellGit
8d351c013d xorg.xkbcomp: 1.4.4 -> 1.4.5 
https://lists.x.org/archives/xorg-announce/2021-March/003075.html
 2021-03-18 03:23:00 +00:00
Sandro
448b953d56
Merge pull request #111403 from TredwellGit/xorg.libXt 
xorg.libXt: 1.2.0 -> 1.2.1
 2021-03-06 05:55:39 +01:00
TredwellGit
f00fde643e xorg.utilmacros: 1.19.2 -> 1.19.3 
https://lists.x.org/archives/xorg-announce/2021-January/003069.html
 2021-03-05 19:04:19 +00:00
TredwellGit
38462b44c6 xorg.xorgproto: 2020.1 -> 2021.3 
https://lists.x.org/archives/xorg-announce/2021-February/003072.html
https://lists.x.org/archives/xorg-announce/2021-February/003073.html
 2021-02-27 22:41:20 +00:00
TredwellGit
f296c4f81f xorg.libXt: 1.2.0 -> 1.2.1 
https://lists.x.org/archives/xorg-announce/2021-January/003070.html
 2021-01-31 07:12:32 +00:00
TredwellGit
ba5dedbbd0 xorg.xf86videonouveau: 1.0.16 -> 1.0.17 
https://lists.freedesktop.org/archives/nouveau/2021-January/037766.html
 2021-01-24 07:33:12 +00:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix 
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
 2021-01-19 01:16:25 -08:00
github-actions[bot]
bd9e17e21f
Merge staging-next into staging 2021-01-10 18:41:46 +00:00
github-actions[bot]
76394e4624
Merge master into staging-next 2021-01-10 18:41:43 +00:00
Profpatsch
66c01cf6f1 x11/xorg: run generator to apply change to stdenv.lib -> lib 2021-01-10 17:45:48 +01:00
Jan Tojnar
0ea0dacc20
Merge branch 'staging-next' into staging 2021-01-07 13:06:41 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next 
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
 2021-01-07 13:04:31 +01:00
Sandro
8529423aa3
Merge pull request #108442 from TredwellGit/xorg.xf86videovesa 2021-01-06 01:26:47 +01:00
Michele Guerini Rocco
5748022aa3
Merge pull request #107117 from TredwellGit/xorg.fonttosfnt 
xorg.fonttosfnt: 1.0.5 -> 1.2.1
 2021-01-05 09:40:37 +01:00
TredwellGit
730976960a xorg.xf86videonouveau: 1.0.15 -> 1.0.16 
https://lists.freedesktop.org/archives/nouveau/2019-January/032053.html
 2021-01-05 03:24:56 +00:00
TredwellGit
45c86b688c xorg.xf86videovesa: 2.4.0 -> 2.5.0 
https://lists.x.org/archives/xorg-announce/2020-September/003060.html
 2021-01-05 03:21:15 +00:00
TredwellGit
8121c9badb xorg.xkbcomp: 1.4.2 -> 1.4.4 
https://lists.x.org/archives/xorg-announce/2020-February/003037.html
https://lists.x.org/archives/xorg-announce/2020-November/003063.html
 2021-01-04 18:07:56 +01:00
TredwellGit
ad86bc75eb xorg.fonttosfnt: 1.0.5 -> 1.2.1 
https://lists.x.org/archives/xorg-announce/2020-January/003035.html
https://lists.x.org/archives/xorg-announce/2020-October/003062.html
https://lists.x.org/archives/xorg-announce/2020-December/003068.html
 2020-12-17 19:59:37 +00:00
TredwellGit
88fcd687d0 xorg.xrandr: 1.5.0 -> 1.5.1 
https://lists.x.org/archives/xorg-announce/2019-August/003018.html
 2020-12-08 05:20:24 +01:00
github-actions[bot]
4763e8b8fd
Merge master into staging-next 2020-12-05 00:38:01 +00:00
TredwellGit
0309973b82 xorg.xorgserver: 1.20.9 -> 1.20.10 
https://lists.x.org/archives/xorg-announce/2020-December/003067.html
https://lists.x.org/archives/xorg-announce/2020-December/003066.html
 2020-12-01 23:47:01 +00:00
Vladimír Čunát
48b3694562
Merge #104825: xorg.libX11: 1.6.12 -> 1.7.0 (security) 2020-11-29 09:55:14 +01:00
TredwellGit
95e815b5ff xorg.libX11: 1.6.12 -> 1.7.0 
https://lists.x.org/archives/xorg-announce/2020-November/003065.html
 2020-11-24 23:54:22 +00:00
TredwellGit
233849a14d xorg.xprop: 1.2.4 -> 1.2.5 
https://lists.x.org/archives/xorg-announce/2020-November/003064.html
 2020-11-24 23:42:45 +00:00
TredwellGit
fc03fe100a xorg: fix update generation 
Both e3d3bc66dc and 1d15641433 were done incorrectly.

Also, use python3 in generate-expr-from-tarballs.pl instead of overrides.nix.
 2020-11-23 13:30:25 -08:00
Frederik Rietdijk
20f001c01e Merge master into staging-next 2020-11-09 14:33:52 +01:00
Danielle Lancashire
f7e691ac7e xorg.xf86videointel: Fix build 
Since c252654584, building xf86videointel
has been broken on my system due to missing libXv. This commit
explicitly includes the dependency when building the package to
hopefully avoid things being broken for others.
 2020-11-06 15:01:43 +01:00
Matthieu Coudron
e3d3bc66dc
Merge pull request #101695 from lourkeur/xkeyboard-config 
xkeyboard-config: 2.27 -> 2.31
 2020-10-27 15:11:04 +01:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge 
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
 2020-10-26 09:01:04 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
 2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
 2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Louis
3cf12aa9c6 xkeyboard-config: 2.27 -> 2.31 2020-10-24 20:22:31 +02:00
Andreas Rammhold
f0af7d27b8
Merge pull request #98748 from TredwellGit/xorg.xorgserver 
xorg.xorgserver: 1.20.8 -> 1.20.9
 2020-10-24 00:44:52 +02:00
Vladimír Čunát
2324085f9f
Merge #100385: xorg xcb updates (into staging) 2020-10-20 12:09:58 +02:00
Vladimír Čunát
744f449aa4
Merge #100376: xorg.xorgproto: 2019.1 -> 2020.1 (into staging) 2020-10-20 12:07:12 +02:00
Vladimír Čunát
b4d8c62423
Merge #100378: xorg.libXvMC: 1.0.11 -> 1.0.12 (into staging) 2020-10-20 12:05:30 +02:00
Vladimír Čunát
b623690daf
Merge #99158: xorg.libX11: 1.6.8 -> 1.6.12 (security) 2020-10-15 07:55:16 +02:00
Rok Garbas
ec49d7a686
Merge pull request #100391 from TredwellGit/xorg.xf86inputlibinput 
xorg.xf86inputlibinput: 0.28.2 -> 0.30.0
 2020-10-14 14:17:12 +02:00
TredwellGit
3e079834a9 xorg.libX11: 1.6.8 -> 1.6.12 
https://lists.x.org/archives/xorg-announce/2020-August/003056.html
https://lists.x.org/archives/xorg-announce/2020-July/003050.html
 2020-10-13 22:47:33 -04:00
TredwellGit
dd6a204464 xorg.xf86inputlibinput: 0.28.2 -> 0.30.0 
https://lists.x.org/archives/xorg-announce/2019-August/003017.html
https://lists.x.org/archives/xorg-announce/2020-May/003045.html
 2020-10-13 07:34:17 +00:00
TredwellGit
3a23e46d6e xorg.libxcb: 1.13.1 -> 1.14 
https://lists.x.org/archives/xorg-announce/2020-February/003039.html
 2020-10-13 06:25:31 +00:00
TredwellGit
9601605ede xorg.xcbproto: 1.13 -> 1.14.1 
https://lists.x.org/archives/xorg-announce/2020-February/003038.html
https://lists.x.org/archives/xorg-announce/2020-October/003061.html
 2020-10-13 06:17:20 +00:00
TredwellGit
55eba47ef6 xorg.libXvMC: 1.0.11 -> 1.0.12 
https://lists.x.org/archives/xorg-announce/2019-September/003023.html
 2020-10-13 05:15:01 +00:00
TredwellGit
9c4f4aa099 xorg.xorgproto: 2019.1 -> 2020.1 
https://lists.x.org/archives/xorg-announce/2019-October/003029.html
https://lists.x.org/archives/xorg-announce/2020-April/003042.html
 2020-10-13 05:02:44 +00:00