Vladimír Čunát
44b36397c2
Merge branch 'master' into staging-next
...
Conflicts - GitHub wouldn't auto-resolve them but my local git did:
pkgs/development/cuda-modules/cuda/overrides.nix
2024-07-04 10:10:22 +02:00
adisbladis
1be927ca66
Merge pull request #316983 from edolstra/let-float-json
...
Let-float various fromJSON calls to avoid repeated JSON reading/parsing
2024-07-04 13:47:08 +12:00
github-actions[bot]
aba75819b6
Merge master into staging-next
2024-07-03 18:01:04 +00:00
éclairevoyant
83a657cacd
Merge pull request #324353 from delan/bye
...
maintainers: remove delan
2024-07-03 17:39:29 +00:00
Vladimír Čunát
c76085b3a9
Merge branch 'master' into staging-next
2024-07-03 19:07:35 +02:00
Delan Azabani
01aa077998
maintainers: remove delan
2024-07-03 19:54:30 +08:00
Jussi Kuokkanen
9b4703cf14
pkgs/misc: remove licenses.gpl2
2024-07-03 14:24:14 +03:00
github-actions[bot]
d77a3adc09
Merge master into staging-next
2024-07-03 00:02:45 +00:00
Weijia Wang
3814f8ed46
Merge pull request #322685 from r-ryantm/auto-update/mxt-app
...
mxt-app: 1.36 -> 1.38
2024-07-02 23:10:41 +02:00
K900
665f1d6183
Merge remote-tracking branch 'origin/master' into staging-next
2024-07-02 08:32:46 +03:00
Janik H.
76cd1d2211
maintainers: drop janik
...
I guess my time has come as well...
With this commit, I'm not just dropping my maintainer entry, but I'm also
resigning from my duties as a board observer and NixCon project lead.
I also terminated my Summer of Nix contract today.
I'll also stop hosting the local NixOS meetup.
The only "project" I'll finish under the NixOS Foundation umbrella is
Google Summer of Code because the mentees aren't even remotely
responsible for why I'm leaving, and it would be unfair to leave them
hanging.
I'm grateful for all the things I was able to learn, for all the experiences
I could gather, and for all the friends I made along the way.
NixOS is what makes computers bearable for me, so I'll go and work on
some fork (*something something* you always meet twice in life).
2024-07-02 02:36:42 +02:00
pennae
5c5aaaaaae
maintainers: remove pennae
...
https://discourse.nixos.org/t/nca-jonringer-joint-announcement/48231
https://web.archive.org/web/20240701165505/https://discourse.nixos.org/t/nca-jonringer-joint-announcement/48231
we had little faith in the NCA process, but this is going deep, *deep*
into the territory of wilfully insulting all those had placed even a
modicum of trust in that process.
have you fucking nazi bar.
2024-07-01 18:56:40 +02:00
Martin Weinelt
9b79a05ae1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/flexcache/default.nix
- pkgs/development/python-modules/flexparser/default.nix
- pkgs/development/python-modules/odp-amsterdam/default.nix
- pkgs/development/python-modules/pint/default.nix
- pkgs/development/python-modules/uncertainties/default.nix
- pkgs/top-level/python-packages.nix
2024-07-01 01:07:21 +02:00
Michele Guerini Rocco
373ef925ca
Merge pull request #323235 from rnhmjoj/pr-scc
...
sc-controller: 0.4.8.13 -> 0.4.8.17
2024-06-30 01:11:01 +02:00
K900
bde999c03e
Merge branch 'master' into staging-next
2024-06-29 10:13:13 +03:00
rnhmjoj
6ac745ef3c
sc-controller: 0.4.8.13 -> 0.4.8.17
...
The Ryochan7's fork has been archived, development continues over at
C0rn3j's fork. Hopefully this will me merged into the official
project sooner or later...
2024-06-28 22:20:50 +02:00
Ryan Hendrickson
c81ecdf95b
Merge pull request #322284 from rhendric/rhendric/genericUpdater-allowedVersions
...
common-updater-scripts: add allowedVersions parameter
2024-06-28 15:35:00 -04:00
R. Ryantm
a5b1a60fe8
mxt-app: 1.36 -> 1.38
2024-06-26 16:46:30 +00:00
github-actions[bot]
27074b7d07
Merge master into staging-next
2024-06-26 00:02:13 +00:00
Weijia Wang
68bf0f3d71
Merge pull request #321186 from r-ryantm/auto-update/lilypond-unstable
...
lilypond-unstable: 2.25.16 -> 2.25.17
2024-06-26 00:05:09 +02:00
Ryan Hendrickson
77a9e911a6
alock: use allowedVersions in updateScript
2024-06-25 17:45:57 -04:00
github-actions[bot]
88140ced6d
Merge master into staging-next
2024-06-24 12:01:17 +00:00
Martin Weinelt
74f29cd4b6
libjack2: fix python 3.12 support
...
Backports the waf 2.0.26 update, which adds Python 3.12 support to the
build system.
2024-06-24 12:18:23 +02:00
Shawn8901
0415c9c1f4
epson-escpr2: 1.2.10 -> 1.2.11
2024-06-23 22:31:59 +02:00
Martin Weinelt
2096642430
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
- pkgs/os-specific/windows/mingw-w64/default.nix
2024-06-23 19:09:00 +02:00
Emily
fbda1dbfd6
treewide: replace freeglut with libglut
...
Allow the macOS GLUT framework to be used automatically in many
cases. Packages that specifically search for freeglut or require its
additional APIs should still explicitly depend on it.
Deliberately skip the Haskell package set, which is mostly
automatically generated, and mupdf, which has its own fork of freeglut.
2024-06-22 18:06:51 +01:00
R. Ryantm
44210d5c23
fastly: 10.12.2 -> 10.12.3
2024-06-22 07:02:02 +00:00
github-actions[bot]
c6707a9686
Merge staging-next into staging
2024-06-21 12:01:53 +00:00
Samuel Dionne-Riel
c7882d9a4d
hll2390dw-cups: Drop unmaintained package
2024-06-21 01:06:01 -04:00
Samuel Dionne-Riel
caf402f789
uboot*: Drop samueldr as maintainer
2024-06-20 20:45:18 -04:00
R. Ryantm
82f78e7510
lilypond-unstable: 2.25.16 -> 2.25.17
2024-06-20 07:44:46 +00:00
Martin Weinelt
f822b2ba5c
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
- pkgs/development/python-modules/langsmith/default.nix
- pkgs/development/python-modules/rich-pixels/default.nix
- pkgs/servers/teleport/generic.nix
2024-06-18 20:16:19 +02:00
Ben Siraphob
8222aa9278
Merge pull request #315183 from jopejoe1/fix-pname
...
treewide: replace name with pname
2024-06-16 12:34:01 +00:00
Aleksana
ee9cf00e6d
Merge pull request #315240 from Cryolitia/ghost-font
...
ghostscript: add output `fonts`
2024-06-15 19:32:39 +08:00
jopejoe1
f9cd82dcfd
lssecret: use pname instead of name
2024-06-15 09:56:43 +02:00
github-actions[bot]
eccfb1ee94
Merge staging-next into staging
2024-06-15 00:02:47 +00:00
Weijia Wang
f006c8e547
Merge pull request #319753 from r-ryantm/auto-update/fastly
...
fastly: 10.12.1 -> 10.12.2
2024-06-14 22:39:12 +02:00
github-actions[bot]
098fe8ee26
Merge staging-next into staging
2024-06-14 18:01:39 +00:00
Guillaume Girol
a5ca25f03d
Merge pull request #319840 from nova-r/new-plugin-epkowa
...
epkowa: add plugin for Perfection V100 Photo
2024-06-14 18:28:36 +02:00
nova madeline
82aeb7fba1
epkowa: add plugin for Perfection V100 Photo
2024-06-14 16:40:55 +02:00
Martin Weinelt
abdf5dc772
treewide: remove pythonRelaxDepsHook references
...
It is is now provided automatically, when `pythonRelaxDeps` or
`pythonRemoveDeps` is defined through `mk-python-derivation`.
2024-06-14 14:52:00 +02:00
R. Ryantm
3df1fb8b73
fastly: 10.12.1 -> 10.12.2
2024-06-14 07:34:32 +00:00
Shawn8901
05ae9bdbb3
epson-escpr2: 1.2.9 -> 1.2.10
2024-06-13 22:25:09 +02:00
github-actions[bot]
477d2d32ff
Merge master into staging-next
2024-06-12 00:02:10 +00:00
Rafael Fernández López
07fd30b47a
fastly: 10.12.0 -> 10.12.1
2024-06-11 08:26:14 +02:00
github-actions[bot]
0cc78468fa
Merge master into staging-next
2024-06-10 18:01:13 +00:00
Rafael Fernández López
9a7c749bd7
fastly: 10.11.0 -> 10.12.0
2024-06-10 13:08:07 +02:00
Alyssa Ross
3df6bb2c85
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/blockchains/polkadot/default.nix
2024-06-09 22:47:12 +01:00
Alexis Hildebrandt
f8c4a98e8e
treewide: Remove the definite article from meta.description
...
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"([Tt]he)? ' pkgs \
| xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Tt]he (.)/\1\U\2/'
2024-06-09 23:08:46 +02:00
Alexis Hildebrandt
755b915a15
treewide: Remove indefinite article from meta.description
...
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
| xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
