Commit Graph

111 Commits

Author SHA1 Message Date
Artturin
7130bf3097 jackaudio: only add makeWrapper when needed
The `wrapProgram` usage is behind a conditional below
2024-09-25 20:42:50 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Jörg Thalheim
5356420466 treewide: remove unused with statements from maintainer lists
$ find -type f -name '*.nix' -print0 | xargs -P "$(nproc)" -0 sed -i \
  -e 's!with lib.maintainers; \[ *\];![ ];!' \
  -e 's!with maintainers; \[ *\];![ ];!'
2024-07-29 10:06:20 +08:00
Ivan Trubach
90fbf71333 treewide: remove maintainer goibhniu
Inactive in Nixpkgs since 2018 (and a single PR in 2022).
https://github.com/NixOS/nixpkgs/issues?q=author%3Acillianderoiste
2024-07-24 13:38:22 +03:00
Vladimír Čunát
c76085b3a9
Merge branch 'master' into staging-next 2024-07-03 19:07:35 +02:00
Jussi Kuokkanen
9b4703cf14 pkgs/misc: remove licenses.gpl2 2024-07-03 14:24:14 +03:00
K900
665f1d6183 Merge remote-tracking branch 'origin/master' into staging-next 2024-07-02 08:32:46 +03: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
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
Alyssa Ross
67641d0589 wafHook: don't add cross compilation flags
These flags are not part of waf, they're custom flags that are not
widely implemented.  More packages are broken because of these flags
being added than actually recognise them.

Of the packages in Nixpkgs that directly depend on wafHook that we can
attempt to cross compile (i.e. all their dependencies cross compile),
5 already successfully cross compile and recognise these flags, 2
already successfully cross compile because they have been opted out of
these flags, 3 don't cross compile successfully for reasons unrelated
to these flags, and for the remaining 7, the only thing stopping them
cross compiling successfully is that they are being passed these flags
that they don't recognise.

All of the five successfully cross-compiling packages that do
recognise these flags are samba projects: ldb, talloc, tdb, tevent,
and samba4.  So this isn't a general waf convention, just a samba one.
It therefore doesn't make sense to set these flags by default.  They
should just be included in the expressions for each samba project,
like all the other quirks common to samba build systems.

This change fixes cross compilation of the following packages:

  blockhash ganv ndn-cxx mda_lv2 pflask raul saldl
2024-05-15 16:47:16 +02:00
github-actions[bot]
9df0a1c6a2
Merge staging-next into staging 2023-09-08 18:01:25 +00:00
github-actions[bot]
87ae839e33
Merge master into staging-next 2023-09-08 18:00:54 +00:00
Weijia Wang
db76ee42c2 jack-example-tools: add darwin support 2023-09-08 15:48:38 +02:00
pennae
6054951ae5
Merge pull request #253299 from pennae/jack-tools
jack-example-tools: init at 4
2023-09-08 15:23:25 +02:00
Artturi
6946977de0
Merge pull request #252874 from atorres1985-contrib/waf-cross 2023-09-07 21:39:12 +03:00
github-actions[bot]
204bfce523
Merge staging-next into staging 2023-09-07 00:02:49 +00:00
Weijia Wang
1d9eef8230
Merge pull request #253726 from reckenrode/jack2-fix
jack2: fix build on Darwin
2023-09-07 01:06:20 +02:00
Randy Eckenrode
b54560e818
jack2: fix build on Darwin
jack_control requires dbus, which isn’t enabled on Darwin.
2023-09-06 18:18:15 -04:00
Anderson Torres
e24107b347 treewide: convert configureFlags to wafConfigureFlags when appropriate 2023-09-06 10:41:28 -03:00
Anderson Torres
f2f9262b92 treewide: waf.hook -> wafHook 2023-09-06 10:41:28 -03:00
pennae
9ee9dfac22 jack-example-tools: init at 4 2023-09-04 20:49:55 +02:00
Anderson Torres
9f52275e52 treewide: change wafConfigureFlags to configureFlags
Because it makes no sense to treat it differently.
2023-09-01 15:21:21 +00:00
Anderson Torres
11b910d8c7 jackaudio: change wafHook to waf.hook 2023-08-26 13:12:09 +00:00
R. Ryantm
1260276f1a libjack2: 1.9.19 -> 1.9.22 2023-08-18 21:00:59 +00:00
Mika Tammi
69d67d04e1
libjack2: fix cross compilation
Signed-off-by: Mika Tammi <mika.tammi@unikie.com>
2023-07-26 17:59:34 +03:00
Vladimír Čunát
036bb8ff81
jack2, libjack2: fix jack2.pc after splitting outputs
The split was merged in cfe009304 from PR #226315
This fixes qtractor build (and maybe others):
https://hydra.nixos.org/build/221582472/nixlog/3/tail
2023-05-30 09:37:30 +02:00
Sergei Trofimovich
84fa095d6f libjack2: move headers to "dev" outputs 2023-04-15 18:39:57 +01:00
Winter
ee197b2f33 libjack2: don't use with lib at top-level
It's bit us once already [0], let's get rid of it before it does it again.

[0]: https://github.com/NixOS/nixpkgs/pull/216096#issuecomment-1437763295
2023-02-20 22:38:48 -05:00
Winter
76305f698e libjack2: fix source url
c733f0bf8a switched JACK to using overlay-style
mkDerivation, but forgot to change a reference to `version` to `finalAttrs.version`.

This wasn't caught at eval time because `with lib` was used, making the
source derivation try to fetch (at the time of writing) tag "23.05pre-git",
which obviously doesn't exist :D

Thanks to V for catching this [0].

[0]: https://github.com/NixOS/nixpkgs/pull/216096#issuecomment-1437763295
2023-02-20 22:29:21 -05:00
John Ericson
c733f0bf8a jack: Add meta.pkgConfigModules and test 2023-02-13 10:21:07 -05:00
Artturin
f4ea1208ec treewide: *Flags convert to list from str
*Flags implies a list

slightly relevant:
> stdenv: start deprecating non-list configureFlags https://github.com/NixOS/nixpkgs/pull/173172

the makeInstalledTests function in `nixos/tests/installed-tests/default.nix` isn't available outside of nixpkgs so
it's not a breaking change
2022-10-10 15:30:59 +03:00
Rick van Schijndel
010f6ee30d
treewide: mark broken for darwin 2022-05-30 13:42:58 +02:00
Rick van Schijndel
a13f4f6c1c jackaudio: remove unneeded PKGCONFIG variable
Not needed anymore after setting this correctly in the wafHook.
2022-04-10 17:12:11 +02:00
Bart Brouns
4f84eb18b1 jackaudio: 1.9.17 -> 1.9.19 2021-10-03 13:45:47 +02:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
oxalica
354d262db8
lib.meta: introduce availableOn 2021-04-02 19:20:23 +08:00
Alyssa Ross
8b9ff564c7
libjack2: fix cross
Always defaults to unprefixed pkg-config, even when cross-compiling.

Fixes: https://github.com/NixOS/nixpkgs/issues/96548
2021-02-08 14:55:15 +00:00
R. RyanTM
59eefd2ebe libjack2: 1.9.16 -> 1.9.17 2021-01-22 21:28:42 +01:00
Ben Siraphob
fce00d15c2 pkgs/misc: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Bart Brouns
d2b13f9030 jack2: 1.9.14 -> 1.9.16 2020-10-20 21:06:14 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
worldofpeace
a20dd9528b jack2: 1.9.13 -> 1.9.14, fix build arm
See: https://github.com/jackaudio/jack2/releases/tag/v1.9.14

Thanks for fedora working on python3 there and the arm patch 💖.
2019-11-19 17:26:41 -05:00
c0bw3b
9367367dfd Treewide: fix URL permanent redirects
Permanent redirects on homepages and/or source URLs
as reported by Repology
2019-11-16 01:41:23 +01:00
Robert Scott
e3e9af4d03 jack2: 1.9.12 -> 1.9.13 (security)
addressing CVE-2019-13351

removing now-redundant patch fixing build on macos
2019-11-03 10:35:36 +01:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Daiderd Jordan
df23db8956
jack2: remove cf-private 2019-07-03 22:20:23 +02:00
Andrew Childs
19dd115588 jackaudio: restrict aften dependency to Darwin 2019-05-19 00:28:45 -04:00
Matthew Bauer
6e7cc807ff jackaudio: reenable on darwin
Apply patch to fix darwin build.
2019-04-29 21:34:25 -04:00