From c814d72b517bb201c8bbbfc64e386c7023352886 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 13 Aug 2019 21:52:01 +0000 Subject: [PATCH] treewide: name -> pname --- pkgs/applications/altcoins/aeon/default.nix | 3 ++- pkgs/applications/audio/abcde/default.nix | 3 ++- pkgs/applications/audio/caudec/default.nix | 3 ++- .../applications/audio/clementine/default.nix | 6 ++++-- pkgs/applications/audio/ekho/default.nix | 5 +++-- pkgs/applications/audio/faust/faust1.nix | 3 ++- pkgs/applications/audio/faust/faust2.nix | 3 ++- .../default.nix | 3 ++- pkgs/applications/audio/gradio/default.nix | 3 ++- .../audio/midisheetmusic/default.nix | 3 ++- pkgs/applications/audio/mpc123/default.nix | 5 +++-- .../applications/audio/openmpt123/default.nix | 3 ++- pkgs/applications/audio/pmidi/default.nix | 3 ++- pkgs/applications/audio/rhvoice/default.nix | 3 ++- pkgs/applications/audio/sayonara/default.nix | 3 ++- pkgs/applications/audio/spotify/default.nix | 3 ++- .../audio/tree-from-tags/default.nix | 3 ++- pkgs/applications/audio/uade123/default.nix | 3 ++- pkgs/applications/audio/vmpk/default.nix | 5 +++-- .../display-managers/lightdm/gtk-greeter.nix | 5 +++-- .../display-managers/sddm/default.nix | 3 ++- .../editors/emacs-modes/d/default.nix | 3 ++- .../editors/emacs-modes/haskell/default.nix | 3 ++- .../editors/emacs-modes/hsc3/default.nix | 3 ++- .../emacs-modes/ido-ubiquitous/default.nix | 3 ++- .../emacs-modes/markdown-mode/default.nix | 3 ++- .../editors/emacs-modes/ocaml/default.nix | 3 ++- .../rainbow-delimiters/default.nix | 3 ++- .../editors/emacs-modes/rudel/default.nix | 3 ++- .../editors/emacs-modes/s/default.nix | 3 ++- .../editors/emacs-modes/tuareg/default.nix | 3 ++- .../editors/emacs-modes/writegood/default.nix | 3 ++- pkgs/applications/editors/geany/default.nix | 5 +++-- pkgs/applications/editors/jedit/default.nix | 3 ++- .../editors/kodestudio/default.nix | 3 ++- .../applications/editors/netbeans/default.nix | 3 ++- pkgs/applications/editors/rstudio/default.nix | 5 +++-- .../editors/standardnotes/default.nix | 3 ++- pkgs/applications/editors/texmacs/darwin.nix | 3 ++- .../graphics/awesomebump/default.nix | 3 ++- .../graphics/draftsight/default.nix | 3 ++- .../applications/graphics/fig2dev/default.nix | 3 ++- .../applications/graphics/gcolor2/default.nix | 3 ++- .../applications/graphics/gcolor3/default.nix | 3 ++- .../applications/graphics/guetzli/default.nix | 3 ++- .../graphics/synfigstudio/default.nix | 6 ++++-- .../graphics/unigine-valley/default.nix | 3 ++- pkgs/applications/graphics/xfig/default.nix | 3 ++- .../misc/asciiquarium/default.nix | 3 ++- .../misc/bashSnippets/default.nix | 3 ++- .../misc/bitcoinarmory/default.nix | 3 ++- pkgs/applications/misc/cardpeek/default.nix | 3 ++- pkgs/applications/misc/confclerk/default.nix | 3 ++- pkgs/applications/misc/cura/stable.nix | 3 ++- pkgs/applications/misc/curaengine/stable.nix | 3 ++- .../misc/dfilemanager/default.nix | 3 ++- pkgs/applications/misc/fetchmail/default.nix | 3 ++- pkgs/applications/misc/gmrun/default.nix | 5 +++-- pkgs/applications/misc/gmtp/default.nix | 3 ++- .../applications/misc/googleearth/default.nix | 3 ++- pkgs/applications/misc/gpg-mdp/default.nix | 3 ++- pkgs/applications/misc/hubstaff/default.nix | 3 ++- .../misc/keepass-plugins/keeagent/default.nix | 3 ++- .../keepass-plugins/keepasshttp/default.nix | 3 ++- .../keepass-plugins/keepassrpc/default.nix | 3 ++- pkgs/applications/misc/krusader/default.nix | 5 +++-- pkgs/applications/misc/lxterminal/default.nix | 3 ++- .../misc/masterpdfeditor/default.nix | 3 ++- pkgs/applications/misc/nrsc5/default.nix | 3 ++- pkgs/applications/misc/opentx/default.nix | 3 ++- .../applications/misc/playonlinux/default.nix | 3 ++- pkgs/applications/misc/qdirstat/default.nix | 3 ++- .../misc/qtbitcointrader/default.nix | 3 ++- .../misc/redshift-plasma-applet/default.nix | 3 ++- pkgs/applications/misc/roxterm/default.nix | 5 +++-- pkgs/applications/misc/subsurface/default.nix | 6 ++++-- pkgs/applications/misc/synapse/default.nix | 5 +++-- pkgs/applications/misc/teseq/default.nix | 3 ++- pkgs/applications/misc/tomboy/default.nix | 3 ++- .../networking/browsers/otter/default.nix | 3 ++- .../networking/cluster/hadoop/default.nix | 3 ++- .../networking/cluster/kops/default.nix | 3 ++- .../networking/cluster/kubecfg/default.nix | 3 ++- .../networking/cluster/spark/default.nix | 7 ++++--- pkgs/applications/networking/dropbox/cli.nix | 3 ++- .../instant-messengers/franz/default.nix | 3 ++- .../instant-messengers/hipchat/default.nix | 3 ++- .../pidgin-plugins/pidgin-latex/default.nix | 3 ++- .../pidgin-plugins/pidgin-mra/default.nix | 3 ++- .../pidgin-xmpp-receipts/default.nix | 3 ++- .../pidgin-plugins/purple-matrix/default.nix | 3 ++- .../purple-vk-plugin/default.nix | 3 ++- .../telegram-purple/default.nix | 3 ++- .../instant-messengers/qtox/default.nix | 3 ++- .../instant-messengers/quaternion/default.nix | 3 ++- .../skypeforlinux/default.nix | 3 ++- .../instant-messengers/slack/default.nix | 3 ++- .../vk-messenger/default.nix | 3 ++- .../instant-messengers/wavebox/default.nix | 3 ++- .../instant-messengers/zoom-us/default.nix | 3 ++- .../networking/mailreaders/lumail/default.nix | 3 ++- .../notmuch-addrlookup/default.nix | 3 ++- .../networking/newsreaders/pan/default.nix | 3 ++- .../networking/p2p/freenet/default.nix | 3 ++- .../networking/protonmail-bridge/default.nix | 3 ++- .../networking/spideroak/default.nix | 3 ++- .../networking/super-productivity/default.nix | 3 ++- .../networking/tcpkali/default.nix | 3 ++- .../office/impressive/default.nix | 3 ++- .../office/libreoffice/default.nix | 3 ++- .../applications/office/libreoffice/still.nix | 3 ++- pkgs/applications/office/mendeley/default.nix | 3 ++- pkgs/applications/office/mmex/default.nix | 3 ++- pkgs/applications/office/mytetra/default.nix | 3 ++- pkgs/applications/office/planner/default.nix | 3 ++- .../office/todo.txt-cli/default.nix | 3 ++- .../applications/office/wpsoffice/default.nix | 5 +++-- pkgs/applications/radio/airspy/default.nix | 3 ++- pkgs/applications/radio/gnuradio/limesdr.nix | 3 ++- pkgs/applications/radio/limesuite/default.nix | 3 ++- .../radio/multimon-ng/default.nix | 3 ++- .../applications/radio/qradiolink/default.nix | 3 ++- .../radio/soapyairspy/default.nix | 3 ++- .../radio/soapybladerf/default.nix | 3 ++- .../radio/soapyhackrf/default.nix | 3 ++- .../radio/soapyremote/default.nix | 3 ++- .../radio/soapyrtlsdr/default.nix | 3 ++- pkgs/applications/radio/soapysdr/default.nix | 3 ++- pkgs/applications/radio/soapyuhd/default.nix | 3 ++- pkgs/applications/radio/uhd/default.nix | 3 ++- pkgs/applications/radio/welle-io/default.nix | 3 ++- .../science/astronomy/gpredict/default.nix | 3 ++- .../science/chemistry/gwyddion/default.nix | 3 ++- .../science/chemistry/octopus/default.nix | 3 ++- .../science/chemistry/openmolcas/default.nix | 3 ++- .../science/geometry/tetgen/default.nix | 3 ++- .../science/logic/coq/default.nix | 3 ++- .../science/logic/coq2html/default.nix | 3 ++- .../science/logic/logisim/default.nix | 3 ++- .../science/logic/tlaplus/toolbox.nix | 3 ++- .../science/math/ripser/default.nix | 3 ++- .../science/misc/gephi/default.nix | 3 ++- .../science/misc/megam/default.nix | 3 ++- .../science/misc/tulip/default.nix | 5 +++-- .../science/programming/scyther/cli.nix | 3 ++- .../science/programming/scyther/default.nix | 3 ++- .../git-and-tools/git/default.nix | 3 ++- .../git-and-tools/grv/default.nix | 3 ++- .../svn-all-fast-export/default.nix | 3 ++- .../git-and-tools/svn2git/default.nix | 3 ++- .../version-management/guitone/default.nix | 3 ++- .../version-management/monotone/default.nix | 7 ++++--- .../redmine/4.x/default.nix | 5 +++-- .../version-management/redmine/default.nix | 5 +++-- .../version-management/yadm/default.nix | 3 ++- .../video/subtitleeditor/default.nix | 3 ++- .../applications/video/tivodecode/default.nix | 3 ++- .../virtualization/virtinst/default.nix | 3 ++- .../virtualization/virtualbox/default.nix | 3 ++- .../window-managers/windowlab/default.nix | 3 ++- .../window-managers/yabar/build.nix | 3 ++- pkgs/data/fonts/dejavu-fonts/default.nix | 9 +++++--- pkgs/data/fonts/kochi-substitute/default.nix | 3 ++- pkgs/data/fonts/noto-fonts/default.nix | 3 ++- pkgs/data/misc/shared-mime-info/default.nix | 3 ++- .../gnome-3/apps/gnome-boxes/default.nix | 5 +++-- .../gnome-3/apps/gnome-notes/default.nix | 3 ++- .../gnome-3/core/gnome-contacts/default.nix | 5 +++-- .../extensions/chrome-gnome-shell/default.nix | 5 +++-- pkgs/desktops/gnustep/make/default.nix | 3 ++- pkgs/development/compilers/as31/default.nix | 3 ++- .../compilers/chicken/4/chicken.nix | 3 ++- .../compilers/chicken/5/chicken.nix | 3 ++- pkgs/development/compilers/cmucl/binary.nix | 3 ++- .../development/compilers/crystal/default.nix | 3 ++- pkgs/development/compilers/dale/default.nix | 3 ++- pkgs/development/compilers/gambit/build.nix | 3 ++- .../compilers/gcc-arm-embedded/default.nix | 3 ++- pkgs/development/compilers/gerbil/build.nix | 3 ++- pkgs/development/compilers/gforth/default.nix | 3 ++- pkgs/development/compilers/haxe/default.nix | 3 ++- .../development/compilers/inform7/default.nix | 3 ++- pkgs/development/compilers/ldc/default.nix | 3 ++- pkgs/development/compilers/llvm/3.5/clang.nix | 3 ++- .../compilers/llvm/3.5/dragonegg.nix | 7 ++++--- .../compilers/llvm/3.5/libc++/default.nix | 3 ++- .../compilers/llvm/3.5/libc++abi/default.nix | 3 ++- pkgs/development/compilers/llvm/3.5/lld.nix | 3 ++- pkgs/development/compilers/llvm/3.5/lldb.nix | 3 ++- pkgs/development/compilers/llvm/3.5/llvm.nix | 3 ++- pkgs/development/compilers/llvm/3.5/polly.nix | 3 ++- .../compilers/llvm/3.8/clang/default.nix | 3 ++- .../compilers/llvm/3.8/libc++/default.nix | 3 ++- .../compilers/llvm/3.8/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/3.8/lldb.nix | 3 ++- pkgs/development/compilers/llvm/3.8/llvm.nix | 3 ++- .../compilers/llvm/3.9/clang/default.nix | 3 ++- .../compilers/llvm/3.9/libc++/default.nix | 3 ++- .../compilers/llvm/3.9/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/3.9/lldb.nix | 3 ++- pkgs/development/compilers/llvm/3.9/llvm.nix | 3 ++- .../compilers/llvm/4/libc++/default.nix | 3 ++- .../compilers/llvm/4/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/4/lld.nix | 3 ++- pkgs/development/compilers/llvm/4/lldb.nix | 3 ++- pkgs/development/compilers/llvm/4/openmp.nix | 3 ++- .../compilers/llvm/5/libc++/default.nix | 3 ++- .../compilers/llvm/5/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/5/lld.nix | 3 ++- pkgs/development/compilers/llvm/5/lldb.nix | 3 ++- pkgs/development/compilers/llvm/5/openmp.nix | 3 ++- .../compilers/llvm/6/libc++/default.nix | 3 ++- .../compilers/llvm/6/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/6/lld.nix | 3 ++- pkgs/development/compilers/llvm/6/lldb.nix | 3 ++- pkgs/development/compilers/llvm/6/openmp.nix | 3 ++- .../compilers/llvm/7/libc++/default.nix | 3 ++- .../compilers/llvm/7/libc++abi.nix | 3 ++- pkgs/development/compilers/llvm/7/lld.nix | 3 ++- pkgs/development/compilers/llvm/7/lldb.nix | 3 ++- pkgs/development/compilers/llvm/7/openmp.nix | 3 ++- .../compilers/llvm/8/libc++/default.nix | 3 ++- .../compilers/llvm/8/libc++abi.nix | 3 ++- .../compilers/llvm/8/libunwind.nix | 3 ++- pkgs/development/compilers/llvm/8/lld.nix | 3 ++- pkgs/development/compilers/llvm/8/lldb.nix | 3 ++- pkgs/development/compilers/llvm/8/openmp.nix | 3 ++- pkgs/development/compilers/mlton/20130715.nix | 13 ++++++------ .../compilers/mlton/from-git-source.nix | 3 ++- pkgs/development/compilers/mono/generic.nix | 5 +++-- pkgs/development/compilers/mozart/binary.nix | 3 ++- pkgs/development/compilers/polyml/5.6.nix | 3 ++- pkgs/development/compilers/smlnj/default.nix | 3 ++- .../compilers/swi-prolog/default.nix | 3 ++- pkgs/development/compilers/teyjus/default.nix | 3 ++- .../interpreters/clojure/clooj.nix | 3 ++- .../development/interpreters/dart/default.nix | 3 ++- pkgs/development/interpreters/eff/default.nix | 3 ++- .../interpreters/maude/default.nix | 3 ++- .../interpreters/nix-exec/default.nix | 3 ++- .../development/interpreters/ruby/default.nix | 3 ++- .../interpreters/spidermonkey/52.nix | 3 ++- .../interpreters/spidermonkey/60.nix | 3 ++- pkgs/development/interpreters/tcl/generic.nix | 3 ++- .../development/java-modules/jogl/default.nix | 3 ++- pkgs/development/libraries/adns/default.nix | 3 ++- pkgs/development/libraries/asio/generic.nix | 3 ++- .../libraries/audio/libgme/default.nix | 3 ++- .../libraries/avro-c++/default.nix | 3 ++- pkgs/development/libraries/avro-c/default.nix | 3 ++- .../libraries/bulletml/default.nix | 3 ++- pkgs/development/libraries/cairo/default.nix | 5 +++-- pkgs/development/libraries/celt/generic.nix | 3 ++- .../libraries/classads/default.nix | 3 ++- pkgs/development/libraries/codec2/default.nix | 3 ++- pkgs/development/libraries/csfml/default.nix | 3 ++- pkgs/development/libraries/eigen/default.nix | 3 ++- pkgs/development/libraries/fltk/1.4.nix | 3 ++- pkgs/development/libraries/fltk/default.nix | 3 ++- .../libraries/fontconfig-ultimate/default.nix | 3 ++- pkgs/development/libraries/fox/fox-1.6.nix | 5 +++-- .../libraries/freeglut/default.nix | 3 ++- pkgs/development/libraries/glib/default.nix | 9 ++++---- .../libraries/globalarrays/default.nix | 3 ++- pkgs/development/libraries/gloox/default.nix | 3 ++- .../libraries/gnutls-kdh/generic.nix | 3 ++- pkgs/development/libraries/goocanvas/2.x.nix | 5 +++-- .../libraries/http-parser/default.nix | 3 ++- .../libraries/ignition-math/default.nix | 3 ++- .../libraries/ignition-transport/generic.nix | 3 ++- .../libraries/java/rhino/default.nix | 3 ++- pkgs/development/libraries/libav/default.nix | 5 +++-- .../libraries/libbladeRF/default.nix | 3 ++- .../libraries/libbytesize/default.nix | 3 ++- pkgs/development/libraries/libcec/default.nix | 3 ++- .../development/libraries/libcec/platform.nix | 3 ++- .../libraries/libdwarf/default.nix | 6 ++++-- .../development/libraries/libdynd/default.nix | 3 ++- .../development/libraries/libjson/default.nix | 3 ++- .../libraries/liblastfm/default.nix | 5 +++-- .../libraries/liblouis/default.nix | 3 ++- .../libraries/libmodplug/default.nix | 5 +++-- pkgs/development/libraries/libmpc/default.nix | 3 ++- .../libraries/libmypaint/default.nix | 3 ++- pkgs/development/libraries/libnih/default.nix | 3 ++- pkgs/development/libraries/libofa/default.nix | 5 +++-- .../development/libraries/libopus/default.nix | 3 ++- .../libraries/libopusenc/default.nix | 3 ++- .../libraries/libossp-uuid/default.nix | 3 ++- .../development/libraries/libpar2/default.nix | 5 +++-- pkgs/development/libraries/libpgf/default.nix | 3 ++- .../libraries/libqmatrixclient/default.nix | 3 ++- .../libraries/libspatialindex/default.nix | 3 ++- .../libraries/libspotify/default.nix | 6 ++++-- .../libtorrent-rasterbar/default.nix | 3 ++- .../libraries/libtoxcore/default.nix | 3 ++- .../libraries/libtxc_dxtn/default.nix | 5 +++-- .../libraries/libtxc_dxtn_s2tc/default.nix | 3 ++- pkgs/development/libraries/libxc/default.nix | 3 ++- .../libraries/libxklavier/default.nix | 5 +++-- .../development/libraries/msgpack/generic.nix | 3 ++- .../development/libraries/ndn-cxx/default.nix | 3 ++- pkgs/development/libraries/ndpi/default.nix | 3 ++- .../libraries/nix-plugins/default.nix | 3 ++- pkgs/development/libraries/nspr/default.nix | 3 ++- pkgs/development/libraries/ntrack/default.nix | 5 +++-- .../libraries/opencore-amr/default.nix | 3 ++- .../libraries/openjpeg/generic.nix | 3 ++- .../development/libraries/openmpi/default.nix | 5 +++-- .../development/libraries/openssl/default.nix | 5 +++-- .../libraries/openzwave/default.nix | 3 ++- pkgs/development/libraries/physfs/default.nix | 5 +++-- pkgs/development/libraries/ppl/default.nix | 3 ++- .../libraries/protobuf/generic-v3.nix | 3 ++- .../libraries/protobuf/generic.nix | 3 ++- .../libraries/protobufc/generic.nix | 3 ++- pkgs/development/libraries/qpdf/default.nix | 5 +++-- .../libraries/science/math/arpack/default.nix | 3 ++- .../libraries/science/math/fenics/default.nix | 18 ++++++++++------ .../science/math/liblapack/default.nix | 3 ++- .../libraries/science/math/magma/default.nix | 3 ++- pkgs/development/libraries/sfml/default.nix | 3 ++- .../startup-notification/default.nix | 3 ++- pkgs/development/libraries/tinyxml/2.6.2.nix | 3 ++- pkgs/development/libraries/uthash/default.nix | 3 ++- .../libraries/volume-key/default.nix | 3 ++- pkgs/development/libraries/wt/default.nix | 3 ++- .../libraries/wxwidgets/2.9/default.nix | 3 ++- pkgs/development/libraries/xapian/default.nix | 3 ++- pkgs/development/libraries/xmlsec/default.nix | 3 ++- pkgs/development/misc/amdapp-sdk/default.nix | 3 ++- pkgs/development/misc/avr/libc/default.nix | 3 ++- pkgs/development/misc/msp430/mspdebug.nix | 3 ++- pkgs/development/misc/newlib/default.nix | 3 ++- .../development/misc/qmk_firmware/default.nix | 3 ++- .../misc/stm32/betaflight/default.nix | 3 ++- pkgs/development/misc/stm32/inav/default.nix | 3 ++- pkgs/development/mobile/abootimg/default.nix | 3 ++- pkgs/development/ocaml-modules/base64/2.0.nix | 3 ++- .../ocaml-modules/dolog/default.nix | 3 ++- .../ocaml-modules/iso8601/default.nix | 3 ++- .../ocaml-modules/llvm/default.nix | 3 ++- .../ocaml-modules/magic-mime/default.nix | 3 ++- .../ocaml-modules/menhir/generic.nix | 3 ++- .../ocaml-modules/ocamlmake/default.nix | 3 ++- .../ocsigen-deriving/default.nix | 3 ++- .../tools/analysis/radare2/default.nix | 3 ++- .../tools/build-managers/apache-ant/1.9.nix | 3 ++- .../build-managers/apache-ant/default.nix | 3 ++- .../build-managers/apache-maven/default.nix | 5 +++-- .../tools/build-managers/bazel/default.nix | 3 ++- .../build-managers/gnumake/4.2/default.nix | 3 ++- .../tools/build-managers/rebar/default.nix | 3 ++- pkgs/development/tools/buildah/default.nix | 3 ++- pkgs/development/tools/casperjs/default.nix | 3 ++- .../buildkite-agent/generic.nix | 3 ++- .../tools/database/cdb/default.nix | 3 ++- .../tools/database/squirrel-sql/default.nix | 3 ++- .../tools/flatpak-builder/default.nix | 5 +++-- pkgs/development/tools/flyway/default.nix | 3 ++- .../tools/java/fastjar/default.nix | 3 ++- pkgs/development/tools/minizinc/default.nix | 3 ++- pkgs/development/tools/minizinc/ide.nix | 3 ++- .../tools/misc/dfu-programmer/default.nix | 5 +++-- .../tools/misc/nixbang/default.nix | 3 ++- .../tools/misc/prelink/default.nix | 3 ++- .../development/tools/misc/stlink/default.nix | 3 ++- .../tools/misc/teensy-loader-cli/default.nix | 3 ++- pkgs/development/tools/nailgun/default.nix | 3 ++- .../tools/ocaml/js_of_ocaml/default.nix | 3 ++- .../tools/ocaml/obuild/default.nix | 3 ++- pkgs/development/tools/ocaml/utop/default.nix | 3 ++- pkgs/development/tools/parsing/antlr/4.7.nix | 6 ++++-- .../tools/parsing/ragel/default.nix | 5 +++-- .../tools/profiling/systemtap/default.nix | 3 ++- pkgs/development/tools/pypi2nix/default.nix | 3 ++- pkgs/development/tools/skopeo/default.nix | 3 ++- pkgs/games/anki/default.nix | 8 ++++--- pkgs/games/armagetronad/default.nix | 3 ++- pkgs/games/crrcsim/default.nix | 5 +++-- pkgs/games/dwarf-fortress/dfhack/default.nix | 3 ++- pkgs/games/eduke32/default.nix | 3 ++- pkgs/games/endless-sky/default.nix | 3 ++- pkgs/games/flightgear/default.nix | 3 ++- pkgs/games/freedink/default.nix | 10 +++++---- pkgs/games/freedroidrpg/default.nix | 3 ++- pkgs/games/gogui/default.nix | 3 ++- .../games/linux-steam-integration/default.nix | 3 ++- pkgs/games/megaglest/default.nix | 3 ++- pkgs/games/minetest/default.nix | 3 ++- pkgs/games/nexuiz/default.nix | 3 ++- pkgs/games/openxcom/default.nix | 3 ++- pkgs/games/quake3/content/demo.nix | 3 ++- pkgs/games/quake3/content/pointrelease.nix | 3 ++- pkgs/games/rrootage/default.nix | 3 ++- pkgs/games/simutrans/default.nix | 3 ++- pkgs/games/steam/steam.nix | 3 ++- pkgs/games/stockfish/default.nix | 3 ++- pkgs/games/vdrift/default.nix | 3 ++- pkgs/misc/drivers/epson-201106w/default.nix | 3 ++- pkgs/misc/drivers/epson-alc1100/default.nix | 3 ++- pkgs/misc/drivers/epson_201207w/default.nix | 3 ++- .../drivers/postscript-lexmark/default.nix | 3 ++- pkgs/misc/drivers/sundtek/default.nix | 3 ++- pkgs/misc/drivers/xboxdrv/default.nix | 3 ++- pkgs/misc/emulators/ccemux/default.nix | 3 ++- pkgs/misc/ghostscript/default.nix | 5 +++-- pkgs/misc/long-shebang/default.nix | 3 ++- pkgs/misc/themes/kde2/default.nix | 3 ++- pkgs/misc/themes/qtcurve/default.nix | 3 ++- pkgs/os-specific/linux/beegfs/default.nix | 3 ++- .../linux/firmware/b43-firmware/5.1.138.nix | 3 ++- .../firmware/facetimehd-firmware/default.nix | 3 ++- .../linux/firmware/fwupdate/default.nix | 3 ++- pkgs/os-specific/linux/fuse/common.nix | 5 +++-- pkgs/os-specific/linux/hibernate/default.nix | 3 ++- pkgs/os-specific/linux/iomelt/default.nix | 3 ++- pkgs/os-specific/linux/kernel/generic.nix | 3 ++- .../linux/kmod-blacklist-ubuntu/default.nix | 3 ++- pkgs/os-specific/linux/ldm/default.nix | 3 ++- pkgs/os-specific/linux/lsiutil/default.nix | 3 ++- pkgs/os-specific/linux/lvm2/default.nix | 3 ++- pkgs/os-specific/linux/ply/default.nix | 3 ++- pkgs/os-specific/linux/rdma-core/default.nix | 3 ++- pkgs/os-specific/linux/regionset/default.nix | 3 ++- pkgs/os-specific/linux/util-linux/default.nix | 5 +++-- pkgs/os-specific/windows/libgnurx/default.nix | 5 +++-- .../os-specific/windows/mingw-w64/default.nix | 3 ++- .../windows/pthread-w32/default.nix | 2 +- pkgs/servers/bird/default.nix | 5 +++-- pkgs/servers/brickd/default.nix | 3 ++- pkgs/servers/dns/bind/default.nix | 5 +++-- .../apache-modules/mod_fastcgi/default.nix | 3 ++- pkgs/servers/http/gatling/default.nix | 5 +++-- pkgs/servers/http/myserver/default.nix | 5 +++-- pkgs/servers/http/nginx/generic.nix | 3 ++- pkgs/servers/mail/postfix/pfixtools.nix | 3 ++- pkgs/servers/mattermost/default.nix | 6 ++++-- pkgs/servers/monitoring/uchiwa/default.nix | 6 ++++-- pkgs/servers/nosql/mongodb/default.nix | 3 ++- pkgs/servers/search/sphinxsearch/default.nix | 3 ++- pkgs/servers/sql/monetdb/default.nix | 3 ++- pkgs/servers/tvheadend/default.nix | 3 ++- pkgs/servers/unifi/default.nix | 3 ++- pkgs/servers/varnish/default.nix | 5 +++-- pkgs/servers/x11/quartz-wm/default.nix | 3 ++- pkgs/servers/xmpp/ejabberd/default.nix | 3 ++- pkgs/shells/es/default.nix | 3 ++- pkgs/shells/oil/default.nix | 3 ++- pkgs/shells/zsh/default.nix | 3 ++- .../zsh/nix-zsh-completions/default.nix | 3 ++- pkgs/tools/X11/bumblebee/default.nix | 5 +++-- pkgs/tools/X11/nitrogen/default.nix | 5 +++-- pkgs/tools/X11/xautomation/default.nix | 3 ++- pkgs/tools/X11/xbindkeys/default.nix | 3 ++- pkgs/tools/X11/xwinwrap/default.nix | 3 ++- pkgs/tools/archivers/fsarchiver/default.nix | 3 ++- pkgs/tools/audio/dir2opus/default.nix | 5 +++-- pkgs/tools/audio/qastools/default.nix | 3 ++- pkgs/tools/backup/bup/default.nix | 3 ++- pkgs/tools/backup/znapzend/default.nix | 3 ++- pkgs/tools/cd-dvd/lsdvd/default.nix | 3 ++- pkgs/tools/compression/pbzip2/default.nix | 5 +++-- pkgs/tools/filesystems/ceph/generic.nix | 3 ++- pkgs/tools/filesystems/dislocker/default.nix | 3 ++- pkgs/tools/filesystems/jmtpfs/default.nix | 3 ++- .../filesystems/reiser4progs/default.nix | 5 +++-- .../filesystems/reiserfsprogs/default.nix | 5 +++-- pkgs/tools/filesystems/zfstools/default.nix | 3 ++- pkgs/tools/graphics/argyllcms/default.nix | 3 ++- pkgs/tools/graphics/briss/default.nix | 3 ++- pkgs/tools/graphics/gmic/default.nix | 3 ++- pkgs/tools/graphics/gmic_krita_qt/default.nix | 3 ++- pkgs/tools/graphics/graphviz/base.nix | 3 ++- pkgs/tools/graphics/mscgen/default.nix | 3 ++- pkgs/tools/graphics/pgf/default.nix | 3 ++- pkgs/tools/graphics/twilight/default.nix | 3 ++- pkgs/tools/misc/aptly/default.nix | 3 ++- pkgs/tools/misc/autorandr/default.nix | 3 ++- pkgs/tools/misc/buildtorrent/default.nix | 5 +++-- pkgs/tools/misc/clasp/default.nix | 3 ++- pkgs/tools/misc/ddccontrol/default.nix | 3 ++- pkgs/tools/misc/edid-decode/default.nix | 3 ++- pkgs/tools/misc/fortune/default.nix | 3 ++- pkgs/tools/misc/gh-ost/default.nix | 3 ++- pkgs/tools/misc/gringo/default.nix | 3 ++- pkgs/tools/misc/grub/2.0x.nix | 5 +++-- pkgs/tools/misc/grub/trusted.nix | 3 ++- pkgs/tools/misc/hdaps-gl/default.nix | 3 ++- pkgs/tools/misc/lbdb/default.nix | 3 ++- pkgs/tools/misc/mdbtools/default.nix | 3 ++- pkgs/tools/misc/mongodb-compass/default.nix | 3 ++- pkgs/tools/misc/shallot/default.nix | 3 ++- pkgs/tools/misc/ultrastar-manager/default.nix | 3 ++- pkgs/tools/misc/xburst-tools/default.nix | 3 ++- pkgs/tools/networking/burpsuite/default.nix | 3 ++- pkgs/tools/networking/bwm-ng/default.nix | 5 +++-- pkgs/tools/networking/djbdns/default.nix | 3 ++- pkgs/tools/networking/easyrsa/default.nix | 3 ++- .../networking/gmrender-resurrect/default.nix | 3 ++- pkgs/tools/networking/gnirehtet/default.nix | 3 ++- pkgs/tools/networking/minidlna/default.nix | 3 ++- pkgs/tools/networking/miniupnpc/default.nix | 7 ++++--- pkgs/tools/networking/nettee/default.nix | 3 ++- pkgs/tools/networking/nfdump/default.nix | 3 ++- pkgs/tools/networking/phodav/default.nix | 5 +++-- pkgs/tools/networking/zssh/default.nix | 5 +++-- pkgs/tools/package-management/nix/default.nix | 3 ++- pkgs/tools/security/fail2ban/default.nix | 3 ++- pkgs/tools/security/haka/default.nix | 3 ++- pkgs/tools/security/tpm-tools/default.nix | 5 +++-- pkgs/tools/security/vault/vault-bin.nix | 3 ++- pkgs/tools/system/ior/default.nix | 3 ++- pkgs/tools/system/smartmontools/default.nix | 5 +++-- pkgs/tools/system/tree/default.nix | 3 ++- pkgs/tools/text/cconv/default.nix | 3 ++- pkgs/tools/text/gnugrep/default.nix | 3 ++- pkgs/tools/typesetting/kindlegen/default.nix | 3 ++- pkgs/tools/typesetting/tex/texlive/bin.nix | 21 ++++++++++++------- .../virtualization/cloud-init/default.nix | 3 ++- 520 files changed, 1164 insertions(+), 622 deletions(-) diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix index 5a09641c70d1..d65889be3ac0 100644 --- a/pkgs/applications/altcoins/aeon/default.nix +++ b/pkgs/applications/altcoins/aeon/default.nix @@ -7,7 +7,8 @@ let version = "0.12.9.0"; in stdenv.mkDerivation { - name = "aeon-${version}"; + pname = "aeon"; + inherit version; src = fetchFromGitHub { owner = "aeonix"; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index b602707b3921..adb38d4bbbab 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -6,7 +6,8 @@ let version = "2.9.3"; in stdenv.mkDerivation { - name = "abcde-${version}"; + pname = "abcde"; + inherit version; src = fetchurl { url = "https://abcde.einval.com/download/abcde-${version}.tar.gz"; sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04"; diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 04f0f9d30259..9c2f17c5cc9c 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "caudec-${version}"; + pname = "caudec"; + inherit version; src = fetchurl { url = "http://caudec.net/downloads/caudec-${version}.tar.gz"; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 1b0dfebe22c2..f48a429b3896 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -67,7 +67,8 @@ let ''; free = stdenv.mkDerivation { - name = "clementine-free-${version}"; + pname = "clementine-free"; + inherit version; inherit src patches nativeBuildInputs postPatch; # gst_plugins needed for setup-hooks @@ -95,7 +96,8 @@ let # Unfree Spotify blob for Clementine unfree = stdenv.mkDerivation { - name = "clementine-blob-${version}"; + pname = "clementine-blob"; + inherit version; # Use the same patches and sources as Clementine inherit src nativeBuildInputs postPatch; diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index 209ffa05bf28..0e2c950051a5 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -5,7 +5,8 @@ let version = "5.8.2"; in stdenv.mkDerivation rec { - name = "ekho-${version}"; + pname = "ekho"; + inherit version; meta = with stdenv.lib; { description = "Chinese text-to-speech software"; @@ -23,7 +24,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${name}.tar.xz"; + url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${pname}-${version}.tar.xz"; sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj"; }; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 6e47d921d345..687608b43524 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -25,7 +25,8 @@ let }; faust = stdenv.mkDerivation { - name = "faust-${version}"; + pname = "faust"; + inherit version; inherit src; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 383d2deb10bb..ad1239b22af2 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -35,7 +35,8 @@ let faust = stdenv.mkDerivation { - name = "faust-${version}"; + pname = "faust"; + inherit version; inherit src; diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 7716b1e0c355..b51b72f1c8a4 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -43,7 +43,8 @@ let in stdenv.mkDerivation { - name = "google-play-music-desktop-player-${version}"; + pname = "google-play-music-desktop-player"; + inherit version; src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 3aea07235d8a..94d0f5eb50f5 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -19,7 +19,8 @@ let version = "7.2"; in stdenv.mkDerivation rec { - name = "gradio-${version}"; + pname = "gradio"; + inherit version; src = fetchFromGitHub { owner = "haecker-felix"; diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index dd8b28fc2d8b..48052fc4ec88 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -5,7 +5,8 @@ let version = "2.6"; in stdenv.mkDerivation { - name = "midisheetmusic-${version}"; + pname = "midisheetmusic"; + inherit version; src = fetchurl { url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz"; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index efaef97257e0..f024e5a6a1d1 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -2,10 +2,11 @@ let version = "0.2.4"; in stdenv.mkDerivation rec { - name = "mpc123-${version}"; + pname = "mpc123"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/mpc123/version%20${version}/${name}.tar.gz"; + url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz"; sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1"; }; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index f8f08369ab93..8116bcaf0bda 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -4,7 +4,8 @@ let version = "0.4.1"; in stdenv.mkDerivation rec { - name = "openmpt123-${version}"; + pname = "openmpt123"; + inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index 9f51d3008259..f9b3fbae2137 100644 --- a/pkgs/applications/audio/pmidi/default.nix +++ b/pkgs/applications/audio/pmidi/default.nix @@ -3,7 +3,8 @@ , sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055" }: stdenv.mkDerivation { - name = "pmidi-${version}"; + pname = "pmidi"; + inherit version; src = fetchurl { url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz"; diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index 6516532df33f..c34b27edd96d 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -4,7 +4,8 @@ let version = "unstable-2018-02-10"; in stdenv.mkDerivation rec { - name = "rhvoice-${version}"; + pname = "rhvoice"; + inherit version; src = fetchFromGitHub { owner = "Olga-Yakovleva"; diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index fbe90c5377df..7776fa0c166e 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1-git1-20180828"; in stdenv.mkDerivation { - name = "sayonara-player-${version}"; + pname = "sayonara-player"; + inherit version; src = fetchurl { url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz"; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 77aa79949943..403075f91352 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -60,7 +60,8 @@ let in stdenv.mkDerivation { - name = "spotify-${version}"; + pname = "spotify"; + inherit version; # fetch from snapcraft instead of the debian repository most repos fetch from. # That is a bit more cumbersome. But the debian repository only keeps the last diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix index cdee979768cf..521133cb08fc 100644 --- a/pkgs/applications/audio/tree-from-tags/default.nix +++ b/pkgs/applications/audio/tree-from-tags/default.nix @@ -7,7 +7,8 @@ let gemdir = ./.; }; in stdenv.mkDerivation { - name = "tree-from-tags-${version}"; + pname = "tree-from-tags"; + inherit version; src = fetchFromGitHub { owner = "dbrock"; repo = "bongo"; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 7db3b7ec2376..b5ff8e41fe0b 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -3,7 +3,8 @@ let version = "2.13"; in stdenv.mkDerivation rec { - name = "uade123-${version}"; + pname = "uade123"; + inherit version; src = fetchurl { url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index dde96764fe6c..2bc40a78af48 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -5,7 +5,8 @@ let version = "0.5.1"; in stdenv.mkDerivation rec { - name = "vmpk-${version}"; + pname = "vmpk"; + inherit version; meta = with stdenv.lib; { description = "Virtual MIDI Piano Keyboard"; @@ -15,7 +16,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/vmpk/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/vmpk/${version}/${pname}-${version}.tar.bz2"; sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc"; }; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 61db182f7446..f892a9da50b9 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -12,10 +12,11 @@ let version = "2.0.6"; in stdenv.mkDerivation rec { - name = "lightdm-gtk-greeter-${version}"; + pname = "lightdm-gtk-greeter"; + inherit version; src = fetchurl { - url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; + url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15"; }; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 63f241d9d1c0..fc61d43436da 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -7,7 +7,8 @@ let version = "0.18.1"; in mkDerivation rec { - name = "sddm-${version}"; + pname = "sddm"; + inherit version; src = fetchFromGitHub { owner = "sddm"; diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix index 28736acded2f..779ba992686a 100644 --- a/pkgs/applications/editors/emacs-modes/d/default.nix +++ b/pkgs/applications/editors/emacs-modes/d/default.nix @@ -4,7 +4,8 @@ let version = "20150111"; in stdenv.mkDerivation { - name = "emacs-d-${version}"; + pname = "emacs-d"; + inherit version; src = fetchurl { url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 6b10766bedb7..b55cf9989914 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -6,7 +6,8 @@ let version = "13.14-169-g0d3569d"; # git describe --tags in stdenv.mkDerivation { - name = "haskell-mode-${version}"; + pname = "haskell-mode"; + inherit version; src = fetchFromGitHub { owner = "haskell"; diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix index 199a5886e1df..75b72516a3cd 100644 --- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix +++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -6,7 +6,8 @@ let version = "0.15"; in stdenv.mkDerivation { - name = "hsc3-mode-${version}"; + pname = "hsc3-mode"; + inherit version; src = fetchurl { url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz; sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6"; diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix index 3cc8156337e0..eaa0f2c2a5b1 100644 --- a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix +++ b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix @@ -4,7 +4,8 @@ let version = "3.6-4-gb659bf8"; in stdenv.mkDerivation { - name = "ido-ubiquitous-${version}"; + pname = "ido-ubiquitous"; + inherit version; src = fetchFromGitHub { owner = "DarwinAwardWinner"; diff --git a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix index 7176b289b8b5..4e79e9edda7b 100644 --- a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix @@ -4,7 +4,8 @@ let version = "2.0-82-gfe30ef7"; in stdenv.mkDerivation { - name = "markdown-mode-${version}"; + pname = "markdown-mode"; + inherit version; src = fetchFromGitHub { owner = "defunkt"; diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix index 9f8d408dd5a2..becc2dc5dc9b 100644 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -5,7 +5,8 @@ let version = stdenv.lib.removePrefix "ocaml-" ocaml.name; in stdenv.mkDerivation { - name = "ocaml-mode-${version}"; + pname = "ocaml-mode"; + inherit version; inherit (ocaml) prefixKey src; # a quick configure to get the Makefile generated. Since diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix index 2b4223cdc1fd..9dfe089fe290 100644 --- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix +++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix @@ -3,7 +3,8 @@ let version = "1.3.13"; in stdenv.mkDerivation { - name = "emacs-rainbow-delimiters-${version}"; + pname = "emacs-rainbow-delimiters"; + inherit version; src = fetchurl { url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix index 0031ffee4d4d..8b9e08a53783 100644 --- a/pkgs/applications/editors/emacs-modes/rudel/default.nix +++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "rudel-${version}"; + pname = "rudel"; + inherit version; src = fetchurl { url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/pkgs/applications/editors/emacs-modes/s/default.nix index b818348939e8..fc79ec46761e 100644 --- a/pkgs/applications/editors/emacs-modes/s/default.nix +++ b/pkgs/applications/editors/emacs-modes/s/default.nix @@ -3,7 +3,8 @@ let version = "1.9.0"; in stdenv.mkDerivation { - name = "emacs-s-${version}"; + pname = "emacs-s"; + inherit version; src = fetchurl { url = "https://github.com/magnars/s.el/archive/${version}.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix index be03938f8a53..556b27e4cbfd 100644 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix @@ -6,7 +6,8 @@ let version = "2.0.9"; in stdenv.mkDerivation { - name = "tuareg-mode-${version}"; + pname = "tuareg-mode"; + inherit version; src = fetchzip { url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3"; diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix index 6d0631a4cb83..5f3041d22d42 100644 --- a/pkgs/applications/editors/emacs-modes/writegood/default.nix +++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix @@ -3,7 +3,8 @@ let version = "2.0.2"; in stdenv.mkDerivation { - name = "writegood-mode-${version}"; + pname = "writegood-mode"; + inherit version; src = fetchurl { url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz"; sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k"; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 0ff56e9145fb..a30a8f702242 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -7,10 +7,11 @@ let in stdenv.mkDerivation rec { - name = "geany-${version}"; + pname = "geany"; + inherit version; src = fetchurl { - url = "https://download.geany.org/${name}.tar.bz2"; + url = "https://download.geany.org/${pname}-${version}.tar.bz2"; sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim"; }; diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 11322e8240c2..21a6a8475182 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -13,7 +13,8 @@ let in stdenv.mkDerivation { - name = "jedit-${version}"; + pname = "jedit"; + inherit version; src = fetchurl { url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2"; sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x"; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index b212773712c2..df46cb123386 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation rec { - name = "kodestudio-${version}"; + pname = "kodestudio"; + inherit version; src = fetchurl { url = urlStr; diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 3d215b288564..ba01304f723a 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -15,7 +15,8 @@ let }; in stdenv.mkDerivation { - name = "netbeans-${version}"; + pname = "netbeans"; + inherit version; src = fetchurl { url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip"; sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx"; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index f90e17a6065b..74e5460f529f 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -13,7 +13,8 @@ let gwtVer = "2.8.1"; in stdenv.mkDerivation rec { - name = "RStudio-${version}"; + pname = "RStudio"; + inherit version; nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; @@ -98,7 +99,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ]; desktopItem = makeDesktopItem { - name = name; + name = "${pname}-${version}"; exec = "rstudio %F"; icon = "rstudio"; desktopName = "RStudio"; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 2d52aedc831c..629bd9d019d2 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -15,7 +15,8 @@ let in stdenv.mkDerivation rec { - name = "standardnotes-${version}"; + pname = "standardnotes"; + inherit version; src = fetchurl { url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage"; diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix index dfb2e49e0c8d..5d5843890e14 100644 --- a/pkgs/applications/editors/texmacs/darwin.nix +++ b/pkgs/applications/editors/texmacs/darwin.nix @@ -15,7 +15,8 @@ let }; in stdenv.mkDerivation { - name = "TeXmacs-${version}"; + pname = "TeXmacs"; + inherit version; src= fetchurl { url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index df742645e86b..43f8f561e2f1 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -23,7 +23,8 @@ let ''; }; in stdenv.mkDerivation rec { - name = "awesomebump-${version}"; + pname = "awesomebump"; + inherit version; inherit src; diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 30101bb94770..e59d14f7dd6e 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -6,7 +6,8 @@ let version = "2018SP2"; in stdenv.mkDerivation { - name = "draftsight-${version}"; + pname = "draftsight"; + inherit version; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 1e54152fff4d..ae38730226a4 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -4,7 +4,8 @@ let version = "3.2.7a"; in stdenv.mkDerivation { - name = "fig2dev-${version}"; + pname = "fig2dev"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 025b3ae65ece..103f40fc9c70 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -2,7 +2,8 @@ let version = "0.4"; in stdenv.mkDerivation { - name = "gcolor2-${version}"; + pname = "gcolor2"; + inherit version; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386"; src = fetchurl { diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 5ad7cb88b03a..c7555b612f7b 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -3,7 +3,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "gcolor3-${version}"; + pname = "gcolor3"; + inherit version; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index 061dc2b69a61..d7b964259683 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -3,7 +3,8 @@ let version = "1.0.1"; in stdenv.mkDerivation { - name = "guetzli-${version}"; + pname = "guetzli"; + inherit version; src = fetchFromGitHub { owner = "google"; repo = "guetzli"; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index b399dd2d2284..34294d271292 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -22,7 +22,8 @@ let }; synfig = stdenv.mkDerivation rec { - name = "synfig-${version}"; + pname = "synfig"; + inherit version; src = fetchFromGitHub { repo = "synfig"; @@ -47,7 +48,8 @@ let }; in stdenv.mkDerivation rec { - name = "synfigstudio-${version}"; + pname = "synfigstudio"; + inherit version; src = fetchFromGitHub { repo = "synfig"; diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 3a139f3740cc..09abfc60a528 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -27,7 +27,8 @@ let in stdenv.mkDerivation rec { - name = "unigine-valley-${version}"; + pname = "unigine-valley"; + inherit version; src = fetchurl { url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run"; diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 429af12b9bb3..fe5a13703329 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -6,7 +6,8 @@ let version = "3.2.7a"; in stdenv.mkDerivation { - name = "xfig-${version}"; + pname = "xfig"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix index 3c18d70d6c26..0e524ede0912 100644 --- a/pkgs/applications/misc/asciiquarium/default.nix +++ b/pkgs/applications/misc/asciiquarium/default.nix @@ -2,7 +2,8 @@ let version = "1.1"; in stdenv.mkDerivation { - name = "asciiquarium-${version}"; + pname = "asciiquarium"; + inherit version; src = fetchurl { url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz"; sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v"; diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index fc5fa4d03006..b0af34ec7606 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -12,7 +12,8 @@ let ]; in stdenv.mkDerivation { - name = "bashSnippets-${version}"; + pname = "bashSnippets"; + inherit version; src = fetchFromGitHub { owner = "alexanderepstein"; diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index 9c99dcee2b3c..090cb2f519e1 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -10,7 +10,8 @@ let in buildPythonApplication { - name = "bitcoinarmory-${version}"; + pname = "bitcoinarmory"; + inherit version; src = fetchFromGitHub { owner = "goatpig"; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index a0e5c8149968..40dbfea9801b 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -4,7 +4,8 @@ let version = "0.8.4"; in stdenv.mkDerivation { - name = "cardpeek-${version}"; + pname = "cardpeek"; + inherit version; src = fetchFromGitHub { owner = "L1L1"; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index 3851730c4596..b07e0fb8c520 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -2,7 +2,8 @@ let version = "0.6.4"; in stdenv.mkDerivation { - name = "confclerk-${version}"; + pname = "confclerk"; + inherit version; src = fetchurl { url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index a53b001b0e98..1972042f805e 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -4,7 +4,8 @@ let version = "15.04"; in stdenv.mkDerivation rec { - name = "cura-${version}"; + pname = "cura"; + inherit version; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index ce743a008798..41f110e9ee10 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -3,7 +3,8 @@ let version = "15.04.6"; in stdenv.mkDerivation { - name = "curaengine-${version}"; + pname = "curaengine"; + inherit version; src = fetchurl { url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index eeb7a8ccf526..5df7c0b06727 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -4,7 +4,8 @@ let version = "git-2016-01-10"; in stdenv.mkDerivation { - name = "dfilemanager-${version}"; + pname = "dfilemanager"; + inherit version; src = fetchgit { url = "git://git.code.sf.net/p/dfilemanager/code"; rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4"; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index e9d194666094..bbbf1a0aff9b 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -4,7 +4,8 @@ let version = "6.3.26"; in stdenv.mkDerivation { - name="fetchmail-${version}"; + pname = "fetchmail"; + inherit version; src = fetchurl { url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2"; diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 47fb50242c1d..8a54cefaab04 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -5,10 +5,11 @@ let in stdenv.mkDerivation rec { - name = "gmrun-${version}"; + pname = "gmrun"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/gmrun/${name}.tar.gz"; + url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz"; sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; }; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index bb1556c7c4dc..c8bbcf2aa7f3 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -5,7 +5,8 @@ let version = "1.3.11"; in stdenv.mkDerivation { - name = "gmtp-${version}"; + pname = "gmtp"; + inherit version; src = fetchurl { url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 0fccf83acf76..961efe4b0576 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -40,7 +40,8 @@ let ]; in stdenv.mkDerivation rec { - name = "googleearth-${version}"; + pname = "googleearth"; + inherit version; src = fetchurl { url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb"; inherit sha256; diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index 4143f6fde559..9954ff660adc 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -3,7 +3,8 @@ let version = "0.7.4"; in stdenv.mkDerivation { # mdp renamed to gpg-mdp because there is a mdp package already. - name = "gpg-mdp-${version}"; + pname = "gpg-mdp"; + inherit version; meta = { homepage = https://tamentis.com/projects/mdp/; license = [stdenv.lib.licenses.isc]; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index acdeec10d300..b2997ece5d56 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -17,7 +17,8 @@ let in stdenv.mkDerivation { - name = "hubstaff-${version}"; + pname = "hubstaff"; + inherit version; src = fetchurl { inherit sha256 url; }; diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index 80bf5deceb16..c3d260774435 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -3,7 +3,8 @@ let version = "0.10.1"; drv = stdenv.mkDerivation { - name = "keeagent-${version}"; + pname = "keeagent"; + inherit version; src = fetchzip { url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index e64632d529b1..76ea9df78c25 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -3,7 +3,8 @@ let version = "1.8.4.2"; drv = stdenv.mkDerivation { - name = "keepasshttp-${version}"; + pname = "keepasshttp"; + inherit version; src = fetchFromGitHub { owner = "pfn"; repo = "keepasshttp"; diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index b45cb24b1b51..562835159eb3 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -3,7 +3,8 @@ let version = "1.8.0"; drv = stdenv.mkDerivation { - name = "keepassrpc-${version}"; + pname = "keepassrpc"; + inherit version; src = fetchurl { url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd"; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 70915ca87073..cf81d572c611 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -8,10 +8,11 @@ let pname = "krusader"; version = "2.7.1"; in mkDerivation rec { - name = "krusader-${version}"; + pname = "krusader"; + inherit version; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm"; }; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 4fd86a5a4f52..8ce353e85b91 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -5,7 +5,8 @@ let version = "0.3.2"; in stdenv.mkDerivation rec { - name = "lxterminal-${version}"; + pname = "lxterminal"; + inherit version; src = fetchurl { url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index eb0e61ba6d73..1474ea2fc4f2 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -4,7 +4,8 @@ let version = "5.4.10"; in stdenv.mkDerivation { - name = "masterpdfeditor-${version}"; + pname = "masterpdfeditor"; + inherit version; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index 69f74d66dd01..3ad837768421 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -13,7 +13,8 @@ let version = "1.0"; in stdenv.mkDerivation { - name = "nrsc5-${version}"; + pname = "nrsc5"; + inherit version; src = fetchFromGitHub { owner = "theori-io"; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index cd9a86e7fac7..585c85cbd2c5 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "opentx-${version}"; + pname = "opentx"; + inherit version; src = fetchFromGitHub { owner = "opentx"; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index e5c096fd2ae5..48188574ad4b 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -55,7 +55,8 @@ let libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; in stdenv.mkDerivation { - name = "playonlinux-${version}"; + pname = "playonlinux"; + inherit version; src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 4d2040212472..48a05091ca85 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -5,7 +5,8 @@ let version = "1.6"; in mkDerivation rec { - name = "qdirstat-${version}"; + pname = "qdirstat"; + inherit version; src = fetchFromGitHub { owner = "shundhammer"; diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 7586669218da..d942f999f697 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -4,7 +4,8 @@ let version = "1.40.41"; in stdenv.mkDerivation { - name = "qtbitcointrader-${version}"; + pname = "qtbitcointrader"; + inherit version; src = fetchzip { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index 03b8d709fce2..2eebe67c46da 100644 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -3,7 +3,8 @@ let version = "1.0.18"; in stdenv.mkDerivation { - name = "redshift-plasma-applet-${version}"; + pname = "redshift-plasma-applet"; + inherit version; src = fetchFromGitHub { owner = "kotelnik"; diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index aa0ebc29a557..1cff3635bf9d 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -11,10 +11,11 @@ let version = "3.3.2"; in stdenv.mkDerivation rec { - name = "roxterm-${version}"; + pname = "roxterm"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/roxterm/${name}.tar.xz"; + url = "mirror://sourceforge/roxterm/${pname}-${version}.tar.xz"; sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k"; }; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 5967fa3ad778..a29dad2c4447 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -7,7 +7,8 @@ let version = "4.8.2"; libdc = stdenv.mkDerivation rec { - name = "libdivecomputer-ssrf-${version}"; + pname = "libdivecomputer-ssrf"; + inherit version; src = fetchurl { url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; @@ -66,7 +67,8 @@ let }; in stdenv.mkDerivation rec { - name = "subsurface-${version}"; + pname = "subsurface"; + inherit version; src = fetchurl { url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 3e7983c667f2..c314e8ffe5ac 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -5,10 +5,11 @@ let version = "0.2.99.4"; in stdenv.mkDerivation rec { - name = "synapse-${version}"; + pname = "synapse"; + inherit version; src = fetchurl { - url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${pname}-${version}.tar.xz"; sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j"; }; diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix index 9502b3a0abe7..b17645919824 100644 --- a/pkgs/applications/misc/teseq/default.nix +++ b/pkgs/applications/misc/teseq/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1"; in stdenv.mkDerivation { - name = "teseq-${version}"; + pname = "teseq"; + inherit version; src = fetchurl { url = "mirror://gnu/teseq/teseq-${version}.tar.gz"; diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index ba6e97d61fb3..d8a6f86f104b 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "tomboy-${version}"; + pname = "tomboy"; + inherit version; src = fetchurl { url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz"; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index b7118b49dae6..d41f84404201 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -4,7 +4,8 @@ , sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb" }: stdenv.mkDerivation { - name = "otter-browser-${version}"; + pname = "otter-browser"; + inherit version; src = fetchFromGitHub { owner = "OtterBrowser"; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 42c043d0007f..7522307032e5 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -64,7 +64,8 @@ let }; in stdenv.mkDerivation rec { - name = "hadoop-${version}"; + pname = "hadoop"; + inherit version; src = binary-distributon; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 6a721ef14c1f..c8b95baf2f39 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -6,7 +6,8 @@ let generic = { version, sha256, ...}@attrs: let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in buildGoPackage { - name = "kops-${version}"; + pname = "kops"; + inherit version; inherit goPackagePath; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index cf0116ba8569..e1b5a4425d51 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -3,7 +3,8 @@ let version = "0.12.0"; in buildGoPackage { - name = "kubecfg-${version}"; + pname = "kubecfg"; + inherit version; src = fetchFromGitHub { owner = "bitnami"; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 3572bfe7f5ba..e675d17491af 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -15,18 +15,19 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spark-${version}"; + pname = "spark"; + inherit version; src = fetchzip { inherit sha256; - url = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz"; + url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] ++ optional RSupport R ++ optional mesosSupport mesos; - untarDir = "${name}-bin-without-hadoop"; + untarDir = "${pname}-${version}-bin-without-hadoop"; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} mv * $out/lib/${untarDir} diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index ae0643669dc0..54ed0f2eea04 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -15,7 +15,8 @@ let dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { - name = "dropbox-cli-${version}"; + pname = "dropbox-cli"; + inherit version; outputs = [ "out" "nautilusExtension" ]; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 97a4341dc4d7..f04afb6f1f71 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -5,7 +5,8 @@ let version = "5.2.0"; in stdenv.mkDerivation rec { - name = "franz-${version}"; + pname = "franz"; + inherit version; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg"; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 9e1b9fe9c39f..47854683e0ed 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -39,7 +39,8 @@ let libGL ] + ":${stdenv.cc.cc.lib}/lib64"; in stdenv.mkDerivation { - name = "hipchat-${version}"; + pname = "hipchat"; + inherit version; src = fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 59b1d463c9d2..eb6d954eb334 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -3,7 +3,8 @@ let version = "1.5.0"; in stdenv.mkDerivation { - name = "pidgin-latex-${version}"; + pname = "pidgin-latex"; + inherit version; src = fetchurl { url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 18bf89a5f2ed..9a1e46e5ac55 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -4,7 +4,8 @@ let version = "54b2992"; in stdenv.mkDerivation rec { - name = "pidgin-mra-${version}"; + pname = "pidgin-mra"; + inherit version; src = fetchgit { url = "https://github.com/dreadatour/pidgin-mra"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index f482e12a4bc9..936974a1a880 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -4,7 +4,8 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "pidgin-xmpp-receipts-${version}"; + pname = "pidgin-xmpp-receipts"; + inherit version; src = fetchFromGitHub { owner = "noonien-d"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 0b2cba649207..3c4169274877 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -4,7 +4,8 @@ let version = "2018-08-03"; in stdenv.mkDerivation rec { - name = "purple-matrix-unstable-${version}"; + pname = "purple-matrix-unstable"; + inherit version; src = fetchgit { url = "https://github.com/matrix-org/purple-matrix"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index e54af933a081..22554a4abf8b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -4,7 +4,8 @@ let version = "40ddb6d"; in stdenv.mkDerivation rec { - name = "purple-vk-plugin-${version}"; + pname = "purple-vk-plugin"; + inherit version; src = fetchhg { url = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 8527593c1a20..df2665d8ce8f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -4,7 +4,8 @@ let version = "1.3.0"; in stdenv.mkDerivation rec { - name = "telegram-purple-${version}"; + pname = "telegram-purple"; + inherit version; src = fetchgit { url = "https://github.com/majn/telegram-purple"; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 4ab3c64d16d8..6a43344fbd3c 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -11,7 +11,8 @@ let rev = "v${version}"; in mkDerivation rec { - name = "qtox-${version}"; + pname = "qtox"; + inherit version; src = fetchFromGitHub { owner = "qTox"; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 1c58ae353bb3..111efb182e58 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -4,7 +4,8 @@ let generic = version: sha256: prefix: library: stdenv.mkDerivation rec { - name = "quaternion-${version}"; + pname = "quaternion"; + inherit version; src = fetchFromGitHub { owner = "QMatrixClient"; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index ab84ee6ec0fe..dd76063a0fa5 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -64,7 +64,8 @@ let throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "skypeforlinux-${version}"; + pname = "skypeforlinux"; + inherit version; system = "x86_64-linux"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 94c02ab0226a..fab9c28ec973 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -57,7 +57,8 @@ let throw "Slack is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "slack-${version}"; + pname = "slack"; + inherit version; inherit src; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index b992263e215b..03bf3b3bbdd2 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -4,7 +4,8 @@ let version = "4.0.1"; in stdenv.mkDerivation { - name = "vk-messenger-${version}"; + pname = "vk-messenger"; + inherit version; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 9f704e52721d..da4c5073000a 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -22,7 +22,8 @@ let tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; in stdenv.mkDerivation rec { - name = "wavebox-${version}"; + pname = "wavebox"; + inherit version; src = fetchurl { url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23"; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 8aa732fd6ba7..e822b023f54a 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -31,7 +31,8 @@ let }; in mkDerivation { - name = "zoom-us-${version}"; + pname = "zoom-us"; + inherit version; src = srcs.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index bc0918737dd5..0a670b2b9a6a 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -25,7 +25,8 @@ let luaCPath = getPath "so"; in stdenv.mkDerivation { - name = "lumail-${version}"; + pname = "lumail"; + inherit version; src = fetchurl { url = "https://lumail.org/download/lumail-${version}.tar.gz"; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 126e2854574e..67c673bc913c 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -4,7 +4,8 @@ let version = "9"; in stdenv.mkDerivation rec { - name = "notmuch-addrlookup-${version}"; + pname = "notmuch-addrlookup"; + inherit version; src = fetchFromGitHub { owner = "aperezdc"; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index e88936dc072b..34ebf4364ce7 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -10,7 +10,8 @@ assert spellChecking -> gtkspell3 != null; let version = "0.145"; in stdenv.mkDerivation { - name = "pan-${version}"; + pname = "pan"; + inherit version; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index d674c70e4c2f..244352884883 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -18,7 +18,8 @@ let version = "build01475"; freenet-jars = stdenv.mkDerivation { - name = "freenet-jars-${version}"; + pname = "freenet-jars"; + inherit version; src = fetchFromGitHub { owner = "freenet"; diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index c685a2705862..bf8e7a16a4f3 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -22,7 +22,8 @@ let }; in mkDerivation rec { - name = "protonmail-bridge-${version}"; + pname = "protonmail-bridge"; + inherit version; src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index d96a810ee05a..11c8af368b95 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -14,7 +14,8 @@ let version = "7.5.0"; in stdenv.mkDerivation { - name = "spideroak-${version}"; + pname = "spideroak"; + inherit version; src = fetchurl { name = "SpiderOakONE-${version}-slack_tar_x64.tgz"; diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index 3f87c8558e1f..c5ff090a8076 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -53,7 +53,8 @@ let throw "super-productivity is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "super-productivity-${version}"; + pname = "super-productivity"; + inherit version; inherit src; diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/applications/networking/tcpkali/default.nix index 8a056e21692b..a71425422383 100644 --- a/pkgs/applications/networking/tcpkali/default.nix +++ b/pkgs/applications/networking/tcpkali/default.nix @@ -3,7 +3,8 @@ let version = "1.1.1"; in stdenv.mkDerivation rec { - name = "tcpkali-${version}"; + pname = "tcpkali"; + inherit version; src = fetchFromGitHub { owner = "machinezone"; repo = "tcpkali"; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 8946bbab9316..5065a1cb9bc9 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation { # This project was formerly known as KeyJNote. # See http://keyj.emphy.de/apple-lawsuit/ for details. - name = "impressive-${version}"; + pname = "impressive"; + inherit version; src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a82999366627..6acd692a95ba 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -60,7 +60,8 @@ let }; in stdenv.mkDerivation rec { - name = "libreoffice-${version}"; + pname = "libreoffice"; + inherit version; inherit (primary-src) src; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index efcc4407842b..77109a61fcb9 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -60,7 +60,8 @@ let }; in stdenv.mkDerivation rec { - name = "libreoffice-${version}"; + pname = "libreoffice"; + inherit version; inherit (primary-src) src; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 3c4434f0098c..655a10d3a942 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -91,7 +91,8 @@ let in stdenv.mkDerivation { - name = "mendeley-${version}"; + pname = "mendeley"; + inherit version; src = fetchurl { url = url; diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 3ddca8fe7620..99824cd19ec0 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -5,7 +5,8 @@ let version = "1.3.3"; in stdenv.mkDerivation { - name = "money-manager-ex-${version}"; + pname = "money-manager-ex"; + inherit version; src = fetchgit { url = "https://github.com/moneymanagerex/moneymanagerex.git"; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index a7887357cd30..324cdd5cc427 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -3,7 +3,8 @@ let version = "1.44.55"; in stdenv.mkDerivation rec { - name = "mytetra-${version}"; + pname = "mytetra"; + inherit version; src = fetchurl { url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l"; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index d8765d2fa61a..41cc3d940164 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -13,7 +13,8 @@ let version = "unstable-2019-02-13"; in stdenv.mkDerivation { - name = "planner-${version}"; + pname = "planner"; + inherit version; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index 77a602954438..edb2c778a0a5 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -2,7 +2,8 @@ let version = "2.11.0"; in stdenv.mkDerivation { - name = "todo.txt-cli-${version}"; + pname = "todo.txt-cli"; + inherit version; src = fetchurl { url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz"; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 4c83d67f7cda..1f21ec60ae2b 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -8,10 +8,11 @@ let version = "10.1.0.5672"; in stdenv.mkDerivation rec{ - name = "wpsoffice-${version}"; + pname = "wpsoffice"; + inherit version; src = fetchurl { - name = "${name}.tar.xz"; + name = "${pname}-${version}.tar.xz"; url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz"; sha256 = if bits == "x86_64" then "0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index 2042f1047b22..0a313c35a182 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -6,7 +6,8 @@ let version = "1.0.9"; in stdenv.mkDerivation { - name = "airspy-${version}"; + pname = "airspy"; + inherit version; src = fetchFromGitHub { owner = "airspy"; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index af3cabac9ef7..d56994e46ff5 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -8,7 +8,8 @@ let version = "2.0.0"; in stdenv.mkDerivation rec { - name = "gr-limesdr-${version}"; + pname = "gr-limesdr"; + inherit version; src = fetchFromGitHub { owner = "myriadrf"; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 3ff73c4ef2ab..4e69b11efbf7 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -7,7 +7,8 @@ let version = "19.04.0"; in stdenv.mkDerivation { - name = "limesuite-${version}"; + pname = "limesuite"; + inherit version; src = fetchFromGitHub { owner = "myriadrf"; diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index 13755b88c658..f624359c1632 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -3,7 +3,8 @@ let version = "1.1.8"; in stdenv.mkDerivation { - name = "multimon-ng-${version}"; + pname = "multimon-ng"; + inherit version; src = fetchFromGitHub { owner = "EliasOenal"; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 40a168675f67..a1c1f625bea1 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -8,7 +8,8 @@ let version = "0.5.0"; in stdenv.mkDerivation { - name = "qradiolink-${version}"; + pname = "qradiolink"; + inherit version; src = fetchFromGitHub { owner = "kantooon"; diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 1d8056ca1e81..eacbe66e5e5a 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -6,7 +6,8 @@ let version = "0.1.2"; in stdenv.mkDerivation { - name = "soapyairspy-${version}"; + pname = "soapyairspy"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 5472254b19dc..0bb05a204da7 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -6,7 +6,8 @@ let version = "0.4.1"; in stdenv.mkDerivation { - name = "soapybladerf-${version}"; + pname = "soapybladerf"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 2c5dd058ced3..5ab4c3363f48 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -6,7 +6,8 @@ let version = "0.3.3"; in stdenv.mkDerivation { - name = "soapyhackrf-${version}"; + pname = "soapyhackrf"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index a0057978ea33..2f73403a168b 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -4,7 +4,8 @@ let version = "0.5.1"; in stdenv.mkDerivation { - name = "soapyremote-${version}"; + pname = "soapyremote"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index d85fe347cd74..8bf473cb36a3 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -6,7 +6,8 @@ let version = "0.3.0"; in stdenv.mkDerivation { - name = "soapyrtlsdr-${version}"; + pname = "soapyrtlsdr"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 6754e8f2a55c..5e4a78cfbd22 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -13,7 +13,8 @@ let extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; in stdenv.mkDerivation { - name = "soapysdr-${version}"; + pname = "soapysdr"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 6ed88e0431e3..9e910584158d 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -6,7 +6,8 @@ let version = "0.3.6"; in stdenv.mkDerivation { - name = "soapyuhd-${version}"; + pname = "soapyuhd"; + inherit version; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index fd0bd8d5d75f..b3ff0f51f118 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -21,7 +21,8 @@ let }; in stdenv.mkDerivation { - name = "uhd-${version}"; + pname = "uhd"; + inherit version; src = fetchFromGitHub { owner = "EttusResearch"; diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index acf0226c0db5..c6b09595c202 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "welle-io-${version}"; + pname = "welle-io"; + inherit version; src = fetchFromGitHub { owner = "AlbrechtL"; diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 9bacf6d90417..ff273ab8e95b 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -6,7 +6,8 @@ let version = "2.2.1"; in stdenv.mkDerivation { - name = "gpredict-${version}"; + pname = "gpredict"; + inherit version; src = fetchurl { url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 92f997900d53..12007c940b3d 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -4,7 +4,8 @@ with stdenv.lib; let version = "2.48"; in stdenv.mkDerivation { - name = "gwyddion-${version}"; + pname = "gwyddion"; + inherit version; src = fetchurl { url = "mirror://sourceforge/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz"; sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 4b580a6cf52e..dfb04ccd1de9 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -7,7 +7,8 @@ let fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; in stdenv.mkDerivation { - name = "octopus-${version}"; + pname = "octopus"; + inherit version; src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index bc6301e1fd42..487558a23c19 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -11,7 +11,8 @@ let python = python3.withPackages (ps : with ps; [ six pyparsing ]); in stdenv.mkDerivation { - name = "openmolcas-${version}"; + pname = "openmolcas"; + inherit version; src = fetchFromGitLab { owner = "Molcas"; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index b655cc48c731..7be0103304a4 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -2,7 +2,8 @@ let version = "1.5.0"; in stdenv.mkDerivation { - name = "tetgen-${version}"; + pname = "tetgen"; + inherit version; src = fetchurl { url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 10fe722d7e9a..dfe1277d5ac9 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -39,7 +39,8 @@ let substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; self = stdenv.mkDerivation { - name = "coq-${version}"; + pname = "coq"; + inherit version; passthru = { inherit coq-version; diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix index d76462ca9380..bebf81b030d6 100644 --- a/pkgs/applications/science/logic/coq2html/default.nix +++ b/pkgs/applications/science/logic/coq2html/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "coq2html-${version}"; + pname = "coq2html"; + inherit version; src = fetchgit { url = "https://github.com/xavierleroy/coq2html"; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index db784237ea91..d6a1207b5d60 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -3,7 +3,8 @@ let version = "2.7.1"; in stdenv.mkDerivation { - name = "logisim-${version}"; + pname = "logisim"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar"; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index f1116a27c0be..1566719084c0 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "tla-toolbox-${version}"; + pname = "tla-toolbox"; + inherit version; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q"; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 5e0b7fc300ba..a42a5b710ce0 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -17,7 +17,8 @@ let version = "1.0"; in stdenv.mkDerivation { - name = "ripser-${version}"; + pname = "ripser"; + inherit version; src = fetchFromGitHub { owner = "Ripser"; diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index b81f188a91bf..17b2fe27f297 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -28,7 +28,8 @@ let }; in stdenv.mkDerivation rec { - name = "gephi-${version}"; + pname = "gephi"; + inherit version; inherit src; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 8cd119c7b7b0..59f5afb2f437 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -2,7 +2,8 @@ let version = "0.92"; in stdenv.mkDerivation rec { - name = "megam-${version}"; + pname = "megam"; + inherit version; src = fetchurl { url = "http://hal3.name/megam/megam_src.tgz"; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 7db2e6a12c20..82e3136b8f04 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -3,10 +3,11 @@ let version = "5.1.0"; in stdenv.mkDerivation rec { - name = "tulip-${version}"; + pname = "tulip"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/auber/${name}_src.tar.gz"; + url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz"; sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h"; }; diff --git a/pkgs/applications/science/programming/scyther/cli.nix b/pkgs/applications/science/programming/scyther/cli.nix index 152b71217743..6623f5def4cb 100644 --- a/pkgs/applications/science/programming/scyther/cli.nix +++ b/pkgs/applications/science/programming/scyther/cli.nix @@ -1,7 +1,8 @@ { stdenv, glibc, flex, bison, cmake , version, src, meta }: stdenv.mkDerivation { - name = "scyther-cli-${version}"; + pname = "scyther-cli"; + inherit version; inherit src meta; diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix index e0993a580193..b4daae1afc04 100644 --- a/pkgs/applications/science/programming/scyther/default.nix +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -25,7 +25,8 @@ let }; gui = stdenv.mkDerivation { - name = "scyther-gui-${version}"; + pname = "scyther-gui"; + inherit version; inherit src meta; buildInputs = [ python27Packages.wrapPython diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 870596347525..9a2e2484d7a7 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -28,7 +28,8 @@ let in stdenv.mkDerivation { - name = "git-${version}"; + pname = "git"; + inherit version; src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index b7828418db07..e6b746233fe1 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -3,7 +3,8 @@ let version = "0.3.1"; in buildGoPackage { - name = "grv-${version}"; + pname = "grv"; + inherit version; buildInputs = [ ncurses readline curl libgit2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 34c367b20a43..3c7784e85062 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -4,7 +4,8 @@ let version = "1.0.16"; in stdenv.mkDerivation { - name = "svn-all-fast-export-${version}"; + pname = "svn-all-fast-export"; + inherit version; src = fetchFromGitHub { owner = "svn-all-fast-export"; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index d00fdd0c29e0..821ecf3e3d8f 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -4,7 +4,8 @@ let version = "2.4.0"; in stdenv.mkDerivation { - name = "svn2git-${version}"; + pname = "svn2git"; + inherit version; src = fetchurl { url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 33d2eb89ad08..0aa8afa93619 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -2,7 +2,8 @@ let version = "1.0-mtn-head"; in stdenv.mkDerivation rec { - name = "guitone-${version}"; + pname = "guitone"; + inherit version; #src = fetchurl { # url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz"; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 010d4d2f86ad..7081e1a08996 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -11,7 +11,8 @@ in assert perlVersion != ""; stdenv.mkDerivation rec { - name = "monotone-${version}"; + pname = "monotone"; + inherit version; src = fetchurl { url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { openssl gmp bzip2 ]; postInstall = '' - mkdir -p $out/share/${name} - cp -rv contrib/ $out/share/${name}/contrib + mkdir -p $out/share/${pname}-${version} + cp -rv contrib/ $out/share/${pname}-${version}/contrib mkdir -p $out/${perl.libPrefix}/${perlVersion} cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion} ''; diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix index 1fbc22f87761..a3ba418a1463 100644 --- a/pkgs/applications/version-management/redmine/4.x/default.nix +++ b/pkgs/applications/version-management/redmine/4.x/default.nix @@ -11,10 +11,11 @@ let }; in stdenv.mkDerivation rec { - name = "redmine-${version}"; + pname = "redmine"; + inherit version; src = fetchurl { - url = "https://www.redmine.org/releases/${name}.tar.gz"; + url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a"; }; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index ba1980c3d142..0b1f64b58a17 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -11,10 +11,11 @@ let }; in stdenv.mkDerivation rec { - name = "redmine-${version}"; + pname = "redmine"; + inherit version; src = fetchurl { - url = "https://www.redmine.org/releases/${name}.tar.gz"; + url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r"; }; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 6baeb5279c26..aed5cb807dc7 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -2,7 +2,8 @@ let version = "1.12.0"; in stdenv.mkDerivation { - name = "yadm-${version}"; + pname = "yadm"; + inherit version; src = fetchFromGitHub { owner = "TheLocehiliosan"; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index ea51471d9aa4..03fc1f5399af 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "subtitleeditor-${version}"; + pname = "subtitleeditor"; + inherit version; src = fetchFromGitHub { owner = "kitone"; diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index 83ca41e201c9..bc6561a0bbd0 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -6,7 +6,8 @@ let in stdenv.mkDerivation { - name = "tivodecode-${version}"; + pname = "tivodecode"; + inherit version; src = fetchurl { url = "mirror://sourceforge/tivodecode/tivodecode/${version}/tivodecode-${version}.tar.gz"; diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 8222fb50a8f9..6931e492e99c 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -5,7 +5,8 @@ with stdenv.lib; let version = "0.600.4"; in stdenv.mkDerivation rec { - name = "virtinst-${version}"; + pname = "virtinst"; + inherit version; src = fetchurl { url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 1a6ba5ac5273..20930b865370 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -24,7 +24,8 @@ let main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv"; version = "6.0.8"; in stdenv.mkDerivation { - name = "virtualbox-${version}"; + pname = "virtualbox"; + inherit version; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index caf97c6510de..d0a1de7f6006 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -3,7 +3,8 @@ let version = "1.40"; in stdenv.mkDerivation { - name = "windowlab-${version}"; + pname = "windowlab"; + inherit version; src = fetchurl { url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar"; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 678ebad75dd2..f7867882d222 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -5,7 +5,8 @@ }: stdenv.mkDerivation { - name = "yabar-${version}"; + pname = "yabar"; + inherit version; src = fetchFromGitHub { inherit rev sha256; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index e563d201ff3d..38a2d8fe56ca 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -24,7 +24,8 @@ let }; full-ttf = stdenv.mkDerivation { - name = "dejavu-fonts-full-${version}"; + pname = "dejavu-fonts-full"; + inherit version; nativeBuildInputs = [fontforge perl perlPackages.IOString perlPackages.FontTTF]; src = fetchFromGitHub { @@ -44,14 +45,16 @@ let }; minimal = stdenv.mkDerivation { - name = "dejavu-fonts-minimal-${version}"; + pname = "dejavu-fonts-minimal"; + inherit version; buildCommand = '' install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/DejaVuSans.ttf ''; inherit meta; }; in stdenv.mkDerivation { - name = "dejavu-fonts-${version}"; + pname = "dejavu-fonts"; + inherit version; buildCommand = '' install -m444 -Dt $out/share/fonts/truetype ${full-ttf}/share/fonts/truetype/*.ttf ln -s --relative --force --target-directory=$out/share/fonts/truetype ${minimal}/share/fonts/truetype/DejaVuSans.ttf diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index 6ed540121a2c..cf89a8fcb8f1 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -3,7 +3,8 @@ let version = "20030809"; in stdenv.mkDerivation { - name = "kochi-substitute-${version}"; + pname = "kochi-substitute"; + inherit version; src = fetchurl { url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb"; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 5043e031c08f..0acb8e2c7bed 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -90,7 +90,8 @@ rec { }; }; noto-fonts-emoji = let version = "2018-08-10-unicode11"; in stdenv.mkDerivation { - name = "noto-fonts-emoji-${version}"; + pname = "noto-fonts-emoji"; + inherit version; src = fetchFromGitHub { owner = "googlei18n"; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 6d29d8760734..79924c4832f6 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -3,7 +3,8 @@ let version = "1.12"; in stdenv.mkDerivation rec { - name = "shared-mime-info-${version}"; + pname = "shared-mime-info"; + inherit version; src = fetchurl { url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 2a308a2da450..27ce5d0f078b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -11,10 +11,11 @@ let version = "3.32.1"; in stdenv.mkDerivation rec { - name = "gnome-boxes-${version}"; + pname = "gnome-boxes"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 2941d629f8f7..a729a924f6bb 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -7,7 +7,8 @@ let version = "3.32.2"; in stdenv.mkDerivation rec { - name = "gnome-notes-${version}"; + pname = "gnome-notes"; + inherit version; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 57cb90c7c458..75a15a41f97b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -7,10 +7,11 @@ let version = "3.32.1"; in stdenv.mkDerivation rec { - name = "gnome-contacts-${version}"; + pname = "gnome-contacts"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy"; }; diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 755c8e1b02fb..b4b184d4fa03 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -5,10 +5,11 @@ let inherit (python3.pkgs) python pygobject3 requests; in stdenv.mkDerivation rec { - name = "chrome-gnome-shell-${version}"; + pname = "chrome-gnome-shell"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; }; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 6ef87cece4e4..5e7db35a7276 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "gnustep-make-${version}"; + pname = "gnustep-make"; + inherit version; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix index 519992fd8c26..b70fde00e15e 100644 --- a/pkgs/development/compilers/as31/default.nix +++ b/pkgs/development/compilers/as31/default.nix @@ -5,7 +5,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "as31-${version}"; + pname = "as31"; + inherit version; src = fetchurl { name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz"; diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index ceeff56330b2..34512fc8ef05 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -11,7 +11,8 @@ let lib = stdenv.lib; in stdenv.mkDerivation { - name = "chicken-${version}"; + pname = "chicken"; + inherit version; binaryVersion = 8; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 74f711811907..5fefce12dbf1 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -11,7 +11,8 @@ let lib = stdenv.lib; in stdenv.mkDerivation { - name = "chicken-${version}"; + pname = "chicken"; + inherit version; binaryVersion = 11; diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 9e3184c42eb2..3f93ea9e1bac 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -19,7 +19,8 @@ let in stdenv.mkDerivation { - name = "cmucl-binary-${version}"; + pname = "cmucl-binary"; + inherit version; buildCommand = '' mkdir -p $out diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 2e823fe1f0f8..90355896064c 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -23,7 +23,8 @@ let genericBinary = { version, sha256s, rel ? 1 }: stdenv.mkDerivation rec { - name = "crystal-binary-${version}"; + pname = "crystal-binary"; + inherit version; src = fetchurl { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 8bae6e2363f6..128c245d2773 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -11,7 +11,8 @@ let version = "20170519"; in stdenv.mkDerivation { - name = "dale-${version}"; + pname = "dale"; + inherit version; src = fetchFromGitHub { owner = "tomhrr"; diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 65d16c48a616..7a3324d75602 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,7 +1,8 @@ { stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }: stdenv.mkDerivation rec { - name = "gambit-${version}"; + pname = "gambit"; + inherit version; inherit src; bootstrap = import ./bootstrap.nix ( pkgs ); diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 350eed2fedd0..b86b35525a67 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -14,7 +14,8 @@ let else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update in stdenv.mkDerivation { - name = "gcc-arm-embedded-${version}"; + pname = "gcc-arm-embedded"; + inherit version; src = fetchurl { url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2"; diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index b20d6f9c47ef..9ef650c330fa 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -7,7 +7,8 @@ # TODO: make static compilation work stdenv.mkDerivation rec { - name = "gerbil-${version}"; + pname = "gerbil"; + inherit version; inherit src; # Use makeStaticLibraries to enable creation of statically linked binaries diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index 675522d54ead..e90e0dc3d983 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -4,7 +4,8 @@ let version = "0.7.3"; in stdenv.mkDerivation { - name = "gforth-${version}"; + pname = "gforth"; + inherit version; src = fetchurl { url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 0a974fccc888..7e11c75e07dc 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -3,7 +3,8 @@ let generic = { version, sha256, prePatch }: stdenv.mkDerivation rec { - name = "haxe-${version}"; + pname = "haxe"; + inherit version; buildInputs = [ocaml zlib pcre neko camlp4]; diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index a6955c030519..2a6551aad187 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -2,7 +2,8 @@ let version = "6M62"; in stdenv.mkDerivation { - name = "inform7-${version}"; + pname = "inform7"; + inherit version; buildInputs = [ perl coreutils gnutar gzip ]; src = fetchzip { url = "http://inform7.com/download/content/6M62/I7_6M62_Linux_all.tar.gz"; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index e4ef37e4721d..787a9352e225 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation rec { - name = "ldc-${version}"; + pname = "ldc"; + inherit version; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 132cd67a4aeb..9a602c62777d 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -2,7 +2,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"; diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix index d54ffd96382d..e327fa79c6f0 100644 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix @@ -1,7 +1,8 @@ {stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: stdenv.mkDerivation rec { - name = "dragonegg-${version}"; + pname = "dragonegg"; + inherit version; src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw"; @@ -11,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ]; installPhase = '' - mkdir -p $out/lib $out/share/doc/${name} + mkdir -p $out/lib $out/share/doc/${pname}-${version} cp -d dragonegg.so $out/lib - cp README COPYING $out/share/doc/${name} + cp README COPYING $out/share/doc/${pname}-${version} ''; meta = { diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 6edd5e9798c7..4f766e5f9a5c 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -3,7 +3,8 @@ let version = "3.5.2"; in stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix index 268f2702a234..d295ddbf8a44 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix @@ -8,7 +8,8 @@ let sha256 = "10idgcbs4pcx6mjsbq1vjm8hzqqdk2p7k86cw9f473jmfyfwgf5j"; }; in stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz"; diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix index 4a398bd96a05..8fe4dd6f1d5f 100644 --- a/pkgs/development/compilers/llvm/3.5/lld.nix +++ b/pkgs/development/compilers/llvm/3.5/lld.nix @@ -1,7 +1,8 @@ { stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89"; diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index a5161333b282..b4823e9d8c2a 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7"; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 6eec99717785..95632a45999d 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -18,7 +18,8 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix index bacf4d30556b..06bc7490c7b5 100644 --- a/pkgs/development/compilers/llvm/3.5/polly.nix +++ b/pkgs/development/compilers/llvm/3.5/polly.nix @@ -1,7 +1,8 @@ { stdenv, fetch, cmake, isl, python, gmp, llvm, version }: stdenv.mkDerivation { - name = "polly-${version}"; + pname = "polly"; + inherit version; src = fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx"; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 47a1bed126da..0276393d840c 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -3,7 +3,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"; diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index 5a0410302f2f..b66284152d49 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp"; diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 8b25681c2dbf..80b069fff75a 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index d27786464c05..985cd6663857 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l"; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index a73b73137ddc..5fe681185b2d 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -17,7 +17,8 @@ }: stdenv.mkDerivation rec { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index e2cf437e19e1..3d09277ad4cf 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -3,7 +3,8 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation { - name = "clang-${version}"; + pname = "clang"; + inherit version; src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index bd2cc19d2e0b..af65fd6388ea 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5"; diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index dffb207a32b6..f799199d449f 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index 52f27de8cdb5..1a7c9aeead86 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -13,7 +13,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy"; diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index c8d819cc9634..4dde3be277ab 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -27,7 +27,8 @@ let in stdenv.mkDerivation { - name = "llvm-${version}"; + pname = "llvm"; + inherit version; src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 2b543b9d793a..74e9b8719d1d 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj"; diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 735c5e9e7435..8e36c5ad53a6 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g"; diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index cf6de26a9e83..3ab56677d72f 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3"; diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 325149fc19be..8adf11abddda 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4"; diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix index a8a6b3dfea87..a69fe286ecc0 100644 --- a/pkgs/development/compilers/llvm/4/openmp.nix +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc"; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index b182f1250e72..e3015ae8448d 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf"; diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 227ecbeda194..1b891af09ed1 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index bf23f80ef103..bfee91d91bf6 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6"; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index 5e670d4de159..cce44c7e50f9 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 901015bf2ff4..559377bcc1b7 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir"; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 3a165e9da7b1..906baa4ae646 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"; diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index df9c784a10f4..ac1f4f653e6a 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0"; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 1e68276945ec..58b9b8060fa3 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "04afcfq2h7ysyqxxhyhb7ig4p0vdw7mi63kh8mffl74j0rc781p7"; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 9571e7ab5a63..d3db8082c963 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 908a5f1218f7..447904b9ad5f 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6"; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index e2ec4e274f4c..fc9e3714db0c 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4"; diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 2fe6f1c58f66..b5e6e0e70480 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -1,7 +1,8 @@ { stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2"; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index 63ad43e62cd7..823e9640cf4e 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1"; diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index 1b2dff2c76cf..44687ead4d1c 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -16,7 +16,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v"; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index e55f4aa5ba13..7adc2aa588e3 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy"; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index f8a07de07222..e0bc9e816f50 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -2,7 +2,8 @@ , enableShared ? true }: stdenv.mkDerivation rec { - name = "libc++-${version}"; + pname = "libc++"; + inherit version; src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz"; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 1ee6d069f4b5..58a1241d8236 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -2,7 +2,8 @@ , enableShared ? true }: stdenv.mkDerivation { - name = "libc++abi-${version}"; + pname = "libc++abi"; + inherit version; src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp"; diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix index 75edd1fff54d..646cd3c3ca4a 100644 --- a/pkgs/development/compilers/llvm/8/libunwind.nix +++ b/pkgs/development/compilers/llvm/8/libunwind.nix @@ -1,7 +1,8 @@ { stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: stdenv.mkDerivation { - name = "libunwind-${version}"; + pname = "libunwind"; + inherit version; src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q"; diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index aec1b14b9943..fc52d691d030 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "lld-${version}"; + pname = "lld"; + inherit version; src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz"; diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index f31da000bb82..254933c82a09 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -15,7 +15,8 @@ }: stdenv.mkDerivation { - name = "lldb-${version}"; + pname = "lldb"; + inherit version; src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8"; diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 8cf551735619..166e7f68eb3b 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation { - name = "openmp-${version}"; + pname = "openmp"; + inherit version; src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y"; diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix index f495be8a93e4..207ed8f29bc7 100644 --- a/pkgs/development/compilers/mlton/20130715.nix +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -9,32 +9,33 @@ let in stdenv.mkDerivation rec { - name = "mlton-${version}"; + pname = "mlton"; + inherit version; binSrc = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.x86-linux.tgz"; sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j"; }) else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-linux.tgz"; sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn"; }) else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}-1.amd64-darwin.gmp-macports.tgz"; sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9"; }) else throw "Architecture not supported"; codeSrc = fetchurl { - url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${pname}-${version}.src.tgz"; sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11"; }; srcs = [ binSrc codeSrc ]; - sourceRoot = name; + sourceRoot = "${pname}-${version}"; buildInputs = [ gmp ]; nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index 3a3538a7ea42..2585b599caf3 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -9,7 +9,8 @@ }: stdenv.mkDerivation { - name = "mlton-${version}"; + pname = "mlton"; + inherit version; src = fetchgit { inherit url rev sha256; diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 43ef5d4b62d1..ecb687e96e57 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -4,11 +4,12 @@ let llvm = callPackage ./llvm.nix { }; in stdenv.mkDerivation rec { - name = "mono-${version}"; + pname = "mono"; + inherit version; src = fetchurl { inherit sha256; - url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/mono/${pname}-${version}.tar.bz2"; }; buildInputs = diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index ef6cd1160b33..2067184a5b00 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -16,7 +16,8 @@ let in stdenv.mkDerivation { - name = "mozart-binary-${version}"; + pname = "mozart-binary"; + inherit version; preferLocalBuild = true; diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 7f22f4de6244..370c08f001a7 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "polyml-${version}"; + pname = "polyml"; + inherit version; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index dce46ade4592..89912ac9ad6b 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -29,7 +29,8 @@ let { url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; } ]; in stdenv.mkDerivation { - name = "smlnj-${version}"; + pname = "smlnj"; + inherit version; inherit sources; diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index bf452d21d1dc..9245e59553fe 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -13,7 +13,8 @@ let ''; in stdenv.mkDerivation { - name = "swi-prolog-${version}"; + pname = "swi-prolog"; + inherit version; src = fetchgit { url = "https://github.com/SWI-Prolog/swipl-devel"; diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 04efe1a91342..41cc9b386067 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "teyjus-${version}"; + pname = "teyjus"; + inherit version; src = fetchurl { url = "https://github.com/teyjus/teyjus/archive/v${version}.tar.gz"; diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 57ced325aad0..369d84708dc4 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -3,7 +3,8 @@ let version = "0.4.4"; in stdenv.mkDerivation { - name = "clooj-${version}"; + pname = "clooj"; + inherit version; jar = fetchurl { # mirrored as original mediafire.com source does not work without user interaction diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index fa8996f0fb56..02ac6bfbcde7 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -47,7 +47,8 @@ in stdenv.mkDerivation { - name = "dart-${version}"; + pname = "dart"; + inherit version; nativeBuildInputs = [ unzip diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 258aebe81727..7c7cd9abb7e9 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -4,7 +4,8 @@ let version = "5.0"; in stdenv.mkDerivation { - name = "eff-${version}"; + pname = "eff"; + inherit version; src = fetchFromGitHub { owner = "matijapretnar"; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 30013946886b..afd2627d20ec 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -14,7 +14,8 @@ let in stdenv.mkDerivation rec { - name = "maude-${version}"; + pname = "maude"; + inherit version; src = fetchurl { url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz"; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 277993339e23..bde2f5d9fa96 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let version = "4.1.6"; in stdenv.mkDerivation { - name = "nix-exec-${version}"; + pname = "nix-exec"; + inherit version; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 4e617ce67eb9..a7009097a602 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -46,7 +46,8 @@ let , libiconv, libobjc, libunwind, Foundation }: stdenv.mkDerivation rec { - name = "ruby-${version}"; + pname = "ruby"; + inherit version; src = if useRailsExpress then fetchFromGitHub { owner = "ruby"; diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 2ec5923b0e1f..1e1ea10ef6dd 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -3,7 +3,8 @@ let version = "52.9.0"; in stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; + inherit version; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 518fc5f77b72..175b2f2e7671 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -6,7 +6,8 @@ with stdenv.lib; let version = "60.4.0"; in stdenv.mkDerivation rec { - name = "spidermonkey-${version}"; + pname = "spidermonkey"; + inherit version; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index cd377e70cd9c..d4ec1677bfbc 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "tcl-${version}"; + pname = "tcl"; + inherit version; inherit src; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 36c4af5f4961..abb549110a87 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -16,7 +16,8 @@ in fetchSubmodules = true; }; in stdenv.mkDerivation rec { - name = "jogl-${version}"; + pname = "jogl"; + inherit version; src = fetchgit { url = git://jogamp.org/srv/scm/jogl.git; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 76e49768d53d..c9797b31eaa9 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -4,7 +4,8 @@ let version = "1.5.1"; in stdenv.mkDerivation { - name = "adns-${version}"; + pname = "adns"; + inherit version; src = fetchurl { urls = [ diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index 72305cb633fb..b8d166507a90 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -5,7 +5,8 @@ with stdenv.lib; stdenv.mkDerivation { - name = "asio-${version}"; + pname = "asio"; + inherit version; src = fetchurl { url = "mirror://sourceforge/asio/asio-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index ac6f0470a0a8..b8f1a5c088ac 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -2,7 +2,8 @@ let version = "0.6.2"; in stdenv.mkDerivation { - name = "libgme-${version}"; + pname = "libgme"; + inherit version; meta = with stdenv.lib; { description = "A collection of video game music chip emulators"; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 11c66db70752..a2fdb66d7e95 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -3,7 +3,8 @@ let version = "1.8.2"; in stdenv.mkDerivation { - name = "avro-c++-${version}"; + pname = "avro-c++"; + inherit version; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index cbd29a095d45..9582e54ffaca 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -3,7 +3,8 @@ let version = "1.9.0"; in stdenv.mkDerivation rec { - name = "avro-c-${version}"; + pname = "avro-c"; + inherit version; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix index b61ac1dcb09f..f64090bd53a3 100644 --- a/pkgs/development/libraries/bulletml/default.nix +++ b/pkgs/development/libraries/bulletml/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "bulletml-${version}"; + pname = "bulletml"; + inherit version; srcs = [ (fetchurl { diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index e388b3af5f67..82570fbf7b40 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -16,10 +16,11 @@ let version = "1.16.0"; inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "cairo-${version}"; + pname = "cairo"; + inherit version; src = fetchurl { - url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; + url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; }; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 6bf7975034b5..d9e69b8e7512 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -7,7 +7,8 @@ # The celt codec has been deprecated and is now a part of the opus codec stdenv.mkDerivation rec { - name = "celt-${version}"; + pname = "celt"; + inherit version; inherit src; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index d329b1945fc7..ff8e1ca6759c 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -3,7 +3,8 @@ let version = "1.0.10"; in stdenv.mkDerivation { - name = "classads-${version}"; + pname = "classads"; + inherit version; src = fetchurl { url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 9f4c4c3b6b36..7c42a7479b1a 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -4,7 +4,8 @@ let version = "0.8"; in stdenv.mkDerivation { - name = "codec2-${version}"; + pname = "codec2"; + inherit version; src = fetchsvn { url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}"; diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 9b74ecdb0f7e..506aa5f475d6 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "csfml-${version}"; + pname = "csfml"; + inherit version; src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 6aec15f976bb..63e2707917a5 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -4,7 +4,8 @@ let version = "3.3.7"; in stdenv.mkDerivation { - name = "eigen-${version}"; + pname = "eigen"; + inherit version; src = fetchurl { url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index cad4419a26cc..eebe119d142f 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "fltk-${version}"; + pname = "fltk"; + inherit version; src = fetchurl { url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index bb9f8fe76c9d..a22b5eef8d2e 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "fltk-${version}"; + pname = "fltk"; + inherit version; src = fetchurl { url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix index 9aeb12344ece..b95d6dd559d4 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -2,7 +2,8 @@ let version = "2016-04-23"; in stdenv.mkDerivation { - name = "fontconfig-ultimate-${version}"; + pname = "fontconfig-ultimate"; + inherit version; src = fetchFromGitHub { sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498"; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 4f1e0eaee7fb..af387b7232f4 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -7,10 +7,11 @@ let in stdenv.mkDerivation rec { - name = "fox-${version}"; + pname = "fox"; + inherit version; src = fetchurl { - url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; sha256 = "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5"; }; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index c34d9591d386..8412248b6170 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -2,7 +2,8 @@ let version = "3.0.0"; in stdenv.mkDerivation { - name = "freeglut-${version}"; + pname = "freeglut"; + inherit version; src = fetchurl { url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 269c41df7973..48e65cc063b0 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -50,10 +50,11 @@ let in stdenv.mkDerivation rec { - name = "glib-${version}"; + pname = "glib"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz"; }; @@ -139,7 +140,7 @@ stdenv.mkDerivation rec { sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. - sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.glib.devdoc} $devdoc @@ -148,7 +149,7 @@ stdenv.mkDerivation rec { checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' - export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 269071434d57..9cb5dda507d2 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -6,7 +6,8 @@ let version = "5.7"; in stdenv.mkDerivation { - name = "globalarrays-${version}"; + pname = "globalarrays"; + inherit version; src = fetchFromGitHub { owner = "GlobalArrays"; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index d532e906a510..d44bcdda9aed 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -14,7 +14,8 @@ let version = "1.0.22"; in stdenv.mkDerivation rec { - name = "gloox-${version}"; + pname = "gloox"; + inherit version; src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 75c71632aebc..cb81b52b7301 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -15,7 +15,8 @@ let doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; in stdenv.mkDerivation { - name = "gnutls-kdh-${version}"; + pname = "gnutls-kdh"; + inherit version; inherit src patches; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 99b1307179a5..c7556276dc39 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -3,12 +3,13 @@ let version = "2.0.4"; in stdenv.mkDerivation rec { - name = "goocanvas-${version}"; + pname = "goocanvas"; + inherit version; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz"; + url = "mirror://gnome/sources/goocanvas/2.0/${pname}-${version}.tar.xz"; sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 68bf4ebec347..76173bc5b998 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -3,7 +3,8 @@ let version = "2.9.2"; in stdenv.mkDerivation { - name = "http-parser-${version}"; + pname = "http-parser"; + inherit version; src = fetchFromGitHub { owner = "nodejs"; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 867ce024d2fe..297365be8749 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -4,7 +4,8 @@ let version = "2.6.0"; in stdenv.mkDerivation rec { - name = "ign-math2-${version}"; + pname = "ign-math2"; + inherit version; src = fetchurl { url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 8abff4c5f059..31b9a4b0e9f7 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "ign-transport-${version}"; + pname = "ign-transport"; + inherit version; inherit src; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 544f0f4c4e91..0fdce1bceed0 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "rhino-${version}"; + pname = "rhino"; + inherit version; src = fetchurl { url = "mirror://mozilla/js/rhino1_7R2.zip"; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 1ef453f24cdb..feeb4de15e1b 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -33,10 +33,11 @@ let }; libavFun = version : sha1 : stdenv.mkDerivation rec { - name = "libav-${version}"; + pname = "libav"; + inherit version; src = fetchurl { - url = "${meta.homepage}/releases/${name}.tar.xz"; + url = "${meta.homepage}/releases/${pname}-${version}.tar.xz"; inherit sha1; # upstream directly provides sha1 of releases over https }; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index d22518e96d42..c8c58315b648 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -13,7 +13,8 @@ let version = "2.2.0"; in stdenv.mkDerivation { - name = "libbladeRF-${version}"; + pname = "libbladeRF"; + inherit version; src = fetchFromGitHub { owner = "Nuand"; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index 18593f80799c..4fea84723f99 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -6,7 +6,8 @@ let version = "2.1"; in stdenv.mkDerivation rec { - name = "libbytesize-${version}"; + pname = "libbytesize"; + inherit version; src = fetchFromGitHub { owner = "storaged-project"; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index e016484e6779..2688881e66d3 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -3,7 +3,8 @@ let version = "4.0.4"; in stdenv.mkDerivation { - name = "libcec-${version}"; + pname = "libcec"; + inherit version; src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 0005525a7cd2..e43cfb10a378 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -3,7 +3,8 @@ let version = "2.1.0.1"; in stdenv.mkDerivation { - name = "p8-platform-${version}"; + pname = "p8-platform"; + inherit version; src = fetchurl { url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 1a4da7713af4..3fd2a328558e 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -17,7 +17,8 @@ let in rec { libdwarf = stdenv.mkDerivation rec { - name = "libdwarf-${version}"; + pname = "libdwarf"; + inherit version; configureFlags = [ "--enable-shared" "--disable-nonshared" ]; @@ -37,7 +38,8 @@ in rec { }; dwarfdump = stdenv.mkDerivation rec { - name = "dwarfdump-${version}"; + pname = "dwarfdump"; + inherit version; preConfigure = '' cd dwarfdump diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 93ece69cf056..f8baa347914c 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -2,7 +2,8 @@ let version = "0.7.2"; in stdenv.mkDerivation { - name = "libdynd-${version}"; + pname = "libdynd"; + inherit version; src = fetchFromGitHub { owner = "libdynd"; diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index c83143dd6b13..ba92bdd51655 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -2,7 +2,8 @@ let version = "7.6.1"; in stdenv.mkDerivation rec { - name = "libjson-${version}"; + pname = "libjson"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libjson/libjson_${version}.zip"; sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 767485a75154..ff1a39fc2049 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -4,12 +4,13 @@ let version = "1.1.0"; in stdenv.mkDerivation rec { - name = "liblastfm-${version}"; + pname = "liblastfm"; + inherit version; # Upstream does not package git tags as tarballs. Get tarball from github. src = fetchurl { url = "https://github.com/lastfm/liblastfm/tarball/${version}"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; }; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index c2731e44efbc..a61c21ffec5f 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -5,7 +5,8 @@ let version = "3.10.0"; in stdenv.mkDerivation rec { - name = "liblouis-${version}"; + pname = "liblouis"; + inherit version; src = fetchFromGitHub { owner = "liblouis"; diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 858004910160..231f18377e48 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -3,7 +3,8 @@ let version = "0.8.9.0"; in stdenv.mkDerivation rec { - name = "libmodplug-${version}"; + pname = "libmodplug"; + inherit version; meta = with stdenv.lib; { description = "MOD playing library"; @@ -14,7 +15,7 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${pname}-${version}.tar.gz"; sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"; }; } diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 106f6fe6c37c..e4010280f4bd 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -6,7 +6,8 @@ let version = "1.1.0"; in stdenv.mkDerivation rec { - name = "libmpc-${version}"; # to avoid clash with the MPD client + pname = "libmpc"; + inherit version; # to avoid clash with the MPD client src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 8719f19acc1d..cde4251e2c69 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -3,7 +3,8 @@ let version = "1.3.0"; in stdenv.mkDerivation rec { - name = "libmypaint-${version}"; + pname = "libmypaint"; + inherit version; src = fetchFromGitHub { owner = "mypaint"; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index a4b0b26a345b..c0c66bc1a4a0 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -3,7 +3,8 @@ let version = "1.0.3"; in stdenv.mkDerivation rec { - name = "libnih-${version}"; + pname = "libnih"; + inherit version; src = fetchurl { url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 8131420cfd65..7dc23aa1e8ae 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -5,10 +5,11 @@ let deb_patch = "5"; in stdenv.mkDerivation rec { - name = "libofa-${version}"; + pname = "libofa"; + inherit version; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz"; sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"; }; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 10d438500a63..752be52963cb 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -5,7 +5,8 @@ let version = "1.3.1"; in stdenv.mkDerivation rec { - name = "libopus-${version}"; + pname = "libopus"; + inherit version; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index 4ca0849447f3..e1d70bee6c4c 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -4,7 +4,8 @@ let version = "0.2.1"; in stdenv.mkDerivation rec { - name = "libopusenc-${version}"; + pname = "libopusenc"; + inherit version; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 952509acc2ee..47d9c4215fdf 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -3,7 +3,8 @@ let version = "1.6.2"; in stdenv.mkDerivation { - name = "libossp-uuid-${version}"; + pname = "libossp-uuid"; + inherit version; src = fetchurl { url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index cf97744069b3..bbdce71bad6a 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -3,10 +3,11 @@ let version = "0.4"; in stdenv.mkDerivation rec { - name = "libpar2-${version}"; + pname = "libpar2"; + inherit version; src = fetchurl { - url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index f8c91df64683..b3dae0c60eaa 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -6,7 +6,8 @@ let version = "6.14.12"; in stdenv.mkDerivation { - name = "libpgf-${version}"; + pname = "libpgf"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f175bb6ea6d9..f1c7874e313e 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,7 +3,8 @@ let generic = version: sha256: prefix: stdenv.mkDerivation rec { - name = "libqmatrixclient-${version}"; + pname = "libqmatrixclient"; + inherit version; src = fetchFromGitHub { owner = "QMatrixClient"; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 8018b84a52be..bdca44dc7d03 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -3,7 +3,8 @@ let version = "1.8.5"; in stdenv.mkDerivation rec { - name = "libspatialindex-${version}"; + pname = "libspatialindex"; + inherit version; src = fetchurl { url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 5bae04a88f94..9ef3d6654138 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -8,7 +8,8 @@ in if (stdenv.hostPlatform.system != "x86_64-linux" && stdenv.hostPlatform.system != "x86_64-darwin" && stdenv.hostPlatform.system != "i686-linux") then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here" else stdenv.mkDerivation { - name = "libspotify-${version}"; + pname = "libspotify"; + inherit version; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -61,7 +62,8 @@ else stdenv.mkDerivation { then throw '' Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly '' else stdenv.mkDerivation { - name = "libspotify-samples-${version}"; + pname = "libspotify-samples"; + inherit version; src = libspotify.src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libspotify readline ] diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 046229e8f1d7..26605eb41dbd 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -11,7 +11,8 @@ let boostPython = boost.override { enablePython = true; inherit python; }; in stdenv.mkDerivation { - name = "libtorrent-rasterbar-${version}"; + pname = "libtorrent-rasterbar"; + inherit version; src = fetchFromGitHub { owner = "arvidn"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 50fdbf2a81f7..9bccff49b540 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -4,7 +4,8 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "libtoxcore-${version}"; + pname = "libtoxcore"; + inherit version; src = fetchFromGitHub { owner = "TokTok"; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index b0be3cb3c12d..5ac456a60f61 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -3,10 +3,11 @@ let version = "1.0.1"; in stdenv.mkDerivation rec { - name = "libtxc_dxtn-${version}"; + pname = "libtxc_dxtn"; + inherit version; src = fetchurl { - url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${pname}-${version}.tar.bz2"; sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index aad8ae00c114..9a3671c32589 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -3,7 +3,8 @@ let version = "1.0"; in stdenv.mkDerivation rec { - name = "libtxc_dxtn_s2tc-${version}"; + pname = "libtxc_dxtn_s2tc"; + inherit version; src = fetchurl { url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 7bd89b44d889..fede13fcd9b4 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -4,7 +4,8 @@ let version = "4.3.4"; in stdenv.mkDerivation { - name = "libxc-${version}"; + pname = "libxc"; + inherit version; src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8"; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 773389e60f54..9408b0c45877 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -5,11 +5,12 @@ let version = "5.4"; in stdenv.mkDerivation rec { - name = "libxklavier-${version}"; + pname = "libxklavier"; + inherit version; src = fetchgit { url = "git://anongit.freedesktop.org/git/libxklavier"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 29ec205d7a11..04f84d49f844 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "msgpack-${version}"; + pname = "msgpack"; + inherit version; inherit src patches; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index cbe1f9840593..7f08d0a75351 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -4,7 +4,8 @@ let version = "0.6.3"; in stdenv.mkDerivation { - name = "ndn-cxx-${version}"; + pname = "ndn-cxx"; + inherit version; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 913a4a087a97..83d01f85d0a4 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -3,7 +3,8 @@ let version = "2.8"; in stdenv.mkDerivation rec { - name = "ndpi-${version}"; + pname = "ndpi"; + inherit version; src = fetchFromGitHub { owner = "ntop"; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index cc5a115ed71e..442fcf2e7615 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: let version = "6.0.0"; in stdenv.mkDerivation { - name = "nix-plugins-${version}"; + pname = "nix-plugins"; + inherit version; src = fetchFromGitHub { owner = "shlevy"; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 4772f1111aca..b62fa1cb704f 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -5,7 +5,8 @@ let version = "4.21"; in stdenv.mkDerivation { - name = "nspr-${version}"; + pname = "nspr"; + inherit version; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index c0a73fa984e7..b79f940affa3 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -5,10 +5,11 @@ let in stdenv.mkDerivation rec { - name = "ntrack-${version}"; + pname = "ntrack"; + inherit version; src = fetchurl { - url = "https://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w"; }; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 9a8787ad7f49..e2d34ae5f07b 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -4,7 +4,8 @@ let version = "0.1.5"; in stdenv.mkDerivation { - name = "opencore-amr-${version}"; + pname = "opencore-amr"; + inherit version; src = fetchurl { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index e26f4160921f..55d003d2d92b 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -24,7 +24,8 @@ let in stdenv.mkDerivation rec { - name = "openjpeg-${version}"; + pname = "openjpeg"; + inherit version; src = fetchFromGitHub { owner = "uclouvain"; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 760fc3e32329..06e4726054e9 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -12,10 +12,11 @@ let version = "4.0.1"; in stdenv.mkDerivation rec { - name = "openmpi-${version}"; + pname = "openmpi"; + inherit version; src = with stdenv.lib.versions; fetchurl { - url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; + url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc"; }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 67b903970d3e..bd4802b8775b 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -8,10 +8,11 @@ with stdenv.lib; let common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { - name = "openssl-${version}"; + pname = "openssl"; + inherit version; src = fetchurl { - url = "https://www.openssl.org/source/${name}.tar.gz"; + url = "https://www.openssl.org/source/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 5a5e8ffaef7c..c3407289f020 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -6,7 +6,8 @@ let version = "2018-11-13"; in stdenv.mkDerivation rec { - name = "openzwave-${version}"; + pname = "openzwave"; + inherit version; # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw. # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference. diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 6edea7f51419..cf9e201b3f6a 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -4,10 +4,11 @@ let generic = version: sha256: stdenv.mkDerivation rec { - name = "physfs-${version}"; + pname = "physfs"; + inherit version; src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; + url = "${meta.homepage}/downloads/${pname}-${version}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 566d88dcdb56..8f6adaf03d9b 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -3,7 +3,8 @@ let version = "1.2"; in stdenv.mkDerivation rec { - name = "ppl-${version}"; + pname = "ppl"; + inherit version; src = fetchurl { url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index a98521a2d1ee..957b59a6f662 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -7,7 +7,8 @@ let mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + pname = "protobuf"; + inherit version; # make sure you test also -A pythonPackages.protobuf src = fetchFromGitHub { diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 1a20d806b968..773e31391758 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + pname = "protobuf"; + inherit version; inherit src; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index e0c5d4db9305..91c0ae5624e8 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "protobuf-c-${version}"; + pname = "protobuf-c"; + inherit version; inherit src; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 5bccbf74965a..789a63bef74d 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -3,10 +3,11 @@ let version = "8.4.2"; in stdenv.mkDerivation rec { - name = "qpdf-${version}"; + pname = "qpdf"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz"; sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9"; }; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 05373cd1cbda..36576de05631 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -7,7 +7,8 @@ let version = "3.7.0"; in stdenv.mkDerivation { - name = "arpack-${version}"; + pname = "arpack"; + inherit version; src = fetchFromGitHub { owner = "opencollab"; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 4ae5ea522555..a93ede63a263 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -30,7 +30,8 @@ let version = "2017.1.0"; dijitso = pythonPackages.buildPythonPackage { - name = "dijitso-${version}"; + pname = "dijitso"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz"; sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg"; @@ -54,7 +55,8 @@ let }; fiat = pythonPackages.buildPythonPackage { - name = "fiat-${version}"; + pname = "fiat"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz"; sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l"; @@ -72,7 +74,8 @@ let }; ufl = pythonPackages.buildPythonPackage { - name = "ufl-${version}"; + pname = "ufl"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz"; sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg"; @@ -90,7 +93,8 @@ let }; ffc = pythonPackages.buildPythonPackage { - name = "ffc-${version}"; + pname = "ffc"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz"; sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0"; @@ -109,7 +113,8 @@ let }; instant = pythonPackages.buildPythonPackage { - name = "instant-${version}"; + pname = "instant"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz"; sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q"; @@ -125,7 +130,8 @@ let in stdenv.mkDerivation { - name = "dolfin-${version}"; + pname = "dolfin"; + inherit version; src = fetchurl { url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz"; sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds"; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 46538d0022e7..2e5bb5e371f5 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -12,7 +12,8 @@ let in stdenv.mkDerivation rec { - name = "liblapack-${version}"; + pname = "liblapack"; + inherit version; src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz"; sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny"; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 8444d88809af..d036e39d01ae 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -5,7 +5,8 @@ with stdenv.lib; let version = "2.0.2"; in stdenv.mkDerivation { - name = "magma-${version}"; + pname = "magma"; + inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk"; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 1b043d33ad6a..cf73e205830b 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "sfml-${version}"; + pname = "sfml"; + inherit version; src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index fc771a493b6d..82cbce8055e8 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -4,7 +4,8 @@ let version = "0.12"; in stdenv.mkDerivation { - name = "libstartup-notification-${version}"; + pname = "libstartup-notification"; + inherit version; src = fetchurl { url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index d61076e569bc..cc7c996f7c3a 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -4,7 +4,8 @@ let version = "2.6.2"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { - name = "tinyxml-${version}"; + pname = "tinyxml"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/tinyxml/tinyxml/${version}/tinyxml_2_6_2.zip"; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index b80984303d76..e1f3c0bd39c2 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -4,7 +4,8 @@ let version = "2.1.0"; in stdenv.mkDerivation rec { - name = "uthash-${version}"; + pname = "uthash"; + inherit version; src = fetchurl { url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index f6669f2f8fea..77cd3be0cbda 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -7,7 +7,8 @@ let version = "0.3.11"; in stdenv.mkDerivation rec { - name = "volume_key-${version}"; + pname = "volume_key"; + inherit version; src = fetchgit { url = https://pagure.io/volume_key.git; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index ba77189b2a55..60f911765992 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -7,7 +7,8 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "wt-${version}"; + pname = "wt"; + inherit version; src = fetchFromGitHub { owner = "emweb"; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 369d011f9b3c..02367e18a95b 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -15,7 +15,8 @@ let version = "2.9.4"; in stdenv.mkDerivation { - name = "wxwidgets-${version}"; + pname = "wxwidgets"; + inherit version; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 271c7adf3d98..362f704a05d8 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -3,7 +3,8 @@ let generic = version: sha256: stdenv.mkDerivation rec { - name = "xapian-${version}"; + pname = "xapian"; + inherit version; passthru = { inherit version; }; src = fetchurl { diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index b19bf000b0d4..3e54944a3779 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -5,7 +5,8 @@ let version = "1.2.28"; in stdenv.mkDerivation rec { - name = "xmlsec-${version}"; + pname = "xmlsec"; + inherit version; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 79651db23ea4..ba6d5559f26b 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -36,7 +36,8 @@ let }; in stdenv.mkDerivation rec { - name = "amdapp-sdk-${version}"; + pname = "amdapp-sdk"; + inherit version; src = fetchurl { url = stdenv.lib.getAttrFromPath [version "url"] src_info; diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 4527a8700f6e..48ea088a73c9 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -4,7 +4,8 @@ let version = "2.0.0"; in stdenv.mkDerivation { - name = "avr-libc-${version}"; + pname = "avr-libc"; + inherit version; src = fetchurl { url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2; diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index 0456c8eae769..b84f358cbee0 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -3,7 +3,8 @@ let version = "0.25"; in stdenv.mkDerivation { - name = "mspdebug-${version}"; + pname = "mspdebug"; + inherit version; src = fetchFromGitHub { owner = "dlbeer"; repo = "mspdebug"; diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index 4230672e12f3..df0ef999dd6a 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -2,7 +2,8 @@ let version = "3.1.0"; in stdenv.mkDerivation { - name = "newlib-${version}"; + pname = "newlib"; + inherit version; src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv"; diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix index 0ec8664dac9e..8abe4b2550e0 100644 --- a/pkgs/development/misc/qmk_firmware/default.nix +++ b/pkgs/development/misc/qmk_firmware/default.nix @@ -6,7 +6,8 @@ let version = "0.6.144"; in stdenv.mkDerivation { - name = "qmk_firmware-${version}"; + pname = "qmk_firmware"; + inherit version; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index e66bb6fe2118..bc806410b1ea 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -15,7 +15,8 @@ let in stdenv.mkDerivation rec { - name = "betaflight-${version}"; + pname = "betaflight"; + inherit version; src = fetchFromGitHub { owner = "betaflight"; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 683883ddbce9..5014cdce8f37 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "inav-${version}"; + pname = "inav"; + inherit version; src = fetchFromGitHub { owner = "iNavFlight"; diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index a2ddda34347a..eed4b43d6a36 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -4,7 +4,8 @@ let version = "0.6"; in stdenv.mkDerivation { - name = "abootimg-${version}"; + pname = "abootimg"; + inherit version; src = fetchFromGitHub { owner = "ggrandou"; diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix index 8128dc1cb6f5..4606ebd51721 100644 --- a/pkgs/development/ocaml-modules/base64/2.0.nix +++ b/pkgs/development/ocaml-modules/base64/2.0.nix @@ -3,7 +3,8 @@ let version = "2.0.0"; in stdenv.mkDerivation { - name = "ocaml-base64-${version}"; + pname = "ocaml-base64"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 318353168336..9239d2543ee3 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -3,7 +3,8 @@ let version = "3.0"; in stdenv.mkDerivation { - name = "ocaml-dolog-${version}"; + pname = "ocaml-dolog"; + inherit version; src = fetchzip { url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz"; sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 8a11d22c2c11..40db8246f4aa 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -3,7 +3,8 @@ let version = "0.2.4"; in stdenv.mkDerivation { - name = "ocaml-iso8601-${version}"; + pname = "ocaml-iso8601"; + inherit version; src = fetchzip { url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz"; sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 3bced92cc3e3..c91a57121379 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -3,7 +3,8 @@ let version = stdenv.lib.getVersion llvm; in stdenv.mkDerivation { - name = "ocaml-llvm-${version}"; + pname = "ocaml-llvm"; + inherit version; inherit (llvm) src; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 9a8a6259a778..65acbd6cc428 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -3,7 +3,8 @@ let version = "1.0.0"; in stdenv.mkDerivation { - name = "ocaml-magic-mime-${version}"; + pname = "ocaml-magic-mime"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index e69b9dabeabc..d767c20f6385 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,7 +1,8 @@ { version, src, stdenv, ocaml, findlib, ocamlbuild, ... }: stdenv.mkDerivation { - name = "menhir-${version}"; + pname = "menhir"; + inherit version; inherit src; diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index d6d0c3292bb5..8063f284728b 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -6,7 +6,8 @@ let sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8"; in stdenv.mkDerivation { - name = "ocaml-make-${version}"; + pname = "ocaml-make"; + inherit version; src = fetchurl { url = "https://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 569f5081355c..0263d3284ffa 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -17,7 +17,8 @@ in let inherit (param) version; in stdenv.mkDerivation { - name = "ocsigen-deriving-${version}"; + pname = "ocsigen-deriving"; + inherit version; src = fetchzip { url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; inherit (param) sha256; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 39cd6417542e..2db6b821b4e1 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -32,7 +32,8 @@ let cs_sha256 }: stdenv.mkDerivation rec { - name = "radare2-${version}"; + pname = "radare2"; + inherit version; src = fetchFromGitHub { owner = "radare"; diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 8816a005ca0f..0a86aaeb6ca0 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -3,7 +3,8 @@ let version = "1.9.6"; in stdenv.mkDerivation { - name = "ant-${version}"; + pname = "ant"; + inherit version; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index b6c2702485b1..8d1e09eeb338 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -3,7 +3,8 @@ let version = "1.10.2"; in stdenv.mkDerivation { - name = "ant-${version}"; + pname = "ant"; + inherit version; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index cde6ea2f7a87..ef339e658c10 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -4,12 +4,13 @@ assert jdk != null; let version = "3.6.1"; in stdenv.mkDerivation rec { - name = "apache-maven-${version}"; + pname = "apache-maven"; + inherit version; builder = ./builder.sh; src = fetchurl { - url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; + url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15"; }; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1007f4df8cad..df8ccfc0e4a0 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -121,7 +121,8 @@ let in stdenv.mkDerivation rec { - name = "bazel-${version}"; + pname = "bazel"; + inherit version; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 47f800c67be5..b543565758c1 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -6,7 +6,8 @@ let version = "4.2.1"; in stdenv.mkDerivation { - name = "gnumake-${version}"; + pname = "gnumake"; + inherit version; src = fetchurl { url = "mirror://gnu/make/make-${version}.tar.bz2"; diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 98cd7e136d22..0b858f6f20d2 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -5,7 +5,8 @@ let version = "2.5.1"; in stdenv.mkDerivation { - name = "rebar-${version}"; + pname = "rebar"; + inherit version; src = fetchurl { url = "https://github.com/rebar/rebar/archive/${version}.tar.gz"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3c04f8a12af6..0472f412f715 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -15,7 +15,8 @@ let goPackagePath = "github.com/containers/buildah"; in buildGoPackage rec { - name = "buildah-${version}"; + pname = "buildah"; + inherit version; inherit src; outputs = [ "bin" "man" "out" ]; diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index e07b3cd9db74..001f87b3b279 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -4,7 +4,8 @@ let version = "1.1.1"; in stdenv.mkDerivation rec { - name = "casperjs-${version}"; + pname = "casperjs"; + inherit version; src = fetchFromGitHub { owner = "casperjs"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index ba0be89abf3d..d9f7237d2897 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -5,7 +5,8 @@ let goPackagePath = "github.com/buildkite/agent"; in buildGoPackage { - name = "buildkite-agent-${version}"; + pname = "buildkite-agent"; + inherit version; inherit goPackagePath src postPatch; diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix index 553d622a83c6..47f625736750 100644 --- a/pkgs/development/tools/database/cdb/default.nix +++ b/pkgs/development/tools/database/cdb/default.nix @@ -16,7 +16,8 @@ let }; in stdenv.mkDerivation { - name = "cdb-${version}"; + pname = "cdb"; + inherit version; src = fetchurl { url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz"; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 5eb7651f199b..ca04d209fabb 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -7,7 +7,8 @@ let version = "3.9.1"; in stdenv.mkDerivation rec { - name = "squirrel-sql-${version}"; + pname = "squirrel-sql"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 7eb057654283..d190ee32fca4 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -45,12 +45,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; version = "1.0.8"; in stdenv.mkDerivation rec { - name = "flatpak-builder-${version}"; + pname = "flatpak-builder"; + inherit version; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { - url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0ns1vv2phhd3vsi2749cajwapapx7xa841kkvssixwgfa575d912"; }; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 4ad04ae0e43b..b57c9841978f 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -3,7 +3,8 @@ version = "5.2.4"; in stdenv.mkDerivation { - name = "flyway-${version}"; + pname = "flyway"; + inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc"; diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index 403bfeabfd05..9791cd56ea1a 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -2,7 +2,8 @@ let version = "0.98"; in stdenv.mkDerivation { - name = "fastjar-${version}"; + pname = "fastjar"; + inherit version; src = fetchurl { url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz"; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 14f42ed9d40a..53e2920c68d6 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -3,7 +3,8 @@ let version = "2.2.3"; in stdenv.mkDerivation { - name = "minizinc-${version}"; + pname = "minizinc"; + inherit version; buildInputs = [ cmake flex bison ]; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 799623d34cc9..284ad4a5a670 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -3,7 +3,8 @@ let version = "2.3.1"; in stdenv.mkDerivation { - name = "minizinc-ide-${version}"; + pname = "minizinc-ide"; + inherit version; nativeBuildInputs = [ qmake makeWrapper ]; buildInputs = [ qtbase qtwebengine qtwebkit ]; diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index ba95889b5a80..1dd53f62cec6 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -3,12 +3,13 @@ let version = "0.7.2"; in stdenv.mkDerivation rec { - name="dfu-programmer-${version}"; + pname = "dfu-programmer"; + inherit version; buildInputs = [ libusb ]; src = fetchurl { - url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; + url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz"; sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x"; }; diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix index ade9954021a1..164e0e80b60c 100644 --- a/pkgs/development/tools/misc/nixbang/default.nix +++ b/pkgs/development/tools/misc/nixbang/default.nix @@ -2,7 +2,8 @@ let version = "0.1.2"; in pythonPackages.buildPythonApplication { - name = "nixbang-${version}"; + pname = "nixbang"; + inherit version; namePrefix = ""; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index f99c904ed01c..c0e7a3653a86 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -4,7 +4,8 @@ let version = "20130503"; in stdenv.mkDerivation rec { - name = "prelink-${version}"; + pname = "prelink"; + inherit version; buildInputs = [ libelf stdenv.cc.libc (stdenv.lib.getOutput "static" stdenv.cc.libc) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index fdacdaef20fc..98c400d52851 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -7,7 +7,8 @@ let version = "1.5.1"; in stdenv.mkDerivation { - name = "stlink-${version}"; + pname = "stlink"; + inherit version; src = fetchFromGitHub { owner = "texane"; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 82d0ec6119ea..2975d64113e8 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -3,7 +3,8 @@ let version = "2.1"; in stdenv.mkDerivation { - name = "teensy-loader-cli-${version}"; + pname = "teensy-loader-cli"; + inherit version; src = fetchgit { url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2"; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 07005131fb5e..689b7da88021 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation rec { - name = "nailgun-${version}"; + pname = "nailgun"; + inherit version; src = fetchFromGitHub { owner = "facebook"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index f88811855a2e..e6fb1b353d2a 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -7,7 +7,8 @@ let version = if stdenv.lib.versionAtLeast ocaml.version "4.02" in stdenv.mkDerivation { - name = "js_of_ocaml-${version}"; + pname = "js_of_ocaml"; + inherit version; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz"; sha256 = { diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 41cde6f8ab73..61e8e77f384b 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -3,7 +3,8 @@ let version = "0.1.10"; in stdenv.mkDerivation { - name = "obuild-${version}"; + pname = "obuild"; + inherit version; src = fetchzip { url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 1dcea0da4cbf..b10b7bdae57b 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { # derivation of just runtime deps so env vars created by # setup-hooks can be saved for use at runtime runtime = stdenv.mkDerivation rec { - name = "utop-runtime-env-${version}"; + pname = "utop-runtime-env"; + inherit version; buildInputs = [ findlib ] ++ propagatedBuildInputs; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index e6e54f8dab92..fcd7e445b8a2 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -12,7 +12,8 @@ let runtime = { cpp = stdenv.mkDerivation { - name = "antlr-runtime-cpp-${version}"; + pname = "antlr-runtime-cpp"; + inherit version; src = source; outputs = [ "out" "dev" "doc" ]; @@ -35,7 +36,8 @@ let }; antlr = stdenv.mkDerivation { - name = "antlr-${version}"; + pname = "antlr"; + inherit version; src = fetchurl { url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index d08df8265b0a..2f4db7982b71 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -5,10 +5,11 @@ let generic = { version, sha256, license }: stdenv.mkDerivation rec { - name = "ragel-${version}"; + pname = "ragel"; + inherit version; src = fetchurl { - url = "https://www.colm.net/files/ragel/${name}.tar.gz"; + url = "https://www.colm.net/files/ragel/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 8f711e14654d..3f0b37a7175e 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -14,7 +14,8 @@ let ## stap binaries stapBuild = stdenv.mkDerivation { - name = "systemtap-${version}"; + pname = "systemtap"; + inherit version; src = fetchgit { inherit url rev sha256; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 0f1482d7953d..6a709cf8f9b1 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -24,7 +24,8 @@ let }; in stdenv.mkDerivation rec { - name = "pypi2nix-${version}"; + pname = "pypi2nix"; + inherit version; srcs = [ src click diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d8899de205fd..786cac68425a 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -20,7 +20,8 @@ let in buildGoPackage rec { - name = "skopeo-${version}"; + pname = "skopeo"; + inherit version; inherit src goPackagePath; outputs = [ "bin" "man" "out" ]; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 2530202a565e..1e2a60566d4e 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -37,7 +37,8 @@ let sha256-manual = "12j4x1bh8x6yinym4d1ard32vfl22iq2wz1lfwz6s3ljhggkc52h"; manual = stdenv.mkDerivation { - name = "anki-manual-${version}"; + pname = "anki-manual"; + inherit version; src = fetchFromGitHub { owner = "dae"; repo = "ankidocs"; @@ -68,11 +69,12 @@ let in buildPythonApplication rec { - name = "anki-${version}"; + pname = "anki"; + inherit version; src = fetchurl { urls = [ - "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" + "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz" # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" # "http://ankisrs.net/download/mirror/${name}.tgz" # "http://ankisrs.net/download/mirror/archive/${name}.tgz" diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 5318108c4913..70c23664dc04 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "armagetron-${version}"; + pname = "armagetron"; + inherit version; src = fetchurl { url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2"; sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3"; diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 98baafbb2fd2..b9d3a69d87b3 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -3,10 +3,11 @@ let version = "0.9.13"; in stdenv.mkDerivation rec { - name = "crrcsim-${version}"; + pname = "crrcsim"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/crrcsim/${name}.tar.gz"; + url = "mirror://sourceforge/crrcsim/${pname}-${version}.tar.gz"; sha256 = "abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698"; }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index a77250543107..0b25af645cfa 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -84,7 +84,8 @@ let ''; dfhack = stdenv.mkDerivation rec { - name = "dfhack-base-${version}"; + pname = "dfhack-base"; + inherit version; # Beware of submodules src = fetchFromGitHub { diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 3407659d977b..2999da8fcaaf 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -18,7 +18,8 @@ let wrapper = "eduke32-wrapper"; in stdenv.mkDerivation { - name = "eduke32-${version}"; + pname = "eduke32"; + inherit version; src = fetchurl { url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz"; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 447724a2043f..a138b46f81bd 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation rec { - name = "endless-sky-${version}"; + pname = "endless-sky"; + inherit version; src = fetchFromGitHub { owner = "endless-sky"; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 5a04e75030f6..19851341da0c 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -9,7 +9,8 @@ let version = "2019.1.1"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { - name = "flightgear-base-${version}"; + pname = "flightgear-base"; + inherit version; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index d5efe2b3ebd9..3b8bc1288efc 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -5,10 +5,11 @@ let version = "1.08.20121209"; freedink_data = stdenv.mkDerivation rec { - name = "freedink-data-${version}"; + pname = "freedink-data"; + inherit version; src = fetchurl { - url = "mirror://gnu/freedink/${name}.tar.gz"; + url = "mirror://gnu/freedink/${pname}-${version}.tar.gz"; sha256 = "1mhns09l1s898x18ahbcy9gabrmgsr8dv7pm0a2ivid8mhxahn1j"; }; @@ -16,10 +17,11 @@ let }; in stdenv.mkDerivation rec { - name = "freedink-${version}"; + pname = "freedink"; + inherit version; src = fetchurl { - url = "mirror://gnu/freedink/${name}.tar.gz"; + url = "mirror://gnu/freedink/${pname}-${version}.tar.gz"; sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr"; }; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 2ebb60f3d5db..b269a5d12d6d 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -3,7 +3,8 @@ let version = "0.16.1"; in stdenv.mkDerivation rec { - name = "freedroidrpg-${version}"; + pname = "freedroidrpg"; + inherit version; src = fetchurl { url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index e89d16b788a6..f9ae137bb626 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -3,7 +3,8 @@ let version = "1.4.9"; in stdenv.mkDerivation { - name = "gogui-${version}"; + pname = "gogui"; + inherit version; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip"; diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index 1fcf9c9527bd..f57571b2a2c4 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -5,7 +5,8 @@ let version = "0.7.3"; in stdenv.mkDerivation rec { - name = "linux-steam-integration-${version}"; + pname = "linux-steam-integration"; + inherit version; src = fetchFromGitHub { owner = "clearlinux"; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index de67afe45a94..df613bb44470 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -17,7 +17,8 @@ let }; in stdenv.mkDerivation { - name = "megaglest-${version}"; + pname = "megaglest"; + inherit version; src = fetchFromGitHub { owner = "MegaGlest"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 17366ae99040..52a911655373 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -24,7 +24,8 @@ let }; }; in stdenv.mkDerivation { - name = "minetest-${version}"; + pname = "minetest"; + inherit version; src = sources.src; diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 39b3ae36f506..72d60eae7f66 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -13,7 +13,8 @@ let version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}"; in stdenv.mkDerivation { - name = "nexuiz-${version}"; + pname = "nexuiz"; + inherit version; src = fetchurl { url = "mirror://sourceforge/nexuiz/nexuiz-${version_short}.zip"; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 211172cee203..9b3d92a350d3 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -3,7 +3,8 @@ let version = "1.0.0.2018.10.08"; in stdenv.mkDerivation { - name = "openxcom-${version}"; + pname = "openxcom"; + inherit version; src = fetchFromGitHub { owner = "SupSuper"; repo = "OpenXcom"; diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix index 88ba8679e8a7..0d8a64f14cdc 100644 --- a/pkgs/games/quake3/content/demo.nix +++ b/pkgs/games/quake3/content/demo.nix @@ -3,7 +3,8 @@ let version = "1.11-6"; in stdenv.mkDerivation { - name = "quake3-demodata-${version}"; + pname = "quake3-demodata"; + inherit version; src = fetchurl { url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh"; diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix index f35aaaad3527..e34064d93b05 100644 --- a/pkgs/games/quake3/content/pointrelease.nix +++ b/pkgs/games/quake3/content/pointrelease.nix @@ -3,7 +3,8 @@ let version = "1.32b-3"; in stdenv.mkDerivation { - name = "quake3-pointrelease-${version}"; + pname = "quake3-pointrelease"; + inherit version; src = fetchurl { url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run"; diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix index 8b07a38c7bb7..459ff238b4a4 100644 --- a/pkgs/games/rrootage/default.nix +++ b/pkgs/games/rrootage/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "rrootage-${version}"; + pname = "rrootage"; + inherit version; src = fetchurl { url = "http://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz"; sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln"; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 5cbb3c1796f1..e6889731619f 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -107,7 +107,8 @@ let }; binaries = stdenv.mkDerivation rec { - name = "simutrans-${version}"; + pname = "simutrans"; + inherit version; src = binary_src; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 3e29ceb5b01f..63c7e4675b7a 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -5,7 +5,8 @@ let version = "1.0.0.59"; in stdenv.mkDerivation rec { - name = "steam-original-${version}"; + pname = "steam-original"; + inherit version; src = fetchurl { url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 13033c7f9f0a..eea92b43b520 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -9,7 +9,8 @@ in stdenv.mkDerivation { - name = "stockfish-${version}"; + pname = "stockfish"; + inherit version; src = fetchurl { url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz"; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 6c571da561c5..e018dfd664d3 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -10,7 +10,8 @@ let version = "git"; bin = stdenv.mkDerivation { - name = "vdrift-${version}"; + pname = "vdrift"; + inherit version; src = fetchFromGitHub { owner = "vdrift"; diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index c61bfb806c59..0fa637e040e2 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -6,7 +6,8 @@ let in stdenv.mkDerivation { - name = "epson-201106w-${version}"; + pname = "epson-201106w"; + inherit version; src = fetchurl { url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"; diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix index 1dac6034fdab..fe52b104a528 100644 --- a/pkgs/misc/drivers/epson-alc1100/default.nix +++ b/pkgs/misc/drivers/epson-alc1100/default.nix @@ -9,7 +9,8 @@ let }; in stdenv.mkDerivation { - name = "epson-alc1100-${version}"; + pname = "epson-alc1100"; + inherit version; src = fetchurl { url = "http://a1227.g.akamai.net/f/1227/40484/7d/download.ebz.epson.net/dsc/f/01/00/01/58/65/cd71929d2bf41ebf7e96f68fa9f1279556545ef1/Epson-ALC1100-filter-1.2.tar.gz"; diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix index 2a92f8a59d91..9da1a8269ab1 100644 --- a/pkgs/misc/drivers/epson_201207w/default.nix +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "epson_201207w-${version}"; + pname = "epson_201207w"; + inherit version; src = fetchurl { url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm"; diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index a7d5710a2793..cd322bf8fdb7 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -3,7 +3,8 @@ let version = "20160218"; in stdenv.mkDerivation { - name = "postscript-lexmark-${version}"; + pname = "postscript-lexmark"; + inherit version; src = fetchurl { url = "https://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm"; diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 35a9bd2e3844..be199936426c 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -17,7 +17,8 @@ in url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz"; sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp"; }; - name = "sundtek-${version}"; + pname = "sundtek"; + inherit version; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index c942ec59f37e..1ed279d2998b 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -4,7 +4,8 @@ let version = "0.8.8"; in stdenv.mkDerivation { - name = "xboxdrv-${version}"; + pname = "xboxdrv"; + inherit version; src = fetchurl { url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz"; diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index a560ecd0a21d..13cd21391f11 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -34,7 +34,8 @@ let in stdenv.mkDerivation rec { - name = "ccemux-${version}"; + pname = "ccemux"; + inherit version; src = jar; dontUnpack = true; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 446aac629829..5b80a5536259 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -36,10 +36,11 @@ let in stdenv.mkDerivation rec { - name = "ghostscript-${version}"; + pname = "ghostscript"; + inherit version; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz"; inherit sha512; }; diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 1a064e8c627d..5af75be690cb 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl }: let version = "1.2.0"; in stdenv.mkDerivation { - name = "long-shebang-${version}"; + pname = "long-shebang"; + inherit version; src = fetchurl { url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz"; diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix index 91584bfa1fe3..7f3aa11c3f0c 100644 --- a/pkgs/misc/themes/kde2/default.nix +++ b/pkgs/misc/themes/kde2/default.nix @@ -5,7 +5,8 @@ let version = "2017-03-15"; in stdenv.mkDerivation rec { - name = "kde2-decoration-${version}"; + pname = "kde2-decoration"; + inherit version; src = fetchFromGitHub { owner = "repos-holder"; diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 54715c01a9ee..0d4655186ebf 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -8,7 +8,8 @@ let version = "1.9"; in stdenv.mkDerivation { - name = "qtcurve-${version}"; + pname = "qtcurve"; + inherit version; src = fetchurl { url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz"; sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8"; diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix index 50c48098ab08..205d788da6e5 100644 --- a/pkgs/os-specific/linux/beegfs/default.nix +++ b/pkgs/os-specific/linux/beegfs/default.nix @@ -27,7 +27,8 @@ let ]; in stdenv.mkDerivation rec { - name = "beegfs-${version}"; + pname = "beegfs"; + inherit version; src = fetchurl { url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}"; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 1cc0e7ae4ca7..58cd88b4dce0 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -3,7 +3,8 @@ let version = "5.100.138"; in stdenv.mkDerivation { - name = "b43-firmware-${version}"; + pname = "b43-firmware"; + inherit version; src = fetchurl { url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2"; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 5f8f6c542521..c9723c944ab1 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -35,7 +35,8 @@ in stdenv.mkDerivation { - name = "facetimehd-firmware-${version}"; + pname = "facetimehd-firmware"; + inherit version; src = fetchurl { url = dmgUrl; sha256 = "0xqkl4yds0n9fdjvnk0v5mj382q02crry6wm2q7j3ncdqwsv02sv"; diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index 5b14546c90fd..70a0bdbe2406 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -2,7 +2,8 @@ let version = "12"; in stdenv.mkDerivation { - name = "fwupdate-${version}"; + pname = "fwupdate"; + inherit version; src = fetchurl { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1"; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index f829f1da424e..35c91c5ec071 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -10,12 +10,13 @@ let isFuse3 = stdenv.lib.hasPrefix "3" version; in stdenv.mkDerivation rec { - name = "fuse-${version}"; + pname = "fuse"; + inherit version; src = fetchFromGitHub { owner = "libfuse"; repo = "libfuse"; - rev = name; + rev = "${pname}-${version}"; sha256 = sha256Hash; }; diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index 15bdabcc3dc8..d2319fdcf5c7 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -3,7 +3,8 @@ let version = "2.0"; in stdenv.mkDerivation rec { - name = "hibernate-${version}"; + pname = "hibernate"; + inherit version; src = fetchurl { url = "http://tuxonice.nigelcunningham.com.au/files/hibernate-script-${version}.tar.gz"; sha256 = "0ib5bac3spbcwmhf8f9apjbll8x7fgqj4k1s5q3srijh793rfifh"; diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index 932b81438982..7b41b095091d 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -2,7 +2,8 @@ let version = "0.7"; in stdenv.mkDerivation { - name = "iomelt-${version}"; + pname = "iomelt"; + inherit version; src = fetchurl { url = "http://iomelt.com/s/iomelt-${version}.tar.gz"; sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im"; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 527811c2b8d6..2c01dcb97312 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -93,7 +93,8 @@ let configfile = stdenv.mkDerivation { inherit ignoreConfigErrors autoModules preferBuiltin kernelArch; - name = "linux-config-${version}"; + pname = "linux-config"; + inherit version; generateConfig = ./generate-config.pl; diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 266c94fd8c84..55ae78219d18 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -4,7 +4,8 @@ let version = "22-1.1ubuntu1"; # Zesty in stdenv.mkDerivation { - name = "kmod-blacklist-${version}"; + pname = "kmod-blacklist"; + inherit version; src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 0c333feab1c1..96bb91175dc8 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -7,7 +7,8 @@ let git = https://github.com/LemonBoy/ldm.git; in stdenv.mkDerivation rec { - name = "ldm-${version}"; + pname = "ldm"; + inherit version; # There is a stable release, but we'll use the lvm branch, which # contains important fixes for LVM setups. diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 93cab433c9c6..b2d1ca4791a6 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -13,7 +13,8 @@ let in stdenv.mkDerivation rec { - name = "lsiutils-${version}"; + pname = "lsiutils"; + inherit version; srcs = [ src "Source/lsiutil.tar.gz" ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 469096d014d7..9944250bf307 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "lvm2-${version}"; + pname = "lvm2"; + inherit version; src = fetchgit { url = "git://sourceware.org/git/lvm2.git"; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 43f184f384dd..24213cd2fb5a 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -5,7 +5,8 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0"; let version = "1.0.beta1-9e810b1"; in stdenv.mkDerivation { - name = "ply-${version}"; + pname = "ply"; + inherit version; nativeBuildInputs = [ autoreconfHook flex yacc p7zip ]; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index e604f73de2dd..ce0e8707ff57 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -7,7 +7,8 @@ let version = "25.0"; in stdenv.mkDerivation { - name = "rdma-core-${version}"; + pname = "rdma-core"; + inherit version; src = fetchFromGitHub { owner = "linux-rdma"; diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix index ee7325edbe70..3cb964f364d3 100644 --- a/pkgs/os-specific/linux/regionset/default.nix +++ b/pkgs/os-specific/linux/regionset/default.nix @@ -2,7 +2,8 @@ let version = "0.2"; in stdenv.mkDerivation { - name = "regionset-${version}"; + pname = "regionset"; + inherit version; src = fetchurl { url = "http://linvdr.org/download/regionset/regionset-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 0962bd911329..b79a2cd342a8 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -8,10 +8,11 @@ let patchVersion = "2"; in stdenv.mkDerivation rec { - name = "util-linux-${version}"; + pname = "util-linux"; + inherit version; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${pname}-${version}.tar.xz"; sha256 = "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3"; }; diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index 88af53dd046e..fedfea15ccb0 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -3,9 +3,10 @@ let version = "2.5.1"; in stdenv.mkDerivation rec { - name = "libgnurx-${version}"; + pname = "libgnurx"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz"; + url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${pname}-${version}-src.tar.gz"; sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi"; }; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index a7d4f09b90e9..022aaffe5961 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -3,7 +3,8 @@ let version = "5.0.4"; in stdenv.mkDerivation { - name = "mingw-w64-${version}"; + pname = "mingw-w64"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index de0f36dac5fa..286f4a0d41fb 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "pthreads-w32-${version}"; + pname = "pthreads-w32"; version = "2.9.1"; src = fetchzip { diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 7fdbfb6472c9..df4a9f85de66 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -6,11 +6,12 @@ let generic = { version, sha256, enableIPv6 ? false }: stdenv.mkDerivation rec { - name = "bird-${version}"; + pname = "bird"; + inherit version; src = fetchurl { inherit sha256; - url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; + url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index 4b71aaeca3ad..e21ad5723b01 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -12,7 +12,8 @@ daemonlib = fetchgit { in stdenv.mkDerivation rec { - name = "brickd-${version}"; + pname = "brickd"; + inherit version; src = fetchgit { url = "git://github.com/Tinkerforge/brickd.git"; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 74d0d1341d66..369bcb5d2cda 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -11,10 +11,11 @@ assert enablePython -> python3 != null; let version = "9.14.4"; in stdenv.mkDerivation rec { - name = "bind-${version}"; + pname = "bind"; + inherit version; src = fetchurl { - url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii"; }; diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index ff767d9ad437..a6f4f9926710 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "mod_fastcgi-${version}"; + pname = "mod_fastcgi"; + inherit version; src = fetchurl { url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz"; diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 19b2d01f5be8..395504e49703 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -4,10 +4,11 @@ let version = "0.15"; in stdenv.mkDerivation rec { - name = "gatling-${version}"; + pname = "gatling"; + inherit version; src = fetchurl { - url = "https://www.fefe.de/gatling/${name}.tar.xz"; + url = "https://www.fefe.de/gatling/${pname}-${version}.tar.xz"; sha256 = "194srqyja3pczpbl6l169zlvx179v7ln0m6yipmhvj6hrv82k8vg"; }; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index b18e1ea162f0..3c29ddb8e0a6 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -4,10 +4,11 @@ let version = "0.11"; in stdenv.mkDerivation rec { - name = "myserver-${version}"; + pname = "myserver"; + inherit version; src = fetchurl { - url = "mirror://gnu/myserver/${version}/${name}.tar.xz"; + url = "mirror://gnu/myserver/${version}/${pname}-${version}.tar.xz"; sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax"; }; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 12b873df6a40..7292efd2f718 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "nginx-${version}"; + pname = "nginx"; + inherit version; src = fetchurl { url = "https://nginx.org/download/nginx-${version}.tar.gz"; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 8c00bcdbee25..890cd1880535 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -22,7 +22,8 @@ let in stdenv.mkDerivation { - name = "pfixtools-${version}"; + pname = "pfixtools"; + inherit version; src = pfixtoolsSrc; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 2fc8232f0a28..2919647e5734 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -4,7 +4,8 @@ let version = "5.9.0"; mattermost-server = buildGoPackage rec { - name = "mattermost-server-${version}"; + pname = "mattermost-server"; + inherit version; src = fetchFromGitHub { owner = "mattermost"; @@ -23,7 +24,8 @@ let }; mattermost-webapp = stdenv.mkDerivation { - name = "mattermost-webapp-${version}"; + pname = "mattermost-webapp"; + inherit version; src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index 1de1edfa8e11..c1f4746fadfe 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -11,7 +11,8 @@ let }; backend = buildGoPackage { - name = "uchiwa-backend-${version}"; + pname = "uchiwa-backend"; + inherit version; goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' @@ -27,7 +28,8 @@ let }; in stdenv.mkDerivation rec { - name = "uchiwa-${version}"; + pname = "uchiwa"; + inherit version; inherit src; diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 842c988d9b33..2864449267a6 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -21,7 +21,8 @@ let version = "3.4.10"; ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; in stdenv.mkDerivation rec { - name = "mongodb-${version}"; + pname = "mongodb"; + inherit version; src = fetchurl { url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 7ba23f61fedb..1238778658a4 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -7,7 +7,8 @@ }: stdenv.mkDerivation rec { - name = "sphinxsearch-${version}"; + pname = "sphinxsearch"; + inherit version; src = mainSrc; configureFlags = [ diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 287054a750b4..0770191c1b9f 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -6,7 +6,8 @@ let version = "11.33.3"; in stdenv.mkDerivation rec { - name = "monetdb-${version}"; + pname = "monetdb"; + inherit version; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index e05d9e919d17..c996d7c0c8b4 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -6,7 +6,8 @@ let version = "4.2.8"; in stdenv.mkDerivation rec { - name = "tvheadend-${version}"; + pname = "tvheadend"; + inherit version; src = fetchFromGitHub { owner = "tvheadend"; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 76c4bfc428e4..b0fa2861dbc4 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -3,7 +3,8 @@ let generic = { version, sha256, suffix ? "" }: stdenv.mkDerivation rec { - name = "unifi-controller-${version}"; + pname = "unifi-controller"; + inherit version; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb"; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 4ee23e68265f..2375e81ff9eb 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -4,10 +4,11 @@ let common = { version, sha256, extraBuildInputs ? [] }: stdenv.mkDerivation rec { - name = "varnish-${version}"; + pname = "varnish"; + inherit version; src = fetchurl { - url = "https://varnish-cache.org/_downloads/${name}.tgz"; + url = "https://varnish-cache.org/_downloads/${pname}-${version}.tgz"; inherit sha256; }; diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/servers/x11/quartz-wm/default.nix index 92350595dd85..84904d48b1ee 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/servers/x11/quartz-wm/default.nix @@ -2,7 +2,8 @@ let version = "1.3.1"; in stdenv.mkDerivation { - name = "quartz-wm-${version}"; + pname = "quartz-wm"; + inherit version; src = fetchurl { url = "http://xquartz-dl.macosforge.org/src/quartz-wm-${version}.tar.xz"; sha256 = "1j8zd3p7rhay1s3sxq6anw78k5s59mx44xpqla2ianl62346a5g9"; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 2fa31fff2996..ed41976e1ac7 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -45,7 +45,8 @@ in stdenv.mkDerivation rec { LANG = "en_US.UTF-8"; deps = stdenv.mkDerivation { - name = "ejabberd-deps-${version}"; + pname = "ejabberd-deps"; + inherit version; inherit src; diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 789ddaf4d9bb..446f28ba6527 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "es-${version}"; + pname = "es"; + inherit version; src = fetchurl { url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 48c8fd0815ec..05e9a0c757e4 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -3,7 +3,8 @@ let version = "0.6.0"; in stdenv.mkDerivation { - name = "oil-${version}"; + pname = "oil"; + inherit version; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index e9458520bb49..0a26b8a78210 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -10,7 +10,8 @@ let in stdenv.mkDerivation { - name = "zsh-${version}"; + pname = "zsh"; + inherit version; src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 0a5c3ef666e2..3ce32a5e4362 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "nix-zsh-completions-${version}"; + pname = "nix-zsh-completions"; + inherit version; src = fetchFromGitHub { owner = "spwhitt"; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 0d764a4cbd10..f5a8fd24f5e6 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -56,10 +56,11 @@ let }; in stdenv.mkDerivation rec { - name = "bumblebee-${version}"; + pname = "bumblebee"; + inherit version; src = fetchurl { - url = "https://bumblebee-project.org/${name}.tar.gz"; + url = "https://bumblebee-project.org/${pname}-${version}.tar.gz"; sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index eda5703d6a86..95aa15840da6 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -3,10 +3,11 @@ let version = "1.6.1"; in stdenv.mkDerivation rec { - name = "nitrogen-${version}"; + pname = "nitrogen"; + inherit version; src = fetchurl { - url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz"; + url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz"; sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl"; }; diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix index 79ef4cb56dcb..a648eefcdde1 100644 --- a/pkgs/tools/X11/xautomation/default.nix +++ b/pkgs/tools/X11/xautomation/default.nix @@ -2,7 +2,8 @@ let version = "1.09"; in stdenv.mkDerivation { - name = "xautomation-${version}"; + pname = "xautomation"; + inherit version; src = fetchurl { url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz"; sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 4e4e49bd9468..23e0ce63e5b4 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -2,7 +2,8 @@ let version = "1.8.6"; in stdenv.mkDerivation { - name = "xbindkeys-${version}"; + pname = "xbindkeys"; + inherit version; src = fetchurl { url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index dbbdb0c04e91..b9d48f545749 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -4,7 +4,8 @@ let version = "4"; in stdenv.mkDerivation { - name = "xwinwrap-${version}"; + pname = "xwinwrap"; + inherit version; src = fetchbzr { url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel; diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index cb73233dcb46..3f958f7f958d 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -6,7 +6,8 @@ let version = "0.8.5"; in stdenv.mkDerivation { - name = "fsarchiver-${version}"; + pname = "fsarchiver"; + inherit version; src = fetchFromGitHub { owner = "fdupoux"; diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index 169f419cd672..d6c988ef0bed 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -2,7 +2,8 @@ let version = "0.12.2"; in stdenv.mkDerivation rec { - name = "dir2opus-${version}"; + pname = "dir2opus"; + inherit version; pythonPath = [ mutagen ]; buildInputs = [ wrapPython ]; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz"; - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d"; }; diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index d86a0b09c269..bdc431bcb928 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -5,7 +5,8 @@ let in mkDerivation { - name = "qastools-${version}"; + pname = "qastools"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2"; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index bf10f556b6bb..8f4cd60e1ee0 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -10,7 +10,8 @@ let version = "0.29.2"; in with stdenv.lib; stdenv.mkDerivation rec { - name = "bup-${version}"; + pname = "bup"; + inherit version; src = fetchFromGitHub { repo = "bup"; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 05792ecbb128..973e92176443 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -24,7 +24,8 @@ let checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; in stdenv.mkDerivation rec { - name = "znapzend-${version}"; + pname = "znapzend"; + inherit version; src = fetchFromGitHub { owner = "oetiker"; diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 56ec8e19f54e..09fbc8b38c87 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -4,7 +4,8 @@ let version = "0.17"; in stdenv.mkDerivation { - name = "lsdvd-${version}"; + pname = "lsdvd"; + inherit version; src = fetchurl { url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz"; sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x"; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 1d5cd85a62e6..94ca5eb58b1f 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -4,10 +4,11 @@ let major = "1.1"; version = "${major}.13"; in stdenv.mkDerivation rec { - name = "pbzip2-${version}"; + pname = "pbzip2"; + inherit version; src = fetchurl { - url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/pbzip2/${major}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg"; }; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 6ecc65149c49..e8a4917be99f 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -96,7 +96,8 @@ let in stdenv.mkDerivation { - name="ceph-${version}"; + pname = "ceph"; + inherit version; inherit src; diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix index 2e4ea88df7f4..e6c4474765c3 100644 --- a/pkgs/tools/filesystems/dislocker/default.nix +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -7,7 +7,8 @@ let version = "0.7.1"; in stdenv.mkDerivation rec { - name = "dislocker-${version}"; + pname = "dislocker"; + inherit version; src = fetchFromGitHub { owner = "aorimn"; diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 6044806a34b7..58963753a51a 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -2,7 +2,8 @@ let version = "0.5"; in stdenv.mkDerivation { - name = "jmtpfs-${version}"; + pname = "jmtpfs"; + inherit version; src = fetchFromGitHub { sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1"; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 967a8ee43bef..c9af30f873b4 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -2,10 +2,11 @@ let version = "1.2.1"; in stdenv.mkDerivation rec { - name = "reiser4progs-${version}"; + pname = "reiser4progs"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; + url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7"; }; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 345974bed58d..a89ea0657500 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -2,10 +2,11 @@ let version = "3.6.24"; in stdenv.mkDerivation rec { - name = "reiserfsprogs-${version}"; + pname = "reiserfsprogs"; + inherit version; src = fetchurl { - url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${name}.tar.xz"; + url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz"; sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y"; }; diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix index 518e92814a41..476d80653127 100644 --- a/pkgs/tools/filesystems/zfstools/default.nix +++ b/pkgs/tools/filesystems/zfstools/default.nix @@ -2,7 +2,8 @@ let version = "0.3.6"; in stdenv.mkDerivation rec { - name = "zfstools-${version}"; + pname = "zfstools"; + inherit version; src = fetchFromGitHub { sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg"; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index b66257f442ea..1b2425fa71a7 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -5,7 +5,8 @@ let version = "2.1.1"; in stdenv.mkDerivation rec { - name = "argyllcms-${version}"; + pname = "argyllcms"; + inherit version; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index 57a6c8c9673c..e57f80f738f3 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -8,7 +8,8 @@ let sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; in stdenv.mkDerivation { - name = "briss-${version}"; + pname = "briss"; + inherit version; src = fetchurl { url = "mirror://sourceforge/briss/briss-${version}.tar.gz"; inherit sha256; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 51212a3ea946..848d804bb385 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -13,7 +13,8 @@ let sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg"; }; in stdenv.mkDerivation rec { - name = "gmic-${version}"; + pname = "gmic"; + inherit version; outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix index 7ea73ab8db8d..e5bdf6f31775 100644 --- a/pkgs/tools/graphics/gmic_krita_qt/default.nix +++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix @@ -7,7 +7,8 @@ let version = "2.3.6"; in stdenv.mkDerivation rec { - name = "gmic_krita_qt-${version}"; + pname = "gmic_krita_qt"; + inherit version; gmic-community = fetchFromGitHub { owner = "dtschump"; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index db21df9b5d0d..6cdd6dd71c1d 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -25,7 +25,8 @@ let in stdenv.mkDerivation rec { - name = "graphviz-${version}"; + pname = "graphviz"; + inherit version; src = fetchFromGitLab { owner = "graphviz"; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 666cdae131e2..832a48baab72 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -4,7 +4,8 @@ let version = "0.20"; in stdenv.mkDerivation { - name = "mscgen-${version}"; + pname = "mscgen"; + inherit version; src = fetchurl { url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index c91c18e3f0b6..b65962ee7ba2 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -6,7 +6,8 @@ let version = "6.14.12"; in stdenv.mkDerivation { - name = "pgf-${version}"; + pname = "pgf"; + inherit version; src = fetchurl { url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz"; diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 3769860d469b..42a86187a72d 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -4,7 +4,8 @@ let version = "2018-04-19"; in stdenv.mkDerivation rec { - name = "twilight-${version}"; + pname = "twilight"; + inherit version; src = fetchFromGitHub { owner = "tweakoz"; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 2dac9bd60c93..55cfa09aa24f 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -22,7 +22,8 @@ let in buildGoPackage { - name = "aptly-${version}"; + pname = "aptly"; + inherit version; src = aptlySrc; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 423fc9d85350..3c0d42e832e7 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -9,7 +9,8 @@ let version = "1.8.1"; in stdenv.mkDerivation { - name = "autorandr-${version}"; + pname = "autorandr"; + inherit version; buildInputs = [ python ]; diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index 90fc68dcc5cc..b86bc38cb267 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -3,10 +3,11 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "buildtorrent-${version}"; + pname = "buildtorrent"; + inherit version; src = fetchurl { - url = "https://mathr.co.uk/blog/code/${name}.tar.gz"; + url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz"; sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; }; diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix index 135eda554b36..31c35af81186 100644 --- a/pkgs/tools/misc/clasp/default.nix +++ b/pkgs/tools/misc/clasp/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "clasp-${version}"; + pname = "clasp"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 8453aa677477..0d5efb2ca22b 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -5,7 +5,8 @@ let version = "0.4.4"; in stdenv.mkDerivation rec { - name = "ddccontrol-${version}"; + pname = "ddccontrol"; + inherit version; src = fetchFromGitHub { owner = "ddccontrol"; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 5eb4055d5b96..bcd3ec6d8f7f 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -2,7 +2,8 @@ let version = "2018-12-06"; in stdenv.mkDerivation rec { - name = "edid-decode-unstable-${version}"; + pname = "edid-decode-unstable"; + inherit version; src = fetchgit { url = "git://linuxtv.org/edid-decode.git"; diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 45d27e7b7c82..871f113a41dd 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -13,7 +13,8 @@ let srcs = { version = "2.6.2"; in stdenv.mkDerivation { - name = "fortune-mod-${version}"; + pname = "fortune-mod"; + inherit version; src = srcs.fortune; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index b79388c6f29d..e5c0997c8e3e 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -7,7 +7,8 @@ let in buildGoPackage ({ - name = "gh-ost-${version}"; + pname = "gh-ost"; + inherit version; inherit goPackagePath; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 6c5bac11e738..51c6d9c20758 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation rec { - name = "gringo-${version}"; + pname = "gringo"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index ec1c5897ed79..a176ef13fccb 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -40,11 +40,12 @@ assert zfsSupport -> zfs != null; assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { - name = "grub-${version}"; + pname = "grub"; + inherit version; src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0"; }; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index ca4e477adce7..7b432df3e8b8 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -29,7 +29,8 @@ let in stdenv.mkDerivation rec { - name = "trustedGRUB2-${version}"; + pname = "trustedGRUB2"; + inherit version; src = if for_HP_laptop then fetchgit { diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index 8b19cd038951..af4d4228c2c6 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -2,7 +2,8 @@ let version = "0.0.5"; in stdenv.mkDerivation { - name = "hdaps-gl-${version}"; + pname = "hdaps-gl"; + inherit version; src = fetchzip { url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz"; sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4"; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index e48d6354eb53..6624eb5102d3 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -12,7 +12,8 @@ in with stdenv.lib; with perlPackages; stdenv.mkDerivation { - name = "lbdb-${version}"; + pname = "lbdb"; + inherit version; src = fetchurl { url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 8a3842322f98..b365086c46d3 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -4,7 +4,8 @@ let version = "0.7.1"; in stdenv.mkDerivation { - name = "mdbtools-${version}"; + pname = "mdbtools"; + inherit version; src = fetchFromGitHub { owner = "brianb"; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 16762d243dbb..25d7eaba55ed 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -52,7 +52,8 @@ let throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "mongodb-compass-${version}"; + pname = "mongodb-compass"; + inherit version; inherit src; diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index 6c757ca224a9..a22799b2073b 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -6,7 +6,8 @@ let version = "0.0.3"; in stdenv.mkDerivation { - name = "shallot-${version}"; + pname = "shallot"; + inherit version; src = fetchFromGitHub { owner = "katmagic"; diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 3ab404d02077..0a3bb19d14b9 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -83,7 +83,8 @@ let }; in stdenv.mkDerivation { - name = "ultrastar-manager-${version}"; + pname = "ultrastar-manager"; + inherit version; src = patchedSrc; postPatch = '' diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index aad5b35c79ff..62e2b31fa153 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -6,7 +6,8 @@ let version = "2011-12-26"; in stdenv.mkDerivation { - name = "xburst-tools-${version}"; + pname = "xburst-tools"; + inherit version; src = fetchgit { url = git://projects.qi-hardware.com/xburst-tools.git; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 993e9ad74692..12885982d26d 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -12,7 +12,8 @@ let exec ${jre}/bin/java -jar ${jar} "$@" ''; in stdenv.mkDerivation { - name = "burpsuite-${version}"; + pname = "burpsuite"; + inherit version; buildCommand = '' mkdir -p $out/bin echo "${launcher}" > $out/bin/burpsuite diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index a06b409ca49b..4637a39e6e90 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -4,10 +4,11 @@ let version = "0.6.1"; in stdenv.mkDerivation rec { - name = "bwm-ng-${version}"; + pname = "bwm-ng"; + inherit version; src = fetchurl { - url = "https://www.gropp.org/bwm-ng/${name}.tar.gz"; + url = "https://www.gropp.org/bwm-ng/${pname}-${version}.tar.gz"; sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; }; diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix index b8a7133e7bc7..974f8a1f346a 100644 --- a/pkgs/tools/networking/djbdns/default.nix +++ b/pkgs/tools/networking/djbdns/default.nix @@ -11,7 +11,8 @@ let in stdenv.mkDerivation { - name = "djbdns-${version}"; + pname = "djbdns"; + inherit version; src = fetchurl { url = "https://cr.yp.to/djbdns/djbdns-${version}.tar.gz"; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index d7ff19612eb1..b5d4d5e6dcbe 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -3,7 +3,8 @@ let version = "3.0.0"; in stdenv.mkDerivation rec { - name = "easyrsa-${version}"; + pname = "easyrsa"; + inherit version; src = fetchFromGitHub { owner = "OpenVPN"; diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index 6fdcfaa70db0..354288b3ce60 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -4,7 +4,8 @@ let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in stdenv.mkDerivation { - name = "gmrender-resurrect-${version}"; + pname = "gmrender-resurrect"; + inherit version; src = fetchFromGitHub { owner = "hzeller"; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index db63b16415b2..8261ba6e2842 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -2,7 +2,8 @@ let version = "2.3"; apk = stdenv.mkDerivation { - name = "gnirehtet.apk-${version}"; + pname = "gnirehtet.apk"; + inherit version; src = fetchzip { url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz"; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 56a101b31573..49cc5710e599 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -3,7 +3,8 @@ let version = "1.2.1"; in stdenv.mkDerivation { - name = "minidlna-${version}"; + pname = "minidlna"; + inherit version; src = fetchurl { url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz"; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 84b31bd5d40c..dc0a4457dde4 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -3,10 +3,11 @@ let generic = { version, sha256 }: stdenv.mkDerivation rec { - name = "miniupnpc-${version}"; + pname = "miniupnpc"; + inherit version; src = fetchurl { - name = "${name}.tar.gz"; - url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; + url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix index fdfa446907c1..d95171807dfa 100644 --- a/pkgs/tools/networking/nettee/default.nix +++ b/pkgs/tools/networking/nettee/default.nix @@ -5,7 +5,8 @@ let sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r"; in stdenv.mkDerivation { - name = "nettee-${version}"; + pname = "nettee"; + inherit version; src = fetchurl { url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz"; diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 5ad3adfc9153..bfd2c035cdb1 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -5,7 +5,8 @@ let version = "1.6.17"; in stdenv.mkDerivation { - name = "nfdump-${version}"; + pname = "nfdump"; + inherit version; src = fetchFromGitHub { owner = "phaag"; diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index e585af81991e..320e7614c7c3 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -4,10 +4,11 @@ let version = "2.2"; in stdenv.mkDerivation rec { - name = "phodav-${version}"; + pname = "phodav"; + inherit version; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${name}.tar.xz"; + url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; sha256 = "1hap0lncbcmivnflh0fbx7y58ry78p9wgj7z03r64ic0kvf0a0q8"; }; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index ac64e135c2fe..b2016fe9452c 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -3,10 +3,11 @@ let version = "1.5c"; in stdenv.mkDerivation rec { - name = "zssh-${version}"; + pname = "zssh"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/zssh/${name}.tgz"; + url = "mirror://sourceforge/zssh/${pname}-${version}.tgz"; sha256 = "06z73iq59lz8ibjrgs7d3xl39vh9yld1988yx8khssch4pw41s52"; }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index aa212d655f89..a5e0e7f2e793 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -124,7 +124,8 @@ common = inherit fromGit; perl-bindings = if includesPerl then nix else stdenv.mkDerivation { - name = "nix-perl-${version}"; + pname = "nix-perl"; + inherit version; inherit src; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 296080cbd8e7..324ac46b0841 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -3,7 +3,8 @@ let version = "0.10.4"; in pythonPackages.buildPythonApplication { - name = "fail2ban-${version}"; + pname = "fail2ban"; + inherit version; src = fetchFromGitHub { owner = "fail2ban"; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index 2b1708c9243c..c4b96f04dc27 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -3,7 +3,8 @@ let version = "0.3.0"; in stdenv.mkDerivation rec { - name = "haka-${version}"; + pname = "haka"; + inherit version; src = fetchurl { name = "haka_${version}_source.tar.gz"; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 1944cf236e1e..1812b2645fec 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -4,10 +4,11 @@ let version = "1.3.9.1"; in stdenv.mkDerivation rec { - name = "tpm-tools-${version}"; + pname = "tpm-tools"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/trousers/tpm-tools/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/trousers/tpm-tools/${version}/${pname}-${version}.tar.gz"; sha256 = "0s7srgghykxnlb1g4izabzf2gfb1knxc0nzn6bly49h8cpi19dww"; }; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index b58e41d850d8..d33cdeb1c56f 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -29,7 +29,8 @@ let }; in stdenv.mkDerivation { - name = "vault-bin-${version}"; + pname = "vault-bin"; + inherit version; src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix index ad7715f0fe69..83c0a287533a 100644 --- a/pkgs/tools/system/ior/default.nix +++ b/pkgs/tools/system/ior/default.nix @@ -6,7 +6,8 @@ let in stdenv.mkDerivation rec { - name = "ior-${version}"; + pname = "ior"; + inherit version; src = fetchurl { url = "https://github.com/LLNL/ior/archive/${version}.tar.gz"; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 05d96afded14..2da76cce0cdd 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -13,10 +13,11 @@ let }; in stdenv.mkDerivation rec { - name = "smartmontools-${version}"; + pname = "smartmontools"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; + url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; sha256 = "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5"; }; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index a69a527f68fd..0163d5502173 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -24,7 +24,8 @@ let ""; # use linux flags by default in stdenv.mkDerivation { - name = "tree-${version}"; + pname = "tree"; + inherit version; src = fetchurl { url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz"; diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix index 9f6b7a7f1227..3b80af365f65 100644 --- a/pkgs/tools/text/cconv/default.nix +++ b/pkgs/tools/text/cconv/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, autoreconfHook }: let version = "0.6.3"; in stdenv.mkDerivation { - name = "cconv-${version}"; + pname = "cconv"; + inherit version; src = fetchurl { url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz"; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 702d1b4d89fa..87c8fdfd8903 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -3,7 +3,8 @@ let version = "3.3"; in stdenv.mkDerivation { - name = "gnugrep-${version}"; + pname = "gnugrep"; + inherit version; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index fc43ed0abe27..2c0e2f29d24f 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -23,7 +23,8 @@ let }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); in stdenv.mkDerivation rec { - name = "kindlegen-${version}"; + pname = "kindlegen"; + inherit version; src = fetchurl { inherit url; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 5aab4c80d275..7c2543f72196 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -91,7 +91,8 @@ texliveYear = year; core = stdenv.mkDerivation rec { - name = "texlive-bin-${version}"; + pname = "texlive-bin"; + inherit version; inherit (common) src patches postPatch preAutoreconf postAutoreconf; @@ -183,7 +184,8 @@ core = stdenv.mkDerivation rec { inherit (core-big) metafont metapost luatex xetex; core-big = stdenv.mkDerivation { #TODO: upmendex - name = "texlive-core-big.bin-${version}"; + pname = "texlive-core-big.bin"; + inherit version; inherit (common) src patches postPatch preAutoreconf postAutoreconf; @@ -246,7 +248,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex dvisvgm = stdenv.mkDerivation { - name = "texlive-dvisvgm.bin-${version}"; + pname = "texlive-dvisvgm.bin"; + inherit version; inherit (common) src; @@ -263,7 +266,8 @@ dvisvgm = stdenv.mkDerivation { dvipng = stdenv.mkDerivation { - name = "texlive-dvipng.bin-${version}"; + pname = "texlive-dvipng.bin"; + inherit version; inherit (common) src; @@ -315,7 +319,8 @@ latexindent = perlPackages.buildPerlPackage rec { inherit biber; bibtexu = bibtex8; bibtex8 = stdenv.mkDerivation { - name = "texlive-bibtex-x.bin-${version}"; + pname = "texlive-bibtex-x.bin"; + inherit version; inherit (common) src; @@ -332,7 +337,8 @@ bibtex8 = stdenv.mkDerivation { xdvi = stdenv.mkDerivation { - name = "texlive-xdvi.bin-${version}"; + pname = "texlive-xdvi.bin"; + inherit version; inherit (common) src; @@ -360,7 +366,8 @@ xdvi = stdenv.mkDerivation { { xindy = stdenv.mkDerivation { - name = "texlive-xindy.bin-${version}"; + pname = "texlive-xindy.bin"; + inherit version; inherit (common) src; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 178720436a6f..76813f4f246c 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -3,7 +3,8 @@ let version = "0.7.9"; in pythonPackages.buildPythonApplication rec { - name = "cloud-init-${version}"; + pname = "cloud-init"; + inherit version; namePrefix = ""; src = fetchurl {