From 91d5ab3ae47e000d32ad4ed3609c8c996f274066 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 14 Mar 2025 02:57:08 +0100 Subject: [PATCH] treewide: remove unused rec expressions --- pkgs/applications/audio/csound/default.nix | 2 +- pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix | 2 +- pkgs/applications/audio/iannix/default.nix | 2 +- pkgs/applications/audio/in-formant/default.nix | 2 +- pkgs/applications/audio/ir.lv2/default.nix | 2 +- pkgs/applications/audio/mmlgui/default.nix | 2 +- pkgs/applications/audio/open-music-kontrollers/eteroj.nix | 2 +- .../applications/audio/open-music-kontrollers/midi_matrix.nix | 2 +- pkgs/applications/audio/open-music-kontrollers/moony.nix | 2 +- pkgs/applications/audio/open-music-kontrollers/sherlock.nix | 2 +- pkgs/applications/audio/open-music-kontrollers/synthpod.nix | 2 +- pkgs/applications/audio/open-music-kontrollers/vm.nix | 2 +- pkgs/applications/audio/squishyball/default.nix | 2 +- pkgs/applications/backup/restique/default.nix | 2 +- pkgs/applications/editors/kakoune/plugins/overrides.nix | 2 +- pkgs/applications/editors/pinegrow/default.nix | 2 +- pkgs/applications/editors/standardnotes/default.nix | 2 +- pkgs/applications/editors/vscode/extensions/default.nix | 2 +- .../editors/vscode/extensions/hashicorp.terraform/default.nix | 2 +- pkgs/applications/graphics/c3d/default.nix | 2 +- pkgs/applications/graphics/pick-colour-picker/default.nix | 2 +- pkgs/applications/graphics/qscreenshot/default.nix | 2 +- pkgs/applications/kde/alligator.nix | 2 +- pkgs/applications/kde/calindori.nix | 2 +- pkgs/applications/kde/falkon.nix | 2 +- pkgs/applications/kde/kalk.nix | 2 +- pkgs/applications/kde/kasts.nix | 2 +- pkgs/applications/kde/kclock.nix | 2 +- pkgs/applications/kde/kdevelop/kdev-php.nix | 2 +- pkgs/applications/kde/kdevelop/kdevelop.nix | 2 +- pkgs/applications/kde/keysmith.nix | 2 +- pkgs/applications/kde/koko.nix | 2 +- pkgs/applications/kde/kpmcore/default.nix | 2 +- pkgs/applications/kde/krecorder.nix | 2 +- pkgs/applications/kde/ktrip.nix | 2 +- pkgs/applications/kde/kweather.nix | 2 +- pkgs/applications/misc/ape/default.nix | 2 +- pkgs/applications/misc/audio/sox/default.nix | 2 +- .../misc/avell-unofficial-control-center/default.nix | 2 +- pkgs/applications/misc/cambrinary/default.nix | 2 +- pkgs/applications/misc/dmenu/wayland.nix | 2 +- pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix | 2 +- pkgs/applications/misc/latte-dock/default.nix | 2 +- pkgs/applications/misc/pomodoro/default.nix | 2 +- pkgs/applications/misc/prusa-slicer/default.nix | 2 +- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 2 +- pkgs/applications/misc/qt-video-wlr/default.nix | 2 +- pkgs/applications/misc/xygrib/default.nix | 2 +- pkgs/applications/networking/browsers/palemoon/bin.nix | 2 +- pkgs/applications/networking/cluster/hadoop/default.nix | 2 +- pkgs/applications/networking/cluster/kubernetes/kubectl.nix | 2 +- pkgs/applications/networking/cluster/spark/default.nix | 2 +- .../networking/instant-messengers/jackline/default.nix | 2 +- .../networking/instant-messengers/kdeltachat/default.nix | 2 +- .../pidgin/pidgin-plugins/pidgin-mra/default.nix | 2 +- .../pidgin/pidgin-plugins/purple-matrix/default.nix | 2 +- .../pidgin/pidgin-plugins/purple-plugin-pack/default.nix | 2 +- pkgs/applications/networking/irc/communi/default.nix | 2 +- pkgs/applications/networking/irc/kvirc/default.nix | 2 +- .../networking/irc/weechat/scripts/weechat-grep/default.nix | 2 +- pkgs/applications/networking/mailreaders/notmuch/mutt.nix | 2 +- pkgs/applications/networking/p2p/synapse-bt/default.nix | 2 +- pkgs/applications/networking/znc/modules.nix | 2 +- pkgs/applications/office/beancount/beancount_share.nix | 2 +- pkgs/applications/plasma-mobile/plasma-dialer.nix | 2 +- pkgs/applications/plasma-mobile/plasma-phonebook.nix | 2 +- pkgs/applications/plasma-mobile/plasma-settings.nix | 2 +- pkgs/applications/radio/qradiolink/default.nix | 2 +- pkgs/applications/radio/suwidgets/default.nix | 2 +- pkgs/applications/science/biology/blast/bin.nix | 2 +- pkgs/applications/science/electronics/kicad/default.nix | 2 +- pkgs/applications/science/electronics/kicad/libraries.nix | 2 +- pkgs/applications/science/electronics/pulseview/default.nix | 2 +- pkgs/applications/science/logic/avy/default.nix | 2 +- pkgs/applications/science/logic/easycrypt/runtest.nix | 2 +- .../science/machine-learning/openbugs/default.nix | 2 +- .../applications/science/misc/openmodelica/omedit/default.nix | 2 +- .../science/misc/openmodelica/omparser/default.nix | 2 +- .../applications/science/misc/openmodelica/omplot/default.nix | 2 +- .../science/misc/openmodelica/omshell/default.nix | 2 +- .../science/misc/openmodelica/omsimulator/default.nix | 2 +- pkgs/applications/science/molecular-dynamics/raspa/data.nix | 2 +- .../rxvt-unicode-plugins/urxvt-theme-switch/default.nix | 2 +- pkgs/applications/terminal-emulators/st/mcaimi-st.nix | 2 +- pkgs/applications/version-management/p4/default.nix | 2 +- pkgs/applications/video/mplayer/default.nix | 2 +- pkgs/applications/video/mpv/scripts/manga-reader.nix | 2 +- pkgs/applications/video/mpv/scripts/mpv-notify-send.nix | 2 +- pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix | 2 +- pkgs/applications/video/mpv/scripts/quack.nix | 2 +- .../video/obs-studio/plugins/obs-transition-table.nix | 2 +- pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix | 2 +- pkgs/applications/video/simplescreenrecorder/default.nix | 2 +- pkgs/applications/virtualization/crosvm/default.nix | 2 +- pkgs/applications/virtualization/docker/gc.nix | 2 +- pkgs/applications/virtualization/lkl/default.nix | 2 +- pkgs/applications/window-managers/i3/rounded.nix | 2 +- pkgs/applications/window-managers/i3/swallow.nix | 2 +- pkgs/applications/window-managers/i3/workstyle.nix | 2 +- pkgs/applications/window-managers/xmonad/xmonadctl.nix | 2 +- pkgs/build-support/rust/build-rust-crate/test/default.nix | 4 ++-- pkgs/build-support/wasm-bindgen-cli/default.nix | 2 +- pkgs/by-name/al/alt-ergo/package.nix | 2 +- pkgs/by-name/ap/apache-airflow/package.nix | 2 +- pkgs/by-name/ho/hover/package.nix | 2 +- pkgs/by-name/io/ioccheck/package.nix | 2 +- pkgs/by-name/pi/picoscope/package.nix | 2 +- pkgs/by-name/po/portmod/package.nix | 2 +- pkgs/by-name/sc/scilab-bin/package.nix | 2 +- pkgs/by-name/x2/x2goserver/package.nix | 2 +- pkgs/data/misc/cacert/default.nix | 2 +- pkgs/data/themes/lightly-boehs/default.nix | 2 +- pkgs/data/themes/material-kwin-decoration/default.nix | 2 +- pkgs/desktops/gnome/extensions/argos/default.nix | 2 +- pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix | 2 +- pkgs/desktops/gnome/extensions/pop-shell/default.nix | 2 +- .../gnome/extensions/sound-output-device-chooser/default.nix | 2 +- pkgs/desktops/gnome/extensions/tilingnome/default.nix | 2 +- .../gnome/extensions/window-corner-preview/default.nix | 2 +- pkgs/desktops/pantheon/apps/switchboard/wrapper.nix | 2 +- pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix | 2 +- .../desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix | 2 +- .../xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix | 2 +- pkgs/development/ada-modules/gnatprove/default.nix | 2 +- pkgs/development/compilers/alan/2.nix | 2 +- pkgs/development/compilers/dotnet/dotnet.nix | 2 +- pkgs/development/compilers/elm/packages/ghc8_10/default.nix | 2 +- pkgs/development/compilers/elm/packages/ghc9_2/default.nix | 2 +- pkgs/development/compilers/factor-lang/scope.nix | 2 +- pkgs/development/compilers/ghc/8.10.7-binary.nix | 2 +- pkgs/development/compilers/ghc/9.10.1.nix | 2 +- pkgs/development/compilers/ghc/9.12.1.nix | 2 +- pkgs/development/compilers/ghc/9.2.4-binary.nix | 2 +- pkgs/development/compilers/ghc/9.6.3-binary.nix | 2 +- pkgs/development/compilers/ghc/9.6.3.nix | 2 +- pkgs/development/compilers/ghc/9.8.1.nix | 2 +- pkgs/development/compilers/ghc/9.8.2.nix | 2 +- pkgs/development/compilers/ghc/9.8.3.nix | 2 +- pkgs/development/compilers/ghc/9.8.4.nix | 2 +- pkgs/development/compilers/obliv-c/default.nix | 2 +- pkgs/development/coq-modules/ExtLib/default.nix | 2 +- pkgs/development/coq-modules/ITree/default.nix | 2 +- pkgs/development/coq-modules/coq-record-update/default.nix | 2 +- pkgs/development/coq-modules/corn/default.nix | 2 +- pkgs/development/coq-modules/fiat/HEAD.nix | 2 +- pkgs/development/coq-modules/gaia-hydras/default.nix | 2 +- pkgs/development/coq-modules/iris-named-props/default.nix | 2 +- pkgs/development/coq-modules/iris/default.nix | 2 +- pkgs/development/coq-modules/itauto/default.nix | 2 +- pkgs/development/coq-modules/lemma-overloading/default.nix | 2 +- pkgs/development/coq-modules/mathcomp-zify/default.nix | 2 +- pkgs/development/coq-modules/semantics/default.nix | 2 +- pkgs/development/coq-modules/stdpp/default.nix | 2 +- pkgs/development/coq-modules/topology/default.nix | 2 +- pkgs/development/interpreters/bqn/cbqn/default.nix | 2 +- pkgs/development/libraries/agda/agda-prelude/default.nix | 2 +- pkgs/development/libraries/bashup-events/generic.nix | 2 +- pkgs/development/libraries/eigen/default.nix | 2 +- pkgs/development/libraries/fltk/1.4.nix | 2 +- pkgs/development/libraries/fltk/common.nix | 2 +- pkgs/development/libraries/getdns/default.nix | 2 +- pkgs/development/libraries/gsmlib/default.nix | 2 +- pkgs/development/libraries/gstreamer/icamerasrc/default.nix | 2 +- pkgs/development/libraries/hunspell/dictionaries.nix | 4 ++-- pkgs/development/libraries/hyphen/dictionaries.nix | 2 +- pkgs/development/libraries/irrlicht/default.nix | 2 +- pkgs/development/libraries/irrlicht/mac.nix | 2 +- pkgs/development/libraries/jabcode/default.nix | 2 +- pkgs/development/libraries/java/rhino/default.nix | 2 +- pkgs/development/libraries/libirc/default.nix | 2 +- pkgs/development/libraries/liblastfm/default.nix | 2 +- pkgs/development/libraries/libosmscout/default.nix | 2 +- pkgs/development/libraries/libsbsms/common.nix | 2 +- pkgs/development/libraries/luabind/default.nix | 2 +- pkgs/development/libraries/malcontent/ui.nix | 2 +- pkgs/development/libraries/qtfeedback/default.nix | 2 +- pkgs/development/libraries/science/biology/mirtk/default.nix | 2 +- pkgs/development/libraries/soci/bc-soci.nix | 2 +- pkgs/development/libraries/soqt/default.nix | 2 +- pkgs/development/lisp-modules/packages.nix | 4 ++-- pkgs/development/misc/msp430/mspds/binary.nix | 2 +- pkgs/development/misc/resholve/oildev.nix | 2 +- pkgs/development/misc/resholve/resholve.nix | 2 +- .../mobile/androidenv/examples/shell-without-emulator.nix | 2 +- pkgs/development/ocaml-modules/angstrom-async/default.nix | 2 +- pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix | 2 +- pkgs/development/ocaml-modules/angstrom-unix/default.nix | 2 +- pkgs/development/ocaml-modules/atd/default.nix | 2 +- pkgs/development/ocaml-modules/atdgen/runtime.nix | 2 +- pkgs/development/ocaml-modules/bitstring/ppx.nix | 2 +- pkgs/development/ocaml-modules/brisk-reconciler/default.nix | 2 +- pkgs/development/ocaml-modules/chrome-trace/default.nix | 2 +- pkgs/development/ocaml-modules/cooltt/default.nix | 2 +- pkgs/development/ocaml-modules/cstruct/async.nix | 2 +- pkgs/development/ocaml-modules/cstruct/sexp.nix | 2 +- pkgs/development/ocaml-modules/ctypes/foreign.nix | 2 +- pkgs/development/ocaml-modules/data-encoding/default.nix | 2 +- pkgs/development/ocaml-modules/dune-action-plugin/default.nix | 2 +- pkgs/development/ocaml-modules/dune-build-info/default.nix | 2 +- pkgs/development/ocaml-modules/dune-configurator/default.nix | 2 +- pkgs/development/ocaml-modules/dune-glob/default.nix | 2 +- pkgs/development/ocaml-modules/dune-private-libs/default.nix | 2 +- pkgs/development/ocaml-modules/dune-rpc/default.nix | 2 +- pkgs/development/ocaml-modules/dune-site/default.nix | 2 +- pkgs/development/ocaml-modules/dypgen/default.nix | 2 +- pkgs/development/ocaml-modules/erm_xml/default.nix | 2 +- pkgs/development/ocaml-modules/erm_xmpp/default.nix | 2 +- pkgs/development/ocaml-modules/faraday/async.nix | 2 +- pkgs/development/ocaml-modules/faraday/lwt-unix.nix | 2 +- pkgs/development/ocaml-modules/faraday/lwt.nix | 2 +- pkgs/development/ocaml-modules/ff/default.nix | 2 +- pkgs/development/ocaml-modules/flex/default.nix | 2 +- pkgs/development/ocaml-modules/gen_js_api/ojs.nix | 2 +- pkgs/development/ocaml-modules/gluten/lwt-unix.nix | 2 +- pkgs/development/ocaml-modules/gluten/lwt.nix | 2 +- pkgs/development/ocaml-modules/graphql/default.nix | 2 +- pkgs/development/ocaml-modules/graphql/lwt.nix | 2 +- pkgs/development/ocaml-modules/h2/default.nix | 2 +- pkgs/development/ocaml-modules/ipaddr/cstruct.nix | 2 +- pkgs/development/ocaml-modules/ipaddr/default.nix | 2 +- pkgs/development/ocaml-modules/ipaddr/sexp.nix | 2 +- pkgs/development/ocaml-modules/irmin/chunk.nix | 2 +- pkgs/development/ocaml-modules/irmin/fs.nix | 2 +- pkgs/development/ocaml-modules/irmin/graphql.nix | 2 +- pkgs/development/ocaml-modules/irmin/pack.nix | 2 +- pkgs/development/ocaml-modules/irmin/tezos.nix | 2 +- pkgs/development/ocaml-modules/kafka/lwt.nix | 2 +- pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix | 2 +- pkgs/development/ocaml-modules/labltk/default.nix | 2 +- pkgs/development/ocaml-modules/memprof-limits/default.nix | 2 +- pkgs/development/ocaml-modules/menhir/default.nix | 2 +- pkgs/development/ocaml-modules/menhir/lib.nix | 2 +- pkgs/development/ocaml-modules/menhir/sdk.nix | 2 +- pkgs/development/ocaml-modules/metrics/influx.nix | 2 +- pkgs/development/ocaml-modules/metrics/unix.nix | 2 +- pkgs/development/ocaml-modules/mirage-block/combinators.nix | 2 +- pkgs/development/ocaml-modules/mirage/runtime.nix | 2 +- pkgs/development/ocaml-modules/mparser/pcre.nix | 2 +- pkgs/development/ocaml-modules/ocaml-protoc/default.nix | 2 +- pkgs/development/ocaml-modules/ocamlformat-mlx/default.nix | 2 +- .../ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix | 2 +- pkgs/development/ocaml-modules/ocamlgraph/gtk.nix | 2 +- pkgs/development/ocaml-modules/opium/default.nix | 2 +- pkgs/development/ocaml-modules/owl/default.nix | 2 +- pkgs/development/ocaml-modules/plotkicadsch/default.nix | 2 +- pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix | 2 +- pkgs/development/ocaml-modules/progress/default.nix | 2 +- pkgs/development/ocaml-modules/rebez/default.nix | 2 +- pkgs/development/ocaml-modules/reperf/default.nix | 2 +- pkgs/development/ocaml-modules/saturn/default.nix | 2 +- pkgs/development/ocaml-modules/tar/unix.nix | 2 +- pkgs/development/ocaml-modules/telegraml/default.nix | 2 +- pkgs/development/ocaml-modules/unisim_archisec/default.nix | 2 +- pkgs/development/ocaml-modules/xdg/default.nix | 2 +- pkgs/development/ocaml-modules/yaml/yaml-sexp.nix | 2 +- pkgs/development/python-modules/acunetix/default.nix | 2 +- .../python-modules/aocd-example-parser/default.nix | 2 +- .../development/python-modules/approval-utilities/default.nix | 2 +- pkgs/development/python-modules/apt-repo/default.nix | 2 +- pkgs/development/python-modules/apted/default.nix | 2 +- pkgs/development/python-modules/asn1crypto/default.nix | 2 +- pkgs/development/python-modules/asyncserial/default.nix | 2 +- pkgs/development/python-modules/baseline/default.nix | 2 +- pkgs/development/python-modules/beanhub-cli/default.nix | 2 +- pkgs/development/python-modules/blinkstick/default.nix | 2 +- pkgs/development/python-modules/blurhash/default.nix | 2 +- .../python-modules/bootstrap/flit-core/default.nix | 2 +- pkgs/development/python-modules/cardimpose/default.nix | 2 +- pkgs/development/python-modules/certauth/default.nix | 2 +- pkgs/development/python-modules/cfscrape/default.nix | 2 +- pkgs/development/python-modules/clean-fid/default.nix | 2 +- pkgs/development/python-modules/cmake/default.nix | 2 +- pkgs/development/python-modules/complycube/default.nix | 2 +- pkgs/development/python-modules/compressed-rtf/default.nix | 2 +- pkgs/development/python-modules/contexttimer/default.nix | 2 +- pkgs/development/python-modules/cppe/default.nix | 2 +- pkgs/development/python-modules/dasbus/default.nix | 2 +- pkgs/development/python-modules/diffimg/default.nix | 2 +- pkgs/development/python-modules/distutils/default.nix | 2 +- .../python-modules/django-crossdomainmedia/default.nix | 2 +- .../python-modules/django-rest-polymorphic/default.nix | 2 +- pkgs/development/python-modules/dlx/default.nix | 2 +- pkgs/development/python-modules/dpcontracts/default.nix | 2 +- pkgs/development/python-modules/fasttext/default.nix | 2 +- pkgs/development/python-modules/fleep/default.nix | 2 +- pkgs/development/python-modules/gdb-pt-dump/default.nix | 2 +- .../python-modules/get-video-properties/default.nix | 2 +- pkgs/development/python-modules/gower/default.nix | 2 +- pkgs/development/python-modules/hcs-utils/default.nix | 2 +- pkgs/development/python-modules/hg-commitsigs/default.nix | 2 +- pkgs/development/python-modules/i2c-tools/default.nix | 2 +- pkgs/development/python-modules/ifconfig-parser/default.nix | 2 +- pkgs/development/python-modules/ilcli/default.nix | 2 +- pkgs/development/python-modules/imantics/default.nix | 2 +- pkgs/development/python-modules/jstyleson/default.nix | 2 +- pkgs/development/python-modules/junit-xml/default.nix | 2 +- pkgs/development/python-modules/libmambapy/default.nix | 2 +- pkgs/development/python-modules/lunarcalendar/default.nix | 2 +- pkgs/development/python-modules/mac-vendor-lookup/default.nix | 2 +- pkgs/development/python-modules/marisa/default.nix | 2 +- pkgs/development/python-modules/minikanren/default.nix | 2 +- pkgs/development/python-modules/mkdocs-exclude/default.nix | 2 +- .../python-modules/mkdocs-gitlab-plugin/default.nix | 2 +- pkgs/development/python-modules/mkdocs-linkcheck/default.nix | 2 +- pkgs/development/python-modules/morphys/default.nix | 2 +- pkgs/development/python-modules/motmetrics/default.nix | 2 +- pkgs/development/python-modules/msrest/default.nix | 2 +- pkgs/development/python-modules/mullvad-closest/default.nix | 2 +- pkgs/development/python-modules/myhdl/default.nix | 2 +- pkgs/development/python-modules/mypy-boto3/default.nix | 2 +- pkgs/development/python-modules/ninja/default.nix | 2 +- pkgs/development/python-modules/nix-kernel/default.nix | 2 +- .../development/python-modules/openbabel-bindings/default.nix | 2 +- .../opentelemetry-instrumentation-botocore/default.nix | 2 +- .../opentelemetry-instrumentation-celery/default.nix | 2 +- .../opentelemetry-instrumentation-logging/default.nix | 2 +- .../opentelemetry-instrumentation-redis/default.nix | 2 +- .../opentelemetry-instrumentation-requests/default.nix | 2 +- .../opentelemetry-propagator-aws-xray/default.nix | 2 +- pkgs/development/python-modules/oyaml/default.nix | 2 +- pkgs/development/python-modules/paranoid-crypto/default.nix | 2 +- pkgs/development/python-modules/percol/default.nix | 2 +- .../development/python-modules/playwright-stealth/default.nix | 2 +- pkgs/development/python-modules/playwright/update.sh | 2 +- pkgs/development/python-modules/prometrix/default.nix | 2 +- pkgs/development/python-modules/pyautogui/default.nix | 2 +- pkgs/development/python-modules/pycryptodomex/default.nix | 2 +- pkgs/development/python-modules/pydes/default.nix | 2 +- pkgs/development/python-modules/pyflipper/default.nix | 2 +- pkgs/development/python-modules/pylibjpeg-data/default.nix | 2 +- pkgs/development/python-modules/pyls-flake8/default.nix | 2 +- pkgs/development/python-modules/pyproject-hooks/default.nix | 2 +- pkgs/development/python-modules/pypubsub/default.nix | 2 +- pkgs/development/python-modules/pyrr/default.nix | 2 +- pkgs/development/python-modules/pysabnzbd/default.nix | 2 +- pkgs/development/python-modules/pyscreeze/default.nix | 2 +- pkgs/development/python-modules/pytest-cov-stub/default.nix | 2 +- pkgs/development/python-modules/pytest-pudb/default.nix | 2 +- pkgs/development/python-modules/python-bring-api/default.nix | 2 +- pkgs/development/python-modules/pytmx/default.nix | 2 +- pkgs/development/python-modules/qreactor/default.nix | 2 +- pkgs/development/python-modules/qscintilla-qt5/default.nix | 2 +- pkgs/development/python-modules/random-user-agent/default.nix | 2 +- pkgs/development/python-modules/rencode/default.nix | 2 +- pkgs/development/python-modules/rmrl/default.nix | 2 +- pkgs/development/python-modules/rumps/default.nix | 2 +- pkgs/development/python-modules/senf/default.nix | 2 +- pkgs/development/python-modules/surt/default.nix | 2 +- .../development/python-modules/testing-postgresql/default.nix | 2 +- pkgs/development/python-modules/textual-slider/default.nix | 2 +- pkgs/development/python-modules/timy/default.nix | 2 +- pkgs/development/python-modules/tinyobjloader-py/default.nix | 2 +- pkgs/development/python-modules/tiptapy/default.nix | 2 +- pkgs/development/python-modules/trectools/default.nix | 2 +- pkgs/development/python-modules/tubes/default.nix | 2 +- pkgs/development/python-modules/tvdb-api/default.nix | 2 +- pkgs/development/python-modules/type-infer/default.nix | 2 +- .../python-modules/types-aiobotocore-packages/default.nix | 2 +- pkgs/development/python-modules/vcver/default.nix | 2 +- pkgs/development/python-modules/vllm/default.nix | 2 +- pkgs/development/python-modules/vqgan-jax/default.nix | 2 +- pkgs/development/python-modules/wsgiprox/default.nix | 2 +- pkgs/development/python2-modules/setuptools/default.nix | 2 +- .../rocm-modules/5/llvm/stage-1/clang-unwrapped.nix | 2 +- .../rocm-modules/5/llvm/stage-3/clang-tools-extra.nix | 2 +- .../rocm-modules/6/llvm/stage-1/clang-unwrapped.nix | 2 +- .../rocm-modules/6/llvm/stage-3/clang-tools-extra.nix | 2 +- pkgs/development/tcl-modules/by-name/le/lexec/package.nix | 2 +- pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix | 2 +- pkgs/development/tools/alloy/default.nix | 4 ++-- pkgs/development/tools/analysis/brakeman/default.nix | 2 +- pkgs/development/tools/analysis/clang-analyzer/default.nix | 2 +- pkgs/development/tools/analysis/nix-linter/default.nix | 2 +- .../tools/build-managers/bazel/bazel_5/default.nix | 2 +- .../tools/build-managers/bazel/bazel_6/default.nix | 2 +- pkgs/development/tools/database/pgsync/default.nix | 2 +- pkgs/development/tools/esbuild/netlify.nix | 2 +- pkgs/development/tools/godot/default.nix | 2 +- pkgs/development/tools/libsigrok/default.nix | 2 +- pkgs/development/tools/misc/qtspim/default.nix | 2 +- pkgs/development/tools/replay-io/default.nix | 2 +- pkgs/development/web/pnpm-lock-export/default.nix | 2 +- pkgs/games/asc/default.nix | 2 +- pkgs/games/crossfire/crossfire-arch.nix | 2 +- pkgs/games/crossfire/crossfire-client.nix | 2 +- pkgs/games/crossfire/crossfire-maps.nix | 2 +- pkgs/games/crossfire/crossfire-server.nix | 2 +- pkgs/games/doom-ports/zandronum/alpha/default.nix | 2 +- pkgs/games/doom-ports/zandronum/default.nix | 2 +- pkgs/games/dxx-rebirth/default.nix | 2 +- pkgs/games/gl-gsync-demo/default.nix | 2 +- pkgs/games/legendary-gl/default.nix | 2 +- pkgs/games/openttd/grfcodec.nix | 2 +- pkgs/games/openttd/jgrpp.nix | 2 +- pkgs/games/pegasus-frontend/default.nix | 2 +- pkgs/games/qzdl/default.nix | 2 +- pkgs/games/warsow/engine.nix | 2 +- pkgs/misc/arm-trusted-firmware/default.nix | 2 +- pkgs/misc/tmux-plugins/default.nix | 2 +- pkgs/os-specific/darwin/openwith/default.nix | 2 +- pkgs/os-specific/darwin/osx-cpu-temp/default.nix | 2 +- pkgs/os-specific/linux/fanout/default.nix | 2 +- pkgs/os-specific/linux/gasket/default.nix | 2 +- pkgs/os-specific/linux/hyperv-daemons/default.nix | 2 +- .../linux/mbp-modules/mbp2018-bridge-drv/default.nix | 2 +- pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix | 2 +- pkgs/os-specific/linux/nct6687d/default.nix | 2 +- pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 2 +- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 2 +- pkgs/os-specific/linux/v86d/default.nix | 2 +- pkgs/os-specific/linux/vendor-reset/default.nix | 2 +- pkgs/os-specific/linux/vmware/default.nix | 2 +- pkgs/servers/etcd/3.5/default.nix | 2 +- pkgs/servers/gpm/default.nix | 2 +- pkgs/servers/irc/solanum/default.nix | 2 +- pkgs/servers/memos/default.nix | 2 +- pkgs/servers/mobilizon/default.nix | 2 +- .../grafana/plugins/bsull-console-datasource/default.nix | 2 +- .../grafana/plugins/doitintl-bigquery-datasource/default.nix | 2 +- .../plugins/fetzerch-sunandmoon-datasource/default.nix | 2 +- .../grafana/plugins/frser-sqlite-datasource/default.nix | 2 +- .../grafana/plugins/grafadruid-druid-datasource/default.nix | 2 +- .../grafana/plugins/grafana-clock-panel/default.nix | 2 +- .../grafana/plugins/grafana-discourse-datasource/default.nix | 2 +- .../grafana/plugins/grafana-github-datasource/default.nix | 2 +- .../plugins/grafana-googlesheets-datasource/default.nix | 2 +- .../grafana/plugins/grafana-mqtt-datasource/default.nix | 2 +- .../grafana/plugins/grafana-opensearch-datasource/default.nix | 2 +- .../grafana/plugins/grafana-piechart-panel/default.nix | 2 +- .../grafana/plugins/grafana-polystat-panel/default.nix | 2 +- .../grafana/plugins/grafana-worldmap-panel/default.nix | 2 +- .../grafana/plugins/marcusolsson-calendar-panel/default.nix | 2 +- .../grafana/plugins/marcusolsson-csv-datasource/default.nix | 2 +- .../plugins/marcusolsson-dynamictext-panel/default.nix | 2 +- .../grafana/plugins/marcusolsson-json-datasource/default.nix | 2 +- pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix | 2 +- .../monitoring/grafana/plugins/redis-datasource/default.nix | 2 +- .../monitoring/grafana/plugins/redis-explorer-app/default.nix | 2 +- .../grafana/plugins/ventura-psychrometric-panel/default.nix | 2 +- .../grafana/plugins/volkovlabs-echarts-panel/default.nix | 2 +- .../grafana/plugins/volkovlabs-form-panel/default.nix | 2 +- .../grafana/plugins/volkovlabs-rss-datasource/default.nix | 2 +- .../grafana/plugins/volkovlabs-variable-panel/default.nix | 2 +- .../plugins/yesoreyeram-infinity-datasource/default.nix | 2 +- pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/kthxbye.nix | 2 +- pkgs/servers/pulseaudio/qpaeq.nix | 2 +- pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 2 +- pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix | 2 +- pkgs/servers/sql/postgresql/ext/smlar.nix | 2 +- pkgs/servers/web-apps/freshrss/extensions/default.nix | 2 +- pkgs/shells/fish/plugins/colored-man-pages.nix | 2 +- pkgs/shells/fish/plugins/git-abbr.nix | 2 +- pkgs/shells/fish/plugins/humantime-fish.nix | 2 +- pkgs/shells/fish/plugins/hydro.nix | 2 +- pkgs/stdenv/linux/default.nix | 2 +- pkgs/tools/admin/pgadmin/default.nix | 2 +- pkgs/tools/admin/pulumi-packages/base.nix | 2 +- pkgs/tools/audio/opl3bankeditor/default.nix | 2 +- pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix | 2 +- pkgs/tools/misc/cutecom/default.nix | 2 +- pkgs/tools/misc/ocs-url/default.nix | 2 +- pkgs/tools/misc/xvfb-run/default.nix | 2 +- pkgs/tools/networking/dnschef/default.nix | 2 +- pkgs/tools/networking/dogdns/default.nix | 2 +- pkgs/tools/networking/spoof-mac/default.nix | 2 +- pkgs/tools/package-management/nix-visualize/default.nix | 2 +- pkgs/tools/system/uefitool/variants.nix | 2 +- pkgs/tools/text/gpt2tc/default.nix | 2 +- pkgs/tools/text/uniscribe/default.nix | 2 +- 470 files changed, 474 insertions(+), 474 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 87b7c0dd7ebe..430bd1cb9fed 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -27,7 +27,7 @@ fltk ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "csound"; version = "6.18.1-unstable-2024-07-02"; diff --git a/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix b/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix index f60351ad11fa..f0a77e38e41d 100644 --- a/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix +++ b/pkgs/applications/audio/deadbeef/plugins/musical-spectrum.nix @@ -9,7 +9,7 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "deadbeef-musical-spectrum-plugin"; version = "unstable-2020-07-01"; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 753a58d0c42a..a6b3cd769205 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -9,7 +9,7 @@ qmake, }: -mkDerivation rec { +mkDerivation { pname = "iannix"; version = "unstable-2020-12-09"; diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index 7266470cc9e9..e6eabd58225a 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -19,7 +19,7 @@ tomlplusplus, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "in-formant"; version = "unstable-2022-09-15"; diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 9414019d956c..797c452c861f 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -11,7 +11,7 @@ zita-convolver, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ir.lv2"; version = "0-unstable-2018-06-21"; diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index d5ea07d6d362..c8ceef846e1f 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -14,7 +14,7 @@ cppunit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mmlgui"; version = "210420-preview-unstable-2024-04-15"; diff --git a/pkgs/applications/audio/open-music-kontrollers/eteroj.nix b/pkgs/applications/audio/open-music-kontrollers/eteroj.nix index 6076a8ff2f79..b888e1b987b4 100644 --- a/pkgs/applications/audio/open-music-kontrollers/eteroj.nix +++ b/pkgs/applications/audio/open-music-kontrollers/eteroj.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix ( args - // rec { + // { pname = "eteroj"; version = "0.10.0"; diff --git a/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix b/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix index 7185ef178585..a8fabb483618 100644 --- a/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix +++ b/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix ( args - // rec { + // { pname = "midi_matrix"; version = "0.30.0"; diff --git a/pkgs/applications/audio/open-music-kontrollers/moony.nix b/pkgs/applications/audio/open-music-kontrollers/moony.nix index d2eda0a202b7..e1199c9151e9 100644 --- a/pkgs/applications/audio/open-music-kontrollers/moony.nix +++ b/pkgs/applications/audio/open-music-kontrollers/moony.nix @@ -9,7 +9,7 @@ callPackage ./generic.nix ( args - // rec { + // { pname = "moony"; version = "0.40.0"; diff --git a/pkgs/applications/audio/open-music-kontrollers/sherlock.nix b/pkgs/applications/audio/open-music-kontrollers/sherlock.nix index 0a79951cd9dd..814a75a7ac36 100644 --- a/pkgs/applications/audio/open-music-kontrollers/sherlock.nix +++ b/pkgs/applications/audio/open-music-kontrollers/sherlock.nix @@ -7,7 +7,7 @@ callPackage ./generic.nix ( args - // rec { + // { pname = "sherlock"; version = "0.28.0"; diff --git a/pkgs/applications/audio/open-music-kontrollers/synthpod.nix b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix index e513a2f61bbd..ed3c03f7de44 100644 --- a/pkgs/applications/audio/open-music-kontrollers/synthpod.nix +++ b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix @@ -17,7 +17,7 @@ callPackage ./generic.nix ( args - // rec { + // { pname = "synthpod"; version = "unstable-2021-10-22"; diff --git a/pkgs/applications/audio/open-music-kontrollers/vm.nix b/pkgs/applications/audio/open-music-kontrollers/vm.nix index 79f8144f54c6..ab73b4f51309 100644 --- a/pkgs/applications/audio/open-music-kontrollers/vm.nix +++ b/pkgs/applications/audio/open-music-kontrollers/vm.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix ( args - // rec { + // { pname = "vm"; version = "0.14.0"; diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index d74b372b25f3..4e0f8ffb0e2b 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -12,7 +12,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "squishyball"; version = "unstable-2020-11-23"; diff --git a/pkgs/applications/backup/restique/default.nix b/pkgs/applications/backup/restique/default.nix index d2e1a78361ee..64625463c83e 100644 --- a/pkgs/applications/backup/restique/default.nix +++ b/pkgs/applications/backup/restique/default.nix @@ -9,7 +9,7 @@ restic, }: -mkDerivation rec { +mkDerivation { pname = "restique"; version = "unstable-2022-11-29"; diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index f31be450e435..c809978616f7 100644 --- a/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -32,7 +32,7 @@ self: super: { meta.homepage = "https://gitlab.com/FlyingWombat/case.kak"; }; - fzf-kak = super.fzf-kak.overrideAttrs (oldAttrs: rec { + fzf-kak = super.fzf-kak.overrideAttrs (oldAttrs: { preFixup = '' if [[ -x "${fzf}/bin/fzf" ]]; then fzfImpl='${fzf}/bin/fzf' diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 25d3f0a100bb..559c9ada84d1 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -36,7 +36,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pinegrow"; # deactivate auto update, because an old 6.21 version is getting mixed up # see e.g. https://github.com/NixOS/nixpkgs/pull/184460 diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 064f2e0832af..defcd6b87446 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "standardnotes"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4d858dd45bd4..d681164b079e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5243,7 +5243,7 @@ let }; }; - vscjava.vscode-gradle = buildVscodeMarketplaceExtension rec { + vscjava.vscode-gradle = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-gradle"; publisher = "vscjava"; diff --git a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix index dca2a081d92b..b2c61f1b0867 100644 --- a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix +++ b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix @@ -3,7 +3,7 @@ vscode-utils, terraform-ls, }: -vscode-utils.buildVscodeMarketplaceExtension rec { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "terraform"; publisher = "hashicorp"; diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index dac235b9995e..52aeb7cfb995 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -7,7 +7,7 @@ Cocoa, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "c3d"; version = "1.4.1-unstable-2024-08-07"; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index 4e72738134d5..b94c0b2d6278 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -10,7 +10,7 @@ wrapGAppsHook3, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pick-colour-picker"; version = "unstable-2022-05-08"; diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index 3120503b0739..fe3b679facf0 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -9,7 +9,7 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qscreenshot"; version = "unstable-2021-10-18"; diff --git a/pkgs/applications/kde/alligator.nix b/pkgs/applications/kde/alligator.nix index 305f39bd712f..0a57cece717e 100644 --- a/pkgs/applications/kde/alligator.nix +++ b/pkgs/applications/kde/alligator.nix @@ -14,7 +14,7 @@ syndication, }: -mkDerivation rec { +mkDerivation { pname = "alligator"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/calindori.nix b/pkgs/applications/kde/calindori.nix index 76bf9a806f19..fd8626c9d224 100644 --- a/pkgs/applications/kde/calindori.nix +++ b/pkgs/applications/kde/calindori.nix @@ -17,7 +17,7 @@ qtquickcontrols2, }: -mkDerivation rec { +mkDerivation { pname = "calindori"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/falkon.nix b/pkgs/applications/kde/falkon.nix index 0a630f0cfe64..c1dca31d9f2a 100644 --- a/pkgs/applications/kde/falkon.nix +++ b/pkgs/applications/kde/falkon.nix @@ -20,7 +20,7 @@ kio, }: -mkDerivation rec { +mkDerivation { pname = "falkon"; preConfigure = '' diff --git a/pkgs/applications/kde/kalk.nix b/pkgs/applications/kde/kalk.nix index 688c3de27112..87fe82a281df 100644 --- a/pkgs/applications/kde/kalk.nix +++ b/pkgs/applications/kde/kalk.nix @@ -19,7 +19,7 @@ qtquickcontrols2, }: -mkDerivation rec { +mkDerivation { pname = "kalk"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kasts.nix b/pkgs/applications/kde/kasts.nix index 7ac724c761c0..63913df1bb2c 100644 --- a/pkgs/applications/kde/kasts.nix +++ b/pkgs/applications/kde/kasts.nix @@ -29,7 +29,7 @@ let gst-plugins-bad ; in -mkDerivation rec { +mkDerivation { pname = "kasts"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kclock.nix b/pkgs/applications/kde/kclock.nix index 2f135727ba64..9a2abb608294 100644 --- a/pkgs/applications/kde/kclock.nix +++ b/pkgs/applications/kde/kclock.nix @@ -17,7 +17,7 @@ qtquickcontrols2, }: -mkDerivation rec { +mkDerivation { pname = "kclock"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kdevelop/kdev-php.nix b/pkgs/applications/kde/kdevelop/kdev-php.nix index 5edb607cb40e..b8b3cff36bc9 100644 --- a/pkgs/applications/kde/kdevelop/kdev-php.nix +++ b/pkgs/applications/kde/kdevelop/kdev-php.nix @@ -9,7 +9,7 @@ kdevelop-pg-qt, }: -mkDerivation rec { +mkDerivation { pname = "kdev-php"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index 7c99e4e23c30..f1380474496b 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -47,7 +47,7 @@ let llvmPackages = llvmPackages_13; in -mkDerivation rec { +mkDerivation { pname = "kdevelop"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/keysmith.nix b/pkgs/applications/kde/keysmith.nix index 427d708f9922..06de93c408f7 100644 --- a/pkgs/applications/kde/keysmith.nix +++ b/pkgs/applications/kde/keysmith.nix @@ -14,7 +14,7 @@ qtquickcontrols2, }: -mkDerivation rec { +mkDerivation { pname = "keysmith"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/koko.nix b/pkgs/applications/kde/koko.nix index 38b0a3f69887..524aeba87ed3 100644 --- a/pkgs/applications/kde/koko.nix +++ b/pkgs/applications/kde/koko.nix @@ -40,7 +40,7 @@ let sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p"; }; in -mkDerivation rec { +mkDerivation { pname = "koko"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kpmcore/default.nix b/pkgs/applications/kde/kpmcore/default.nix index c76603b17473..2f8de5b853ad 100644 --- a/pkgs/applications/kde/kpmcore/default.nix +++ b/pkgs/applications/kde/kpmcore/default.nix @@ -9,7 +9,7 @@ util-linux, }: -mkDerivation rec { +mkDerivation { pname = "kpmcore"; patches = [ diff --git a/pkgs/applications/kde/krecorder.nix b/pkgs/applications/kde/krecorder.nix index baae8e36eefd..39fd2a71ea0e 100644 --- a/pkgs/applications/kde/krecorder.nix +++ b/pkgs/applications/kde/krecorder.nix @@ -15,7 +15,7 @@ qtquickcontrols2, }: -mkDerivation rec { +mkDerivation { pname = "krecorder"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/ktrip.nix b/pkgs/applications/kde/ktrip.nix index 9d14b319a1b9..f1b931ffdc4e 100644 --- a/pkgs/applications/kde/ktrip.nix +++ b/pkgs/applications/kde/ktrip.nix @@ -17,7 +17,7 @@ qtquickcontrols2, }: -mkDerivation rec { +mkDerivation { pname = "ktrip"; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kweather.nix b/pkgs/applications/kde/kweather.nix index 7bf505d27ca4..3c3283f43d62 100644 --- a/pkgs/applications/kde/kweather.nix +++ b/pkgs/applications/kde/kweather.nix @@ -18,7 +18,7 @@ qtquickcontrols2, }: -mkDerivation rec { +mkDerivation { pname = "kweather"; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index b3c281c6b820..64aa654e77d3 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -10,7 +10,7 @@ license ? lib.licenses.lgpl3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname; version = "2019-08-10"; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 26a93f8b0035..6d6b3b7a1887 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -37,7 +37,7 @@ libpulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sox"; version = "unstable-2021-05-09"; diff --git a/pkgs/applications/misc/avell-unofficial-control-center/default.nix b/pkgs/applications/misc/avell-unofficial-control-center/default.nix index 94b091a2b2ca..4a8440da0cc2 100644 --- a/pkgs/applications/misc/avell-unofficial-control-center/default.nix +++ b/pkgs/applications/misc/avell-unofficial-control-center/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "avell-unofficial-control-center"; version = "1.0.4"; diff --git a/pkgs/applications/misc/cambrinary/default.nix b/pkgs/applications/misc/cambrinary/default.nix index c55007b6205f..f2db2829a3ac 100644 --- a/pkgs/applications/misc/cambrinary/default.nix +++ b/pkgs/applications/misc/cambrinary/default.nix @@ -7,7 +7,7 @@ beautifulsoup4, }: -buildPythonApplication rec { +buildPythonApplication { pname = "cambrinary"; version = "unstable-2023-07-16"; format = "pyproject"; diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 996aef30464d..eb9a12416714 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -16,7 +16,7 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dmenu-wayland"; version = "unstable-2023-05-18"; diff --git a/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix b/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix index 8e08295a58e3..e9cd5c80b002 100644 --- a/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix +++ b/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lukesmithxyz-bible-kjv"; version = "unstable-2022-06-01"; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 4337fb4c85bb..c7f6946926c7 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -19,7 +19,7 @@ xorg, }: -mkDerivation rec { +mkDerivation { pname = "latte-dock"; version = "unstable-2024-01-31"; diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index 7656407c6b94..a5049d253d73 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -6,7 +6,7 @@ Foundation, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "pomodoro"; version = "unstable-2021-06-18"; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index baff4e6918e1..08efcd606c17 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -41,7 +41,7 @@ , opencascade-override ? null }: let - wxGTK-prusa = wxGTK32.overrideAttrs (old: rec { + wxGTK-prusa = wxGTK32.overrideAttrs (old: { pname = "wxwidgets-prusa3d-patched"; version = "3.2.0"; configureFlags = old.configureFlags ++ [ "--disable-glcanvasegl" ]; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 27bafc26db90..0e7114cc787f 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -115,7 +115,7 @@ let passthru = allVersions; }; - wxGTK31-prusa = wxGTK31.overrideAttrs (old: rec { + wxGTK31-prusa = wxGTK31.overrideAttrs (old: { pname = "wxwidgets-prusa3d-patched"; version = "3.1.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix index 7b3fe39b6d1a..0c0b766ef817 100644 --- a/pkgs/applications/misc/qt-video-wlr/default.nix +++ b/pkgs/applications/misc/qt-video-wlr/default.nix @@ -24,7 +24,7 @@ let gst-plugins-ugly ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qt-video-wlr"; version = "2023-07-22"; diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index a1cfab39320c..4139a80696a4 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -13,7 +13,7 @@ openjpeg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "unstable-2022-05-16"; pname = "xygrib"; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index d9e171a24491..3cb1857b5bcc 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; desktopItems = [ - (makeDesktopItem rec { + (makeDesktopItem { name = "palemoon-bin"; desktopName = "Pale Moon Web Browser"; comment = "Browse the World Wide Web"; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 47cd3764a77a..554e4fa4b29a 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -166,7 +166,7 @@ in { # Different version of hadoop support different java runtime versions # https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions - hadoop_3_4 = common rec { + hadoop_3_4 = common { pname = "hadoop"; platformAttrs = rec { x86_64-linux = { diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index 48c6805aef59..b446f21cfdd5 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,6 +1,6 @@ { lib, kubernetes }: -kubernetes.overrideAttrs (_: rec { +kubernetes.overrideAttrs (_: { pname = "kubectl"; outputs = [ diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 7749c9ef9a50..a2472525b122 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -95,7 +95,7 @@ in # we strictly adhere to the EOL timeline, despite 3.3.4 being released one day before (2023-12-08). # A better policy is to keep these versions around, and clean up EOL versions just before # a new NixOS release. - spark_3_5 = spark rec { + spark_3_5 = spark { pname = "spark"; version = "3.5.4"; hash = "sha256-rSr7UH1dZIkUYW6ehc/dYxlmN9yVjEKwrwLMT+uMd/0="; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index c81355666be4..70c6607158cc 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -6,7 +6,7 @@ with ocamlPackages; -buildDunePackage rec { +buildDunePackage { pname = "jackline"; version = "unstable-2024-10-21"; diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index a0150fd67780..f84eb379fec8 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -13,7 +13,7 @@ qtwebengine, }: -mkDerivation rec { +mkDerivation { pname = "kdeltachat"; version = "unstable-2024-01-14"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix index 9a53cd25f732..447944b0e32d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-mra/default.nix @@ -6,7 +6,7 @@ pidgin, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pidgin-mra"; version = "unstable-2014-07-08"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix index 1c34b3381708..1bb3a3943092 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-matrix/default.nix @@ -12,7 +12,7 @@ libgcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-matrix-unstable"; version = "2019-06-06"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix index 47c01b853834..46c3deaabc70 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-plugin-pack/default.nix @@ -7,7 +7,7 @@ pidgin, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "purple-plugin-pack"; version = "2.8.0"; diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 2d631994512b..45e1ea74e4b0 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -8,7 +8,7 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "communi"; version = "3.6.0"; diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index c68b84fac1cb..f91905bc1a2a 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -11,7 +11,7 @@ gettext, }: -mkDerivation rec { +mkDerivation { pname = "kvirc"; version = "2022-06-29"; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-grep/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-grep/default.nix index de1b34576a0b..8f1b6e5c1c33 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-grep/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-grep/default.nix @@ -4,7 +4,7 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "weechat-grep"; version = "0.8.5"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index 370dc7ebf8fe..c1a1137564d1 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -8,7 +8,7 @@ notmuch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "notmuch-mutt"; version = notmuch.version; diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index bbfbfda1f0c8..798d4b906b44 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -9,7 +9,7 @@ Security, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "synapse-bt"; version = "unstable-2023-02-16"; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 30e1973b180c..cde866ff60fe 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -33,7 +33,7 @@ let in { - backlog = zncDerivation rec { + backlog = zncDerivation { pname = "znc-backlog"; version = "unstable-2017-06-13"; module_name = "backlog"; diff --git a/pkgs/applications/office/beancount/beancount_share.nix b/pkgs/applications/office/beancount/beancount_share.nix index f9732bfc5f50..48951fe6ce41 100644 --- a/pkgs/applications/office/beancount/beancount_share.nix +++ b/pkgs/applications/office/beancount/beancount_share.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication { pname = "beancount_share"; version = "2023-12-31"; diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix index e741de2974f6..3c24ec7ea8d1 100644 --- a/pkgs/applications/plasma-mobile/plasma-dialer.nix +++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix @@ -31,7 +31,7 @@ wayland-protocols, }: -mkDerivation rec { +mkDerivation { pname = "plasma-dialer"; nativeBuildInputs = [ diff --git a/pkgs/applications/plasma-mobile/plasma-phonebook.nix b/pkgs/applications/plasma-mobile/plasma-phonebook.nix index 00bf96db6ec1..bf59be8fd1bf 100644 --- a/pkgs/applications/plasma-mobile/plasma-phonebook.nix +++ b/pkgs/applications/plasma-mobile/plasma-phonebook.nix @@ -14,7 +14,7 @@ qtquickcontrols2, }: -mkDerivation rec { +mkDerivation { pname = "plasma-phonebook"; nativeBuildInputs = [ diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix index 39465ab00ec6..05d98492c3a5 100644 --- a/pkgs/applications/plasma-mobile/plasma-settings.nix +++ b/pkgs/applications/plasma-mobile/plasma-settings.nix @@ -22,7 +22,7 @@ util-linux, }: -mkDerivation rec { +mkDerivation { pname = "plasma-settings"; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 6d60329d717c..6ce1eef126f1 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -23,7 +23,7 @@ , uhd }: -gnuradio.pkgs.mkDerivation rec { +gnuradio.pkgs.mkDerivation { pname = "qradiolink"; # https://github.com/qradiolink/qradiolink/tree/gr_3.10 version = "0.9.0-1-unstable-2024-08-29"; diff --git a/pkgs/applications/radio/suwidgets/default.nix b/pkgs/applications/radio/suwidgets/default.nix index 84fa92ef5352..103316cc81b1 100644 --- a/pkgs/applications/radio/suwidgets/default.nix +++ b/pkgs/applications/radio/suwidgets/default.nix @@ -9,7 +9,7 @@ fftwSinglePrec, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "suwidgets"; version = "unstable-2022-04-03"; diff --git a/pkgs/applications/science/biology/blast/bin.nix b/pkgs/applications/science/biology/blast/bin.nix index 8f3a6f6be0b3..630ef07fd88c 100644 --- a/pkgs/applications/science/biology/blast/bin.nix +++ b/pkgs/applications/science/biology/blast/bin.nix @@ -17,7 +17,7 @@ let pname = "blast-bin"; version = "2.16.0"; - srcs = rec { + srcs = { x86_64-linux = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-linux.tar.gz"; hash = "sha256-sLEwmMkB0jsyStFwDnRxu3QIp/f1F9dNX6rXEb526PQ="; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index b9075230090f..50afc63be481 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -309,7 +309,7 @@ stdenv.mkDerivation rec { supportedFeatures = [ "commit" ]; }; - meta = rec { + meta = { description = ( if (stable) then diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 15c937671434..2073b2bd7c16 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -28,7 +28,7 @@ let find $out -type f -name '*.step' | parallel 'stepreduce {} {} && zip -9 {.}.stpZ {} && rm {}' ''; - meta = rec { + meta = { license = lib.licenses.cc-by-sa-40; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 2e59358072c7..6bbcc4f54fa5 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -22,7 +22,7 @@ desktopToDarwinBundle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pulseview"; version = "0.4.2-unstable-2024-03-14"; diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 9edd9f27e5ac..a376a3764380 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -7,7 +7,7 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "avy"; version = "2019.05.01"; # date of cav19 tag diff --git a/pkgs/applications/science/logic/easycrypt/runtest.nix b/pkgs/applications/science/logic/easycrypt/runtest.nix index b714dc14991b..a8be8cc4868c 100644 --- a/pkgs/applications/science/logic/easycrypt/runtest.nix +++ b/pkgs/applications/science/logic/easycrypt/runtest.nix @@ -1,6 +1,6 @@ { python3Packages, easycrypt }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { inherit (easycrypt) src version; format = "other"; diff --git a/pkgs/applications/science/machine-learning/openbugs/default.nix b/pkgs/applications/science/machine-learning/openbugs/default.nix index 52055a7b32e3..0a2a5770c295 100644 --- a/pkgs/applications/science/machine-learning/openbugs/default.nix +++ b/pkgs/applications/science/machine-learning/openbugs/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "OpenBUGS"; version = "3.2.3"; diff --git a/pkgs/applications/science/misc/openmodelica/omedit/default.nix b/pkgs/applications/science/misc/openmodelica/omedit/default.nix index d06b4a40d13b..f0fc12f0a72b 100644 --- a/pkgs/applications/science/misc/openmodelica/omedit/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omedit/default.nix @@ -13,7 +13,7 @@ mkOpenModelicaDerivation, }: with openmodelica; -mkOpenModelicaDerivation rec { +mkOpenModelicaDerivation { pname = "omedit"; omdir = "OMEdit"; omdeps = [ diff --git a/pkgs/applications/science/misc/openmodelica/omparser/default.nix b/pkgs/applications/science/misc/openmodelica/omparser/default.nix index 7f27de2b457b..53cd2784732e 100644 --- a/pkgs/applications/science/misc/openmodelica/omparser/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omparser/default.nix @@ -7,7 +7,7 @@ mkOpenModelicaDerivation, }: -mkOpenModelicaDerivation rec { +mkOpenModelicaDerivation { pname = "omparser"; omdir = "OMParser"; omdeps = [ openmodelica.omcompiler ]; diff --git a/pkgs/applications/science/misc/openmodelica/omplot/default.nix b/pkgs/applications/science/misc/openmodelica/omplot/default.nix index 1469022626ee..5656e63bf253 100644 --- a/pkgs/applications/science/misc/openmodelica/omplot/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omplot/default.nix @@ -8,7 +8,7 @@ mkOpenModelicaDerivation, }: -mkOpenModelicaDerivation rec { +mkOpenModelicaDerivation { pname = "omplot"; omdir = "OMPlot"; omdeps = [ openmodelica.omcompiler ]; diff --git a/pkgs/applications/science/misc/openmodelica/omshell/default.nix b/pkgs/applications/science/misc/openmodelica/omshell/default.nix index cbbf44524687..972a2b664c5e 100644 --- a/pkgs/applications/science/misc/openmodelica/omshell/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omshell/default.nix @@ -9,7 +9,7 @@ mkOpenModelicaDerivation, }: -mkOpenModelicaDerivation rec { +mkOpenModelicaDerivation { pname = "omshell"; omdir = "OMShell"; omdeps = [ openmodelica.omcompiler ]; diff --git a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix index e344bf2494e3..26dc2cb7f993 100644 --- a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix @@ -9,7 +9,7 @@ fetchpatch, }: -mkOpenModelicaDerivation rec { +mkOpenModelicaDerivation { pname = "omsimulator"; omdir = "OMSimulator"; omdeps = [ openmodelica.omcompiler ]; diff --git a/pkgs/applications/science/molecular-dynamics/raspa/data.nix b/pkgs/applications/science/molecular-dynamics/raspa/data.nix index 642548fca205..996bc141e706 100644 --- a/pkgs/applications/science/molecular-dynamics/raspa/data.nix +++ b/pkgs/applications/science/molecular-dynamics/raspa/data.nix @@ -4,7 +4,7 @@ raspa, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "raspa-data"; inherit (raspa) version src; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index c356ee687e79..3a1151e8ae77 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "urxvt-theme-switch"; version = "unstable-2014-12-21"; diff --git a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix index 57085230621a..972b6523df16 100644 --- a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix +++ b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix @@ -10,7 +10,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mcaimi-st"; version = "0.pre+unstable=2021-08-30"; diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 3dd91492e904..56f2f8e463b1 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -35,7 +35,7 @@ let } ]; in -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "p4"; version = "2024.1/2596294"; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index bf94c7c1d9f1..e156fee4a1ff 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -118,7 +118,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mplayer"; version = "1.5-unstable-2024-12-21"; diff --git a/pkgs/applications/video/mpv/scripts/manga-reader.nix b/pkgs/applications/video/mpv/scripts/manga-reader.nix index 4b76691fd8a8..77223d041c8a 100644 --- a/pkgs/applications/video/mpv/scripts/manga-reader.nix +++ b/pkgs/applications/video/mpv/scripts/manga-reader.nix @@ -5,7 +5,7 @@ buildLua, }: -buildLua rec { +buildLua { pname = "manga-reader"; version = "0-unstable-2025-02-16"; diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index fa148c3cde2a..024932cc0434 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -6,7 +6,7 @@ libnotify, }: -buildLua rec { +buildLua { pname = "mpv-notify-send"; version = "0-unstable-2024-07-11"; diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index b25d1e2da86a..8d07970ddd07 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -6,7 +6,7 @@ yt-dlp, }: -buildLua rec { +buildLua { pname = "mpv-playlistmanager"; version = "0-unstable-2025-02-23"; diff --git a/pkgs/applications/video/mpv/scripts/quack.nix b/pkgs/applications/video/mpv/scripts/quack.nix index a1b32f291181..f3226cb744d6 100644 --- a/pkgs/applications/video/mpv/scripts/quack.nix +++ b/pkgs/applications/video/mpv/scripts/quack.nix @@ -5,7 +5,7 @@ buildLua, }: -buildLua rec { +buildLua { pname = "mpv-quack"; version = "0-unstable-2020-05-27"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix b/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix index 89ea4b6f35b6..097dbe334a83 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix @@ -7,7 +7,7 @@ qtbase, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "obs-transition-table"; version = "0.2.7-unstable-2024-11-27"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix index 48daa0a25676..72c1768cf5b8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix @@ -12,7 +12,7 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "obs-webkitgtk"; version = "unstable-2023-11-10"; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index b99821a64e05..c979752948d0 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -23,7 +23,7 @@ nix-update-script, }: -mkDerivation rec { +mkDerivation { pname = "simplescreenrecorder"; version = "0.4.4-unstable-2024-08-13"; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index baa59e05a8cb..7e95a2df2d8c 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -19,7 +19,7 @@ pkgsCross, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "crosvm"; version = "0-unstable-2025-02-18"; diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index f300cf2e73da..fed3249e3caa 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -10,7 +10,7 @@ findutils, gnugrep, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "docker-gc"; version = "unstable-2015-10-5"; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 4c4a267632c1..cff5da08d3aa 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -13,7 +13,7 @@ firewallSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lkl"; # NOTE: pinned to the last known version that doesn't have a hang in cptofs. diff --git a/pkgs/applications/window-managers/i3/rounded.nix b/pkgs/applications/window-managers/i3/rounded.nix index edf5cd74b80e..4d22a661f544 100644 --- a/pkgs/applications/window-managers/i3/rounded.nix +++ b/pkgs/applications/window-managers/i3/rounded.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, i3, pcre }: -i3.overrideAttrs (oldAttrs: rec { +i3.overrideAttrs (oldAttrs: { pname = "i3-rounded"; version = "4.21.1"; diff --git a/pkgs/applications/window-managers/i3/swallow.nix b/pkgs/applications/window-managers/i3/swallow.nix index 7cb42710e7a9..1c73d6f5f773 100644 --- a/pkgs/applications/window-managers/i3/swallow.nix +++ b/pkgs/applications/window-managers/i3/swallow.nix @@ -8,7 +8,7 @@ six, }: -buildPythonApplication rec { +buildPythonApplication { pname = "i3-swallow"; version = "unstable-2022-02-19"; diff --git a/pkgs/applications/window-managers/i3/workstyle.nix b/pkgs/applications/window-managers/i3/workstyle.nix index cd1694404ce0..a12bdb24ebfa 100644 --- a/pkgs/applications/window-managers/i3/workstyle.nix +++ b/pkgs/applications/window-managers/i3/workstyle.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "workstyle"; version = "unstable-2023-08-23"; diff --git a/pkgs/applications/window-managers/xmonad/xmonadctl.nix b/pkgs/applications/window-managers/xmonad/xmonadctl.nix index a755982afda2..e28e6da55d06 100644 --- a/pkgs/applications/window-managers/xmonad/xmonadctl.nix +++ b/pkgs/applications/window-managers/xmonad/xmonadctl.nix @@ -12,7 +12,7 @@ let self.X11 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xmonadctl"; inherit (haskellPackages.xmonad-contrib) src version; diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 610222d2868a..f4a417a6a8e6 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -680,7 +680,7 @@ rec { # By default ".", meaning the top level directory is assumed. # Using null will trigger a search. workspace_member = null; - src = symlinkJoin rec { + src = symlinkJoin { name = "find-cargo-toml"; paths = [ (mkCargoToml { name = "ignoreMe"; }) @@ -736,7 +736,7 @@ rec { ) cases; in tests - // rec { + // { crateBinWithPathOutputs = assertOutputs { name = "crateBinWithPath"; diff --git a/pkgs/build-support/wasm-bindgen-cli/default.nix b/pkgs/build-support/wasm-bindgen-cli/default.nix index 4597009c387b..40c120c14b79 100644 --- a/pkgs/build-support/wasm-bindgen-cli/default.nix +++ b/pkgs/build-support/wasm-bindgen-cli/default.nix @@ -17,7 +17,7 @@ cargoDeps, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "wasm-bindgen-cli"; inherit version src cargoDeps; diff --git a/pkgs/by-name/al/alt-ergo/package.nix b/pkgs/by-name/al/alt-ergo/package.nix index f44a8fe7daf7..1cd2bb503889 100644 --- a/pkgs/by-name/al/alt-ergo/package.nix +++ b/pkgs/by-name/al/alt-ergo/package.nix @@ -36,7 +36,7 @@ let in let - alt-ergo-parsers = ocamlPackages.buildDunePackage rec { + alt-ergo-parsers = ocamlPackages.buildDunePackage { pname = "alt-ergo-parsers"; inherit version src; nativeBuildInputs = [ ocamlPackages.menhir ]; diff --git a/pkgs/by-name/ap/apache-airflow/package.nix b/pkgs/by-name/ap/apache-airflow/package.nix index 1cf891aa77b8..5ed986239f0e 100644 --- a/pkgs/by-name/ap/apache-airflow/package.nix +++ b/pkgs/by-name/ap/apache-airflow/package.nix @@ -74,7 +74,7 @@ let }; format = "setuptools"; }); - httpcore = pySuper.httpcore.overridePythonAttrs (o: rec { + httpcore = pySuper.httpcore.overridePythonAttrs (o: { # nullify upstream's pytest flags which cause # "TLS/SSL connection has been closed (EOF)" # with pytest-httpbin 1.x diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix index c02e12b7ad75..140be9ca8ddf 100644 --- a/pkgs/by-name/ho/hover/package.nix +++ b/pkgs/by-name/ho/hover/package.nix @@ -87,7 +87,7 @@ let }; in -buildFHSEnv rec { +buildFHSEnv { inherit pname version; targetPkgs = pkgs: diff --git a/pkgs/by-name/io/ioccheck/package.nix b/pkgs/by-name/io/ioccheck/package.nix index 89b478f02347..1cc7b79667ce 100644 --- a/pkgs/by-name/io/ioccheck/package.nix +++ b/pkgs/by-name/io/ioccheck/package.nix @@ -43,7 +43,7 @@ let }; }; in -py.pkgs.buildPythonApplication rec { +py.pkgs.buildPythonApplication { pname = "ioccheck"; version = "unstable-2021-09-29"; pyproject = true; diff --git a/pkgs/by-name/pi/picoscope/package.nix b/pkgs/by-name/pi/picoscope/package.nix index 5b4c548fdf8b..edd02f15fd71 100644 --- a/pkgs/by-name/pi/picoscope/package.nix +++ b/pkgs/by-name/pi/picoscope/package.nix @@ -79,7 +79,7 @@ let version, sha256, }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "lib${name}"; inherit version; src = fetchurl { inherit url sha256; }; diff --git a/pkgs/by-name/po/portmod/package.nix b/pkgs/by-name/po/portmod/package.nix index 9956a2cff8f5..0095bfb3dfcf 100644 --- a/pkgs/by-name/po/portmod/package.nix +++ b/pkgs/by-name/po/portmod/package.nix @@ -46,7 +46,7 @@ let ]; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { inherit src version; pname = "portmod"; diff --git a/pkgs/by-name/sc/scilab-bin/package.nix b/pkgs/by-name/sc/scilab-bin/package.nix index a89197a9eb0d..9d9afc9e9fe9 100644 --- a/pkgs/by-name/sc/scilab-bin/package.nix +++ b/pkgs/by-name/sc/scilab-bin/package.nix @@ -70,7 +70,7 @@ let ''; }; - linux = stdenv.mkDerivation rec { + linux = stdenv.mkDerivation { inherit pname version diff --git a/pkgs/by-name/x2/x2goserver/package.nix b/pkgs/by-name/x2/x2goserver/package.nix index d3570b2e8ea4..a07a7bc9d2d8 100644 --- a/pkgs/by-name/x2/x2goserver/package.nix +++ b/pkgs/by-name/x2/x2goserver/package.nix @@ -96,7 +96,7 @@ let xorg.setxkbmap ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname version src; buildInputs = [ diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 3a78ed813f92..c908df82511f 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -64,7 +64,7 @@ let inherit meta; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nss-cacert"; inherit version; diff --git a/pkgs/data/themes/lightly-boehs/default.nix b/pkgs/data/themes/lightly-boehs/default.nix index 521736858752..145b7a22037d 100644 --- a/pkgs/data/themes/lightly-boehs/default.nix +++ b/pkgs/data/themes/lightly-boehs/default.nix @@ -10,7 +10,7 @@ qt5, }: -mkDerivation rec { +mkDerivation { pname = "lightly-boehs"; version = "0.4.1"; diff --git a/pkgs/data/themes/material-kwin-decoration/default.nix b/pkgs/data/themes/material-kwin-decoration/default.nix index a32eb8766e46..037a786a5b5f 100644 --- a/pkgs/data/themes/material-kwin-decoration/default.nix +++ b/pkgs/data/themes/material-kwin-decoration/default.nix @@ -16,7 +16,7 @@ unstableGitUpdater, }: -mkDerivation rec { +mkDerivation { pname = "material-kwin-decoration"; version = "7-unstable-2023-01-15"; diff --git a/pkgs/desktops/gnome/extensions/argos/default.nix b/pkgs/desktops/gnome/extensions/argos/default.nix index f74bfb6773d3..5e845e1741c9 100644 --- a/pkgs/desktops/gnome/extensions/argos/default.nix +++ b/pkgs/desktops/gnome/extensions/argos/default.nix @@ -5,7 +5,7 @@ unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "argos"; version = "unstable-2024-10-28"; diff --git a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix index d95679f601c5..890c461bfb98 100644 --- a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -8,7 +8,7 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-shell-extension-drop-down-terminal"; version = "unstable-2020-03-25"; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix index aa932eb719b8..c6c7d8c36612 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -8,7 +8,7 @@ unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-shell-extension-pop-shell"; version = "1.2.0-unstable-2025-02-20"; diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index d70d1bb1e031..adf0b3f839c8 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -7,7 +7,7 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-shell-extension-sound-output-device-chooser"; # For gnome 42 support many commits not tagged yet are needed. version = "unstable-2022-03-29"; diff --git a/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix index 516d85ce378e..3ce00bcae920 100644 --- a/pkgs/desktops/gnome/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -6,7 +6,7 @@ gnome-shell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-shell-extension-tilingnome"; version = "unstable-2019-09-19"; diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix index 82692ae90f42..2d666d68ae9d 100644 --- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -5,7 +5,7 @@ gnome-shell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-shell-extension-window-corner-preview"; version = "unstable-2019-04-03"; diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 0a1f24780ab1..d4aa9fcb83e6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -21,7 +21,7 @@ let testingName = lib.optionalString (testName != null) "${testName}-"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "${testingName}${switchboard.pname}-with-plugs"; inherit (switchboard) version; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index fb65b6f3162e..c94b42894dc1 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -19,7 +19,7 @@ let else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "${wingpanel.pname}-with-indicators"; inherit (wingpanel) version; diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix index 873b7cc2ceed..f68df7b7b642 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix @@ -8,7 +8,7 @@ qtx11extras, }: -mkDerivation rec { +mkDerivation { pname = "plasma-applet-virtual-desktop-bar"; version = "unstable-2021-02-20"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index 261b770a57c0..e6e38ef171a8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -12,7 +12,7 @@ xorgproto, }: -mkXfceDerivation rec { +mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpugraph-plugin"; version = "1.2.11"; diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index e08461a44c41..405e3bc1e944 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -65,7 +65,7 @@ let (builtins.throw "GNATprove depends on a specific GNAT version and can't be built using GNAT ${gnat_version}."); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnatprove"; version = "fsf-${gnat_version}_${thisSpark.commit_date}"; diff --git a/pkgs/development/compilers/alan/2.nix b/pkgs/development/compilers/alan/2.nix index b05415b629bb..5833cc8ea79a 100644 --- a/pkgs/development/compilers/alan/2.nix +++ b/pkgs/development/compilers/alan/2.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "alan2"; version = "2.8.7"; diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix index cf5a0bca0782..f27136912b67 100644 --- a/pkgs/development/compilers/dotnet/dotnet.nix +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -30,7 +30,7 @@ let ; bootstrapSdk = (buildDotnetSdk bootstrapSdkFile).sdk.unwrapped.overrideAttrs (old: { passthru = old.passthru or { } // { - artifacts = stdenvNoCC.mkDerivation rec { + artifacts = stdenvNoCC.mkDerivation { name = lib.nameFromURL artifactsUrl ".tar.gz"; src = fetchurl { diff --git a/pkgs/development/compilers/elm/packages/ghc8_10/default.nix b/pkgs/development/compilers/elm/packages/ghc8_10/default.nix index ff866eab7e81..223e389dd501 100644 --- a/pkgs/development/compilers/elm/packages/ghc8_10/default.nix +++ b/pkgs/development/compilers/elm/packages/ghc8_10/default.nix @@ -6,7 +6,7 @@ pkgs.haskell.packages.ghc810.override { self: super: let inherit (pkgs.haskell.lib.compose) justStaticExecutables overrideCabal doJailbreak; - elmPkgs = rec { + elmPkgs = { elmi-to-json = justStaticExecutables ( overrideCabal (drv: { version = "unstable-2021-07-19"; diff --git a/pkgs/development/compilers/elm/packages/ghc9_2/default.nix b/pkgs/development/compilers/elm/packages/ghc9_2/default.nix index 00cb7f6cf53b..caf59af8ab69 100644 --- a/pkgs/development/compilers/elm/packages/ghc9_2/default.nix +++ b/pkgs/development/compilers/elm/packages/ghc9_2/default.nix @@ -6,7 +6,7 @@ pkgs.haskell.packages.ghc92.override { self: super: let inherit (pkgs.haskell.lib.compose) justStaticExecutables overrideCabal doJailbreak; - elmPkgs = rec { + elmPkgs = { /* The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: `package/nix/build.sh` diff --git a/pkgs/development/compilers/factor-lang/scope.nix b/pkgs/development/compilers/factor-lang/scope.nix index af0d7af1293f..4c3e2f82d21a 100644 --- a/pkgs/development/compilers/factor-lang/scope.nix +++ b/pkgs/development/compilers/factor-lang/scope.nix @@ -4,7 +4,7 @@ let inside = (self: let callPackage = pkgs.newScope self; - in rec { + in { interpreter = callPackage ./factor99.nix { inherit (pkgs) stdenv; }; # Convenience access for using the returned attribute the same way as the diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index fc0e6e613195..00524b39c838 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -229,7 +229,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "ghc-binary${binDistUsed.variantSuffix}"; diff --git a/pkgs/development/compilers/ghc/9.10.1.nix b/pkgs/development/compilers/ghc/9.10.1.nix index 7955661f50e1..d1824ce680fd 100644 --- a/pkgs/development/compilers/ghc/9.10.1.nix +++ b/pkgs/development/compilers/ghc/9.10.1.nix @@ -1,4 +1,4 @@ -import ./common-hadrian.nix rec { +import ./common-hadrian.nix { version = "9.10.1"; sha256 = "bf386a302d4ee054791ffd51748900f15d71760fd199157922d120cc1f89e2f7"; } diff --git a/pkgs/development/compilers/ghc/9.12.1.nix b/pkgs/development/compilers/ghc/9.12.1.nix index 914c111e144b..6dd4bac79411 100644 --- a/pkgs/development/compilers/ghc/9.12.1.nix +++ b/pkgs/development/compilers/ghc/9.12.1.nix @@ -1,4 +1,4 @@ -import ./common-hadrian.nix rec { +import ./common-hadrian.nix { version = "9.12.1"; sha256 = "4a7410bdeec70f75717087b8f94bf5a6598fd61b3a0e1f8501d8f10be1492754"; } diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index a0065f28a79b..0e83d177e1d1 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -218,7 +218,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "ghc-binary${binDistUsed.variantSuffix}"; diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 6f9184899b1a..becb1bb43ce9 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -217,7 +217,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "ghc-binary${binDistUsed.variantSuffix}"; diff --git a/pkgs/development/compilers/ghc/9.6.3.nix b/pkgs/development/compilers/ghc/9.6.3.nix index 35bbf020acbf..14860037a3c5 100644 --- a/pkgs/development/compilers/ghc/9.6.3.nix +++ b/pkgs/development/compilers/ghc/9.6.3.nix @@ -1,4 +1,4 @@ -import ./common-hadrian.nix rec { +import ./common-hadrian.nix { version = "9.6.3"; sha256 = "1xbpxchmvm9gswrwwz1rsvx9kjaxhc2q3fx9l6wa0l5599xydkfz"; } diff --git a/pkgs/development/compilers/ghc/9.8.1.nix b/pkgs/development/compilers/ghc/9.8.1.nix index 7c8c476c5b1a..eed5bd67f511 100644 --- a/pkgs/development/compilers/ghc/9.8.1.nix +++ b/pkgs/development/compilers/ghc/9.8.1.nix @@ -1,4 +1,4 @@ -import ./common-hadrian.nix rec { +import ./common-hadrian.nix { version = "9.8.1"; sha256 = "b2f8ed6b7f733797a92436f4ff6e088a520913149c9a9be90465b40ad1f20751"; } diff --git a/pkgs/development/compilers/ghc/9.8.2.nix b/pkgs/development/compilers/ghc/9.8.2.nix index 0a7b109013bf..da29023b2bfa 100644 --- a/pkgs/development/compilers/ghc/9.8.2.nix +++ b/pkgs/development/compilers/ghc/9.8.2.nix @@ -1,4 +1,4 @@ -import ./common-hadrian.nix rec { +import ./common-hadrian.nix { version = "9.8.2"; sha256 = "4vt6fddGEjfSLoNlqD7dnhp30uFdBF85RTloRah3gck="; } diff --git a/pkgs/development/compilers/ghc/9.8.3.nix b/pkgs/development/compilers/ghc/9.8.3.nix index ce77308f9212..9f850708265f 100644 --- a/pkgs/development/compilers/ghc/9.8.3.nix +++ b/pkgs/development/compilers/ghc/9.8.3.nix @@ -1,4 +1,4 @@ -import ./common-hadrian.nix rec { +import ./common-hadrian.nix { version = "9.8.3"; sha256 = "99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70"; } diff --git a/pkgs/development/compilers/ghc/9.8.4.nix b/pkgs/development/compilers/ghc/9.8.4.nix index 2596249a70b4..5daea86169fb 100644 --- a/pkgs/development/compilers/ghc/9.8.4.nix +++ b/pkgs/development/compilers/ghc/9.8.4.nix @@ -1,4 +1,4 @@ -import ./common-hadrian.nix rec { +import ./common-hadrian.nix { version = "9.8.4"; sha256 = "17e8188f3c8a5c2f73fb4e35d01032e8dc258835ec876d52c8ad8ee3d24b2fc5"; } diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 5c453974ac0e..00d38215ff1e 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -6,7 +6,7 @@ ocamlPackages, perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "obliv-c"; version = "0.0pre20210621"; diff --git a/pkgs/development/coq-modules/ExtLib/default.nix b/pkgs/development/coq-modules/ExtLib/default.nix index 90fd3a261639..d7acce7ad691 100644 --- a/pkgs/development/coq-modules/ExtLib/default.nix +++ b/pkgs/development/coq-modules/ExtLib/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, stdlib, version ? null }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 8491e8c4bb29..ec43ebe2cb4b 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -7,7 +7,7 @@ ExtLib, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "InteractionTrees"; owner = "DeepSpec"; inherit version; diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index d4c901ef044f..2ca54c4b8a15 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -5,7 +5,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "coq-record-update"; owner = "tchajed"; inherit version; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index a6f8ab00d043..9470a4f6aea8 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -8,7 +8,7 @@ version ? null, }: -(mkCoqDerivation rec { +(mkCoqDerivation { pname = "corn"; inherit version; defaultVersion = diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index be317a531d75..5fd9ebb53692 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -6,7 +6,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "fiat"; owner = "mit-plv"; repo = "fiat"; diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index e50eed907e16..ff395c892f5e 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -9,7 +9,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "gaia-hydras"; repo = "hydra-battles"; diff --git a/pkgs/development/coq-modules/iris-named-props/default.nix b/pkgs/development/coq-modules/iris-named-props/default.nix index e2b6f9d7e296..73c07261a30b 100644 --- a/pkgs/development/coq-modules/iris-named-props/default.nix +++ b/pkgs/development/coq-modules/iris-named-props/default.nix @@ -6,7 +6,7 @@ iris, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "iris-named-props"; owner = "tchajed"; inherit version; diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index adcc9c3e5c72..8eb6340957d3 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,7 +6,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "iris"; domain = "gitlab.mpi-sws.org"; owner = "iris"; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index ede84f75f6a7..6c1a592dc3e7 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -7,7 +7,7 @@ version ? null, }: -(mkCoqDerivation rec { +(mkCoqDerivation { pname = "itauto"; owner = "fbesson"; domain = "gitlab.inria.fr"; diff --git a/pkgs/development/coq-modules/lemma-overloading/default.nix b/pkgs/development/coq-modules/lemma-overloading/default.nix index 58400a50e0ee..743a462944aa 100644 --- a/pkgs/development/coq-modules/lemma-overloading/default.nix +++ b/pkgs/development/coq-modules/lemma-overloading/default.nix @@ -6,7 +6,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "lemma-overloading"; inherit version; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index fe2535af6cf9..ffad0bc8b0b8 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -9,7 +9,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index 25e7645fb7c8..55b646fab1e5 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -5,7 +5,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "semantics"; owner = "coq-community"; releaseRev = v: "v${v}"; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 13a24d1600f7..da020725d9ff 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,7 +6,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "stdpp"; inherit version; domain = "gitlab.mpi-sws.org"; diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index fb0a321e0f9e..7d285060d575 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -6,7 +6,7 @@ version ? null, }: -mkCoqDerivation rec { +mkCoqDerivation { pname = "topology"; releaseRev = v: "v${v}"; diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index d5fe8880bdf2..4f450938f9a0 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -17,7 +17,7 @@ let sources = callPackage ./sources.nix { }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cbqn" + lib.optionalString (!generateBytecode) "-standalone"; inherit (sources.cbqn) version src; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 4150941f09cb..15f27998bec2 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -mkDerivation rec { +mkDerivation { version = "unstable-2024-08-22"; pname = "agda-prelude"; diff --git a/pkgs/development/libraries/bashup-events/generic.nix b/pkgs/development/libraries/bashup-events/generic.nix index f91179ff5a23..317a7fa9d5f3 100644 --- a/pkgs/development/libraries/bashup-events/generic.nix +++ b/pkgs/development/libraries/bashup-events/generic.nix @@ -31,7 +31,7 @@ let ''; in -resholve.mkDerivation rec { +resholve.mkDerivation { # bashup.events doesn't version yet but it has two variants with # differing features/performance characteristics: # - branch master: a variant for bash 3.2+ diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 8fe840bea596..eaa298848184 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -5,7 +5,7 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "eigen"; version = "3.4.0-unstable-2022-05-19"; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index d5aa780affa7..3246e8908a06 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,4 +1,4 @@ -import ./common.nix rec { +import ./common.nix { version = "1.4.x-2021-12-21"; rev = "c8bb2a35850be7c6eaec5ad5a2936a77f7913de2"; sha256 = "1fwfg1hp1ajqh2b4ra4phi96854q9i8c0gbyi7pr35ljyv848295"; diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix index 19ac83098337..6e851c66e077 100644 --- a/pkgs/development/libraries/fltk/common.nix +++ b/pkgs/development/libraries/fltk/common.nix @@ -49,7 +49,7 @@ let onOff = value: if value then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fltk"; inherit version; diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index dda34ffa5a27..aa0df3aebc17 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -79,7 +79,7 @@ rec { }; }; - stubby = stdenv.mkDerivation rec { + stubby = stdenv.mkDerivation { pname = "stubby"; version = "0.4.3"; outputs = [ diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/development/libraries/gsmlib/default.nix index 673ede3f9d57..e106bd64c28c 100644 --- a/pkgs/development/libraries/gsmlib/default.nix +++ b/pkgs/development/libraries/gsmlib/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsmlib"; version = "unstable-2017-10-06"; diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index a3b36672295c..ff33300e966c 100644 --- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -10,7 +10,7 @@ libva, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "icamerasrc-${ipu6-camera-hal.ipuVersion}"; version = "unstable-2024-09-29"; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 1c62282da048..25ad3c405b7d 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -192,7 +192,7 @@ let mkDictFromXuxen = { shortName, srcs, shortDescription, longDescription, dictFileName }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "hunspell-dict-${shortName}-xuxen"; version = "5-2015.11.10"; @@ -1033,7 +1033,7 @@ rec { /* Turkish */ tr_TR = tr-tr; - tr-tr = mkDict rec { + tr-tr = mkDict { pname = "hunspell-dict-tr-tr"; version = "1.1.1"; diff --git a/pkgs/development/libraries/hyphen/dictionaries.nix b/pkgs/development/libraries/hyphen/dictionaries.nix index 7eabf1f985aa..01303652017a 100644 --- a/pkgs/development/libraries/hyphen/dictionaries.nix +++ b/pkgs/development/libraries/hyphen/dictionaries.nix @@ -55,7 +55,7 @@ rec { # ENGLISH en_US = en-us; - en-us = stdenv.mkDerivation rec { + en-us = stdenv.mkDerivation { nativeBuildInputs = hyphen.nativeBuildInputs; version = hyphen.version; pname = "hyphen-dict-en-us"; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index c1113514a7cf..c2b9ddb7e076 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -14,7 +14,7 @@ let common = import ./common.nix { inherit fetchzip; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = common.pname; version = common.version; diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index 62ff5042a772..1625421de09d 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -13,7 +13,7 @@ let common = import ./common.nix { inherit fetchzip; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "irrlicht-mac"; version = common.version; diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index ddfec0814ca0..a7b6404b6a86 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -15,7 +15,7 @@ let "writer" = "jabcodeWriter"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jabcode-${subproject}"; version = "unstable-2022-06-17"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index e31665b2ef7a..1d8c54faed15 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -14,7 +14,7 @@ let sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rhino"; version = "1.7R2"; diff --git a/pkgs/development/libraries/libirc/default.nix b/pkgs/development/libraries/libirc/default.nix index 962a4d041e79..d14179fd571a 100644 --- a/pkgs/development/libraries/libirc/default.nix +++ b/pkgs/development/libraries/libirc/default.nix @@ -6,7 +6,7 @@ qtbase, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libirc"; version = "unstable-2022-10-15"; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 4fb1af2a14d6..0eb07279b716 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -12,7 +12,7 @@ darwin, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "liblastfm-unstable"; version = "2019-08-23"; diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix index 5df2831aa051..47f66b697f65 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -10,7 +10,7 @@ qtlocation, }: -mkDerivation rec { +mkDerivation { pname = "libosmscout"; version = "2022.04.25"; diff --git a/pkgs/development/libraries/libsbsms/common.nix b/pkgs/development/libraries/libsbsms/common.nix index aec4fb6deaeb..d1144ce2759c 100644 --- a/pkgs/development/libraries/libsbsms/common.nix +++ b/pkgs/development/libraries/libsbsms/common.nix @@ -10,7 +10,7 @@ homepage, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname version; src = fetchurl { diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index e498602061c5..eb002cf895a6 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -7,7 +7,7 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "luabind"; version = "0.9.1"; diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix index 3e76f3a2e7f3..66e470de4403 100644 --- a/pkgs/development/libraries/malcontent/ui.nix +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -20,7 +20,7 @@ glib-testing, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "malcontent-ui"; inherit (malcontent) version src; diff --git a/pkgs/development/libraries/qtfeedback/default.nix b/pkgs/development/libraries/qtfeedback/default.nix index 182b70910332..2a7e4aa5fb37 100644 --- a/pkgs/development/libraries/qtfeedback/default.nix +++ b/pkgs/development/libraries/qtfeedback/default.nix @@ -7,7 +7,7 @@ qtdeclarative, }: -mkDerivation rec { +mkDerivation { pname = "qtfeedback"; version = "unstable-2018-09-03"; diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index 320aa6ddfcee..6726fe3002bf 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -14,7 +14,7 @@ tbb, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mirtk"; version = "unstable-2022-07-22"; diff --git a/pkgs/development/libraries/soci/bc-soci.nix b/pkgs/development/libraries/soci/bc-soci.nix index f8442371a6f7..1d8d4bc1e46a 100644 --- a/pkgs/development/libraries/soci/bc-soci.nix +++ b/pkgs/development/libraries/soci/bc-soci.nix @@ -8,7 +8,7 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bc-soci"; version = "linphone-4.4.1"; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 9f2fff51c5f0..a02f91e527eb 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -8,7 +8,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soqt"; version = "2020-12-05-unstable"; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 04aa25f3ca07..29a039ace639 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -197,7 +197,7 @@ let }; }; - clfswm = super.clfswm.overrideAttrs (o: rec { + clfswm = super.clfswm.overrideAttrs (o: { buildScript = pkgs.writeText "build-clfswm.lisp" '' (load "${o.asdfFasl}/asdf.${o.faslExt}") (asdf:load-system 'clfswm) @@ -324,7 +324,7 @@ let lispLibs = with self; [ clim mcclim mcclim-layouts ]; }; - kons-9 = build-asdf-system rec { + kons-9 = build-asdf-system { pname = "kons-9"; version = "trunk"; src = pkgs.fetchFromGitHub { diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index a25f3fb30160..6f83335e9c7b 100644 --- a/pkgs/development/misc/msp430/mspds/binary.nix +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -11,7 +11,7 @@ let stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isDarwin ) "_64"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "msp-debug-stack-bin"; version = "3.15.1.1"; src = fetchurl { diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index ff8385fbcd54..f7d558396cbe 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -13,7 +13,7 @@ typing, }: -rec { +{ /* Upstream isn't interested in packaging this as a library (or accepting all of the patches we need to do so). diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 1539580446ed..8ae76e373b1d 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -15,7 +15,7 @@ }: let - sedparse = python27.pkgs.buildPythonPackage rec { + sedparse = python27.pkgs.buildPythonPackage { pname = "sedparse"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix index b4266eb4f74c..16fd105e4b59 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix @@ -87,7 +87,7 @@ let platformTools = androidComposition.platform-tools; jdk = pkgs.jdk; in -pkgs.mkShell rec { +pkgs.mkShell { name = "androidenv-example-without-emulator-demo"; packages = [ androidSdk diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index 3b1a8663148b..ffbf115b7eed 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -5,7 +5,7 @@ async, }: -buildDunePackage rec { +buildDunePackage { pname = "angstrom-async"; inherit (angstrom) version src; diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index be3a83cca34e..16b4887bb4af 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -5,7 +5,7 @@ lwt, }: -buildDunePackage rec { +buildDunePackage { pname = "angstrom-lwt-unix"; inherit (angstrom) version src; diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 6f6664765f92..9c854164de65 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -4,7 +4,7 @@ angstrom, }: -buildDunePackage rec { +buildDunePackage { pname = "angstrom-unix"; inherit (angstrom) version src; diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index c956c430fc2e..abb27e525e22 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -10,7 +10,7 @@ nixosTests, }: -buildDunePackage rec { +buildDunePackage { pname = "atd"; inherit (atdgen-codec-runtime) version src; diff --git a/pkgs/development/ocaml-modules/atdgen/runtime.nix b/pkgs/development/ocaml-modules/atdgen/runtime.nix index 547dfd32d0dd..4531dce25bb9 100644 --- a/pkgs/development/ocaml-modules/atdgen/runtime.nix +++ b/pkgs/development/ocaml-modules/atdgen/runtime.nix @@ -5,7 +5,7 @@ yojson, }: -buildDunePackage rec { +buildDunePackage { pname = "atdgen-runtime"; inherit (atdgen-codec-runtime) version src; diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix index aef82b128133..be5fb657f908 100644 --- a/pkgs/development/ocaml-modules/bitstring/ppx.nix +++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix @@ -11,7 +11,7 @@ if lib.versionOlder ppxlib.version "0.18.0" then throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}" else - buildDunePackage rec { + buildDunePackage { pname = "ppx_bitstring"; inherit (bitstring) version src; diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix index 20fc2b0f97cb..91c9efc90e8f 100644 --- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix +++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix @@ -6,7 +6,7 @@ ppxlib, }: -buildDunePackage rec { +buildDunePackage { pname = "brisk-reconciler"; version = "unstable-2020-12-02"; diff --git a/pkgs/development/ocaml-modules/chrome-trace/default.nix b/pkgs/development/ocaml-modules/chrome-trace/default.nix index e07f1c796eed..51bf1c51e85b 100644 --- a/pkgs/development/ocaml-modules/chrome-trace/default.nix +++ b/pkgs/development/ocaml-modules/chrome-trace/default.nix @@ -4,7 +4,7 @@ dune_3, }: -buildDunePackage rec { +buildDunePackage { pname = "chrome-trace"; inherit (dune_3) src version; diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index b4f9e338c2bd..69647bb08aa8 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -21,7 +21,7 @@ }: let - bantorra = buildDunePackage rec { + bantorra = buildDunePackage { pname = "bantorra"; version = "unstable-2022-05-08"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/cstruct/async.nix b/pkgs/development/ocaml-modules/cstruct/async.nix index 44ac3beb9985..67c6b07419f3 100644 --- a/pkgs/development/ocaml-modules/cstruct/async.nix +++ b/pkgs/development/ocaml-modules/cstruct/async.nix @@ -6,7 +6,7 @@ core, }: -buildDunePackage rec { +buildDunePackage { pname = "cstruct-async"; inherit (cstruct) src version meta; diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix index 0b4b1e42f0e2..05e507da83bf 100644 --- a/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -11,7 +11,7 @@ if lib.versionOlder (cstruct.version or "1") "3" then cstruct else - buildDunePackage rec { + buildDunePackage { pname = "cstruct-sexp"; inherit (cstruct) version src meta; diff --git a/pkgs/development/ocaml-modules/ctypes/foreign.nix b/pkgs/development/ocaml-modules/ctypes/foreign.nix index cb8f454e0e0c..d1a0371bb7ef 100644 --- a/pkgs/development/ocaml-modules/ctypes/foreign.nix +++ b/pkgs/development/ocaml-modules/ctypes/foreign.nix @@ -7,7 +7,7 @@ lwt, }: -buildDunePackage rec { +buildDunePackage { pname = "ctypes-foreign"; inherit (ctypes) version src doCheck; diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix index 0a893686fe91..5172e6974083 100644 --- a/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -13,7 +13,7 @@ ppx_expect, }: -buildDunePackage rec { +buildDunePackage { pname = "data-encoding"; inherit (json-data-encoding) src version; diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index 1c40f29295d1..70e4bd4b7964 100644 --- a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -7,7 +7,7 @@ dune-rpc, }: -buildDunePackage rec { +buildDunePackage { pname = "dune-action-plugin"; inherit (dune_3) src version; diff --git a/pkgs/development/ocaml-modules/dune-build-info/default.nix b/pkgs/development/ocaml-modules/dune-build-info/default.nix index 81f876a8d78c..c8affa8f1722 100644 --- a/pkgs/development/ocaml-modules/dune-build-info/default.nix +++ b/pkgs/development/ocaml-modules/dune-build-info/default.nix @@ -4,7 +4,7 @@ dune-action-plugin, }: -buildDunePackage rec { +buildDunePackage { pname = "dune-build-info"; inherit (dune-action-plugin) src version preBuild; diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index df4a8578df89..537ecd6cdc11 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -5,7 +5,7 @@ csexp, }: -buildDunePackage rec { +buildDunePackage { pname = "dune-configurator"; inherit (dune_3) src version patches; diff --git a/pkgs/development/ocaml-modules/dune-glob/default.nix b/pkgs/development/ocaml-modules/dune-glob/default.nix index 08523a8974c2..d3facb0edf02 100644 --- a/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -5,7 +5,7 @@ dune-private-libs, }: -buildDunePackage rec { +buildDunePackage { pname = "dune-glob"; inherit (dune_3) src version; diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index ad60aa1c75ec..fc66d504d639 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -5,7 +5,7 @@ stdune, }: -buildDunePackage rec { +buildDunePackage { pname = "dune-private-libs"; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/dune-rpc/default.nix b/pkgs/development/ocaml-modules/dune-rpc/default.nix index 07b8c584023b..2814f4e8f5da 100644 --- a/pkgs/development/ocaml-modules/dune-rpc/default.nix +++ b/pkgs/development/ocaml-modules/dune-rpc/default.nix @@ -10,7 +10,7 @@ dyn, }: -buildDunePackage rec { +buildDunePackage { pname = "dune-rpc"; inherit (dune_3) src version; diff --git a/pkgs/development/ocaml-modules/dune-site/default.nix b/pkgs/development/ocaml-modules/dune-site/default.nix index dde8e616bd94..95b25afb363f 100644 --- a/pkgs/development/ocaml-modules/dune-site/default.nix +++ b/pkgs/development/ocaml-modules/dune-site/default.nix @@ -5,7 +5,7 @@ dune-private-libs, }: -buildDunePackage rec { +buildDunePackage { pname = "dune-site"; inherit (dune_3) src version; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 2be5bdf3e596..9437809938c5 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -31,7 +31,7 @@ let throw "dypgen is not available for OCaml ${ocaml.version}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ocaml${ocaml.version}-dypgen"; inherit (params) src version; diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index a5676c358741..de1e15115e7b 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -11,7 +11,7 @@ if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5. throw "erm_xml is not available for OCaml ${ocaml.version}" else - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "ocaml${ocaml.version}-erm_xml"; version = "0.3+20180112"; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 40990b8af982..d98b8fac9036 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -14,7 +14,7 @@ digestif, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.3+20241009"; pname = "ocaml${ocaml.version}-erm_xmpp"; diff --git a/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix index adb80e01db3b..14bcbef29ade 100644 --- a/pkgs/development/ocaml-modules/faraday/async.nix +++ b/pkgs/development/ocaml-modules/faraday/async.nix @@ -5,7 +5,7 @@ async, }: -buildDunePackage rec { +buildDunePackage { pname = "faraday-async"; inherit (faraday) version src; diff --git a/pkgs/development/ocaml-modules/faraday/lwt-unix.nix b/pkgs/development/ocaml-modules/faraday/lwt-unix.nix index f194b6b56e92..8dd6edd2ee84 100644 --- a/pkgs/development/ocaml-modules/faraday/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/faraday/lwt-unix.nix @@ -5,7 +5,7 @@ lwt, }: -buildDunePackage rec { +buildDunePackage { pname = "faraday-lwt-unix"; inherit (faraday) version src; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/faraday/lwt.nix b/pkgs/development/ocaml-modules/faraday/lwt.nix index b7d0b35e6c34..e85d5cba7765 100644 --- a/pkgs/development/ocaml-modules/faraday/lwt.nix +++ b/pkgs/development/ocaml-modules/faraday/lwt.nix @@ -4,7 +4,7 @@ lwt, }: -buildDunePackage rec { +buildDunePackage { pname = "faraday-lwt"; inherit (faraday) version src; diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix index a4268e0ec063..090532b0e775 100644 --- a/pkgs/development/ocaml-modules/ff/default.nix +++ b/pkgs/development/ocaml-modules/ff/default.nix @@ -6,7 +6,7 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage { pname = "ff"; inherit (ff-sig) version src; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/flex/default.nix b/pkgs/development/ocaml-modules/flex/default.nix index d638e057ea1e..f41f0c38e7d3 100644 --- a/pkgs/development/ocaml-modules/flex/default.nix +++ b/pkgs/development/ocaml-modules/flex/default.nix @@ -5,7 +5,7 @@ reason, }: -buildDunePackage rec { +buildDunePackage { pname = "flex"; version = "unstable-2020-09-12"; diff --git a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix index 0d64ef2d2250..49453f48d87f 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix @@ -4,7 +4,7 @@ js_of_ocaml-compiler, }: -buildDunePackage rec { +buildDunePackage { pname = "ojs"; inherit (gen_js_api) version src; diff --git a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix index 28f043d50c80..65aefa003058 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix @@ -6,7 +6,7 @@ lwt_ssl, }: -buildDunePackage rec { +buildDunePackage { pname = "gluten-lwt-unix"; inherit (gluten) doCheck diff --git a/pkgs/development/ocaml-modules/gluten/lwt.nix b/pkgs/development/ocaml-modules/gluten/lwt.nix index 2da3d0f7d011..8ea372c24a80 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt.nix @@ -4,7 +4,7 @@ lwt, }: -buildDunePackage rec { +buildDunePackage { pname = "gluten-lwt"; inherit (gluten) doCheck diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix index b095180b6dc7..fb56ac42d83b 100644 --- a/pkgs/development/ocaml-modules/graphql/default.nix +++ b/pkgs/development/ocaml-modules/graphql/default.nix @@ -6,7 +6,7 @@ yojson, }: -buildDunePackage rec { +buildDunePackage { pname = "graphql"; inherit (graphql_parser) version src; diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix index fbd2df35a233..57df8a3f5232 100644 --- a/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -5,7 +5,7 @@ ocaml_lwt, }: -buildDunePackage rec { +buildDunePackage { pname = "graphql-lwt"; inherit (graphql) version src; diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix index 325f6dc1f1c8..927ca5b6c18d 100644 --- a/pkgs/development/ocaml-modules/h2/default.nix +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -21,7 +21,7 @@ let }; in -buildDunePackage rec { +buildDunePackage { pname = "h2"; inherit (hpack) diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index 5091612d9404..0cf9cb91605d 100644 --- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -4,7 +4,7 @@ cstruct, }: -buildDunePackage rec { +buildDunePackage { pname = "ipaddr-cstruct"; inherit (ipaddr) version src; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 8ed4d492149d..ec752d475ee0 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -8,7 +8,7 @@ ppx_sexp_conv, }: -buildDunePackage rec { +buildDunePackage { pname = "ipaddr"; inherit (macaddr) version src; diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 15de03d0c309..73efb521024d 100644 --- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -6,7 +6,7 @@ ppx_sexp_conv, }: -buildDunePackage rec { +buildDunePackage { pname = "ipaddr-sexp"; inherit (ipaddr) version src; diff --git a/pkgs/development/ocaml-modules/irmin/chunk.nix b/pkgs/development/ocaml-modules/irmin/chunk.nix index 7def846cff25..00b92d81d633 100644 --- a/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -8,7 +8,7 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage { pname = "irmin-chunk"; inherit (irmin) version src; diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index 4d395a36fffb..f421c5c51b61 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -9,7 +9,7 @@ irmin-watcher, }: -buildDunePackage rec { +buildDunePackage { pname = "irmin-fs"; diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 945e9d728c37..f9a269a83415 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -13,7 +13,7 @@ cacert, }: -buildDunePackage rec { +buildDunePackage { pname = "irmin-graphql"; diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index ecdb968f3c9c..7ae8259a2164 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -17,7 +17,7 @@ irmin-test, }: -buildDunePackage rec { +buildDunePackage { minimalOCamlVersion = "4.12"; pname = "irmin-pack"; diff --git a/pkgs/development/ocaml-modules/irmin/tezos.nix b/pkgs/development/ocaml-modules/irmin/tezos.nix index 08d84929aea4..cd7a108d84d8 100644 --- a/pkgs/development/ocaml-modules/irmin/tezos.nix +++ b/pkgs/development/ocaml-modules/irmin/tezos.nix @@ -15,7 +15,7 @@ fpath, }: -buildDunePackage rec { +buildDunePackage { pname = "irmin-tezos"; inherit (irmin) version src; diff --git a/pkgs/development/ocaml-modules/kafka/lwt.nix b/pkgs/development/ocaml-modules/kafka/lwt.nix index b389de60b34c..e638fe513f3b 100644 --- a/pkgs/development/ocaml-modules/kafka/lwt.nix +++ b/pkgs/development/ocaml-modules/kafka/lwt.nix @@ -11,7 +11,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "kafka_lwt is not available for OCaml ${ocaml.version}" buildDunePackage - rec { + { pname = "kafka_lwt"; inherit (kafka) version src; diff --git a/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix b/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix index f38d3a524ad1..d9855335d960 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/rsvg2.nix @@ -6,7 +6,7 @@ pkg-config, }: -buildDunePackage rec { +buildDunePackage { pname = "lablgtk3-rsvg2"; inherit (lablgtk3) version src; diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 2ec6bc0e9d5c..7593ce4858ea 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -88,7 +88,7 @@ let or (throw "labltk is not available for OCaml ${ocaml.version}"); in -param.stdenv.mkDerivation rec { +param.stdenv.mkDerivation { inherit (param) version src; pname = "ocaml${ocaml.version}-labltk"; diff --git a/pkgs/development/ocaml-modules/memprof-limits/default.nix b/pkgs/development/ocaml-modules/memprof-limits/default.nix index 5548dce3a3d5..32ffbd5f82cf 100644 --- a/pkgs/development/ocaml-modules/memprof-limits/default.nix +++ b/pkgs/development/ocaml-modules/memprof-limits/default.nix @@ -12,7 +12,7 @@ else pname = "memprof-limits"; version = "0.2.1"; - src = fetchFromGitLab rec { + src = fetchFromGitLab { owner = "gadmm"; repo = pname; rev = "v${version}"; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index c465e0fc6d32..1d04424a11c2 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -6,7 +6,7 @@ menhirSdk, }: -buildDunePackage rec { +buildDunePackage { pname = "menhir"; minimalOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/menhir/lib.nix b/pkgs/development/ocaml-modules/menhir/lib.nix index f421b9de86c5..6b63aabafd5f 100644 --- a/pkgs/development/ocaml-modules/menhir/lib.nix +++ b/pkgs/development/ocaml-modules/menhir/lib.nix @@ -18,7 +18,7 @@ let }; }) version; in -buildDunePackage rec { +buildDunePackage { pname = "menhirLib"; inherit (fetched) version src; diff --git a/pkgs/development/ocaml-modules/menhir/sdk.nix b/pkgs/development/ocaml-modules/menhir/sdk.nix index 9369be3a49f4..b7d744d16211 100644 --- a/pkgs/development/ocaml-modules/menhir/sdk.nix +++ b/pkgs/development/ocaml-modules/menhir/sdk.nix @@ -4,7 +4,7 @@ menhirLib, }: -buildDunePackage rec { +buildDunePackage { pname = "menhirSdk"; inherit (menhirLib) version src; diff --git a/pkgs/development/ocaml-modules/metrics/influx.nix b/pkgs/development/ocaml-modules/metrics/influx.nix index d4b94bc231e7..634982454c55 100644 --- a/pkgs/development/ocaml-modules/metrics/influx.nix +++ b/pkgs/development/ocaml-modules/metrics/influx.nix @@ -6,7 +6,7 @@ lwt, }: -buildDunePackage rec { +buildDunePackage { pname = "metrics-influx"; inherit (metrics) version src; diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix index 91cb89c15f00..037ec04ffe11 100644 --- a/pkgs/development/ocaml-modules/metrics/unix.nix +++ b/pkgs/development/ocaml-modules/metrics/unix.nix @@ -8,7 +8,7 @@ uuidm, }: -buildDunePackage rec { +buildDunePackage { pname = "metrics-unix"; diff --git a/pkgs/development/ocaml-modules/mirage-block/combinators.nix b/pkgs/development/ocaml-modules/mirage-block/combinators.nix index 939cbacbbbb8..713bedb88716 100644 --- a/pkgs/development/ocaml-modules/mirage-block/combinators.nix +++ b/pkgs/development/ocaml-modules/mirage-block/combinators.nix @@ -4,7 +4,7 @@ logs, }: -buildDunePackage rec { +buildDunePackage { pname = "mirage-block-combinators"; inherit (mirage-block) version src; diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index 399a68b2630d..c3843217a9c0 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -8,7 +8,7 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage { pname = "mirage-runtime"; inherit (functoria-runtime) src version; diff --git a/pkgs/development/ocaml-modules/mparser/pcre.nix b/pkgs/development/ocaml-modules/mparser/pcre.nix index 86ddc6c8c3c2..c2f81d1c149a 100644 --- a/pkgs/development/ocaml-modules/mparser/pcre.nix +++ b/pkgs/development/ocaml-modules/mparser/pcre.nix @@ -4,7 +4,7 @@ mparser, }: -buildDunePackage rec { +buildDunePackage { pname = "mparser-pcre"; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix index 1342aa079a11..8d9d3a768209 100644 --- a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -4,7 +4,7 @@ stdlib-shims, }: -buildDunePackage rec { +buildDunePackage { pname = "ocaml-protoc"; inherit (pbrt) version src; diff --git a/pkgs/development/ocaml-modules/ocamlformat-mlx/default.nix b/pkgs/development/ocaml-modules/ocamlformat-mlx/default.nix index ba8d0f828f07..2ed0aa7a0acd 100644 --- a/pkgs/development/ocaml-modules/ocamlformat-mlx/default.nix +++ b/pkgs/development/ocaml-modules/ocamlformat-mlx/default.nix @@ -5,7 +5,7 @@ ocamlformat-mlx-lib, re, }: -buildDunePackage rec { +buildDunePackage { pname = "ocamlformat-mlx"; minimalOcamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix index 1a714241fa07..dbef96fa1fa5 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix @@ -16,7 +16,7 @@ let inherit (callPackage ./generic.nix (args // version_arg)) src version; in -buildDunePackage rec { +buildDunePackage { pname = "ocamlformat-rpc-lib"; inherit src version; diff --git a/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix b/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix index e5529f1507ba..6405315fc955 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix @@ -6,7 +6,7 @@ ... }: -buildDunePackage rec { +buildDunePackage { pname = "ocamlgraph_gtk"; inherit (ocamlgraph) version src meta; diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index 719f0fcbfe9f..47514abae061 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -21,7 +21,7 @@ alcotest-lwt, }: -buildDunePackage rec { +buildDunePackage { pname = "opium"; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index 720bb6fb5df6..9d7aec9decf1 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -9,7 +9,7 @@ npy, }: -buildDunePackage rec { +buildDunePackage { pname = "owl"; inherit (owl-base) version src meta; diff --git a/pkgs/development/ocaml-modules/plotkicadsch/default.nix b/pkgs/development/ocaml-modules/plotkicadsch/default.nix index 3497dd0771a3..1b7e1943aacf 100644 --- a/pkgs/development/ocaml-modules/plotkicadsch/default.nix +++ b/pkgs/development/ocaml-modules/plotkicadsch/default.nix @@ -15,7 +15,7 @@ imagemagick, }: -buildDunePackage rec { +buildDunePackage { pname = "plotkicadsch"; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index 26d2cc66e37a..62fa34853599 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -8,7 +8,7 @@ yojson, }: -buildDunePackage rec { +buildDunePackage { pname = "ppx_deriving_rpc"; inherit (rpclib) version src; diff --git a/pkgs/development/ocaml-modules/progress/default.nix b/pkgs/development/ocaml-modules/progress/default.nix index d5ca6eee3860..eb0601917a67 100644 --- a/pkgs/development/ocaml-modules/progress/default.nix +++ b/pkgs/development/ocaml-modules/progress/default.nix @@ -11,7 +11,7 @@ astring, }: -buildDunePackage rec { +buildDunePackage { pname = "progress"; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/rebez/default.nix b/pkgs/development/ocaml-modules/rebez/default.nix index 026c67445706..0397eb96d5e3 100644 --- a/pkgs/development/ocaml-modules/rebez/default.nix +++ b/pkgs/development/ocaml-modules/rebez/default.nix @@ -5,7 +5,7 @@ reason, }: -buildDunePackage rec { +buildDunePackage { pname = "rebez"; version = "unstable-2019-06-20"; diff --git a/pkgs/development/ocaml-modules/reperf/default.nix b/pkgs/development/ocaml-modules/reperf/default.nix index 829c1653840e..2d1cbed11861 100644 --- a/pkgs/development/ocaml-modules/reperf/default.nix +++ b/pkgs/development/ocaml-modules/reperf/default.nix @@ -6,7 +6,7 @@ reason, }: -buildDunePackage rec { +buildDunePackage { pname = "reperf"; version = "1.5.1"; diff --git a/pkgs/development/ocaml-modules/saturn/default.nix b/pkgs/development/ocaml-modules/saturn/default.nix index caa735dd17a6..85eb26776707 100644 --- a/pkgs/development/ocaml-modules/saturn/default.nix +++ b/pkgs/development/ocaml-modules/saturn/default.nix @@ -11,7 +11,7 @@ qcheck-stm, }: -buildDunePackage rec { +buildDunePackage { pname = "saturn"; inherit (saturn_lockfree) src version; diff --git a/pkgs/development/ocaml-modules/tar/unix.nix b/pkgs/development/ocaml-modules/tar/unix.nix index 701e2a4458bf..79f1950fefa0 100644 --- a/pkgs/development/ocaml-modules/tar/unix.nix +++ b/pkgs/development/ocaml-modules/tar/unix.nix @@ -6,7 +6,7 @@ git, }: -buildDunePackage rec { +buildDunePackage { pname = "tar-unix"; inherit (tar) version src doCheck; diff --git a/pkgs/development/ocaml-modules/telegraml/default.nix b/pkgs/development/ocaml-modules/telegraml/default.nix index 23ce695840bc..95d5d945886b 100644 --- a/pkgs/development/ocaml-modules/telegraml/default.nix +++ b/pkgs/development/ocaml-modules/telegraml/default.nix @@ -8,7 +8,7 @@ yojson, }: -buildDunePackage rec { +buildDunePackage { pname = "telegraml"; version = "unstable-2021-06-17"; diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix index 1e6564707704..5a8e8f48e2bf 100644 --- a/pkgs/development/ocaml-modules/unisim_archisec/default.nix +++ b/pkgs/development/ocaml-modules/unisim_archisec/default.nix @@ -4,7 +4,7 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage { pname = "unisim_archisec"; version = "0.0.10"; diff --git a/pkgs/development/ocaml-modules/xdg/default.nix b/pkgs/development/ocaml-modules/xdg/default.nix index ca18fb0bd4da..97ab776bab04 100644 --- a/pkgs/development/ocaml-modules/xdg/default.nix +++ b/pkgs/development/ocaml-modules/xdg/default.nix @@ -4,7 +4,7 @@ dune_3, }: -buildDunePackage rec { +buildDunePackage { pname = "xdg"; inherit (dune_3) src version; diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix index ae3d3f302575..a25c6a37c7f8 100644 --- a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix +++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix @@ -6,7 +6,7 @@ junit_alcotest, }: -buildDunePackage rec { +buildDunePackage { pname = "yaml-sexp"; inherit (yaml) version src; diff --git a/pkgs/development/python-modules/acunetix/default.nix b/pkgs/development/python-modules/acunetix/default.nix index 2c1800fbc503..59a011b54665 100644 --- a/pkgs/development/python-modules/acunetix/default.nix +++ b/pkgs/development/python-modules/acunetix/default.nix @@ -7,7 +7,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage { pname = "acunetix"; version = "0.0.7"; format = "setuptools"; diff --git a/pkgs/development/python-modules/aocd-example-parser/default.nix b/pkgs/development/python-modules/aocd-example-parser/default.nix index 3914a8c492f1..01993be540ad 100644 --- a/pkgs/development/python-modules/aocd-example-parser/default.nix +++ b/pkgs/development/python-modules/aocd-example-parser/default.nix @@ -6,7 +6,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { pname = "aocd-example-parser"; version = "2024.12.25"; pyproject = true; diff --git a/pkgs/development/python-modules/approval-utilities/default.nix b/pkgs/development/python-modules/approval-utilities/default.nix index c7e7157539b4..e0081554dedd 100644 --- a/pkgs/development/python-modules/approval-utilities/default.nix +++ b/pkgs/development/python-modules/approval-utilities/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage { pname = "approval-utilities"; inherit (approvaltests) version src; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/apt-repo/default.nix b/pkgs/development/python-modules/apt-repo/default.nix index d2be4543fe61..05cf66705bdf 100644 --- a/pkgs/development/python-modules/apt-repo/default.nix +++ b/pkgs/development/python-modules/apt-repo/default.nix @@ -9,7 +9,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "apt-repo"; version = "0.5-unstable-2023-09-27"; pyproject = true; diff --git a/pkgs/development/python-modules/apted/default.nix b/pkgs/development/python-modules/apted/default.nix index d2f93ddd6616..a13231d23f0a 100644 --- a/pkgs/development/python-modules/apted/default.nix +++ b/pkgs/development/python-modules/apted/default.nix @@ -6,7 +6,7 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "apted"; version = "1.0.3"; pyproject = true; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index 4fb33a866a60..8f27c895beec 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -30,7 +30,7 @@ let }; in -buildPythonPackage rec { +buildPythonPackage { pname = "asn1crypto"; pyproject = true; inherit (provenance) version; diff --git a/pkgs/development/python-modules/asyncserial/default.nix b/pkgs/development/python-modules/asyncserial/default.nix index 1fec899b050f..2eab95bd4dfb 100644 --- a/pkgs/development/python-modules/asyncserial/default.nix +++ b/pkgs/development/python-modules/asyncserial/default.nix @@ -5,7 +5,7 @@ pyserial, }: -buildPythonPackage rec { +buildPythonPackage { pname = "asyncserial"; version = "unstable-2022-06-10"; format = "setuptools"; diff --git a/pkgs/development/python-modules/baseline/default.nix b/pkgs/development/python-modules/baseline/default.nix index 1fadfe681b88..8b3bb590b5aa 100644 --- a/pkgs/development/python-modules/baseline/default.nix +++ b/pkgs/development/python-modules/baseline/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "baseline"; version = "1.2.1"; format = "setuptools"; diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index d6e8ec7501b4..31d3fae9ede1 100644 --- a/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/pkgs/development/python-modules/beanhub-cli/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { uvicorn ] ++ lib.flatten (lib.attrValues optional-dependencies); - optional-dependencies = rec { + optional-dependencies = { login = [ attrs httpx diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix index 6e170382a01b..e746ebdfda77 100644 --- a/pkgs/development/python-modules/blinkstick/default.nix +++ b/pkgs/development/python-modules/blinkstick/default.nix @@ -5,7 +5,7 @@ pyusb, }: -buildPythonPackage rec { +buildPythonPackage { pname = "blinkstick"; version = "unstable-2023-05-04"; format = "setuptools"; diff --git a/pkgs/development/python-modules/blurhash/default.nix b/pkgs/development/python-modules/blurhash/default.nix index 349687e30fe3..3397e12f57c4 100644 --- a/pkgs/development/python-modules/blurhash/default.nix +++ b/pkgs/development/python-modules/blurhash/default.nix @@ -7,7 +7,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage { pname = "blurhash"; version = "1.1.4"; format = "setuptools"; diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index 01e9e43f3acd..67b8a00ee0ee 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -4,7 +4,7 @@ flit-core, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "${python.libPrefix}-bootstrap-${flit-core.pname}"; inherit (flit-core) version diff --git a/pkgs/development/python-modules/cardimpose/default.nix b/pkgs/development/python-modules/cardimpose/default.nix index 5983f55a5aee..412e7d28ac0e 100644 --- a/pkgs/development/python-modules/cardimpose/default.nix +++ b/pkgs/development/python-modules/cardimpose/default.nix @@ -5,7 +5,7 @@ setuptools, pymupdf, }: -buildPythonPackage rec { +buildPythonPackage { pname = "cardimpose"; version = "0.2.1-unstable-2024-12-28"; pyproject = true; diff --git a/pkgs/development/python-modules/certauth/default.nix b/pkgs/development/python-modules/certauth/default.nix index d68cbd3481c2..20fd82c2d9e8 100644 --- a/pkgs/development/python-modules/certauth/default.nix +++ b/pkgs/development/python-modules/certauth/default.nix @@ -9,7 +9,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { pname = "certauth"; version = "1.3.0"; pyproject = true; diff --git a/pkgs/development/python-modules/cfscrape/default.nix b/pkgs/development/python-modules/cfscrape/default.nix index f4d6bc7a38a9..c5fba3baf917 100644 --- a/pkgs/development/python-modules/cfscrape/default.nix +++ b/pkgs/development/python-modules/cfscrape/default.nix @@ -5,7 +5,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage { pname = "cfscrape"; version = "2.1.1"; format = "setuptools"; diff --git a/pkgs/development/python-modules/clean-fid/default.nix b/pkgs/development/python-modules/clean-fid/default.nix index d88bbcc7105e..eb6941f4aa48 100644 --- a/pkgs/development/python-modules/clean-fid/default.nix +++ b/pkgs/development/python-modules/clean-fid/default.nix @@ -13,7 +13,7 @@ tqdm, }: -buildPythonPackage rec { +buildPythonPackage { pname = "clean-fid"; version = "0.1.35"; format = "setuptools"; diff --git a/pkgs/development/python-modules/cmake/default.nix b/pkgs/development/python-modules/cmake/default.nix index 5a6afc13602b..312b634161f5 100644 --- a/pkgs/development/python-modules/cmake/default.nix +++ b/pkgs/development/python-modules/cmake/default.nix @@ -5,7 +5,7 @@ cmake, }: -buildPythonPackage rec { +buildPythonPackage { pname = "cmake"; inherit (cmake) version; format = "pyproject"; diff --git a/pkgs/development/python-modules/complycube/default.nix b/pkgs/development/python-modules/complycube/default.nix index 2ad68d938682..7e74f3d56ba9 100644 --- a/pkgs/development/python-modules/complycube/default.nix +++ b/pkgs/development/python-modules/complycube/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "1.1.6"; pyproject = true; - src = fetchPypi rec { + src = fetchPypi { inherit version; pname = "complycube"; hash = "sha256-hetcn5RX582CRVmtG5dAvr+NXD+7NKJjaqgOo8LlpqM="; diff --git a/pkgs/development/python-modules/compressed-rtf/default.nix b/pkgs/development/python-modules/compressed-rtf/default.nix index 7788fe065635..46ad11bfc1fc 100644 --- a/pkgs/development/python-modules/compressed-rtf/default.nix +++ b/pkgs/development/python-modules/compressed-rtf/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "compressed-rtf"; version = "1.0.6-unstable-2023-10-15"; pyproject = true; diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix index 1cba5807e96d..6029a556a270 100644 --- a/pkgs/development/python-modules/contexttimer/default.nix +++ b/pkgs/development/python-modules/contexttimer/default.nix @@ -8,7 +8,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage { pname = "contexttimer"; version = "unstable-2019-03-30"; format = "setuptools"; diff --git a/pkgs/development/python-modules/cppe/default.nix b/pkgs/development/python-modules/cppe/default.nix index f313e3a97ec0..63c05e7998a7 100644 --- a/pkgs/development/python-modules/cppe/default.nix +++ b/pkgs/development/python-modules/cppe/default.nix @@ -16,7 +16,7 @@ llvmPackages, }: -buildPythonPackage rec { +buildPythonPackage { inherit (cppe) pname version diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index f95508612a71..93f167bd0a14 100644 --- a/pkgs/development/python-modules/dasbus/default.nix +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "dasbus"; version = "unstable-11-10-2022"; pyproject = true; diff --git a/pkgs/development/python-modules/diffimg/default.nix b/pkgs/development/python-modules/diffimg/default.nix index 4136041f7d82..f263bdf48fad 100644 --- a/pkgs/development/python-modules/diffimg/default.nix +++ b/pkgs/development/python-modules/diffimg/default.nix @@ -7,7 +7,7 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage { pname = "diffimg"; version = "0.3.0"; # github recognized 0.1.3, there's a v0.1.5 tag and setup.py says 0.3.0 format = "setuptools"; diff --git a/pkgs/development/python-modules/distutils/default.nix b/pkgs/development/python-modules/distutils/default.nix index f0264209b887..907c4dcea791 100644 --- a/pkgs/development/python-modules/distutils/default.nix +++ b/pkgs/development/python-modules/distutils/default.nix @@ -19,7 +19,7 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage { pname = "distutils"; inherit (setuptools) version; pyproject = true; diff --git a/pkgs/development/python-modules/django-crossdomainmedia/default.nix b/pkgs/development/python-modules/django-crossdomainmedia/default.nix index 3f2134e42239..998b69818a40 100644 --- a/pkgs/development/python-modules/django-crossdomainmedia/default.nix +++ b/pkgs/development/python-modules/django-crossdomainmedia/default.nix @@ -8,7 +8,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage { pname = "django-crossdomainmedia"; version = "0.0.4"; format = "setuptools"; diff --git a/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/pkgs/development/python-modules/django-rest-polymorphic/default.nix index 73196ccfbcf0..6691daca93fd 100644 --- a/pkgs/development/python-modules/django-rest-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-rest-polymorphic/default.nix @@ -11,7 +11,7 @@ six, }: -buildPythonPackage rec { +buildPythonPackage { pname = "django-rest-polymorphic"; version = "0.1.10"; format = "setuptools"; diff --git a/pkgs/development/python-modules/dlx/default.nix b/pkgs/development/python-modules/dlx/default.nix index 3917dd4540cc..6951f64315dd 100644 --- a/pkgs/development/python-modules/dlx/default.nix +++ b/pkgs/development/python-modules/dlx/default.nix @@ -5,7 +5,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage { pname = "dlx"; version = "1.0.4"; format = "setuptools"; diff --git a/pkgs/development/python-modules/dpcontracts/default.nix b/pkgs/development/python-modules/dpcontracts/default.nix index df423a46d478..eb687800b3a9 100644 --- a/pkgs/development/python-modules/dpcontracts/default.nix +++ b/pkgs/development/python-modules/dpcontracts/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage { pname = "dpcontracts"; version = "unstable-2018-11-20"; format = "setuptools"; diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 11d5ef13a248..9d9aca986d36 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -6,7 +6,7 @@ pybind11, }: -buildPythonPackage rec { +buildPythonPackage { inherit (pkgs.fasttext) pname version src; format = "setuptools"; diff --git a/pkgs/development/python-modules/fleep/default.nix b/pkgs/development/python-modules/fleep/default.nix index 4f178a836c22..54fe116a8178 100644 --- a/pkgs/development/python-modules/fleep/default.nix +++ b/pkgs/development/python-modules/fleep/default.nix @@ -5,7 +5,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage { pname = "fleep"; version = "1.0.1"; format = "setuptools"; diff --git a/pkgs/development/python-modules/gdb-pt-dump/default.nix b/pkgs/development/python-modules/gdb-pt-dump/default.nix index 591583510cd8..26bcc50a1c9f 100644 --- a/pkgs/development/python-modules/gdb-pt-dump/default.nix +++ b/pkgs/development/python-modules/gdb-pt-dump/default.nix @@ -5,7 +5,7 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage { pname = "gdb-pt-dump"; version = "0-unstable-2024-04-01"; pyproject = true; diff --git a/pkgs/development/python-modules/get-video-properties/default.nix b/pkgs/development/python-modules/get-video-properties/default.nix index 70b2c568f6b7..a12dd528531e 100644 --- a/pkgs/development/python-modules/get-video-properties/default.nix +++ b/pkgs/development/python-modules/get-video-properties/default.nix @@ -5,7 +5,7 @@ ffmpeg-headless, }: -buildPythonPackage rec { +buildPythonPackage { pname = "get-video-properties"; version = "0.1.1"; format = "setuptools"; diff --git a/pkgs/development/python-modules/gower/default.nix b/pkgs/development/python-modules/gower/default.nix index ad05ba9153cc..bc46f000ada5 100644 --- a/pkgs/development/python-modules/gower/default.nix +++ b/pkgs/development/python-modules/gower/default.nix @@ -8,7 +8,7 @@ pandas, }: -buildPythonPackage rec { +buildPythonPackage { pname = "gower"; version = "0.1.2"; diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix index 4876fdaa51c7..bd691b42dc73 100644 --- a/pkgs/development/python-modules/hcs-utils/default.nix +++ b/pkgs/development/python-modules/hcs-utils/default.nix @@ -9,7 +9,7 @@ fetchFromGitLab, }: -buildPythonPackage rec { +buildPythonPackage { pname = "hcs-utils"; version = "2.1.0"; pyproject = true; diff --git a/pkgs/development/python-modules/hg-commitsigs/default.nix b/pkgs/development/python-modules/hg-commitsigs/default.nix index be96f45368ac..39a50194fafc 100644 --- a/pkgs/development/python-modules/hg-commitsigs/default.nix +++ b/pkgs/development/python-modules/hg-commitsigs/default.nix @@ -5,7 +5,7 @@ python, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hg-commitsigs"; # Latest tag is 11 years old. version = "unstable-2021-01-08"; diff --git a/pkgs/development/python-modules/i2c-tools/default.nix b/pkgs/development/python-modules/i2c-tools/default.nix index 8b88b07b95ac..0440bc204f8e 100644 --- a/pkgs/development/python-modules/i2c-tools/default.nix +++ b/pkgs/development/python-modules/i2c-tools/default.nix @@ -4,7 +4,7 @@ i2c-tools, }: -buildPythonPackage rec { +buildPythonPackage { inherit (i2c-tools) pname version src; format = "setuptools"; diff --git a/pkgs/development/python-modules/ifconfig-parser/default.nix b/pkgs/development/python-modules/ifconfig-parser/default.nix index 29241983c4c7..448e61b0a8c0 100644 --- a/pkgs/development/python-modules/ifconfig-parser/default.nix +++ b/pkgs/development/python-modules/ifconfig-parser/default.nix @@ -6,7 +6,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { pname = "ifconfig-parser"; version = "0.0.5"; pyproject = true; diff --git a/pkgs/development/python-modules/ilcli/default.nix b/pkgs/development/python-modules/ilcli/default.nix index f2cb741931db..c7cf161a8e38 100644 --- a/pkgs/development/python-modules/ilcli/default.nix +++ b/pkgs/development/python-modules/ilcli/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "ilcli"; version = "0.3.2"; pyproject = true; diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix index 9727da3837f6..7c54901baa8e 100644 --- a/pkgs/development/python-modules/imantics/default.nix +++ b/pkgs/development/python-modules/imantics/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "imantics"; version = "0.1.12"; pyproject = true; diff --git a/pkgs/development/python-modules/jstyleson/default.nix b/pkgs/development/python-modules/jstyleson/default.nix index c38e84787275..45cb07cf48be 100644 --- a/pkgs/development/python-modules/jstyleson/default.nix +++ b/pkgs/development/python-modules/jstyleson/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "jstyleson"; version = "0.0.2"; format = "setuptools"; diff --git a/pkgs/development/python-modules/junit-xml/default.nix b/pkgs/development/python-modules/junit-xml/default.nix index 8ec89b19beb7..853a1ef160f2 100644 --- a/pkgs/development/python-modules/junit-xml/default.nix +++ b/pkgs/development/python-modules/junit-xml/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "junit-xml"; version = "1.9"; format = "setuptools"; diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 1f617718cf77..abfae9c25c8f 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -21,7 +21,7 @@ wheel, }: -buildPythonPackage rec { +buildPythonPackage { pname = "libmambapy"; pyproject = true; diff --git a/pkgs/development/python-modules/lunarcalendar/default.nix b/pkgs/development/python-modules/lunarcalendar/default.nix index 7472ea07a751..2ad174355995 100644 --- a/pkgs/development/python-modules/lunarcalendar/default.nix +++ b/pkgs/development/python-modules/lunarcalendar/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "lunarcalendar"; version = "0.0.9"; format = "setuptools"; diff --git a/pkgs/development/python-modules/mac-vendor-lookup/default.nix b/pkgs/development/python-modules/mac-vendor-lookup/default.nix index e5cd0d793b6a..2981d9b469d4 100644 --- a/pkgs/development/python-modules/mac-vendor-lookup/default.nix +++ b/pkgs/development/python-modules/mac-vendor-lookup/default.nix @@ -6,7 +6,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage { pname = "mac-vendor-lookup"; version = "0.1.12"; format = "setuptools"; diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix index 1de25320bb3f..79bd8cc061ea 100644 --- a/pkgs/development/python-modules/marisa/default.nix +++ b/pkgs/development/python-modules/marisa/default.nix @@ -5,7 +5,7 @@ swig, }: -buildPythonPackage rec { +buildPythonPackage { pname = "marisa"; format = "setuptools"; inherit (marisa) src version; diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix index f8be0a3d6b3b..7ac0d401096a 100644 --- a/pkgs/development/python-modules/minikanren/default.nix +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -12,7 +12,7 @@ pytest-html, }: -buildPythonPackage rec { +buildPythonPackage { pname = "minikanren"; version = "1.0.3"; format = "setuptools"; diff --git a/pkgs/development/python-modules/mkdocs-exclude/default.nix b/pkgs/development/python-modules/mkdocs-exclude/default.nix index 431eeb44cc53..c791e9dea6c2 100644 --- a/pkgs/development/python-modules/mkdocs-exclude/default.nix +++ b/pkgs/development/python-modules/mkdocs-exclude/default.nix @@ -5,7 +5,7 @@ mkdocs, }: -buildPythonPackage rec { +buildPythonPackage { pname = "mkdocs-exclude"; version = "1.0.2"; format = "setuptools"; diff --git a/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix b/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix index 45b87d4ba3f8..39d0bd890e93 100644 --- a/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix @@ -6,7 +6,7 @@ mkdocs, }: -buildPythonPackage rec { +buildPythonPackage { pname = "mkdocs-gitlab-plugin"; version = "0.1.4"; format = "setuptools"; diff --git a/pkgs/development/python-modules/mkdocs-linkcheck/default.nix b/pkgs/development/python-modules/mkdocs-linkcheck/default.nix index e03215565300..7d2336f52fb4 100644 --- a/pkgs/development/python-modules/mkdocs-linkcheck/default.nix +++ b/pkgs/development/python-modules/mkdocs-linkcheck/default.nix @@ -6,7 +6,7 @@ pythonPackages, }: -buildPythonPackage rec { +buildPythonPackage { pname = "mkdocs-linkcheck"; version = "unstable-2021-08-24"; format = "setuptools"; diff --git a/pkgs/development/python-modules/morphys/default.nix b/pkgs/development/python-modules/morphys/default.nix index 4ce36203a700..bfd201cf2d6f 100644 --- a/pkgs/development/python-modules/morphys/default.nix +++ b/pkgs/development/python-modules/morphys/default.nix @@ -3,7 +3,7 @@ fetchFromGitHub, lib, }: -buildPythonPackage rec { +buildPythonPackage { pname = "morphys"; version = "1.0"; format = "setuptools"; diff --git a/pkgs/development/python-modules/motmetrics/default.nix b/pkgs/development/python-modules/motmetrics/default.nix index 74a0fade7bd9..235ab9fffb4b 100644 --- a/pkgs/development/python-modules/motmetrics/default.nix +++ b/pkgs/development/python-modules/motmetrics/default.nix @@ -17,7 +17,7 @@ pytest-benchmark, }: -buildPythonPackage rec { +buildPythonPackage { pname = "motmetrics"; version = "1.4.0-unstable-20240130"; pyproject = true; diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 937d489f6f5e..de7662b7bc8f 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ trio, }: -buildPythonPackage rec { +buildPythonPackage { pname = "msrest"; version = "0.7.1"; pyproject = true; diff --git a/pkgs/development/python-modules/mullvad-closest/default.nix b/pkgs/development/python-modules/mullvad-closest/default.nix index 1affe574c0db..e395d6cea406 100644 --- a/pkgs/development/python-modules/mullvad-closest/default.nix +++ b/pkgs/development/python-modules/mullvad-closest/default.nix @@ -10,7 +10,7 @@ fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage { pname = "mullvad-closest"; version = "unstable-2023-07-09"; format = "pyproject"; diff --git a/pkgs/development/python-modules/myhdl/default.nix b/pkgs/development/python-modules/myhdl/default.nix index 959856365d24..457f8663cc9d 100644 --- a/pkgs/development/python-modules/myhdl/default.nix +++ b/pkgs/development/python-modules/myhdl/default.nix @@ -8,7 +8,7 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage { pname = "myhdl"; # The stable version is from 2019 and it doesn't pass tests version = "unstable-2022-04-26"; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 6a3923275ea3..51bc466de9be 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -12,7 +12,7 @@ let buildMypyBoto3Package = serviceName: version: hash: - buildPythonPackage rec { + buildPythonPackage { pname = "mypy-boto3-${serviceName}"; inherit version; pyproject = true; diff --git a/pkgs/development/python-modules/ninja/default.nix b/pkgs/development/python-modules/ninja/default.nix index a735308e657e..6f9785e47664 100644 --- a/pkgs/development/python-modules/ninja/default.nix +++ b/pkgs/development/python-modules/ninja/default.nix @@ -5,7 +5,7 @@ ninja, }: -buildPythonPackage rec { +buildPythonPackage { pname = "ninja"; inherit (ninja) version; format = "pyproject"; diff --git a/pkgs/development/python-modules/nix-kernel/default.nix b/pkgs/development/python-modules/nix-kernel/default.nix index a14a12b5b4f0..335b77e2cde6 100644 --- a/pkgs/development/python-modules/nix-kernel/default.nix +++ b/pkgs/development/python-modules/nix-kernel/default.nix @@ -9,7 +9,7 @@ nix, }: -buildPythonPackage rec { +buildPythonPackage { pname = "nix-kernel"; version = "unstable-2020-04-26"; pyproject = true; diff --git a/pkgs/development/python-modules/openbabel-bindings/default.nix b/pkgs/development/python-modules/openbabel-bindings/default.nix index 4ab6b77465c1..24fb1677de36 100644 --- a/pkgs/development/python-modules/openbabel-bindings/default.nix +++ b/pkgs/development/python-modules/openbabel-bindings/default.nix @@ -5,7 +5,7 @@ buildPythonPackage, }: -buildPythonPackage rec { +buildPythonPackage { inherit (openbabel) pname version; src = "${openbabel}/${python.sitePackages}"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix index caa6d327dfeb..cdb964876e10 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix @@ -13,7 +13,7 @@ aws-xray-sdk, }: -buildPythonPackage rec { +buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-botocore"; pyproject = true; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix index bb6c9e5716ef..fdfce885ae01 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-celery/default.nix @@ -11,7 +11,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-celery"; pyproject = true; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix index 5d0e946bd1b5..c81381cdf363 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-logging"; pyproject = true; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix index db41c4fd56f8..35371f9e84e7 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-redis/default.nix @@ -12,7 +12,7 @@ fakeredis, }: -buildPythonPackage rec { +buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-redis"; pyproject = true; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix index fb01247ccfe0..232d50791d2e 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix @@ -12,7 +12,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-requests"; pyproject = true; diff --git a/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix b/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix index 47d67c2b100a..4ef467cc7230 100644 --- a/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix +++ b/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix @@ -12,7 +12,7 @@ pytest-benchmark, }: -buildPythonPackage rec { +buildPythonPackage { inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-propagator-aws-xray"; pyproject = true; diff --git a/pkgs/development/python-modules/oyaml/default.nix b/pkgs/development/python-modules/oyaml/default.nix index ffa881c8c06e..a52d9012919a 100644 --- a/pkgs/development/python-modules/oyaml/default.nix +++ b/pkgs/development/python-modules/oyaml/default.nix @@ -9,7 +9,7 @@ pyyaml, }: -buildPythonPackage rec { +buildPythonPackage { pname = "oyaml"; version = "unstable-2021-12-03"; format = "setuptools"; diff --git a/pkgs/development/python-modules/paranoid-crypto/default.nix b/pkgs/development/python-modules/paranoid-crypto/default.nix index 206fd2acf1c3..65299f9f22db 100644 --- a/pkgs/development/python-modules/paranoid-crypto/default.nix +++ b/pkgs/development/python-modules/paranoid-crypto/default.nix @@ -14,7 +14,7 @@ sympy, }: -buildPythonPackage rec { +buildPythonPackage { pname = "paranoid-crypto"; version = "unstable-20220819"; format = "setuptools"; diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix index 9e0ec0df24ea..1710fb7db566 100644 --- a/pkgs/development/python-modules/percol/default.nix +++ b/pkgs/development/python-modules/percol/default.nix @@ -5,7 +5,7 @@ cmigemo, }: -buildPythonPackage rec { +buildPythonPackage { pname = "percol"; version = "unstable-2019-07-24"; format = "setuptools"; diff --git a/pkgs/development/python-modules/playwright-stealth/default.nix b/pkgs/development/python-modules/playwright-stealth/default.nix index 0ee048182ba6..c5b3bd825a6d 100644 --- a/pkgs/development/python-modules/playwright-stealth/default.nix +++ b/pkgs/development/python-modules/playwright-stealth/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "playwright-stealth"; version = "1.0.6-unstable-2023-09-11"; pyproject = true; diff --git a/pkgs/development/python-modules/playwright/update.sh b/pkgs/development/python-modules/playwright/update.sh index db0086b6ed46..aab3f14f5390 100755 --- a/pkgs/development/python-modules/playwright/update.sh +++ b/pkgs/development/python-modules/playwright/update.sh @@ -32,7 +32,7 @@ replace_sha() { prefetch_browser() { # nix-prefetch is used to obtain sha with `stripRoot = false` # doesn't work on macOS https://github.com/msteen/nix-prefetch/issues/53 - nix-prefetch -q "{ stdenv, fetchzip }: stdenv.mkDerivation rec { name=\"browser\"; src = fetchzip { url = \"$1\"; stripRoot = $2; }; }" + nix-prefetch -q "{ stdenv, fetchzip }: stdenv.mkDerivation { name=\"browser\"; src = fetchzip { url = \"$1\"; stripRoot = $2; }; }" } update_browser() { diff --git a/pkgs/development/python-modules/prometrix/default.nix b/pkgs/development/python-modules/prometrix/default.nix index 4c362e26ef27..d22b9c353f2b 100644 --- a/pkgs/development/python-modules/prometrix/default.nix +++ b/pkgs/development/python-modules/prometrix/default.nix @@ -14,7 +14,7 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage { pname = "prometrix"; version = "0.1.18-unstable-2024-04-30"; pyproject = true; diff --git a/pkgs/development/python-modules/pyautogui/default.nix b/pkgs/development/python-modules/pyautogui/default.nix index a76479f79725..03cb123a8df3 100644 --- a/pkgs/development/python-modules/pyautogui/default.nix +++ b/pkgs/development/python-modules/pyautogui/default.nix @@ -13,7 +13,7 @@ xvfb-run, scrot, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyautogui"; version = "0.9.53"; format = "setuptools"; diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index b2ced090667d..56b09bdda832 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -1,6 +1,6 @@ { pycryptodome }: -(pycryptodome.overrideAttrs (oldAttrs: rec { +(pycryptodome.overrideAttrs (oldAttrs: { pname = "pycryptodomex"; postPatch = '' diff --git a/pkgs/development/python-modules/pydes/default.nix b/pkgs/development/python-modules/pydes/default.nix index e04090e686db..2b5fe8f78a34 100644 --- a/pkgs/development/python-modules/pydes/default.nix +++ b/pkgs/development/python-modules/pydes/default.nix @@ -5,7 +5,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pydes"; version = "unstable-2019-01-08"; format = "setuptools"; diff --git a/pkgs/development/python-modules/pyflipper/default.nix b/pkgs/development/python-modules/pyflipper/default.nix index f807ac56c959..1e4eabb239d9 100644 --- a/pkgs/development/python-modules/pyflipper/default.nix +++ b/pkgs/development/python-modules/pyflipper/default.nix @@ -8,7 +8,7 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyflipper"; version = "0.18-unstable-2024-04-15"; pyproject = true; diff --git a/pkgs/development/python-modules/pylibjpeg-data/default.nix b/pkgs/development/python-modules/pylibjpeg-data/default.nix index dcc14a7fd912..b652743e2934 100644 --- a/pkgs/development/python-modules/pylibjpeg-data/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-data/default.nix @@ -6,7 +6,7 @@ flit-core, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pylibjpeg-data"; version = "unstable-2024-03-28"; pyproject = true; diff --git a/pkgs/development/python-modules/pyls-flake8/default.nix b/pkgs/development/python-modules/pyls-flake8/default.nix index c8b8329797a6..da93d28ab60f 100644 --- a/pkgs/development/python-modules/pyls-flake8/default.nix +++ b/pkgs/development/python-modules/pyls-flake8/default.nix @@ -7,7 +7,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyls-flake8"; version = "0.4.0"; format = "setuptools"; diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix index 180886e462d0..65bf85d27f39 100644 --- a/pkgs/development/python-modules/pyproject-hooks/default.nix +++ b/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi rec { + src = fetchPypi { pname = "pyproject_hooks"; inherit version; hash = "sha256-HoWb1cQPrpRIZC3Yca30WeXiCEGG6NLCp5qCTJcNofg="; diff --git a/pkgs/development/python-modules/pypubsub/default.nix b/pkgs/development/python-modules/pypubsub/default.nix index cac77e5cc2cd..2bf879624a22 100644 --- a/pkgs/development/python-modules/pypubsub/default.nix +++ b/pkgs/development/python-modules/pypubsub/default.nix @@ -6,7 +6,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pypubsub"; version = "4.0.3"; format = "setuptools"; diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index a4f709f2dfb2..1a3dc11f176f 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -6,7 +6,7 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyrr"; version = "unstable-2022-07-22"; format = "setuptools"; diff --git a/pkgs/development/python-modules/pysabnzbd/default.nix b/pkgs/development/python-modules/pysabnzbd/default.nix index 4515bc0b37c8..05cfa38c5cef 100644 --- a/pkgs/development/python-modules/pysabnzbd/default.nix +++ b/pkgs/development/python-modules/pysabnzbd/default.nix @@ -5,7 +5,7 @@ aiohttp, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pysabnzbd"; version = "1.1.1"; format = "setuptools"; diff --git a/pkgs/development/python-modules/pyscreeze/default.nix b/pkgs/development/python-modules/pyscreeze/default.nix index 51898b3ed925..dfcf654cc0f7 100644 --- a/pkgs/development/python-modules/pyscreeze/default.nix +++ b/pkgs/development/python-modules/pyscreeze/default.nix @@ -7,7 +7,7 @@ xvfb-run, scrot, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyscreeze"; version = "0.1.26"; diff --git a/pkgs/development/python-modules/pytest-cov-stub/default.nix b/pkgs/development/python-modules/pytest-cov-stub/default.nix index 1a177559f319..f223dd0257c7 100644 --- a/pkgs/development/python-modules/pytest-cov-stub/default.nix +++ b/pkgs/development/python-modules/pytest-cov-stub/default.nix @@ -4,7 +4,7 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytest-cov-stub"; # please use pythonRemoveDeps rather than change this version version = (lib.importTOML ./src/pyproject.toml).project.version; diff --git a/pkgs/development/python-modules/pytest-pudb/default.nix b/pkgs/development/python-modules/pytest-pudb/default.nix index 376a7142af04..95881ab0b98e 100644 --- a/pkgs/development/python-modules/pytest-pudb/default.nix +++ b/pkgs/development/python-modules/pytest-pudb/default.nix @@ -7,7 +7,7 @@ pudb, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytest-pudb"; version = "0.7.0"; format = "setuptools"; diff --git a/pkgs/development/python-modules/python-bring-api/default.nix b/pkgs/development/python-modules/python-bring-api/default.nix index 060c73d39cd4..5c42edbea208 100644 --- a/pkgs/development/python-modules/python-bring-api/default.nix +++ b/pkgs/development/python-modules/python-bring-api/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-bring-api"; version = "3.0.0-unstable-2024-02-03"; pyproject = true; diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix index 7d4588da7397..125ceabace4c 100644 --- a/pkgs/development/python-modules/pytmx/default.nix +++ b/pkgs/development/python-modules/pytmx/default.nix @@ -10,7 +10,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytmx"; version = "3.32"; diff --git a/pkgs/development/python-modules/qreactor/default.nix b/pkgs/development/python-modules/qreactor/default.nix index 5caaf04047e8..7d575ed63908 100644 --- a/pkgs/development/python-modules/qreactor/default.nix +++ b/pkgs/development/python-modules/qreactor/default.nix @@ -7,7 +7,7 @@ pyqt5, }: -buildPythonPackage rec { +buildPythonPackage { pname = "qreactor-unstable"; version = "2018-09-29"; diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 2ef0d3280f83..3ba31569f4c3 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -19,7 +19,7 @@ let pyqt-builder ; in -buildPythonPackage rec { +buildPythonPackage { pname = "qscintilla-qt5"; version = qscintilla.version; src = qscintilla.src; diff --git a/pkgs/development/python-modules/random-user-agent/default.nix b/pkgs/development/python-modules/random-user-agent/default.nix index 086c8dab3937..ea7ce11de50b 100644 --- a/pkgs/development/python-modules/random-user-agent/default.nix +++ b/pkgs/development/python-modules/random-user-agent/default.nix @@ -6,7 +6,7 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage { pname = "random-user-agent"; version = "1.0.1-unstable-2018-12-26"; pyproject = true; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index 388e7ec9cd81..4c1857e1b70b 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "rencode"; version = "unstable-2021-08-10"; diff --git a/pkgs/development/python-modules/rmrl/default.nix b/pkgs/development/python-modules/rmrl/default.nix index 0dc783881414..27bad1461010 100644 --- a/pkgs/development/python-modules/rmrl/default.nix +++ b/pkgs/development/python-modules/rmrl/default.nix @@ -12,7 +12,7 @@ xdg, }: -buildPythonPackage rec { +buildPythonPackage { pname = "rmrl"; version = "0.2.1-unstable-2023-06-1"; diff --git a/pkgs/development/python-modules/rumps/default.nix b/pkgs/development/python-modules/rumps/default.nix index 1fb1729de358..0e9749b981dd 100644 --- a/pkgs/development/python-modules/rumps/default.nix +++ b/pkgs/development/python-modules/rumps/default.nix @@ -6,7 +6,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "rumps"; version = "unstable-2025-02-02"; pyproject = true; diff --git a/pkgs/development/python-modules/senf/default.nix b/pkgs/development/python-modules/senf/default.nix index 3f4f943500cc..8397a856f7e1 100644 --- a/pkgs/development/python-modules/senf/default.nix +++ b/pkgs/development/python-modules/senf/default.nix @@ -7,7 +7,7 @@ unstableGitUpdater, }: -buildPythonPackage rec { +buildPythonPackage { pname = "senf"; version = "1.5.0-unstable-2024-11-26"; diff --git a/pkgs/development/python-modules/surt/default.nix b/pkgs/development/python-modules/surt/default.nix index 74e5723eb906..57b89aa0795e 100644 --- a/pkgs/development/python-modules/surt/default.nix +++ b/pkgs/development/python-modules/surt/default.nix @@ -8,7 +8,7 @@ tldextract, }: -buildPythonPackage rec { +buildPythonPackage { pname = "surt"; version = "0.3.1"; format = "setuptools"; diff --git a/pkgs/development/python-modules/testing-postgresql/default.nix b/pkgs/development/python-modules/testing-postgresql/default.nix index 1b16def31580..5a786a4b01d2 100644 --- a/pkgs/development/python-modules/testing-postgresql/default.nix +++ b/pkgs/development/python-modules/testing-postgresql/default.nix @@ -12,7 +12,7 @@ testing-common-database, }: -buildPythonPackage rec { +buildPythonPackage { pname = "testing-postgresql"; # Version 1.3.0 isn't working so let's use the latest commit from GitHub version = "unstable-2017-10-31"; diff --git a/pkgs/development/python-modules/textual-slider/default.nix b/pkgs/development/python-modules/textual-slider/default.nix index 1a6734a31462..669d80637e84 100644 --- a/pkgs/development/python-modules/textual-slider/default.nix +++ b/pkgs/development/python-modules/textual-slider/default.nix @@ -6,7 +6,7 @@ textual, }: -buildPythonPackage rec { +buildPythonPackage { pname = "textual-slider"; version = "0.1.2"; diff --git a/pkgs/development/python-modules/timy/default.nix b/pkgs/development/python-modules/timy/default.nix index 678623fabd0e..ad4092cfba35 100644 --- a/pkgs/development/python-modules/timy/default.nix +++ b/pkgs/development/python-modules/timy/default.nix @@ -5,7 +5,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "timy"; version = "0.4.2"; diff --git a/pkgs/development/python-modules/tinyobjloader-py/default.nix b/pkgs/development/python-modules/tinyobjloader-py/default.nix index ea3d31342c25..6be11a91b581 100644 --- a/pkgs/development/python-modules/tinyobjloader-py/default.nix +++ b/pkgs/development/python-modules/tinyobjloader-py/default.nix @@ -5,7 +5,7 @@ tinyobjloader, }: -buildPythonPackage rec { +buildPythonPackage { pname = "tinyobjloader-py"; format = "setuptools"; inherit (tinyobjloader) version src; diff --git a/pkgs/development/python-modules/tiptapy/default.nix b/pkgs/development/python-modules/tiptapy/default.nix index be559c3d79e7..41fc1c05e54e 100644 --- a/pkgs/development/python-modules/tiptapy/default.nix +++ b/pkgs/development/python-modules/tiptapy/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "tiptapy"; # github repository does not have version tags version = "0.20.0-unstable-2024-06-14"; diff --git a/pkgs/development/python-modules/trectools/default.nix b/pkgs/development/python-modules/trectools/default.nix index e70b806ec17c..e91175fbc193 100644 --- a/pkgs/development/python-modules/trectools/default.nix +++ b/pkgs/development/python-modules/trectools/default.nix @@ -16,7 +16,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "trectools"; version = "0.0.50"; diff --git a/pkgs/development/python-modules/tubes/default.nix b/pkgs/development/python-modules/tubes/default.nix index df51ef91265a..36077d1a4d9c 100644 --- a/pkgs/development/python-modules/tubes/default.nix +++ b/pkgs/development/python-modules/tubes/default.nix @@ -8,7 +8,7 @@ twisted, }: -buildPythonPackage rec { +buildPythonPackage { pname = "tubes"; version = "0.2.1-unstable-2023-11-06"; format = "setuptools"; diff --git a/pkgs/development/python-modules/tvdb-api/default.nix b/pkgs/development/python-modules/tvdb-api/default.nix index 31877a0e58d9..7006c38dd058 100644 --- a/pkgs/development/python-modules/tvdb-api/default.nix +++ b/pkgs/development/python-modules/tvdb-api/default.nix @@ -6,7 +6,7 @@ pytest, }: -buildPythonPackage rec { +buildPythonPackage { pname = "tvdb-api"; version = "3.2.0-beta"; format = "setuptools"; diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 7ae03036bc5c..97d8e1f48614 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -31,7 +31,7 @@ let version = "0.0.21"; tag = "v${version}"; in -buildPythonPackage rec { +buildPythonPackage { pname = "type-infer"; inherit version; pyproject = true; diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index 90407c09fdb0..d5ccd832a0d0 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -58,7 +58,7 @@ let }; }; in -rec { +{ types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.21.1" "sha256-R+eS/SwpXvYD/Up9nb4Z3ExnyopPYGzZpg6z24/OXu8="; diff --git a/pkgs/development/python-modules/vcver/default.nix b/pkgs/development/python-modules/vcver/default.nix index 5dcbab7dc6d9..d1f5d20566f4 100644 --- a/pkgs/development/python-modules/vcver/default.nix +++ b/pkgs/development/python-modules/vcver/default.nix @@ -5,7 +5,7 @@ packaging, }: -buildPythonPackage rec { +buildPythonPackage { pname = "vcver"; version = "0.2.12"; format = "setuptools"; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index a1d6f26706b0..9261ba0ef101 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -88,7 +88,7 @@ let hash = "sha256-GUTRXmv3DiM/GN5Bvv2LYovMLKZMlMhoKv4O0g627gs="; }; - vllm-flash-attn = stdenv.mkDerivation rec { + vllm-flash-attn = stdenv.mkDerivation { pname = "vllm-flash-attn"; # https://github.com/vllm-project/flash-attention/blob/${src.rev}/vllm_flash_attn/__init__.py version = "2.7.2.post1"; diff --git a/pkgs/development/python-modules/vqgan-jax/default.nix b/pkgs/development/python-modules/vqgan-jax/default.nix index 87a16ca58bf5..fe259acad018 100644 --- a/pkgs/development/python-modules/vqgan-jax/default.nix +++ b/pkgs/development/python-modules/vqgan-jax/default.nix @@ -8,7 +8,7 @@ transformers, }: -buildPythonPackage rec { +buildPythonPackage { pname = "vqgan-jax"; version = "unstable-2022-04-20"; diff --git a/pkgs/development/python-modules/wsgiprox/default.nix b/pkgs/development/python-modules/wsgiprox/default.nix index 98bb446f9232..f2b461b0263e 100644 --- a/pkgs/development/python-modules/wsgiprox/default.nix +++ b/pkgs/development/python-modules/wsgiprox/default.nix @@ -6,7 +6,7 @@ certauth, }: -buildPythonPackage rec { +buildPythonPackage { pname = "wsgiprox"; version = "1.5.2"; format = "setuptools"; diff --git a/pkgs/development/python2-modules/setuptools/default.nix b/pkgs/development/python2-modules/setuptools/default.nix index 1e7c78532e59..3761a055a0a2 100644 --- a/pkgs/development/python2-modules/setuptools/default.nix +++ b/pkgs/development/python2-modules/setuptools/default.nix @@ -45,7 +45,7 @@ let ''; }; in -buildPythonPackage rec { +buildPythonPackage { inherit pname version; # Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly. # Instead, we override it to remove setuptools to avoid a circular dependency. diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix index 4363521d8802..2045f410ce11 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix @@ -5,7 +5,7 @@ llvm, }: -callPackage ../base.nix rec { +callPackage ../base.nix { inherit stdenv rocmUpdateScript; targetName = "clang-unwrapped"; targetDir = "clang"; diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix index 4351c4bc6629..314ce9806424 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-3/clang-tools-extra.nix @@ -7,7 +7,7 @@ gtest, }: -callPackage ../base.nix rec { +callPackage ../base.nix { inherit stdenv rocmUpdateScript; buildTests = false; # `invalid operands to binary expression ('std::basic_stringstream' and 'const llvm::StringRef')` targetName = "clang-tools-extra"; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix b/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix index dc9af79816c3..7e44ecb0bff2 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix @@ -5,7 +5,7 @@ llvm, }: -callPackage ../base.nix rec { +callPackage ../base.nix { inherit stdenv rocmUpdateScript; targetName = "clang-unwrapped"; targetDir = "clang"; diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/clang-tools-extra.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/clang-tools-extra.nix index 4351c4bc6629..314ce9806424 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-3/clang-tools-extra.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-3/clang-tools-extra.nix @@ -7,7 +7,7 @@ gtest, }: -callPackage ../base.nix rec { +callPackage ../base.nix { inherit stdenv rocmUpdateScript; buildTests = false; # `invalid operands to binary expression ('std::basic_stringstream' and 'const llvm::StringRef')` targetName = "clang-tools-extra"; diff --git a/pkgs/development/tcl-modules/by-name/le/lexec/package.nix b/pkgs/development/tcl-modules/by-name/le/lexec/package.nix index ca1e40aeeeec..047676ba4cde 100644 --- a/pkgs/development/tcl-modules/by-name/le/lexec/package.nix +++ b/pkgs/development/tcl-modules/by-name/le/lexec/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -mkTclDerivation rec { +mkTclDerivation { pname = "lexec"; version = "0-unstable-2020-03-11"; diff --git a/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix index 6f281c828908..d5991b0cc3ef 100644 --- a/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix +++ b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix @@ -5,7 +5,7 @@ tclx, }: -mkTclDerivation rec { +mkTclDerivation { pname = "tcl-fcgi"; version = "0.5.0"; diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 806ce6f7faca..0786c3cb6e56 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -69,12 +69,12 @@ let in rec { - alloy5 = generic rec { + alloy5 = generic { version = "5.1.0"; sha256 = "02k9khs4k5nc86x9pp5k3vcb0kiwdgcin46mlap4fycnr673xd53"; }; - alloy6 = generic rec { + alloy6 = generic { version = "6.0.0"; sha256 = "sha256-rA7mNxcu0DWkykMyfV4JwFmQqg0HOIcwjjD4jCRxNww="; }; diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index 98e3c3a28fae..e8532a81d03b 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -5,7 +5,7 @@ bundlerUpdateScript, }: -bundlerApp rec { +bundlerApp { pname = "brakeman"; exes = [ "brakeman" ]; gemdir = ./.; diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix index 84c948566deb..81eb580b5569 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -8,7 +8,7 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "clang-analyzer"; inherit (llvmPackages.clang-unwrapped) src version; diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix index 1dd6cfdf3de9..7456dadefa2e 100644 --- a/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/pkgs/development/tools/analysis/nix-linter/default.nix @@ -20,7 +20,7 @@ bytestring, }: -mkDerivation rec { +mkDerivation { pname = "nix-linter"; version = "0.2.0.4"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 79c6726806ea..6a4d5e6b9a59 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -399,7 +399,7 @@ stdenv.mkDerivation rec { }; }; - src_for_updater = stdenv.mkDerivation rec { + src_for_updater = stdenv.mkDerivation { name = "updater-sources"; inherit src; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index e941d53395c0..a9ef3514a37f 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -361,7 +361,7 @@ stdenv.mkDerivation rec { pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; }; - src_for_updater = stdenv.mkDerivation rec { + src_for_updater = stdenv.mkDerivation { name = "updater-sources"; inherit src; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/database/pgsync/default.nix b/pkgs/development/tools/database/pgsync/default.nix index d1ae5a11b34a..c257c7b2b12c 100644 --- a/pkgs/development/tools/database/pgsync/default.nix +++ b/pkgs/development/tools/database/pgsync/default.nix @@ -4,7 +4,7 @@ bundlerUpdateScript, }: -bundlerApp rec { +bundlerApp { gemdir = ./.; pname = "pgsync"; exes = [ "pgsync" ]; diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix index 5431b56ddbf7..e1bedd603cb4 100644 --- a/pkgs/development/tools/esbuild/netlify.nix +++ b/pkgs/development/tools/esbuild/netlify.nix @@ -5,7 +5,7 @@ netlify-cli, }: -buildGoModule rec { +buildGoModule { pname = "esbuild"; version = "0.14.39"; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 20a697c01fd0..c81d2762d5f4 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -44,7 +44,7 @@ let godotPackages_4 = godotPackages_4_4; godotPackages = godotPackages_4; in -rec { +{ godot3 = callPackage ./3 { }; godot3-export-templates = callPackage ./3/export-templates.nix { }; godot3-headless = callPackage ./3/headless.nix { }; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 84366aab70be..d2390501fc18 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -19,7 +19,7 @@ sigrok-firmware-fx2lafw, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libsigrok"; version = "0.5.2-unstable-2024-10-20"; diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/development/tools/misc/qtspim/default.nix index 42c927e5b32d..1108cddc740e 100644 --- a/pkgs/development/tools/misc/qtspim/default.nix +++ b/pkgs/development/tools/misc/qtspim/default.nix @@ -10,7 +10,7 @@ flex, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qtspim"; version = "9.1.23"; diff --git a/pkgs/development/tools/replay-io/default.nix b/pkgs/development/tools/replay-io/default.nix index e5ef210c5fbb..ab15c278ddcc 100644 --- a/pkgs/development/tools/replay-io/default.nix +++ b/pkgs/development/tools/replay-io/default.nix @@ -21,7 +21,7 @@ let metadata = lib.importJSON ./meta.json; in rec { - replay-recordreplay = stdenv.mkDerivation rec { + replay-recordreplay = stdenv.mkDerivation { pname = "replay-recordreplay"; version = builtins.head (builtins.match ".*/linux-recordreplay-(.*).tgz" metadata.recordreplay.url); nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/development/web/pnpm-lock-export/default.nix b/pkgs/development/web/pnpm-lock-export/default.nix index 2a019d5920f6..83dab2c5e380 100644 --- a/pkgs/development/web/pnpm-lock-export/default.nix +++ b/pkgs/development/web/pnpm-lock-export/default.nix @@ -3,7 +3,7 @@ buildNpmPackage, fetchFromGitHub, }: -buildNpmPackage rec { +buildNpmPackage { pname = "pnpm-lock-export"; version = "unstable-2023-07-31"; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index fb74dada582f..008d10ab6566 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -28,7 +28,7 @@ libogg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "asc"; version = "2.6.3.0"; diff --git a/pkgs/games/crossfire/crossfire-arch.nix b/pkgs/games/crossfire/crossfire-arch.nix index cb21856eab9f..0d3b3c0e6ed2 100644 --- a/pkgs/games/crossfire/crossfire-arch.nix +++ b/pkgs/games/crossfire/crossfire-arch.nix @@ -7,7 +7,7 @@ sha256, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "crossfire-arch"; version = rev; diff --git a/pkgs/games/crossfire/crossfire-client.nix b/pkgs/games/crossfire/crossfire-client.nix index 99c3ae355af6..2f96c2bf4cc4 100644 --- a/pkgs/games/crossfire/crossfire-client.nix +++ b/pkgs/games/crossfire/crossfire-client.nix @@ -25,7 +25,7 @@ sha256, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "crossfire-client"; version = rev; diff --git a/pkgs/games/crossfire/crossfire-maps.nix b/pkgs/games/crossfire/crossfire-maps.nix index 7740452d054d..32f2330b23b8 100644 --- a/pkgs/games/crossfire/crossfire-maps.nix +++ b/pkgs/games/crossfire/crossfire-maps.nix @@ -7,7 +7,7 @@ sha256, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "crossfire-maps"; version = rev; diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/games/crossfire/crossfire-server.nix index a22eb9dc1193..43d71aaede35 100644 --- a/pkgs/games/crossfire/crossfire-server.nix +++ b/pkgs/games/crossfire/crossfire-server.nix @@ -17,7 +17,7 @@ arch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "crossfire-server"; version = rev; diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix index 0cacb54b2f2d..739d3eea18d8 100644 --- a/pkgs/games/doom-ports/zandronum/alpha/default.nix +++ b/pkgs/games/doom-ports/zandronum/alpha/default.nix @@ -29,7 +29,7 @@ let clientLibPath = lib.makeLibraryPath [ fluidsynth ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zandronum-alpha${suffix}"; version = "3.2-230709-1914"; diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/games/doom-ports/zandronum/default.nix index 9a39719d42db..d9b076173b3f 100644 --- a/pkgs/games/doom-ports/zandronum/default.nix +++ b/pkgs/games/doom-ports/zandronum/default.nix @@ -29,7 +29,7 @@ let clientLibPath = lib.makeLibraryPath [ fluidsynth ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "zandronum${suffix}"; version = "3.1.0"; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index c184f715c5bf..692a80b74978 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -22,7 +22,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dxx-rebirth"; version = "0.60.0-beta2-unstable-2025-01-12"; diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix index 9a7be5418c8a..fcfb9fb53144 100644 --- a/pkgs/games/gl-gsync-demo/default.nix +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -9,7 +9,7 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gl-gsync-demo"; version = "unstable-2020-12-27"; diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index 7888c2111f51..b8dbf3c41402 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -8,7 +8,7 @@ filelock, }: -buildPythonApplication rec { +buildPythonApplication { pname = "legendary-gl"; # Name in pypi version = "0.20.34"; diff --git a/pkgs/games/openttd/grfcodec.nix b/pkgs/games/openttd/grfcodec.nix index e9d559793adf..584816769ef3 100644 --- a/pkgs/games/openttd/grfcodec.nix +++ b/pkgs/games/openttd/grfcodec.nix @@ -7,7 +7,7 @@ git, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openttd-grfcodec"; version = "unstable-2021-03-10"; diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index 766fb5d11437..9c8be5e790f3 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -4,7 +4,7 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; version = "0.64.1"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; diff --git a/pkgs/games/pegasus-frontend/default.nix b/pkgs/games/pegasus-frontend/default.nix index de566c43e6a8..3f5244273c8b 100644 --- a/pkgs/games/pegasus-frontend/default.nix +++ b/pkgs/games/pegasus-frontend/default.nix @@ -14,7 +14,7 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pegasus-frontend"; version = "0-unstable-2024-11-11"; diff --git a/pkgs/games/qzdl/default.nix b/pkgs/games/qzdl/default.nix index de7cef007f27..e7cbc238d5b7 100644 --- a/pkgs/games/qzdl/default.nix +++ b/pkgs/games/qzdl/default.nix @@ -12,7 +12,7 @@ copyDesktopItems, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qzdl"; version = "unstable-2023-04-04"; diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix index 0d2ef4cfaae1..944827cdb062 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -17,7 +17,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "warsow-engine"; version = "2.1.0"; diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 25420dd0bf6c..a959d2c2130a 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -115,7 +115,7 @@ in { inherit buildArmTrustedFirmware; - armTrustedFirmwareTools = buildArmTrustedFirmware rec { + armTrustedFirmwareTools = buildArmTrustedFirmware { # Normally, arm-trusted-firmware builds the build tools for buildPlatform # using CC_FOR_BUILD (or as it calls it HOSTCC). Since want to build them # for the hostPlatform here, we trick it by overriding the HOSTCC setting diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 7f90ffe6a173..1559328665fa 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -48,7 +48,7 @@ let ''; })); -in rec { +in { inherit mkTmuxPlugin; battery = mkTmuxPlugin { diff --git a/pkgs/os-specific/darwin/openwith/default.nix b/pkgs/os-specific/darwin/openwith/default.nix index f9bf5ffb94e7..e0b559af2836 100644 --- a/pkgs/os-specific/darwin/openwith/default.nix +++ b/pkgs/os-specific/darwin/openwith/default.nix @@ -8,7 +8,7 @@ let inherit (swiftPackages) stdenv swift; arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openwith"; version = "unstable-2022-10-28"; diff --git a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix index 59c92f9d434a..03c56c0adf91 100644 --- a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix +++ b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "osx-cpu-temp"; version = "unstable-2020-12-04"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { name = "osx-cpu-temp-source"; owner = "lavoiesl"; repo = pname; diff --git a/pkgs/os-specific/linux/fanout/default.nix b/pkgs/os-specific/linux/fanout/default.nix index 36b2bef05ebc..701f90ac7125 100644 --- a/pkgs/os-specific/linux/fanout/default.nix +++ b/pkgs/os-specific/linux/fanout/default.nix @@ -8,7 +8,7 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fanout"; version = "unstable-2022-10-17-${kernel.version}"; diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 0be0a18024a1..ace9235b76fd 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -7,7 +7,7 @@ kernelModuleMakeFlags, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gasket"; version = "1.0-18-unstable-2024-04-25"; diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index 728017fda2ce..dd458e973f5a 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -19,7 +19,7 @@ let # The fcopy program is explicitly left out in the Makefile on aarch64 (if stdenv.hostPlatform.isAarch64 then null else "fcopy_uio"); - daemons = stdenv.mkDerivation rec { + daemons = stdenv.mkDerivation { pname = "hyperv-daemons-bin"; inherit (kernel) src version; diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 717f680ab088..8fa84fd95dba 100644 --- a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -6,7 +6,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mbp2018-bridge-drv"; version = "2020-01-31"; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix index 7bee5011f0b8..4b77c2a40f8b 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/common.nix @@ -69,7 +69,7 @@ rec { kaem.runCommand "${pname}-${version}" { inherit pname version meta; - passthru.tests = rec { + passthru.tests = { get-version = result: kaem.runCommand "${pname}-get-version-${version}" { } '' diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index eadcb88e9c7a..af29f4888321 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -7,7 +7,7 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nct6687d"; version = "0-unstable-2024-11-05"; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 805eaffab03a..30a335238ee7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -8,7 +8,7 @@ nvidia_x11: sha256: libtirpc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nvidia-persistenced"; version = nvidia_x11.persistencedVersion; diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 58f810fe0830..b69d1ce60849 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -5,7 +5,7 @@ kernel, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rtl88xxau-aircrack"; version = "${kernel.version}-unstable-2024-04-09"; diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index a86fa31baec0..e6ca1d0e99f8 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -9,7 +9,7 @@ let pversion = "0.1.10"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "v86d"; version = "${pversion}-${kernel.version}"; diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index e1abf143bcc9..210ffa17f152 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -5,7 +5,7 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vendor-reset"; version = "unstable-2024-04-16-${kernel.version}"; diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix index 3a5362104566..4541279140a2 100644 --- a/pkgs/os-specific/linux/vmware/default.nix +++ b/pkgs/os-specific/linux/vmware/default.nix @@ -7,7 +7,7 @@ gnugrep, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vmware-modules"; version = "workstation-17.6.1-unstable-2024-10-12-${kernel.version}"; diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index c1da23912eab..aee1cc8892c8 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -33,7 +33,7 @@ let platforms = platforms.darwin ++ platforms.linux; }; - etcdserver = buildGoModule rec { + etcdserver = buildGoModule { pname = "etcdserver"; inherit diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 3b71f1033474..5201cd7f7da5 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -14,7 +14,7 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpm"; version = "unstable-2020-06-17"; diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index de681d1bf3aa..a2dcb6b4aa1a 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -14,7 +14,7 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "solanum"; version = "0-unstable-2025-02-25"; diff --git a/pkgs/servers/memos/default.nix b/pkgs/servers/memos/default.nix index 1037aa4379d8..4abdcf3f7e56 100644 --- a/pkgs/servers/memos/default.nix +++ b/pkgs/servers/memos/default.nix @@ -33,7 +33,7 @@ let ''; }; in -buildGoModule rec { +buildGoModule { pname = "memos"; inherit version src; diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index 390f9879bbff..cfe9d710ab17 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -73,7 +73,7 @@ mixRelease rec { }); # The remainder are Git dependencies (and their deps) that are not supported by mix2nix currently. - web_push_encryption = buildMix rec { + web_push_encryption = buildMix { name = "web_push_encryption"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix index 30f38f1c4ae4..e86b4eb8ff6c 100644 --- a/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "bsull-console-datasource"; version = "1.0.1"; zipHash = "sha256-V6D/VIdwwQvG21nVMXD/xF86Uy8WRecL2RjyDTZr1wQ="; diff --git a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix index aa8520e69b8e..3220ab078b0a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "doitintl-bigquery-datasource"; version = "2.0.3"; zipHash = "sha256-QxUNRsO1ony+6tVdpwx3P/63XNIdAVIren6hUwChf9E="; diff --git a/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix index 3c1c3410f248..cf0c8a3c1eb2 100644 --- a/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "fetzerch-sunandmoon-datasource"; version = "0.3.3"; zipHash = "sha256-IJe1OiPt9MxqqPymuH0K27jToSb92M0P4XGZXvk0paE="; diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix index ba3733860526..705313dea56e 100644 --- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "frser-sqlite-datasource"; version = "3.5.0"; zipHash = "sha256-BwAurFpMyyR318HMzVXCnOEQWM8W2vPPisXhhklFLBY="; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix index a5ed12fbfa47..8abcd59560a4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafadruid-druid-datasource"; version = "1.4.1"; zipHash = "sha256-7atxqRqKqop6ABQ+ead6wR/YRpJaV8j/Ri4VB9FXMu8="; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix index 0165770335f7..5d575e66bdd5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-clock-panel"; version = "2.1.8"; zipHash = "sha256-QLvq2CSlJuEaYAazn8MoY3XCiXeRILj4dTp/aqrHL/k="; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix index a1250b353cf9..ac370bb1894d 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-discourse-datasource"; version = "2.0.2"; zipHash = "sha256-0MTxPe7RJHMA0SwjOcFlbi4VkhlLUFP+5r2DsHAaffc="; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix index f76beec1866f..2b8333298f98 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-github-datasource"; version = "1.9.0"; zipHash = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix index 4e258eb81378..71751d169ff9 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-googlesheets-datasource"; version = "1.2.14"; zipHash = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix index e132e831fc66..1441713a4aeb 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-mqtt-datasource"; version = "1.1.0-beta.2"; zipHash = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix index 3a5955efcb4c..a3b36da66dd2 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-opensearch-datasource"; version = "2.19.0"; zipHash = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix index 168295c64cd5..af5baf31d443 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-piechart-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-piechart-panel"; version = "1.6.4"; zipHash = "sha256-bdAl3OmZgSNB+IxxlCb81abR+4dykKkRY3MpQUQyLks="; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 05c59191dc9b..c877e46a112b 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-polystat-panel"; version = "2.1.13"; zipHash = "sha256-O8YOSVLhJ1hDNbBHKwkikNBOjQTrGofGklVTalgDH4I="; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix index 630e5833667c..f0d6bc5824ab 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-worldmap-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "grafana-worldmap-panel"; version = "1.0.6"; zipHash = "sha256-/lgsdBEL9HdJX1X1Qy0THBlYdUUI8SRtgF1Wig1Ktpk="; diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix index cdf6b85c2a81..63d447f3cca4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "marcusolsson-calendar-panel"; version = "3.7.0"; zipHash = "sha256-O8EvkS+lWq2qaIj1HJzPagRGhrEENvY1YDBusvUejM0="; diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix index bafa04400514..6f2cce6a735f 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "marcusolsson-csv-datasource"; version = "0.6.19"; zipHash = { diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix index cc962a99ce63..ff9cafd08ffc 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "marcusolsson-dynamictext-panel"; version = "5.6.0"; zipHash = "sha256-UDJG6KAaothSv26SHKo1HNQwVHg5slI01rmDnGgGBWs="; diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix index f2ca72a12134..e9d25c6c7849 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "marcusolsson-json-datasource"; version = "1.3.17"; zipHash = "sha256-L1G5s9fEEuvNs5AWXlT00f+dU2/2Rtjm4R3kpFc4NRg="; diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix index f3dedc247bdb..501b8c4bbde8 100644 --- a/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "redis-app"; version = "2.2.1"; zipHash = "sha256-1ZzJaGhlM6CaTecj69aqJ9fqN7wYSsiDCMTRVkZJUb0="; diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix index 4d21fe4fffec..22d9ecc8b5ba 100644 --- a/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/redis-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "redis-datasource"; version = "2.2.0"; zipHash = "sha256-a4at8o185XSOyNxZZKfb0/j1CVoKQ9JZx0ofoPUBqKs="; diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix index e58da0bebd83..8d6805426223 100644 --- a/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/redis-explorer-app/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "redis-explorer-app"; version = "2.1.1"; zipHash = "sha256-t5L9XURNcswDbZWSmehs/JYU7NoEwhX1If7ghbi509g="; diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix index 28cdd3f09446..d8a96be6c264 100644 --- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "ventura-psychrometric-panel"; version = "4.5.1"; zipHash = "sha256-Y/Eh3eWZkPS8Q1eha7sEJ3wTMI7QxOr7MEbPc25fnGg="; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix index ecb8b7f70727..eb380bc05d87 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "volkovlabs-echarts-panel"; version = "6.4.1"; zipHash = "sha256-RHOfFKplZs0gbD/esvrpXkkPKPfo5R4zjCUJWPpkDNU="; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix index 21eb1fb5cf41..73f76d3c78b1 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "volkovlabs-form-panel"; version = "4.6.0"; zipHash = "sha256-ne2dfCr+PBodeaxGfZL0VrAxHLYEAaeQfuZQf2F3s0s="; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix index 06c5b41e798a..246abd3a4107 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "volkovlabs-rss-datasource"; version = "4.2.0"; zipHash = "sha256-+3tgvpH6xlJORqN4Sx7qwzsiQZoLwdarzhx6kHvtOoY="; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix index abeffe05dc10..6cd53b80f2fd 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "volkovlabs-variable-panel"; version = "3.5.0"; zipHash = "sha256-SqMTCdB+8OUo94zJ3eS5NoCeyjc7sdMCR0CTvVe/L1g="; diff --git a/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix index 7c6eab7d4931..1cf4c6a8e8d6 100644 --- a/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix @@ -1,6 +1,6 @@ { grafanaPlugin, lib }: -grafanaPlugin rec { +grafanaPlugin { pname = "yesoreyeram-infinity-datasource"; version = "2.11.0"; zipHash = { diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 922e6998564c..4b513ed3bde3 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -5,7 +5,7 @@ nixosTests, }: -buildGoModule rec { +buildGoModule { pname = "fritzbox-exporter"; version = "unstable-2021-04-13"; diff --git a/pkgs/servers/monitoring/prometheus/kthxbye.nix b/pkgs/servers/monitoring/prometheus/kthxbye.nix index 5d2a5c417096..a8cd32b3e02d 100644 --- a/pkgs/servers/monitoring/prometheus/kthxbye.nix +++ b/pkgs/servers/monitoring/prometheus/kthxbye.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "kthxbye"; version = "0.16"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "prymitive"; repo = "kthxbye"; rev = "v${version}"; diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index bfdb6c173183..c337761ec4d1 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -21,7 +21,7 @@ let startupNotify = false; }; in -mkDerivation rec { +mkDerivation { pname = "qpaeq"; inherit (pulseaudio) version src; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index d459251a9205..b9223e4beecc 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -7,7 +7,7 @@ buildPostgresqlExtension, }: -buildPostgresqlExtension rec { +buildPostgresqlExtension { pname = "cstore_fdw"; version = "1.7.0-unstable-2021-03-08"; diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix index dbff8f7e8eb8..8d8ccf12e56b 100644 --- a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix +++ b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix @@ -6,7 +6,7 @@ buildPostgresqlExtension, }: -buildPostgresqlExtension rec { +buildPostgresqlExtension { pname = "jsonb_deep_sum"; version = "0-unstable-2021-12-24"; diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index 5c00051fb64f..e7b26482cd72 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -6,7 +6,7 @@ buildPostgresqlExtension, }: -buildPostgresqlExtension rec { +buildPostgresqlExtension { pname = "smlar-unstable"; version = "2021-11-08"; diff --git a/pkgs/servers/web-apps/freshrss/extensions/default.nix b/pkgs/servers/web-apps/freshrss/extensions/default.nix index f22c5279e757..3c7c920350a6 100644 --- a/pkgs/servers/web-apps/freshrss/extensions/default.nix +++ b/pkgs/servers/web-apps/freshrss/extensions/default.nix @@ -56,7 +56,7 @@ let }; }; - reading-time = buildFreshRssExtension rec { + reading-time = buildFreshRssExtension { FreshRssExtUniqueId = "ReadingTime"; pname = "reading-time"; version = "1.5"; diff --git a/pkgs/shells/fish/plugins/colored-man-pages.nix b/pkgs/shells/fish/plugins/colored-man-pages.nix index b2c76ce1d86e..d2326ed74bb6 100644 --- a/pkgs/shells/fish/plugins/colored-man-pages.nix +++ b/pkgs/shells/fish/plugins/colored-man-pages.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildFishPlugin rec { +buildFishPlugin { pname = "colored-man-pages"; version = "0-unstable-2022-04-30"; diff --git a/pkgs/shells/fish/plugins/git-abbr.nix b/pkgs/shells/fish/plugins/git-abbr.nix index 664c89750082..743600d61132 100644 --- a/pkgs/shells/fish/plugins/git-abbr.nix +++ b/pkgs/shells/fish/plugins/git-abbr.nix @@ -3,7 +3,7 @@ buildFishPlugin, fetchFromGitHub, }: -buildFishPlugin rec { +buildFishPlugin { pname = "fish-git-abbr"; version = "0.2.1-unstable-2023-06-19"; diff --git a/pkgs/shells/fish/plugins/humantime-fish.nix b/pkgs/shells/fish/plugins/humantime-fish.nix index 33e708e94f82..15b4bd6d4d5d 100644 --- a/pkgs/shells/fish/plugins/humantime-fish.nix +++ b/pkgs/shells/fish/plugins/humantime-fish.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fishtape, }: -buildFishPlugin rec { +buildFishPlugin { pname = "humantime-fish"; version = "1.0.0-unstable-2022-04-08"; diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix index d5f4d6522133..6f7619e27437 100644 --- a/pkgs/shells/fish/plugins/hydro.nix +++ b/pkgs/shells/fish/plugins/hydro.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildFishPlugin rec { +buildFishPlugin { pname = "hydro"; version = "0-unstable-2024-11-02"; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 01faee1e6924..44ce43beff50 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -593,7 +593,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check overrides = self: super: - rec { + { inherit (prevStage) ccWrapperStdenv binutils diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 471d1f87a7c0..ff81bde603f5 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -28,7 +28,7 @@ let # keep the scope, as it is used throughout the derivation and tests # this also makes potential future overrides easier - pythonPackages = python3.pkgs.overrideScope (final: prev: rec { }); + pythonPackages = python3.pkgs.overrideScope (final: prev: { }); offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; diff --git a/pkgs/tools/admin/pulumi-packages/base.nix b/pkgs/tools/admin/pulumi-packages/base.nix index 5f5857f1a1fd..5c5e9c687469 100644 --- a/pkgs/tools/admin/pulumi-packages/base.nix +++ b/pkgs/tools/admin/pulumi-packages/base.nix @@ -35,7 +35,7 @@ let , ... }: python3Packages.callPackage ({ buildPythonPackage, pythonOlder, parver, pip, pulumi, semver, setuptools }: - buildPythonPackage rec { + buildPythonPackage { inherit pname meta src version; format = "pyproject"; diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index 85762bb69b96..f905e01db3d7 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,4 +1,4 @@ -import ./common.nix rec { +import ./common.nix { pname = "opl3bankeditor"; chip = "OPL3"; version = "1.5.1"; diff --git a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix index d9c4bbe1511d..9286d29d2d0e 100644 --- a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix +++ b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix @@ -1,4 +1,4 @@ -import ./common.nix rec { +import ./common.nix { pname = "opn2bankeditor"; chip = "OPN2"; version = "1.3"; diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index 0fc665fbd739..2ef00647be52 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -7,7 +7,7 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cutecom"; version = "0.51.0+patch"; diff --git a/pkgs/tools/misc/ocs-url/default.nix b/pkgs/tools/misc/ocs-url/default.nix index 968b3bd5692e..38dd28cc660f 100644 --- a/pkgs/tools/misc/ocs-url/default.nix +++ b/pkgs/tools/misc/ocs-url/default.nix @@ -21,7 +21,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ocs-url"; inherit version; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index e2c2dc742e4c..b5611fcbdfcc 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -14,7 +14,7 @@ installShellFiles, xterm, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "xvfb-run"; version = "1+g87f6705"; diff --git a/pkgs/tools/networking/dnschef/default.nix b/pkgs/tools/networking/dnschef/default.nix index 598126e9aa72..5d36f80253fb 100644 --- a/pkgs/tools/networking/dnschef/default.nix +++ b/pkgs/tools/networking/dnschef/default.nix @@ -5,7 +5,7 @@ lib, }: -buildPythonApplication rec { +buildPythonApplication { pname = "dnschef"; version = "0.4"; diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 17d994fe2ae5..d6075d7bb960 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -11,7 +11,7 @@ Security, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "dogdns"; version = "unstable-2021-10-07"; diff --git a/pkgs/tools/networking/spoof-mac/default.nix b/pkgs/tools/networking/spoof-mac/default.nix index 7bd211147446..6ef25c5055bc 100644 --- a/pkgs/tools/networking/spoof-mac/default.nix +++ b/pkgs/tools/networking/spoof-mac/default.nix @@ -5,7 +5,7 @@ docopt, }: -buildPythonPackage rec { +buildPythonPackage { pname = "spoof-mac"; version = "unstable-2018-01-27"; diff --git a/pkgs/tools/package-management/nix-visualize/default.nix b/pkgs/tools/package-management/nix-visualize/default.nix index fab3aa952647..0dfc01a198e7 100644 --- a/pkgs/tools/package-management/nix-visualize/default.nix +++ b/pkgs/tools/package-management/nix-visualize/default.nix @@ -10,7 +10,7 @@ setuptools, }: -python.pkgs.buildPythonApplication rec { +python.pkgs.buildPythonApplication { version = "1.0.5-unstable-2024-01-17"; pname = "nix-visualize"; pyproject = true; diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix index d9a7a5622f68..851338497472 100644 --- a/pkgs/tools/system/uefitool/variants.nix +++ b/pkgs/tools/system/uefitool/variants.nix @@ -3,7 +3,7 @@ let common = opts: libsForQt5.callPackage (import ./common.nix opts) { }; in rec { - new-engine = common rec { + new-engine = common { version = "A62"; sha256 = "sha256-U89j0BV57luv1c9hoYJtisKLxFezuaGFokZ29/NJ0xg="; installFiles = [ diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/tools/text/gpt2tc/default.nix index 96fc570d1318..d53f47e896a2 100644 --- a/pkgs/tools/text/gpt2tc/default.nix +++ b/pkgs/tools/text/gpt2tc/default.nix @@ -6,7 +6,7 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpt2tc"; version = "2021-04-24"; diff --git a/pkgs/tools/text/uniscribe/default.nix b/pkgs/tools/text/uniscribe/default.nix index 94b49a0b4d23..e45f430b44eb 100644 --- a/pkgs/tools/text/uniscribe/default.nix +++ b/pkgs/tools/text/uniscribe/default.nix @@ -12,7 +12,7 @@ let gemdir = ./.; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uniscribe"; version = (import ./gemset.nix).uniscribe.version;