Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/by-name/ak/akkoma-admin-fe/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
yarn,
nodejs,
git,
python3,
python311,
pkg-config,
libsass,
nix-update-script,
Expand Down Expand Up @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
yarn
nodejs
pkg-config
python3
python311
git
libsass
]
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/al/alsa-utils/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
pciutils,
procps,
which,
fftw,
fftwFloat,
pipewire,
withPipewireLib ? true,
symlinkJoin,
Expand Down Expand Up @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
alsa-lib
ncurses
libsamplerate
fftw
fftwFloat
];

configureFlags = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/aq/aquamarine/package.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
cmake,
fetchFromGitHub,
hwdata,
Expand All @@ -21,7 +21,7 @@
wayland-protocols,
wayland-scanner,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "aquamarine";
version = "0.9.5";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ar/armips/package.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
stdenv,
clangStdenv,
lib,
fetchFromGitHub,
cmake,
}:

stdenv.mkDerivation rec {
clangStdenv.mkDerivation rec {
pname = "armips";
version = "0.11.0";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ar/art/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
lcms2,
libraw,
libiptcdata,
fftw,
fftwSinglePrec,
expat,
pcre2,
libsigcxx,
Expand Down Expand Up @@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
lcms2
libraw
libiptcdata
fftw
fftwSinglePrec
expat
pcre2
libsigcxx
Expand Down
3 changes: 0 additions & 3 deletions pkgs/by-name/ba/bazel_7/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
makeBinaryWrapper,
autoPatchelfHook,
buildFHSEnv,
# this package (through the fixpoint glass)
# TODO probably still need for tests at some point
bazel_self,
# native build inputs
runtimeShell,
zip,
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/bi/biblioteca/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
gtk4,
gobject-introspection,
libadwaita,
webkitgtk,
webkitgtk_6_0,
coreutils,
makeShellWrapper,
wrapGAppsHook4,
Expand Down Expand Up @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk4
gobject-introspection
libadwaita
webkitgtk
webkitgtk_6_0
glib-networking
];

Expand All @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk4.devdoc
glib.devdoc
libadwaita.devdoc
webkitgtk.devdoc
webkitgtk_6_0.devdoc
gobject-introspection.devdoc
]
++ extraDocsPackage;
Expand Down
3 changes: 2 additions & 1 deletion pkgs/by-name/bl/blender/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
pkg-config,
potrace,
pugixml,
python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
python311Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
rocmPackages, # comes with a significantly larger closure size
runCommand,
shaderc,
Expand All @@ -94,6 +94,7 @@ let
(!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;
vulkanSupport = !stdenv.hostPlatform.isDarwin;

python3Packages = python311Packages;
python3 = python3Packages.python;
pyPkgsOpenusd = python3Packages.openusd.override (old: {
opensubdiv = old.opensubdiv.override { inherit cudaSupport; };
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ca/cantata/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
withHttpStream ? true,
gst_all_1,
withReplaygain ? true,
ffmpeg,
ffmpeg_6,
speex,
mpg123,
withMtp ? true,
Expand Down Expand Up @@ -91,7 +91,7 @@ let
];
enable = withReplaygain;
pkgs = [
ffmpeg
ffmpeg_6
speex
mpg123
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/cl/clang-uml/package.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
lib,
fetchFromGitHub,
stdenv,
clangStdenv,
cmake,
pkg-config,
installShellFiles,
Expand All @@ -15,7 +15,7 @@
enableLibcxx ? false,
debug ? false,
}:
stdenv.mkDerivation (finalAttrs: {
clangStdenv.mkDerivation (finalAttrs: {
pname = "clang-uml";
version = "0.6.1";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/cl/clash-verge-rev/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
wrapGAppsHook3,
v2ray-geoip,
v2ray-domain-list-community,
libsoup,
libsoup_3,
}:
let
pname = "clash-verge-rev";
Expand Down Expand Up @@ -50,7 +50,7 @@ let
pnpm-hash
vendor-hash
meta
libsoup
libsoup_3
;
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
kdePackages,
libayatana-appindicator,
libsForQt5,
libsoup,
libsoup_3,
openssl,
webkitgtk_4_1,
}:
Expand Down Expand Up @@ -99,7 +99,7 @@ rustPlatform.buildRustPackage {

buildInputs = [
libayatana-appindicator
libsoup
libsoup_3
openssl
webkitgtk_4_1
];
Expand Down
7 changes: 5 additions & 2 deletions pkgs/by-name/co/cope/package.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
lib,
fetchFromGitHub,
perl,
perlPackages,
perl538Packages,
}:

let
perlPackages = perl538Packages;
in

perlPackages.buildPerlPackage {
pname = "cope";
version = "0-unstable-2024-03-27";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/cp/cp2k/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
fftw,
libint,
libvori,
libxc,
libxc_7,
dftd4,
simple-dftd3,
tblite,
Expand Down Expand Up @@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
gsl
libint
libvori
libxc
libxc_7
libxsmm
mpi
spglib
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/da/darktable/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
libtiff,
libwebp,
libxml2,
lua,
lua5_4,
util-linux,
openexr,
openjpeg,
Expand Down Expand Up @@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
libtiff
libwebp
libxml2
lua
lua5_4
openexr
openjpeg
osm-gps-map
Expand Down
7 changes: 6 additions & 1 deletion pkgs/by-name/da/davis/package.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
lib,
fetchFromGitHub,
php,
php83,
nixosTests,
}:

let
# https://github.com/tchapi/davis/issues/195
php = php83;
in

php.buildComposerProject2 (finalAttrs: {
pname = "davis";
version = "5.2.0";
Expand Down
12 changes: 8 additions & 4 deletions pkgs/by-name/db/dbqn/package.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
lib,
stdenv,
stdenvNoCC,
fetchFromGitHub,
jdk,
jre,
makeWrapper,
buildNativeImage ? false,
}:

stdenv.mkDerivation rec {
let
jdk = jre;
in

stdenvNoCC.mkDerivation rec {
pname = "dbqn" + lib.optionalString buildNativeImage "-native";
version = "0.2.2";

Expand Down Expand Up @@ -78,6 +82,6 @@ stdenv.mkDerivation rec {
sternenseemann
];
inherit (jdk.meta) platforms;
broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin
broken = stdenvNoCC.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin
};
}
6 changes: 3 additions & 3 deletions pkgs/by-name/di/dillo/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
lib,
autoreconfHook,
fetchFromGitHub,
fltk,
fltk13,
libjpeg,
libpng,
libwebp,
Expand Down Expand Up @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
autoreconfHook
pkg-config
fltk
fltk13
which
];

Expand All @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
libpng
libwebp
ssl
fltk
fltk13
];

outputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/dj/djv/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
libpng,
opencolorio_1,
freetype,
openexr,
openexr_2,
}:

let
Expand Down Expand Up @@ -152,7 +152,7 @@ stdenv.mkDerivation {
freetype
opencolorio_1
djv-deps
openexr
openexr_2
];

postPatch = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/dw/dwl/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
wayland,
wayland-protocols,
wayland-scanner,
wlroots,
wlroots_0_18,
writeText,
xcbutilwm,
xwayland,
Expand Down Expand Up @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
pixman
wayland
wayland-protocols
wlroots
wlroots_0_18
]
++ lib.optionals enableXWayland [
libX11
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ef/eff/package.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
lib,
fetchFromGitHub,
ocamlPackages,
ocaml-ng,
}:

let
inherit (ocamlPackages) buildDunePackage js_of_ocaml menhir;
inherit (ocaml-ng.ocamlPackages_5_2) buildDunePackage js_of_ocaml menhir;
in

buildDunePackage rec {
Expand Down
3 changes: 2 additions & 1 deletion pkgs/by-name/el/element-web/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
stdenv,
jq,
element-web-unwrapped,
conf ? { },
config,
conf ? config.element-web.conf or { },
Comment on lines -6 to +7

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don’t think we should be using config for this. (Not a blocker, because it was like that beforehand – but I’d like to drop this, as you did with config.aegisub. OTOH, conf is really not a great name for this anyway, so eh…)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem here is that conf is currently used from within nixpkgs, IIRC. So I can't drop it as easily. But I agree with you 100%.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scrubbing most ad-hoc config. from pkgs is on my giant notebook of "changes-to-make".

}:

if (conf == { }) then
Expand Down
Loading