From e19569f6a7cf4a15792190c525bd3ebe56a2ac68 Mon Sep 17 00:00:00 2001 From: davidak Date: Fri, 22 Jan 2021 07:30:34 +0100 Subject: [PATCH] treewide: move "unstable" from version to pname according to the current rules https://nixos.org/manual/nixpkgs/stable/#sec-package-naming Also - fixed some version formatting - changed `name` to `pname` - fixed some style issues - in some cases it was needed to replace `${pname}` with the actual string, so it does not contain "unstable" - in tmux-plugins, the `pluginName` was changed - in one case (ppx_tools) the "unstable" part was lost --- pkgs/applications/audio/ams/default.nix | 4 +- pkgs/applications/audio/artyFX/default.nix | 4 +- .../audio/cheesecutter/default.nix | 4 +- .../audio/csound/csound-manual/default.nix | 4 +- .../audio/deadbeef/plugins/lyricbar.nix | 4 +- pkgs/applications/audio/dsf2flac/default.nix | 6 +- .../audio/ensemble-chorus/default.nix | 4 +- pkgs/applications/audio/faust/faust2.nix | 4 +- pkgs/applications/audio/faust/faustlive.nix | 4 +- pkgs/applications/audio/freqtweak/default.nix | 4 +- pkgs/applications/audio/friture/default.nix | 4 +- pkgs/applications/audio/fverb/default.nix | 4 +- .../audio/hivelytracker/default.nix | 4 +- pkgs/applications/audio/iannix/default.nix | 4 +- pkgs/applications/audio/ingen/default.nix | 5 +- .../audio/littlegptracker/default.nix | 4 +- .../applications/audio/molot-lite/default.nix | 4 +- pkgs/applications/audio/mooSpace/default.nix | 14 +-- pkgs/applications/audio/musly/default.nix | 8 +- .../audio/pulseaudio-dlna/default.nix | 4 +- .../real_time_config_quick_scan/default.nix | 18 +-- pkgs/applications/audio/rhvoice/default.nix | 4 +- pkgs/applications/audio/sc68/default.nix | 4 +- .../audio/speech-denoiser/default.nix | 8 +- pkgs/applications/audio/spek/default.nix | 4 +- .../audio/string-machine/default.nix | 4 +- .../audio/tamgamp.lv2/default.nix | 4 +- pkgs/applications/audio/tuijam/default.nix | 4 +- pkgs/applications/audio/tunefish/default.nix | 4 +- .../applications/audio/uhhyou.lv2/default.nix | 4 +- pkgs/applications/audio/yoshimi/default.nix | 4 +- .../editors/kakoune/plugins/case.kak.nix | 5 +- .../editors/kakoune/plugins/openscad.kak.nix | 4 +- pkgs/applications/editors/tecoc/default.nix | 8 +- pkgs/applications/editors/viw/default.nix | 6 +- pkgs/applications/graphics/c3d/default.nix | 4 +- .../graphics/gimp/plugins/default.nix | 4 +- .../applications/graphics/mcomix3/default.nix | 14 +-- pkgs/applications/graphics/meme/default.nix | 4 +- .../graphics/pick-colour-picker/default.nix | 4 +- .../applications/graphics/xrgears/default.nix | 4 +- pkgs/applications/misc/antfs-cli/default.nix | 4 +- .../misc/autospotting/default.nix | 5 +- pkgs/applications/misc/bicon/default.nix | 4 +- pkgs/applications/misc/cataract/build.nix | 5 +- pkgs/applications/misc/cataract/default.nix | 2 +- pkgs/applications/misc/cataract/unstable.nix | 4 +- .../misc/elf-dissector/default.nix | 4 +- pkgs/applications/misc/haxor-news/default.nix | 4 +- pkgs/applications/misc/kjv/default.nix | 4 +- pkgs/applications/misc/lifelines/default.nix | 4 +- .../applications/misc/mps-youtube/default.nix | 4 +- pkgs/applications/misc/ola/default.nix | 4 +- .../misc/pass-secret-service/default.nix | 4 +- pkgs/applications/misc/pbpst/default.nix | 4 +- pkgs/applications/misc/perkeep/default.nix | 4 +- .../misc/qt-box-editor/default.nix | 4 +- pkgs/applications/misc/rootbar/default.nix | 4 +- pkgs/applications/misc/slstatus/default.nix | 4 +- pkgs/applications/misc/ssocr/default.nix | 4 +- pkgs/applications/misc/tdrop/default.nix | 4 +- pkgs/applications/misc/tipp10/default.nix | 4 +- pkgs/applications/misc/wego/default.nix | 4 +- .../networking/browsers/surf/default.nix | 4 +- .../networking/flent/http-getter.nix | 4 +- .../instant-messengers/go-neb/default.nix | 4 +- .../instant-messengers/jackline/default.nix | 4 +- .../instant-messengers/matrix-dl/default.nix | 4 +- .../pidgin-plugins/purple-discord/default.nix | 4 +- .../networking/ipfs-cluster/default.nix | 4 +- .../mailreaders/trojita/default.nix | 4 +- .../networking/ngadmin/default.nix | 4 +- .../networking/ps2client/default.nix | 4 +- .../networking/remote/x2goclient/default.nix | 4 +- pkgs/applications/office/gtg/default.nix | 4 +- pkgs/applications/office/planner/default.nix | 4 +- .../science/biology/EZminc/default.nix | 6 +- .../science/biology/N3/default.nix | 4 +- .../science/biology/conglomerate/default.nix | 4 +- .../science/biology/minc-tools/default.nix | 4 +- .../science/biology/mni_autoreg/default.nix | 4 +- .../science/biology/poretools/default.nix | 4 +- .../science/electronics/appcsxcad/default.nix | 4 +- .../science/electronics/csxcad/default.nix | 4 +- .../science/electronics/fparser/default.nix | 4 +- .../science/electronics/fped/default.nix | 4 +- .../science/electronics/openems/default.nix | 4 +- .../science/electronics/vhd2vl/default.nix | 4 +- .../science/logic/beluga/default.nix | 4 +- .../machine-learning/starspace/default.nix | 4 +- .../terminal-emulators/tilix/default.nix | 4 +- .../terminal-emulators/wayst/default.nix | 4 +- .../terminal-emulators/wezterm/default.nix | 4 +- .../git-and-tools/git-remote-hg/default.nix | 4 +- .../git-and-tools/git-reparent/default.nix | 4 +- .../git-and-tools/git-vanity-hash/default.nix | 4 +- .../video/mjpg-streamer/default.nix | 4 +- .../video/mpv/scripts/sponsorblock.nix | 4 +- .../window-managers/i3/layout-manager.nix | 4 +- .../window-managers/i3/pystatus.nix | 6 +- .../window-managers/kbdd/default.nix | 4 +- .../window-managers/wio/default.nix | 4 +- .../xmonad/log-applet/default.nix | 5 +- .../window-managers/yabar/build.nix | 4 +- .../window-managers/yabar/default.nix | 1 + .../window-managers/yabar/unstable.nix | 3 +- pkgs/data/fonts/gelasio/default.nix | 6 +- pkgs/data/fonts/ir-standard-fonts/default.nix | 9 +- pkgs/data/fonts/lalezar-fonts/default.nix | 7 +- pkgs/data/fonts/xkcd-font/default.nix | 9 +- .../data/icons/bibata-cursors/translucent.nix | 4 +- pkgs/data/icons/iso-flags/default.nix | 4 +- .../gnome-2/platform/gtkglext/default.nix | 4 +- .../extensions/EasyScreenCast/default.nix | 4 +- .../extensions/drop-down-terminal/default.nix | 4 +- .../gnome-3/extensions/impatience/default.nix | 4 +- .../extensions/noannoyance/default.nix | 4 +- .../extensions/system-monitor/default.nix | 4 +- .../gnome-3/extensions/tilingnome/default.nix | 2 +- .../gnome-3/extensions/timepp/default.nix | 4 +- .../window-corner-preview/default.nix | 4 +- .../pantheon/apps/elementary-dock/default.nix | 4 +- .../elementary-redacted-script/default.nix | 4 +- .../bluetooth/default.nix | 6 +- .../wingpanel-indicators/session/default.nix | 6 +- .../elementary-notifications/default.nix | 4 +- pkgs/desktops/surf-display/default.nix | 4 +- pkgs/development/compilers/acme/default.nix | 4 +- .../compilers/bluespec/default.nix | 4 +- pkgs/development/compilers/gambit/build.nix | 6 +- pkgs/development/compilers/gambit/default.nix | 1 + .../development/compilers/gambit/unstable.nix | 3 +- pkgs/development/compilers/gerbil/build.nix | 4 +- pkgs/development/compilers/gerbil/default.nix | 1 + .../compilers/gerbil/gerbil-crypto.nix | 4 +- .../compilers/gerbil/gerbil-ethereum.nix | 4 +- .../compilers/gerbil/gerbil-libp2p.nix | 4 +- .../compilers/gerbil/gerbil-persist.nix | 4 +- .../compilers/gerbil/gerbil-poo.nix | 4 +- .../compilers/gerbil/gerbil-utils.nix | 4 +- .../compilers/gerbil/smug-gerbil.nix | 4 +- .../development/compilers/gerbil/unstable.nix | 3 +- pkgs/development/compilers/ghdl/default.nix | 4 +- .../development/compilers/lobster/default.nix | 4 +- .../compilers/openspin/default.nix | 4 +- pkgs/development/compilers/qbe/default.nix | 4 +- .../compilers/spasm-ng/default.nix | 4 +- .../interpreters/icon-lang/default.nix | 4 +- pkgs/development/libraries/adslib/default.nix | 4 +- pkgs/development/libraries/alure2/default.nix | 4 +- .../libraries/audio/raul/default.nix | 5 +- .../development/libraries/beignet/default.nix | 6 +- .../development/libraries/boxfort/default.nix | 4 +- pkgs/development/libraries/coin3d/default.nix | 4 +- pkgs/development/libraries/dee/default.nix | 4 +- pkgs/development/libraries/ganv/default.nix | 6 +- .../development/libraries/gdk-pixbuf/xlib.nix | 4 +- pkgs/development/libraries/gsmlib/default.nix | 4 +- pkgs/development/libraries/herqq/default.nix | 4 +- .../libraries/libelfin/default.nix | 4 +- .../development/libraries/liberio/default.nix | 4 +- .../libraries/libevdevplus/default.nix | 4 +- .../libraries/libgumath/default.nix | 4 +- .../development/libraries/libminc/default.nix | 4 +- .../libraries/libndtypes/default.nix | 4 +- .../libraries/libnest2d/default.nix | 4 +- .../libraries/libraspberrypi/default.nix | 4 +- .../libraries/libtgvoip/default.nix | 4 +- .../development/libraries/libubox/default.nix | 4 +- .../libraries/libunity/default.nix | 4 +- pkgs/development/libraries/libuvc/default.nix | 4 +- pkgs/development/libraries/libxnd/default.nix | 4 +- .../libraries/libykclient/default.nix | 4 +- pkgs/development/libraries/libzra/default.nix | 4 +- .../libraries/mediastreamer/msopenh264.nix | 4 +- .../libraries/multipart-parser-c/default.nix | 4 +- pkgs/development/libraries/mumlib/default.nix | 4 +- pkgs/development/libraries/mutest/default.nix | 4 +- .../nvidia-texture-tools/default.nix | 4 +- .../libraries/opencl-clang/default.nix | 4 +- .../libraries/rapidcheck/default.nix | 4 +- .../science/biology/bicgl/default.nix | 6 +- .../science/biology/bicpl/default.nix | 6 +- .../science/biology/gifticlib/default.nix | 4 +- .../science/biology/oobicpl/default.nix | 6 +- .../science/electronics/qcsxcad/default.nix | 4 +- pkgs/development/libraries/smpeg2/default.nix | 4 +- pkgs/development/libraries/soqt/default.nix | 4 +- pkgs/development/libraries/soxt/default.nix | 4 +- .../libraries/sycl-info/default.nix | 4 +- pkgs/development/libraries/ticpp/default.nix | 4 +- pkgs/development/libraries/ubus/default.nix | 4 +- pkgs/development/libraries/uci/default.nix | 4 +- .../libraries/yubico-pam/default.nix | 4 +- pkgs/development/lua-modules/overrides.nix | 3 +- pkgs/development/misc/rappel/default.nix | 4 +- pkgs/development/misc/rpiboot/unstable.nix | 4 +- .../development/ocaml-modules/npy/default.nix | 6 +- .../ocaml-modules/phylogenetics/default.nix | 4 +- .../ocaml-modules/ppx_tools/default.nix | 2 +- .../default.nix | 4 +- .../python-modules/glasgow/default.nix | 4 +- .../python-modules/gpyopt/default.nix | 4 +- .../python-modules/gtimelog/default.nix | 4 +- .../python-modules/kinparse/default.nix | 4 +- .../python-modules/nbmerge/default.nix | 4 +- .../python-modules/nix-kernel/default.nix | 4 +- .../python-modules/nmigen-boards/default.nix | 4 +- .../python-modules/nmigen-soc/default.nix | 4 +- .../python-modules/nmigen/default.nix | 4 +- .../python-modules/nxt-python/default.nix | 5 +- .../python-modules/oauthlib/default.nix | 4 +- .../python-modules/ptable/default.nix | 4 +- .../python-modules/py3buddy/default.nix | 4 +- .../python-modules/pybluez/default.nix | 4 +- .../python-modules/pyfantom/default.nix | 4 +- .../python-modules/pymaging/default.nix | 4 +- .../python-modules/pymaging_png/default.nix | 4 +- .../python-modules/pyspinel/default.nix | 4 +- .../pytest-ordering/default.nix | 4 +- .../python-modules/python-csxcad/default.nix | 4 +- .../python-modules/python-mapnik/default.nix | 4 +- .../python-modules/python-openems/default.nix | 4 +- .../python-modules/python-unshare/default.nix | 4 +- .../python-modules/pytricia/default.nix | 4 +- .../python-modules/scikit-fuzzy/default.nix | 4 +- .../python-modules/skidl/default.nix | 4 +- .../python-modules/slob/default.nix | 4 +- .../python-modules/tess/default.nix | 4 +- .../python-modules/traittypes/default.nix | 4 +- .../python-modules/transforms3d/default.nix | 4 +- .../tools/analysis/panopticon/default.nix | 14 +-- .../tools/analysis/pev/default.nix | 4 +- .../tools/analysis/rr/unstable.nix | 3 +- pkgs/development/tools/dep2nix/default.nix | 4 +- pkgs/development/tools/easyjson/default.nix | 4 +- .../tools/fusee-launcher/default.nix | 4 +- pkgs/development/tools/glpaper/default.nix | 4 +- .../tools/gnome-desktop-testing/default.nix | 4 +- pkgs/development/tools/go-bindata/default.nix | 4 +- pkgs/development/tools/go-outline/default.nix | 4 +- .../tools/gojsontoyaml/default.nix | 4 +- pkgs/development/tools/hobbes/default.nix | 4 +- .../literate-programming/Literate/default.nix | 4 +- .../tools/misc/blackmagic/default.nix | 4 +- .../tools/misc/cc-tool/default.nix | 4 +- .../tools/misc/itm-tools/default.nix | 4 +- .../tools/misc/mdctags/default.nix | 4 +- .../tools/misc/universal-ctags/default.nix | 4 +- pkgs/development/tools/mmixware/default.nix | 4 +- .../tools/ofono-phonesim/default.nix | 4 +- pkgs/development/tools/rdocker/default.nix | 4 +- .../development/tools/rust/racerd/default.nix | 4 +- pkgs/development/tools/vgo2nix/default.nix | 4 +- .../tools/wxformbuilder/default.nix | 4 +- pkgs/development/tools/yaml2json/default.nix | 4 +- pkgs/games/assaultcube/default.nix | 10 +- pkgs/games/frogatto/data.nix | 4 +- pkgs/games/frogatto/default.nix | 5 +- pkgs/games/frogatto/engine.nix | 4 +- pkgs/games/gnome-hexgl/default.nix | 4 +- pkgs/games/gscrabble/default.nix | 4 +- pkgs/games/gweled/default.nix | 4 +- pkgs/games/pingus/default.nix | 4 +- pkgs/games/qgo/default.nix | 4 +- pkgs/games/sm64ex/default.nix | 4 +- pkgs/games/soldat-unstable/default.nix | 4 +- pkgs/games/warmux/default.nix | 4 +- pkgs/misc/cups/drivers/carps-cups/default.nix | 4 +- pkgs/misc/drivers/utsushi/default.nix | 4 +- pkgs/misc/emulators/duckstation/default.nix | 4 +- pkgs/misc/emulators/emu2/default.nix | 4 +- .../emulators/oberon-risc-emu/default.nix | 4 +- pkgs/misc/emulators/pcsx2/default.nix | 4 +- pkgs/misc/emulators/simplenes/default.nix | 4 +- pkgs/misc/lguf-brightness/default.nix | 4 +- pkgs/misc/rkdeveloptool/default.nix | 4 +- pkgs/misc/tmux-plugins/default.nix | 112 +++++++++--------- pkgs/misc/uq/default.nix | 4 +- .../darwin/osx-cpu-temp/default.nix | 4 +- pkgs/os-specific/linux/anbox/default.nix | 4 +- .../linux/asus-wmi-sensors/default.nix | 4 +- pkgs/os-specific/linux/catfs/default.nix | 4 +- pkgs/os-specific/linux/digimend/default.nix | 4 +- pkgs/os-specific/linux/facetimehd/default.nix | 6 +- pkgs/os-specific/linux/kmscon/default.nix | 4 +- .../linux/ledger-udev-rules/default.nix | 4 +- .../linux/numworks-udev-rules/default.nix | 4 +- pkgs/os-specific/linux/pcimem/default.nix | 4 +- pkgs/os-specific/linux/rtl8821cu/default.nix | 4 +- pkgs/os-specific/linux/rtl88x2bu/default.nix | 4 +- pkgs/os-specific/linux/syslinux/default.nix | 4 +- .../linux/trezor-udev-rules/default.nix | 4 +- .../linux/zsa-udev-rules/default.nix | 4 +- pkgs/servers/demoit/default.nix | 4 +- pkgs/servers/dns/https-dns-proxy/default.nix | 6 +- pkgs/servers/echoip/default.nix | 4 +- pkgs/servers/gemini/molly-brown/default.nix | 4 +- .../http/apache-modules/mod_tile/default.nix | 4 +- pkgs/servers/irc/solanum/default.nix | 4 +- pkgs/servers/isso/default.nix | 4 +- .../monitoring/prometheus/lnd-exporter.nix | 4 +- .../prometheus/varnish-exporter.nix | 4 +- pkgs/servers/mumsi/default.nix | 4 +- pkgs/servers/pim6sd/default.nix | 4 +- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 4 +- pkgs/servers/u9fs/default.nix | 4 +- pkgs/servers/webmetro/default.nix | 4 +- pkgs/shells/ion/default.nix | 4 +- pkgs/tools/X11/xcape/default.nix | 4 +- pkgs/tools/X11/xdg-utils/default.nix | 6 +- pkgs/tools/audio/beets/default.nix | 4 +- pkgs/tools/audio/tts/default.nix | 4 +- pkgs/tools/backup/diskrsync/default.nix | 4 +- pkgs/tools/backup/easysnap/default.nix | 4 +- pkgs/tools/backup/iceshelf/default.nix | 8 +- pkgs/tools/backup/zfsbackup/default.nix | 4 +- pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix | 4 +- pkgs/tools/compression/flips/default.nix | 4 +- pkgs/tools/filesystems/ubidump/default.nix | 4 +- pkgs/tools/graphics/amber/default.nix | 4 +- pkgs/tools/graphics/exifprobe/default.nix | 4 +- .../tools/graphics/jpegexiforient/default.nix | 4 +- pkgs/tools/graphics/piglit/default.nix | 4 +- pkgs/tools/graphics/yaxg/default.nix | 4 +- pkgs/tools/inputmethods/hime/default.nix | 4 +- pkgs/tools/misc/bcunit/default.nix | 4 +- pkgs/tools/misc/bonfire/default.nix | 4 +- pkgs/tools/misc/cht.sh/default.nix | 4 +- pkgs/tools/misc/cod/default.nix | 4 +- pkgs/tools/misc/codebraid/default.nix | 4 +- pkgs/tools/misc/dpt-rp1-py/default.nix | 4 +- pkgs/tools/misc/edid-generator/default.nix | 4 +- pkgs/tools/misc/fffuu/default.nix | 4 +- pkgs/tools/misc/g933-utils/default.nix | 4 +- pkgs/tools/misc/loop/default.nix | 4 +- pkgs/tools/misc/ltunify/default.nix | 4 +- pkgs/tools/misc/sta/default.nix | 4 +- pkgs/tools/misc/urn-timer/default.nix | 4 +- pkgs/tools/misc/venus/default.nix | 4 +- pkgs/tools/misc/vimv/default.nix | 4 +- pkgs/tools/misc/xilinx-bootgen/default.nix | 4 +- pkgs/tools/misc/zabbixctl/default.nix | 4 +- pkgs/tools/misc/zalgo/default.nix | 4 +- pkgs/tools/networking/iodine/default.nix | 4 +- pkgs/tools/networking/linkchecker/default.nix | 4 +- pkgs/tools/networking/mmsd/default.nix | 4 +- pkgs/tools/networking/netifd/default.nix | 4 +- .../network-manager/iodine/default.nix | 6 +- .../network-manager/sstp/default.nix | 6 +- .../networking/openconnect_pa/default.nix | 4 +- pkgs/tools/networking/p2p/amule/default.nix | 4 +- pkgs/tools/networking/packetdrill/default.nix | 4 +- .../networking/py-wmi-client/default.nix | 4 +- pkgs/tools/networking/rdrview/default.nix | 4 +- pkgs/tools/networking/uqmi/default.nix | 4 +- pkgs/tools/networking/wstunnel/default.nix | 4 +- pkgs/tools/security/b2sum/default.nix | 4 +- .../security/bash-supergenpass/default.nix | 4 +- pkgs/tools/security/crowbar/default.nix | 4 +- pkgs/tools/security/doona/default.nix | 4 +- pkgs/tools/security/hash_extender/default.nix | 4 +- pkgs/tools/security/onesixtyone/default.nix | 4 +- pkgs/tools/system/yeshup/default.nix | 4 +- pkgs/tools/text/gawk/gawkextlib.nix | 4 +- pkgs/tools/text/rosie/default.nix | 4 +- pkgs/tools/typesetting/docbookrx/default.nix | 4 +- .../typesetting/tex/latexrun/default.nix | 4 +- .../tools/typesetting/tex/pplatex/default.nix | 4 +- pkgs/top-level/emscripten-packages.nix | 8 +- 370 files changed, 854 insertions(+), 843 deletions(-) diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index 188584b8e7328..c7cd97454cde3 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -12,8 +12,8 @@ }: stdenv.mkDerivation rec { - name = "ams"; - version = "unstable-2019-04-27"; + pname = "ams-unstable"; + version = "2019-04-27"; src = fetchgit { url = "https://git.code.sf.net/p/alsamodular/ams.git"; diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 84914e3e798a5..eb07e63ace16a 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkg-config }: stdenv.mkDerivation rec { - pname = "artyFX"; + pname = "artyFX-unstable"; # Fix build with lv2 1.18: https://github.com/openAVproductions/openAV-ArtyFX/pull/41/commits/492587461b50d140455aa3c98d915eb8673bebf0 - version = "unstable-2020-04-28"; + version = "2020-04-28"; src = fetchFromGitHub { owner = "openAVproductions"; diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/applications/audio/cheesecutter/default.nix index 84f6b183033e1..3b07a910a5b42 100644 --- a/pkgs/applications/audio/cheesecutter/default.nix +++ b/pkgs/applications/audio/cheesecutter/default.nix @@ -7,8 +7,8 @@ , SDL }: stdenv.mkDerivation rec { - pname = "cheesecutter"; - version = "unstable-2020-04-03"; + pname = "cheesecutter-unstable"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "theyamo"; diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index ecd6685e21712..b4b1748e90ca3 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation { - pname = "csound-manual"; - version = "unstable-2019-02-22"; + pname = "csound-manual-unstable"; + version = "2019-02-22"; src = fetchFromGitHub { owner = "csound"; diff --git a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix index bc6d206956f09..ba9717ca62430 100644 --- a/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/lyricbar.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtkmm3, libxmlxx3 }: stdenv.mkDerivation { - pname = "deadbeef-lyricbar-plugin"; - version = "unstable-2019-01-29"; + pname = "deadbeef-lyricbar-plugin-unstable"; + version = "2019-01-29"; src = fetchFromGitHub { owner = "C0rn3j"; diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix index db07acf7c36c4..8e45399269c29 100644 --- a/pkgs/applications/audio/dsf2flac/default.nix +++ b/pkgs/applications/audio/dsf2flac/default.nix @@ -2,12 +2,12 @@ , taglib, zlib }: stdenv.mkDerivation rec { - pname = "dsf2flac"; - version = "unstable-2018-01-02"; + pname = "dsf2flac-unstable"; + version = "2018-01-02"; src = fetchFromGitHub { owner = "hank"; - repo = pname; + repo = "dsf2flac"; rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16"; sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc"; }; diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index 7858da25b7c5c..e10565de35bc6 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/pkgs/applications/audio/ensemble-chorus/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }: stdenv.mkDerivation rec { - pname = "ensemble-chorus"; - version = "unstable-15-02-2019"; + pname = "ensemble-chorus-unstable"; + version = "15-02-2019"; src = fetchFromGitHub { owner = "jpcima"; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 990d073528e14..c7cb9ca59d0a2 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,7 +20,7 @@ with lib.strings; let - version = "unstable-2020-08-27"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "grame-cncm"; @@ -40,7 +40,7 @@ let faust = stdenv.mkDerivation { - pname = "faust"; + pname = "faust-unstable"; inherit version; inherit src; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 20afb6fd7617d..372e4adc8d5fa 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -4,8 +4,8 @@ }: stdenv.mkDerivation rec { - pname = "faustlive"; - version = "unstable-dev-2020-08-03"; + pname = "faustlive-unstable"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix index 113894a9357d9..4e514c257d054 100644 --- a/pkgs/applications/audio/freqtweak/default.nix +++ b/pkgs/applications/audio/freqtweak/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, fftwFloat, libjack2, libsigcxx, libxml2, wxGTK }: stdenv.mkDerivation rec { - pname = "freqtweak"; - version = "unstable-2019-08-03"; + pname = "freqtweak-unstable"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "essej"; diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index e4bd79a08e318..4cac4b23e9967 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -3,8 +3,8 @@ let py = python3Packages; in py.buildPythonApplication rec { - pname = "friture"; - version = "unstable-2020-02-16"; + pname = "friture-unstable"; + version = "2020-02-16"; src = fetchFromGitHub { owner = "tlecomte"; diff --git a/pkgs/applications/audio/fverb/default.nix b/pkgs/applications/audio/fverb/default.nix index 2cd723b73bc9a..75a85b1096289 100644 --- a/pkgs/applications/audio/fverb/default.nix +++ b/pkgs/applications/audio/fverb/default.nix @@ -4,9 +4,9 @@ }: stdenv.mkDerivation rec { - pname = "fverb"; + pname = "fverb-unstable"; # no release yet: https://github.com/jpcima/fverb/issues/2 - version = "unstable-2020-06-09"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "jpcima"; diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix index 4cf20e3c89852..0f54ed66b4c21 100644 --- a/pkgs/applications/audio/hivelytracker/default.nix +++ b/pkgs/applications/audio/hivelytracker/default.nix @@ -11,8 +11,8 @@ }: stdenv.mkDerivation rec { - pname = "hivelytracker"; - version = "unstable-2020-08-19"; + pname = "hivelytracker-unstable"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "pete-gordon"; diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 304f67e85aafd..2fee0e027b580 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -2,8 +2,8 @@ }: mkDerivation rec { - pname = "iannix"; - version = "unstable-2020-12-09"; + pname = "iannix-unstable"; + version = "2020-12-09"; src = fetchFromGitHub { owner = "iannix"; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 55456b2fb6fd0..efa750d98fe12 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -5,9 +5,8 @@ }: stdenv.mkDerivation rec { - pname = "ingen"; - version = "unstable-2019-12-09"; - name = "${pname}-${version}"; + pname = "ingen-unstable"; + version = "2019-12-09"; src = fetchgit { url = "https://gitlab.com/drobilla/ingen.git"; diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 638f54da5150e..aeaf59e5e28d7 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -7,8 +7,8 @@ }: stdenv.mkDerivation rec { - pname = "littlegptracker"; - version = "unstable-2020-11-26"; + pname = "littlegptracker-unstable"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "Mdashdotdashn"; diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix index d30b6bcad2fb5..bea8f29e42f65 100644 --- a/pkgs/applications/audio/molot-lite/default.nix +++ b/pkgs/applications/audio/molot-lite/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, unzip, lv2 }: stdenv.mkDerivation { - pname = "molot-lite"; - version = "unstable-2014-04-23"; + pname = "molot-lite-unstable"; + version = "2014-04-23"; src = fetchurl { # fetchzip does not accept urls that do not end with .zip. diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/applications/audio/mooSpace/default.nix index b7d7502d25ab9..5ea2d10bebed0 100644 --- a/pkgs/applications/audio/mooSpace/default.nix +++ b/pkgs/applications/audio/mooSpace/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - pname = "mooSpace"; - version = "unstable-2020-06-10"; + pname = "mooSpace-unstable"; + version = "2020-06-10"; src = fetchFromGitHub { owner = "modularev"; @@ -12,18 +12,18 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jaqt faust2lv2 ]; - patchPhase = "mv ${pname}_faust.dsp ${pname}.dsp"; + patchPhase = "mv mooSpace_faust.dsp mooSpace.dsp"; buildPhase = '' - faust2jaqt -time -vec -t 0 ${pname}.dsp - faust2lv2 -time -vec -t 0 -gui ${pname}.dsp + faust2jaqt -time -vec -t 0 mooSpace.dsp + faust2lv2 -time -vec -t 0 -gui mooSpace.dsp ''; installPhase = '' mkdir -p $out/bin - cp ${pname} $out/bin/ + cp mooSpace $out/bin/ mkdir -p $out/lib/lv2 - cp -r ${pname}.lv2 $out/lib/lv2 + cp -r mooSpace.lv2 $out/lib/lv2 ''; meta = { diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 1e8d29d377073..8a15e514bac51 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -1,15 +1,19 @@ { lib, stdenv, fetchFromGitHub, cmake, eigen, libav }: stdenv.mkDerivation { - pname = "musly"; - version = "unstable-2017-04-26"; + pname = "musly-unstable"; + version = "2017-04-26"; + src = fetchFromGitHub { owner = "dominikschnitzer"; repo = "musly"; rev = "f911eacbbe0b39ebe87cb37d0caef09632fa40d6"; sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ]; + fixupPhase = if stdenv.isDarwin then '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index a19a03d4bd2aa..c14efab395a7b 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -18,8 +18,8 @@ let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; in pythonPackages.buildPythonApplication { - pname = "pulseaudio-dlna"; - version = "unstable-2017-11-01"; + pname = "pulseaudio-dlna-unstable"; + version = "2017-11-01"; src = fetchFromGitHub { owner = "masmu"; diff --git a/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/pkgs/applications/audio/real_time_config_quick_scan/default.nix index 3fb476b65cc4b..52f533e799e7c 100644 --- a/pkgs/applications/audio/real_time_config_quick_scan/default.nix +++ b/pkgs/applications/audio/real_time_config_quick_scan/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - pname = "realTimeConfigQuickScan"; - version = "unstable-2020-07-23"; + pname = "realTimeConfigQuickScan-unstable"; + version = "2020-07-23"; src = fetchFromGitHub { owner = "raboof"; @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/bin - mkdir -p $out/share/$pname - mkdir -p $out/share/doc/$pname + mkdir -p $out/share/realTimeConfigQuickScan + mkdir -p $out/share/doc/realTimeConfigQuickScan # Install Script Files: # *.pm files for i in *.pm; do - install -Dm 755 "$i" "$out/share/$pname/$i" + install -Dm 755 "$i" "$out/share/realTimeConfigQuickScan/$i" done # Install doc files: - install -D COPYING "$out/share/doc/$pname/COPYING" - install -D README.md "$out/share/doc/$pname/README.md" + install -D COPYING "$out/share/doc/realTimeConfigQuickScan/COPYING" + install -D README.md "$out/share/doc/realTimeConfigQuickScan/README.md" # Install Executable scripts: install -Dm 755 realTimeConfigQuickScan.pl "$out/bin/realTimeConfigQuickScan" install -Dm 755 QuickScan.pl "$out/bin/QuickScan" @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/realTimeConfigQuickScan \ - --set PERL5LIB "$out/share/$pname" + --set PERL5LIB "$out/share/realTimeConfigQuickScan" wrapProgram $out/bin/QuickScan \ - --set PERL5LIB "$out/share/$pname:${with perlPackages; makePerlPath [ Tk ]}" + --set PERL5LIB "$out/share/realTimeConfigQuickScan:${with perlPackages; makePerlPath [ Tk ]}" ''; meta = with lib; { diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index af35ad829dda3..fff5157f262ec 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -2,9 +2,9 @@ , python, glibmm, libpulseaudio, libao }: let - version = "unstable-2018-02-10"; + version = "2018-02-10"; in stdenv.mkDerivation { - pname = "rhvoice"; + pname = "rhvoice-unstable"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/applications/audio/sc68/default.nix index 2ea9b123c0865..ca819a748bf1d 100644 --- a/pkgs/applications/audio/sc68/default.nix +++ b/pkgs/applications/audio/sc68/default.nix @@ -12,8 +12,8 @@ }: stdenv.mkDerivation rec { - pname = "sc68"; - version = "unstable-2020-05-18"; + pname = "sc68-unstable"; + version = "2020-05-18"; src = fetchsvn { url = "svn://svn.code.sf.net/p/sc68/code/"; diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index c6536c4d20fb1..b616463116c3d 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -9,8 +9,8 @@ let }; rnnoise-nu = stdenv.mkDerivation { - pname = "rnnoise-nu"; - version = "unstable-07-10-2019"; + pname = "rnnoise-nu-unstable"; + version = "07-10-2019"; src = speech-denoiser-src; sourceRoot = "source/rnnoise"; nativeBuildInputs = [ autoreconfHook ]; @@ -19,8 +19,8 @@ let }; in stdenv.mkDerivation { - pname = "speech-denoiser"; - version = "unstable-07-10-2019"; + pname = "speech-denoiser-unstable"; + version = "07-10-2019"; src = speech-denoiser-src; diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 1a73b8adea72a..36a28c3253330 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - pname = "spek"; - version = "unstable-2018-12-29"; + pname = "spek-unstable"; + version = "2018-12-29"; src = fetchFromGitHub { owner = "alexkay"; diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/applications/audio/string-machine/default.nix index a146ea8cd977a..4ef4e6f6a3be3 100644 --- a/pkgs/applications/audio/string-machine/default.nix +++ b/pkgs/applications/audio/string-machine/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, boost, cairo, lv2, pkg-config }: stdenv.mkDerivation rec { - pname = "string-machine"; - version = "unstable-2020-01-20"; + pname = "string-machine-unstable"; + version = "2020-01-20"; src = fetchFromGitHub { owner = "jpcima"; diff --git a/pkgs/applications/audio/tamgamp.lv2/default.nix b/pkgs/applications/audio/tamgamp.lv2/default.nix index 2907a5277ee29..9d7f5564ed33e 100644 --- a/pkgs/applications/audio/tamgamp.lv2/default.nix +++ b/pkgs/applications/audio/tamgamp.lv2/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, lv2, zita-resampler }: stdenv.mkDerivation rec { - pname = "tamgamp.lv2"; - version = "unstable-2020-06-14"; + pname = "tamgamp.lv2-unstable"; + version = "2020-06-14"; src = fetchFromGitHub { owner = "sadko4u"; diff --git a/pkgs/applications/audio/tuijam/default.nix b/pkgs/applications/audio/tuijam/default.nix index 8a08b64508d78..f5c36f1588ff8 100644 --- a/pkgs/applications/audio/tuijam/default.nix +++ b/pkgs/applications/audio/tuijam/default.nix @@ -6,8 +6,8 @@ }: buildPythonApplication rec { - pname = "tuijam"; - version = "unstable-2020-06-05"; + pname = "tuijam-unstable"; + version = "2020-06-05"; src = fetchFromGitHub { owner = "cfangmeier"; diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix index 6dc1eb3396276..f437fa05208e0 100644 --- a/pkgs/applications/audio/tunefish/default.nix +++ b/pkgs/applications/audio/tunefish/default.nix @@ -3,8 +3,8 @@ }: stdenv.mkDerivation { - pname = "tunefish"; - version = "unstable-2020-08-13"; + pname = "tunefish-unstable"; + version = "2020-08-13"; src = fetchFromGitHub { owner = "jpcima"; diff --git a/pkgs/applications/audio/uhhyou.lv2/default.nix b/pkgs/applications/audio/uhhyou.lv2/default.nix index 9c748929d6252..0af20bfba5824 100644 --- a/pkgs/applications/audio/uhhyou.lv2/default.nix +++ b/pkgs/applications/audio/uhhyou.lv2/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { # this is what upstream calls the package, see: # https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2 - pname = "uhhyou.lv2"; - version = "unstable-2020-07-31"; + pname = "uhhyou.lv2-unstable"; + version = "2020-07-31"; src = fetchFromGitHub { owner = "ryukau"; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index e9e191112f9b8..957a44fd4656f 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -5,9 +5,9 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - pname = "yoshimi"; + pname = "yoshimi-unstable"; # Fix build with lv2 1.18: https://github.com/Yoshimi/yoshimi/pull/102/commits/86996cbb235f0fe138ae814a6758c2c8ba1c2a38 - version = "unstable-2020-05-10"; + version = "2020-05-10"; src = fetchFromGitHub { owner = "Yoshimi"; diff --git a/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/pkgs/applications/editors/kakoune/plugins/case.kak.nix index 3fa91113bbadc..14e3ca334321d 100644 --- a/pkgs/applications/editors/kakoune/plugins/case.kak.nix +++ b/pkgs/applications/editors/kakoune/plugins/case.kak.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitLab }: stdenv.mkDerivation { - name = "case.kak"; - version = "unstable-2020-04-06"; + pname = "case.kak-unstable"; + version = "2020-04-06"; src = fetchFromGitLab { owner = "FlyingWombat"; @@ -24,4 +24,3 @@ stdenv.mkDerivation { platform = platforms.all; }; } - diff --git a/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix b/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix index 57c1033ebbdd1..aea3f2c6ca665 100644 --- a/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix +++ b/pkgs/applications/editors/kakoune/plugins/openscad.kak.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "openscad.kak"; - version = "unstable-2019-11-08"; + pname = "openscad.kak-unstable"; + version = "2019-11-08"; src = fetchFromGitHub { owner = "mayjs"; diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix index f5ad8d947c7bd..98021a85c9ed0 100644 --- a/pkgs/applications/editors/tecoc/default.nix +++ b/pkgs/applications/editors/tecoc/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation rec { - pname = "tecoc"; - version = "unstable-2020-11-03"; + pname = "tecoc-unstable"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "blakemcbride"; @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ]; preInstall = '' - install -d $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros + install -d $out/bin $out/share/doc/tecoc-${version} $out/lib/teco/macros ''; installPhase = '' runHook preInstall install -m755 src/tecoc $out/bin - install -m644 src/aaout.txt doc/* $out/share/doc/${pname}-${version} + install -m644 src/aaout.txt doc/* $out/share/doc/tecoc-${version} install -m644 lib/* lib2/* $out/lib/teco/macros runHook postInstall ''; diff --git a/pkgs/applications/editors/viw/default.nix b/pkgs/applications/editors/viw/default.nix index 3aad18ef11cbc..fab8c71155db7 100644 --- a/pkgs/applications/editors/viw/default.nix +++ b/pkgs/applications/editors/viw/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - pname = "viw"; - version = "unstable-20171029"; + pname = "viw-unstable"; + version = "20171029"; src = fetchFromGitHub { owner = "lpan"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm 755 -t $out/bin viw - install -Dm 644 -t $out/share/doc/${pname} README.md + install -Dm 644 -t $out/share/doc/viw README.md ''; meta = with lib; { diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 0a4ed515511c0..628b86e5bde42 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, itk4, Cocoa }: stdenv.mkDerivation rec { - pname = "c3d"; - version = "unstable-2020-10-05"; + pname = "c3d-unstable"; + version = "2020-10-05"; src = fetchFromGitHub { owner = "pyushkevich"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b2a5b771211cc..9ac35f8f1402d 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -168,8 +168,8 @@ in }; gimplensfun = pluginDerivation rec { - version = "unstable-2018-10-21"; - name = "gimplensfun-${version}"; + pname = "gimplensfun-unstable"; + version = "2018-10-21"; src = fetchFromGitHub { owner = "seebk"; diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix index 81077578eb272..914f8c8dd0a3b 100644 --- a/pkgs/applications/graphics/mcomix3/default.nix +++ b/pkgs/applications/graphics/mcomix3/default.nix @@ -17,12 +17,12 @@ }: python3.pkgs.buildPythonApplication rec { - pname = "mcomix3"; - version = "unstable-2020-11-23"; + pname = "mcomix3-unstable"; + version = "2020-11-23"; # no official release on pypi/github and no build system src = fetchFromGitHub { - repo = "${pname}"; + repo = "mcomix3"; owner = "multiSnow"; rev = "cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8"; sha256 = "0q9xgl60ryf7qmy5vgzgfry4rvw5j9rb4d1ilxmpjmvm7dd3fm2k"; @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { runHook preInstall ${python3.executable} installer.py --srcdir=mcomix --target=$libdir - mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname} + mv $libdir/mcomix/mcomixstarter.py $out/bin/mcomix3 mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb mv $libdir/mcomix/mcomix/* $libdir/mcomix @@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { postInstall = '' rmdir $libdir/mcomix/mcomix - mv man/mcomix.1 man/${pname}.1 + mv man/mcomix.1 man/mcomix3.1 installManPage man/* cp -r mime/icons/* $out/share/icons/hicolor/ cp mime/*.desktop $out/share/applications/ @@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication rec { for folder in $out/share/icons/hicolor/*; do mkdir $folder/{apps,mimetypes} mv $folder/*.png $folder/mimetypes - cp $libdir/mcomix/images/$(basename $folder)/mcomix.png $folder/apps/${pname}.png + cp $libdir/mcomix/images/$(basename $folder)/mcomix.png $folder/apps/mcomix3.png cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbr.png cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbz.png done @@ -84,7 +84,7 @@ python3.pkgs.buildPythonApplication rec { # real pytests broken upstream checkPhase = '' $out/bin/comicthumb --help > /dev/null - $out/bin/${pname} --help > /dev/null + $out/bin/mcomix3 --help > /dev/null ''; meta = with lib; { diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix index c894de2c93308..b3514f5f63cea 100644 --- a/pkgs/applications/graphics/meme/default.nix +++ b/pkgs/applications/graphics/meme/default.nix @@ -5,8 +5,8 @@ }: buildGoModule { - pname = "meme"; - version = "unstable-2020-05-28"; + pname = "meme-unstable"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "nomad-software"; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index d4788b3c1e764..5187e49ef5c3e 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -11,8 +11,8 @@ }: buildPythonPackage rec { - pname = "pick-colour-picker"; - version = "unstable-2019-10-11"; # "1.5.0-3ec940" + pname = "pick-colour-picker-unstable"; + version = "2019-10-11"; # "1.5.0-3ec940" src = fetchFromGitHub { owner = "stuartlangridge"; diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/applications/graphics/xrgears/default.nix index 20e01a1701dad..b332ef37efaf0 100644 --- a/pkgs/applications/graphics/xrgears/default.nix +++ b/pkgs/applications/graphics/xrgears/default.nix @@ -12,8 +12,8 @@ }: stdenv.mkDerivation rec { - pname = "xrgears"; - version = "unstable-2020-04-15"; + pname = "xrgears-unstable"; + version = "2020-04-15"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 133194f7af516..fb6a7e3d5a85f 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { - pname = "antfs-cli"; - version = "unstable-2017-02-11"; + pname = "antfs-cli-unstable"; + version = "2017-02-11"; meta = with lib; { homepage = "https://github.com/Tigge/antfs-cli"; diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 0b57ad292661c..f7d2c5061637e 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { - pname = "autospotting"; - version = "unstable-2018-11-17"; + pname = "autospotting-unstable"; + version = "2018-11-17"; + goPackagePath = "github.com/AutoSpotting/AutoSpotting"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix index 72f5a639f11f6..07d62ebaba93e 100644 --- a/pkgs/applications/misc/bicon/default.nix +++ b/pkgs/applications/misc/bicon/default.nix @@ -9,8 +9,8 @@ }: stdenv.mkDerivation rec { - pname = "bicon"; - version = "unstable-2018-09-10"; + pname = "bicon-unstable"; + version = "2018-09-10"; src = fetchFromGitHub { owner = "behdad"; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index f894dc91bd8a8..8069c13f5d748 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -6,13 +6,14 @@ , libxml2 , exiv2 , imagemagick +, pname , version , sha256 , rev }: stdenv.mkDerivation { inherit version; - pname = "cataract"; + inherit pname; src = fetchgit { url = "git://git.bzatek.net/cataract"; @@ -39,5 +40,3 @@ stdenv.mkDerivation { platforms = with platforms; linux ++ darwin; }; } - - diff --git a/pkgs/applications/misc/cataract/default.nix b/pkgs/applications/misc/cataract/default.nix index 3a9f20289227b..5cb48d9d065a6 100644 --- a/pkgs/applications/misc/cataract/default.nix +++ b/pkgs/applications/misc/cataract/default.nix @@ -1,8 +1,8 @@ { callPackage }: callPackage ./build.nix { + pname = "cataract"; version = "1.1.0"; rev = "675e647dc8ae918d29f520a29be9201ae85a94dd"; sha256 = "13b9rvcy9k2ay8w36j28kc7f4lnxp4jc0494ck3xsmwgqsawmzdj"; } - diff --git a/pkgs/applications/misc/cataract/unstable.nix b/pkgs/applications/misc/cataract/unstable.nix index 397aed355a952..d1d5546181599 100644 --- a/pkgs/applications/misc/cataract/unstable.nix +++ b/pkgs/applications/misc/cataract/unstable.nix @@ -1,8 +1,8 @@ { callPackage }: callPackage ./build.nix { - version = "unstable-2016-10-18"; + pname = "cataract-unstable"; + version = "2016-10-18"; rev = "db3d992febbe703931840e9bdad95c43081694a5"; sha256 = "04f85piy675lq36w1mw6mw66n8911mmn4ifj8h9x47z8z806h3rf"; } - diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/applications/misc/elf-dissector/default.nix index 6edbcc0cce2ea..62e803de53ff9 100644 --- a/pkgs/applications/misc/elf-dissector/default.nix +++ b/pkgs/applications/misc/elf-dissector/default.nix @@ -2,8 +2,8 @@ , libiberty, libelf, libdwarf, libopcodes }: mkDerivation rec { - pname = "elf-dissector"; - version = "unstable-2020-11-14"; + pname = "elf-dissector-unstable"; + version = "2020-11-14"; src = fetchgit { url = "https://invent.kde.org/sdk/elf-dissector.git"; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 467cbfad65685..68b96401bcec7 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -21,8 +21,8 @@ in with py.pkgs; buildPythonApplication rec { - pname = "haxor-news"; - version = "unstable-2020-10-20"; + pname = "haxor-news-unstable"; + version = "2020-10-20"; # haven't done a stable release in 3+ years, but actively developed src = fetchFromGitHub { diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 5247207d1493b..2b0e769858222 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -17,8 +17,8 @@ add-install-target = fetchpatch { in stdenv.mkDerivation rec { - pname = "kjv"; - version = "unstable-2018-12-25"; + pname = "kjv-unstable"; + version = "2018-12-25"; src = fetchFromGitHub { owner = "bontibon"; diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/applications/misc/lifelines/default.nix index 50827355cac08..024bf8dd575c5 100644 --- a/pkgs/applications/misc/lifelines/default.nix +++ b/pkgs/applications/misc/lifelines/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, gettext, libiconv, bison, ncurses, perl, autoreconfHook }: stdenv.mkDerivation rec { - pname = "lifelines"; - version = "unstable-2019-05-07"; + pname = "lifelines-unstable"; + version = "2019-05-07"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/applications/misc/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix index b1118cfc59770..3ce0a57c3c6ce 100644 --- a/pkgs/applications/misc/mps-youtube/default.nix +++ b/pkgs/applications/misc/mps-youtube/default.nix @@ -3,8 +3,8 @@ with python3Packages; buildPythonApplication rec { - pname = "mps-youtube"; - version = "unstable-2020-01-28"; + pname = "mps-youtube-unstable"; + version = "2020-01-28"; src = fetchFromGitHub { owner = "mps-youtube"; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 224b5921baa8f..d0f73b037a27c 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -15,8 +15,8 @@ }: stdenv.mkDerivation rec { - pname = "ola"; - version = "unstable-2020-07-17"; + pname = "ola-unstable"; + version = "2020-07-17"; src = fetchFromGitHub { owner = "OpenLightingProject"; diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index f2386a5cd83b8..f83aed54fd3cd 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub, python3, dbus, gnupg }: python3.pkgs.buildPythonApplication rec { - pname = "pass-secret-service"; + pname = "pass-secret-service-unstable"; # PyPI has old alpha version. Since then the project has switched from using a # seemingly abandoned D-Bus package pydbus and started using maintained # dbus-next. So let's use latest from GitHub. - version = "unstable-2020-04-12"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "mdellweg"; diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix index 68b1908e51502..c9d4ac0d9c2b4 100644 --- a/pkgs/applications/misc/pbpst/default.nix +++ b/pkgs/applications/misc/pbpst/default.nix @@ -7,8 +7,8 @@ }: llvmPackages.stdenv.mkDerivation rec { - version = "unstable-2018-01-11"; - name = "pbpst-${version}"; + pname = "pbpst-unstable"; + version = "2018-01-11"; src = fetchFromGitHub { owner = "HalosGhost"; diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 5a1e5ba65dedd..d8bbea56748e7 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -12,8 +12,8 @@ let }; in buildGoPackage rec { - name = "perkeep-${version}"; - version = "unstable-2020-03-23"; + pname = "perkeep-unstable"; + version = "2020-03-23"; src = fetchFromGitHub { owner = "perkeep"; diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 5de2428250a0c..90f38cde62005 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -9,8 +9,8 @@ }: mkDerivation { - pname = "qt-box-editor"; - version = "unstable-2019-07-12"; + pname = "qt-box-editor-unstable"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "zdenop"; diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/applications/misc/rootbar/default.nix index d50cefb2a7180..e8df1415a7fe6 100644 --- a/pkgs/applications/misc/rootbar/default.nix +++ b/pkgs/applications/misc/rootbar/default.nix @@ -11,8 +11,8 @@ }: stdenv.mkDerivation rec { - pname = "rootbar"; - version = "unstable-2020-11-13"; + pname = "rootbar-unstable"; + version = "2020-11-13"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/rootbar"; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 613d2f8e78bf6..84266fbae23be 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -3,8 +3,8 @@ with lib; stdenv.mkDerivation rec { - pname = "slstatus"; - version = "unstable-2019-02-16"; + pname = "slstatus-unstable"; + version = "2019-02-16"; src = fetchgit { url = "https://git.suckless.org/slstatus"; diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index 42bd58cd78316..d2f615fe0c896 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, imlib2, libX11 }: stdenv.mkDerivation { - pname = "ssocr"; - version = "unstable-2018-08-11"; + pname = "ssocr-unstable"; + version = "2018-08-11"; src = fetchFromGitHub { owner = "auerswal"; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index e8c42ab48d704..8b2a92df2d161 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -3,8 +3,8 @@ , gnugrep, procps }: stdenv.mkDerivation { - pname = "tdrop"; - version = "unstable-2020-05-14"; + pname = "tdrop-unstable"; + version = "2020-05-14"; src = fetchFromGitHub { owner = "noctuid"; diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 0658b43626ed3..55dd7fafac350 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -2,8 +2,8 @@ qtmultimedia, qttools, ... }: mkDerivation rec { - pname = "tipp10"; - version = "unstable-20200616"; + pname = "tipp10-unstable"; + version = "2020-06-16"; src = fetchFromGitLab { owner = "tipp10"; diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 74c424a277b19..9991d81324ddc 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - pname = "wego"; - version = "unstable-2019-02-11"; + pname = "wego-unstable"; + version = "2019-02-11"; rev = "994e4f141759a1070d7b0c8fbe5fad2cc7ee7d45"; goPackagePath = "github.com/schachmat/wego"; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 26cbc92adace7..1f98d5eb9d9bd 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation rec { - pname = "surf"; - version = "unstable-2019-02-08"; + pname = "surf-unstable"; + version = "2019-02-08"; src = fetchgit { url = "git://git.suckless.org/surf"; diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix index 21c9d3ca6fb10..5fa36b2d78885 100644 --- a/pkgs/applications/networking/flent/http-getter.nix +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, pkg-config }: stdenv.mkDerivation { - pname = "http-getter"; - version = "unstable-2020-12-08"; + pname = "http-getter-unstable"; + version = "2020-12-08"; src = fetchFromGitHub { owner = "tohojo"; diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix index 04418dc64fcfe..b03fb536a5574 100644 --- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -1,8 +1,8 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule { - pname = "go-neb"; - version = "unstable-2020-04-09"; + pname = "go-neb-unstable"; + version = "2020-04-09"; src = fetchFromGitHub { owner = "matrix-org"; repo = "go-neb"; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 4c067e384f951..6529b7683997d 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -3,8 +3,8 @@ with ocamlPackages; buildDunePackage rec { - pname = "jackline"; - version = "unstable-2020-09-03"; + pname = "jackline-unstable"; + version = "2020-09-03"; minimumOCamlVersion = "4.08"; diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix index caf6669e120b5..010e07129385d 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -1,8 +1,8 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - pname = "matrix-dl"; - version = "unstable-2020-07-14"; + pname = "matrix-dl-unstable"; + version = "2020-07-14"; src = fetchFromGitHub { owner = "rubo77"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 10cbcb6c1d298..471c50dd6d24e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib }: stdenv.mkDerivation { - pname = "purple-discord"; - version = "unstable-2018-04-10"; + pname = "purple-discord-unstable"; + version = "2018-04-10"; src = fetchFromGitHub { owner = "EionRobb"; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 69b2d9ef30947..7f80b58441725 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "ipfs-cluster"; - version = "unstable-2020-10-20"; + pname = "ipfs-cluster-unstable"; + version = "2020-10-20"; vendorSha256 = "0abfhl4v4yqy89aqn13ymj4rw5zhr92a9fh1abgpkr19adnyrs3d"; diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index d7c7320b9e4f5..9277a1f42b7ec 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -28,8 +28,8 @@ let sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q"; }; in mkDerivation rec { - pname = "trojita"; - version = "unstable-2020-07-06"; + pname = "trojita-unstable"; + version = "2020-07-06"; src = fetchgit { url = "https://anongit.kde.org/trojita.git"; diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/applications/networking/ngadmin/default.nix index 8392e05834542..58d1d3618d822 100644 --- a/pkgs/applications/networking/ngadmin/default.nix +++ b/pkgs/applications/networking/ngadmin/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation { - pname = "ngadmin"; - version = "unstable-2020-10-05"; + pname = "ngadmin-unstable"; + version = "2020-10-05"; src = fetchFromGitHub { owner = "Alkorin"; diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix index 87d4e75c33e3a..e5d91e756fb01 100644 --- a/pkgs/applications/networking/ps2client/default.nix +++ b/pkgs/applications/networking/ps2client/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - version = "unstable-2018-10-18"; - pname = "ps2client"; + version = "2018-10-18"; + pname = "ps2client-unstable"; src = fetchFromGitHub { owner = "ps2dev"; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index dc828b5882585..516337d38d6f5 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -2,8 +2,8 @@ , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: mkDerivation { - pname = "x2goclient"; - version = "unstable-2019-07-24"; + pname = "x2goclient-unstable"; + version = "2019-07-24"; src = fetchgit { url = "git://code.x2go.org/x2goclient.git"; diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 52558df5da810..b15c47e2d762d 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -15,8 +15,8 @@ }: python3Packages.buildPythonApplication rec { - pname = "gtg"; - version = "unstable-2020-10-22"; + pname = "gtg-unstable"; + version = "2020-10-22"; src = fetchFromGitHub { owner = "getting-things-gnome"; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 0df6070319d3c..60b8c11b5a6e8 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -10,10 +10,10 @@ , python2 }: -let version = "unstable-2019-02-13"; +let version = "2019-02-13"; in stdenv.mkDerivation { - pname = "planner"; + pname = "planner-unstable"; inherit version; src = fetchFromGitLab { diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index a2ba038c05991..f824fb7f2a6f5 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { - pname = "EZminc"; - version = "unstable-2019-03-12"; + pname = "EZminc-unstable"; + version = "2019-03-12"; src = fetchFromGitHub { owner = "BIC-MNI"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DEZMINC_BUILD_DD=TRUE" ]; meta = with lib; { - homepage = "https://github.com/BIC-MNI/${pname}"; + homepage = "https://github.com/BIC-MNI/EZminc"; description = "Collection of Perl and shell scripts for processing MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/applications/science/biology/N3/default.nix index 2f4aa4ce3927e..52b7119837400 100644 --- a/pkgs/applications/science/biology/N3/default.nix +++ b/pkgs/applications/science/biology/N3/default.nix @@ -3,8 +3,8 @@ libminc, EBTKS }: stdenv.mkDerivation rec { - pname = "N3"; - version = "unstable-2018-08-09"; + pname = "N3-unstable"; + version = "2018-08-09"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index fe1c1f5511d1e..ec20825226806 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -2,8 +2,8 @@ makeWrapper }: stdenv.mkDerivation rec { - pname = "conglomerate"; - version = "unstable-2017-09-10"; + pname = "conglomerate-unstable"; + version = "2017-09-10"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 3dece25915b47..10f159e4bf6ae 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -2,8 +2,8 @@ libminc, libjpeg, nifticlib, zlib }: stdenv.mkDerivation rec { - pname = "minc-tools"; - version = "unstable-2020-07-25"; + pname = "minc-tools-unstable"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix index b0ec8a70e149a..7a4bf7c3967aa 100644 --- a/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc }: stdenv.mkDerivation rec { - pname = "mni_autoreg"; - version = "unstable-2017-09-22"; + pname = "mni_autoreg-unstable"; + version = "2017-09-22"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index 454843e2f324d..d99edf29ef963 100755 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonPackage rec { - pname = "poretools"; - version = "unstable-2016-07-10"; + pname = "poretools-unstable"; + version = "2016-07-10"; src = fetchFromGitHub { repo = pname; diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index 7aafa70f7fa1a..da2026d53263c 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -15,8 +15,8 @@ }: mkDerivation { - pname = "appcsxcad"; - version = "unstable-2020-01-04"; + pname = "appcsxcad-unstable"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "thliebig"; diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index d9953a7857390..9668b4b893bc2 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -12,8 +12,8 @@ }: stdenv.mkDerivation rec { - pname = "csxcad"; - version = "unstable-2020-02-08"; + pname = "csxcad-unstable"; + version = "2020-02-08"; src = fetchFromGitHub { owner = "thliebig"; diff --git a/pkgs/applications/science/electronics/fparser/default.nix b/pkgs/applications/science/electronics/fparser/default.nix index 73db0575d0b1b..91e9efb8b3574 100644 --- a/pkgs/applications/science/electronics/fparser/default.nix +++ b/pkgs/applications/science/electronics/fparser/default.nix @@ -4,8 +4,8 @@ }: stdenv.mkDerivation rec { - pname = "fparser"; - version = "unstable-2015-09-25"; + pname = "fparser-unstable"; + version = "2015-09-25"; src = fetchFromGitHub { owner = "thliebig"; diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index f1c458f40d9f9..308ea2888ba3c 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -5,8 +5,8 @@ with lib; stdenv.mkDerivation { - pname = "fped"; - version = "unstable-2017-05-11"; + pname = "fped-unstable"; + version = "2017-05-11"; src = fetchgit { url = "git://projects.qi-hardware.com/fped.git"; diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index e1063f8e26cf0..0fbc0fa035c3b 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -24,8 +24,8 @@ assert withMPI -> openmpi != null; assert withHyp2mat -> hyp2mat != null; stdenv.mkDerivation { - pname = "openems"; - version = "unstable-2020-02-15"; + pname = "openems-unstable"; + version = "2020-02-15"; src = fetchFromGitHub { owner = "thliebig"; diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index adce30551071a..6bdb187f32e36 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -7,8 +7,8 @@ }: stdenv.mkDerivation rec { - pname = "vhd2vl"; - version = "unstable-2018-09-01"; + pname = "vhd2vl-unstable"; + version = "2018-09-01"; src = fetchFromGitHub { owner = "ldoolitt"; diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 44478a032b38a..89e8e9629e29a 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, ocamlPackages, rsync }: ocamlPackages.buildDunePackage { - pname = "beluga"; - version = "unstable-2020-03-11"; + pname = "beluga-unstable"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "Beluga-lang"; diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix index b511b4ea42e29..00cbf4c89d749 100644 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, boost165 }: stdenv.mkDerivation rec { - pname = "starspace"; - version = "unstable-2021-01-17"; + pname = "starspace-unstable"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "facebookresearch"; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index 80956a5124427..57b09a4eb8571 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -19,8 +19,8 @@ }: stdenv.mkDerivation { - pname = "tilix"; - version = "unstable-2019-10-02"; + pname = "tilix-unstable"; + version = "2019-10-02"; src = fetchFromGitHub { owner = "gnunn1"; diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix index 528e3f50ea066..c52a33d4dfa52 100644 --- a/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/pkgs/applications/terminal-emulators/wayst/default.nix @@ -33,8 +33,8 @@ let }; in stdenv.mkDerivation rec { - pname = "wayst"; - version = "unstable-2020-10-12"; + pname = "wayst-unstable"; + version = "2020-10-12"; src = fetchFromGitHub { owner = "91861"; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 8fce22089e971..a0177a927f111 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -52,12 +52,12 @@ let CoreGraphics Cocoa ]; - pname = "wezterm"; + pname = "wezterm-unstable"; in rustPlatform.buildRustPackage { inherit pname; - version = "unstable-2020-11-22"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "wez"; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index dd4e6e011a6e7..6b5fd84703840 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -3,8 +3,8 @@ }: python3Packages.buildPythonApplication rec { - pname = "git-remote-hg"; - version = "unstable-2020-06-12"; + pname = "git-remote-hg-unstable"; + version = "2020-06-12"; src = fetchFromGitHub { owner = "mnauw"; diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index 037de14658d6d..ec1f309d7b84c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, git, gnused }: stdenv.mkDerivation rec { - pname = "git-reparent"; - version = "unstable-2017-09-03"; + pname = "git-reparent-unstable"; + version = "2017-09-03"; src = fetchFromGitHub { owner = "MarkLodato"; diff --git a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix index 77e077436169e..cde8eb26c2f64 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "git-vanity-hash"; - version = "2020-02-26-unstable"; + pname = "git-vanity-hash-unstable"; + version = "2020-02-26"; src = fetchFromGitHub { owner = "prasmussen"; diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index a82839ef7548c..fb8b7b3ed0ea8 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, libjpeg }: stdenv.mkDerivation { - pname = "mjpg-streamer"; - version = "unstable-2019-05-24"; + pname = "mjpg-streamer-unstable"; + version = "2019-05-24"; src = fetchFromGitHub { owner = "jacksonliam"; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 79ede806b0ca1..37abd8ce08a5d 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -2,8 +2,8 @@ # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` stdenv.mkDerivation { - pname = "mpv_sponsorblock"; - version = "unstable-2020-07-05"; + pname = "mpv_sponsorblock-unstable"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "po5"; diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index 8fd0364bb58c5..5fd42c656f321 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -5,8 +5,8 @@ let in stdenv.mkDerivation rec { - pname = "i3-layout-manager"; - version = "unstable-2020-05-04"; + pname = "i3-layout-manager-unstable"; + version = "2020-05-04"; src = fetchFromGitHub { owner = "klaxalk"; diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 404e7b41f556e..b8380f8fc64db 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -10,8 +10,8 @@ python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2020-06-12"; - pname = "i3pystatus"; + version = "2020-06-12"; + pname = "i3pystatus-unstable"; src = fetchFromGitHub { owner = "enkore"; @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { ''; postInstall = '' - makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ + makeWrapper ${python3Packages.python.interpreter} $out/bin/i3pystatus-python-interpreter \ --prefix PYTHONPATH : "$PYTHONPATH" \ ''${makeWrapperArgs[@]} ''; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 8f684fec620f6..4413fe05bc1db 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, dbus-glib, autoreconfHook, xorg }: stdenv.mkDerivation { - pname = "kbdd"; - version = "unstable-2017-01-29"; + pname = "kbdd-unstable"; + version = "2017-01-29"; src = fetchFromGitHub { owner = "qnikst"; diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix index 301b0184e9c73..ccd3b2e62304a 100644 --- a/pkgs/applications/window-managers/wio/default.nix +++ b/pkgs/applications/window-managers/wio/default.nix @@ -15,8 +15,8 @@ }: stdenv.mkDerivation rec { - pname = "wio"; - version = "unstable-2020-11-02"; + pname = "wio-unstable"; + version = "2020-11-02"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/wio"; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index ebabcf196d5b6..52cd1aabb1be8 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -8,8 +8,8 @@ assert desktopSupport == "gnomeflashback" || desktopSupport == "mate" || desktopSupport == "xfce4"; stdenv.mkDerivation rec { - version = "unstable-2017-09-15"; - pname = "xmonad-log-applet"; + version = "2017-09-15"; + pname = "xmonad-log-applet-unstable"; name = "${pname}-${desktopSupport}-${version}"; src = fetchFromGitHub { @@ -44,4 +44,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar ]; }; } - diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index ec15f7e362758..6b32d0a35e00d 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkg-config , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib -, rev, sha256, version, patches ? [] +, rev, sha256, pname, version, patches ? [] }: stdenv.mkDerivation { - pname = "yabar"; + inherit pname; inherit version; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix index a33a75676ee94..33ba624f0f8ef 100644 --- a/pkgs/applications/window-managers/yabar/default.nix +++ b/pkgs/applications/window-managers/yabar/default.nix @@ -2,6 +2,7 @@ let overrides = rec { + pname = "yabar"; version = "0.4.0"; rev = version; diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix index 47c8f6c5e5685..be46ce40b59eb 100644 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ b/pkgs/applications/window-managers/yabar/unstable.nix @@ -2,7 +2,8 @@ let pkg = callPackage ./build.nix ({ - version = "unstable-2018-01-18"; + pname = "yabar-unstable"; + version = "2018-01-18"; rev = "c516e8e78d39dd2b339acadc4c175347171150bb"; sha256 = "1p9lx78cayyn7qc2q66id2xfs76jyddnqv2x1ypsvixaxwcvqgdb"; diff --git a/pkgs/data/fonts/gelasio/default.nix b/pkgs/data/fonts/gelasio/default.nix index c8cf655a18cfb..40cb4af9fb311 100644 --- a/pkgs/data/fonts/gelasio/default.nix +++ b/pkgs/data/fonts/gelasio/default.nix @@ -1,9 +1,10 @@ { lib, fetchFromGitHub }: let - version = "unstable-2018-08-12"; + pname = "gelasio-unstable"; + version = "2018-08-12"; in fetchFromGitHub { - name = "gelasio-${version}"; + name = "${pname}-${version}"; # this should probably not be needed owner = "SorkinType"; repo = "Gelasio"; rev = "5bced461d54bcf8e900bb3ba69455af35b0d2ff1"; @@ -28,4 +29,3 @@ in fetchFromGitHub { maintainers = with maintainers; [ colemickens ]; }; } - diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index 25ec1e5d11da7..999c1e64787e2 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -1,12 +1,13 @@ { lib, fetchFromGitHub }: let - pname = "ir-standard-fonts"; - version = "unstable-2017-01-21"; -in fetchFromGitHub { + pname = "ir-standard-fonts-unstable"; + version = "2017-01-21"; +in +fetchFromGitHub { name = "${pname}-${version}"; owner = "morealaz"; - repo = pname; + repo = "ir-standard-fonts"; rev = "d36727d6c38c23c01b3074565667a2fe231fe18f"; postFetch = '' diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/data/fonts/lalezar-fonts/default.nix index 01e9d209a3177..bad39c50baab7 100644 --- a/pkgs/data/fonts/lalezar-fonts/default.nix +++ b/pkgs/data/fonts/lalezar-fonts/default.nix @@ -1,9 +1,10 @@ { lib, fetchFromGitHub }: let - pname = "lalezar-fonts"; - version = "unstable-2017-02-28"; -in fetchFromGitHub { + pname = "lalezar-fonts-unstable"; + version = "2017-02-28"; +in +fetchFromGitHub { name = "${pname}-${version}"; owner = "BornaIz"; repo = "Lalezar"; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix index af740e4089814..80db51a918b39 100644 --- a/pkgs/data/fonts/xkcd-font/default.nix +++ b/pkgs/data/fonts/xkcd-font/default.nix @@ -1,13 +1,14 @@ { lib, fetchFromGitHub }: let - pname = "xkcd-font"; - version = "unstable-2017-08-24"; -in fetchFromGitHub { + pname = "xkcd-font-unstable"; + version = "2017-08-24"; +in +fetchFromGitHub { name = "${pname}-${version}"; owner = "ipython"; - repo = pname; + repo = "xkcd-font"; rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; postFetch = '' diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index d1e2814a8aa3a..436468e61740e 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -1,8 +1,8 @@ { lib, stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { - pname = "bibata-cursors-translucent"; - version = "unstable-2019-09-13"; + pname = "bibata-cursors-translucent-unstable"; + version = "2019-09-13"; src = fetchFromGitHub { owner = "Silicasandwhich"; diff --git a/pkgs/data/icons/iso-flags/default.nix b/pkgs/data/icons/iso-flags/default.nix index 4252853b898ca..e071144cfe7f2 100644 --- a/pkgs/data/icons/iso-flags/default.nix +++ b/pkgs/data/icons/iso-flags/default.nix @@ -9,8 +9,8 @@ }: stdenv.mkDerivation { - pname = "iso-flags"; - version = "unstable-18012020"; + pname = "iso-flags-unstable"; + version = "18012020"; src = fetchFromGitHub { owner = "joielechong"; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index ed0971b7131b4..298f2250c9736 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -16,8 +16,8 @@ }: stdenv.mkDerivation rec { - pname = "gtkglext"; - version = "unstable-2019-12-19"; + pname = "gtkglext-unstable"; + version = "2019-12-19"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix index fa1d89173fdd6..ba62c9c625a51 100644 --- a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-EasyScreenCast"; - version = "unstable-2020-11-25"; + pname = "gnome-shell-extension-EasyScreenCast-unstable"; + version = "2020-11-25"; src = fetchFromGitHub { # To make it work with gnome 3.38, using effectively: https://github.com/EasyScreenCast/EasyScreenCast/pull/276 diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix index 8cd567a590dbd..6013acad5957a 100644 --- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-drop-down-terminal"; - version = "unstable-2020-03-25"; + pname = "gnome-shell-extension-drop-down-terminal-unstable"; + version = "2020-03-25"; src = fetchFromGitHub { owner = "zzrough"; diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome-3/extensions/impatience/default.nix index 82551efef3c78..373decc38abd1 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - pname = "gnome-shell-impatience"; - version = "unstable-2019-09-23"; + pname = "gnome-shell-impatience-unstable"; + version = "2019-09-23"; src = fetchFromGitHub { owner = "timbertson"; diff --git a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix b/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix index 4763d90575517..ad5b79bdcc22f 100644 --- a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix +++ b/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix @@ -3,8 +3,8 @@ , fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "noannoyance"; - version = "unstable-2021-01-17"; + pname = "noannoyance-unstable"; + version = "2021-01-17"; src = fetchFromGitHub { owner = "BjoernDaase"; diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 77e3f48850d2e..b8cff1cef97de 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, substituteAll, fetchpatch, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-system-monitor"; - version = "2020-04-27-unstable"; + pname = "gnome-shell-system-monitor-unstable"; + version = "2020-04-27"; src = fetchFromGitHub { owner = "paradoxxxzero"; diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix index dcea4c69ff82e..ba5771e390781 100644 --- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-tilingnome-unstable"; - version = "unstable-2019-09-19"; + version = "2019-09-19"; src = fetchFromGitHub { owner = "rliang"; diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index 94b8540c1bf32..24b3e7bb8b1d9 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-timepp"; - version = "unstable-2020-03-15"; + pname = "gnome-shell-extension-timepp-unstable"; + version = "2020-03-15"; src = fetchFromGitHub { owner = "zagortenay333"; diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix index 42f226e96777c..15aacfed8f1cd 100644 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-window-corner-preview"; - version = "unstable-2019-04-03"; + pname = "gnome-shell-extension-window-corner-preview-unstable"; + version = "2019-04-03"; src = fetchFromGitHub { owner = "medenagan"; diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index db6633aa5bdbd..f30499fa1be59 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -27,8 +27,8 @@ }: stdenv.mkDerivation rec { - pname = "elementary-dock"; - version = "unstable-2020-06-11"; + pname = "elementary-dock-unstable"; + version = "2020-06-11"; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 6a9d1b0aca365..0c7a73c5fec9a 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -4,8 +4,8 @@ }: stdenv.mkDerivation { - pname = "elementary-redacted-script"; - version = "unstable-2016-06-03"; + pname = "elementary-redacted-script-unstable"; + version = "2016-06-03"; src = fetchFromGitHub { owner = "png2378"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 03500abd6237b..ee9259a19642c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -17,8 +17,8 @@ }: stdenv.mkDerivation rec { - pname = "wingpanel-indicator-bluetooth"; - version = "unstable-2020-10-01"; + pname = "wingpanel-indicator-bluetooth-unstable"; + version = "2020-10-01"; src = fetchFromGitHub { owner = "elementary"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; + attrPath = "pantheon.wingpanel-indicator-bluetooth"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index a6c08b613bbdd..1449aa97f97e1 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -15,8 +15,8 @@ }: stdenv.mkDerivation rec { - pname = "wingpanel-indicator-session"; - version = "unstable-2020-09-13"; + pname = "wingpanel-indicator-session-unstable"; + version = "2020-09-13"; src = fetchFromGitHub { owner = "elementary"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; + attrPath = "pantheon.wingpanel-indicator-session"; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 73cace23cca97..1d79481bc149c 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -15,8 +15,8 @@ }: stdenv.mkDerivation rec { - pname = "elementary-notifications"; - version = "unstable-2020-03-31"; + pname = "elementary-notifications-unstable"; + version = "2020-03-31"; repoName = "notifications"; diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix index 3a74982eb4ae2..e2b88ef674c3c 100644 --- a/pkgs/desktops/surf-display/default.nix +++ b/pkgs/desktops/surf-display/default.nix @@ -3,8 +3,8 @@ , xorg, pulseaudio, xprintidle-ng }: stdenv.mkDerivation rec { - pname = "surf-display"; - version = "unstable-2019-04-15"; + pname = "surf-display-unstable"; + version = "2019-04-15"; src = fetchgit { url = "https://code.it-zukunft-schule.de/cgit/surf-display"; diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix index f2f2c9cf8aa6d..c97b830283733 100644 --- a/pkgs/development/compilers/acme/default.nix +++ b/pkgs/development/compilers/acme/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchsvn }: stdenv.mkDerivation rec { - pname = "acme"; - version = "unstable-2020-12-27"; + pname = "acme-unstable"; + version = "2020-12-27"; src = fetchsvn { url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index 1e9fd8505c523..3ef6c8cea1647 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -26,8 +26,8 @@ let ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ])); in stdenv.mkDerivation rec { - pname = "bluespec"; - version = "unstable-2020.11.04"; + pname = "bluespec-unstable"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "B-Lang-org"; diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index a4b884147db17..5526cb5c411a9 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,5 +1,5 @@ { gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, - src, version, git-version, + src, pname, version, git-version, gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, @@ -20,9 +20,7 @@ # so I stick with -O1 (in the defaults above), which is also the default for Gambit. gccStdenv.mkDerivation rec { - - pname = "gambit"; - inherit src version git-version; + inherit src pname version git-version; bootstrap = gambit-support.gambit-bootstrap; # TODO: if/when we can get all the library packages we depend on to have static versions, diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 8f77daa4173be..f27b6d120112a 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,6 +1,7 @@ { callPackage, fetchurl }: callPackage ./build.nix rec { + pname = "gambit"; version = "4.9.3"; git-version = version; src = fetchurl { diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index a689991a1e13a..05a93a85062f6 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,7 +1,8 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-09-20"; + pname = "gambit-unstable"; + version = "2020-09-20"; git-version = "4.9.3-1234-g6acd87df"; src = fetchFromGitHub { owner = "feeley"; diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 8297dafff8e2d..28bb7a38fbfe1 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,6 +1,6 @@ { pkgs, gccStdenv, lib, coreutils, bash, # makeStaticLibraries, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, - version, git-version, + pname, version, git-version, gambit-support, gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, src }: @@ -8,7 +8,7 @@ let stdenv = gccStdenv; in stdenv.mkDerivation rec { - pname = "gerbil"; + inherit pname; inherit version; inherit src; diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 3367ae581b2e0..ac6bf683ac748 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,6 +1,7 @@ { callPackage, fetchFromGitHub }: callPackage ./build.nix rec { + pname = "gerbil"; version = "0.16"; git-version = version; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix index 12f4726f1c62e..679afc0143e0a 100644 --- a/pkgs/development/compilers/gerbil/gerbil-crypto.nix +++ b/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -1,8 +1,8 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: gerbil-support.gerbilPackage { - pname = "gerbil-crypto"; - version = "unstable-2020-08-01"; + pname = "gerbil-crypto-unstable"; + version = "2020-08-01"; git-version = "0.0-6-ga228862"; gerbil-package = "clan/crypto"; gerbil = gerbil-unstable; diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index e498818d2e611..0d8587e32b3da 100644 --- a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -1,8 +1,8 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: gerbil-support.gerbilPackage { - pname = "gerbil-ethereum"; - version = "unstable-2020-10-18"; + pname = "gerbil-ethereum-unstable"; + version = "2020-10-18"; git-version = "0.0-26-gf27ada8"; gerbil-package = "mukn/ethereum"; gerbil = gerbil-unstable; diff --git a/pkgs/development/compilers/gerbil/gerbil-libp2p.nix b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix index 336f5af89c3bb..3e1a4ddd0fcbe 100644 --- a/pkgs/development/compilers/gerbil/gerbil-libp2p.nix +++ b/pkgs/development/compilers/gerbil/gerbil-libp2p.nix @@ -1,8 +1,8 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: gerbil-support.gerbilPackage { - pname = "gerbil-libp2p"; - version = "unstable-2018-12-27"; + pname = "gerbil-libp2p-unstable"; + version = "2018-12-27"; git-version = "2376b3f"; gerbil-package = "vyzo"; gerbil = gerbil-unstable; diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/development/compilers/gerbil/gerbil-persist.nix index 74485c19c2d0a..2d24085ea251f 100644 --- a/pkgs/development/compilers/gerbil/gerbil-persist.nix +++ b/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -1,8 +1,8 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: gerbil-support.gerbilPackage { - pname = "gerbil-persist"; - version = "unstable-2020-08-31"; + pname = "gerbil-persist-unstable"; + version = "2020-08-31"; git-version = "0.0-8-gd211390"; gerbil-package = "clan/persist"; gerbil = gerbil-unstable; diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/development/compilers/gerbil/gerbil-poo.nix index c6580ea0c77a6..c89d88e351a6d 100644 --- a/pkgs/development/compilers/gerbil/gerbil-poo.nix +++ b/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -1,8 +1,8 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: gerbil-support.gerbilPackage { - pname = "gerbil-ethereum"; - version = "unstable-2020-10-17"; + pname = "gerbil-ethereum-unstable"; + version = "2020-10-17"; git-version = "0.0-35-g44d490d"; gerbil-package = "clan/poo"; gerbil = gerbil-unstable; diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix index 6d89e1181f2d3..9191586096b4e 100644 --- a/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: gerbil-support.gerbilPackage { - pname = "gerbil-utils"; - version = "unstable-2020-10-18"; + pname = "gerbil-utils-unstable"; + version = "2020-10-18"; git-version = "0.2-36-g8b481b7"; gerbil-package = "clan"; gerbil = gerbil-unstable; diff --git a/pkgs/development/compilers/gerbil/smug-gerbil.nix b/pkgs/development/compilers/gerbil/smug-gerbil.nix index 732cdb500b9b9..0d5b458064257 100644 --- a/pkgs/development/compilers/gerbil/smug-gerbil.nix +++ b/pkgs/development/compilers/gerbil/smug-gerbil.nix @@ -1,8 +1,8 @@ { pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: gerbil-support.gerbilPackage { - pname = "smug-gerbil"; - version = "unstable-2019-12-24"; + pname = "smug-gerbil-unstable"; + version = "2019-12-24"; git-version = "95d60d4"; gerbil-package = "drewc/smug"; gerbil = gerbil-unstable; diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index d4ff3ca7a98a4..bfba068c9a1dc 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,7 +1,8 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2020-11-05"; + pname = "gerbil-unstable"; + version = "2020-11-05"; git-version = "0.16-152-g808929ae"; src = fetchFromGitHub { owner = "vyzo"; diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 6181486f50c7b..dd73ef49de70a 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -4,10 +4,10 @@ assert backend == "mcode" || backend == "llvm"; stdenv.mkDerivation rec { - pname = "ghdl-${backend}"; + pname = "ghdl-${backend}-unstable"; # NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable # version of the yosys plugin - version = "unstable-2021.01.14"; + version = "2021-01-14"; src = fetchFromGitHub { owner = "ghdl"; diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 728049448e666..d1bba7ac08287 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -18,8 +18,8 @@ }: stdenv.mkDerivation rec { - pname = "lobster"; - version = "unstable-2020-10-04"; + pname = "lobster-unstable"; + version = "2020-10-04"; src = fetchFromGitHub { owner = "aardappel"; diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix index fe10f43abd5ef..017c7b3e66516 100644 --- a/pkgs/development/compilers/openspin/default.nix +++ b/pkgs/development/compilers/openspin/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "openspin"; - version = "unstable-2018-10-02"; + pname = "openspin-unstable"; + version = "2018-10-02"; src = fetchFromGitHub { owner = "parallaxinc"; diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index 436b03e499c37..9e15fdf4a76ea 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -4,8 +4,8 @@ }: stdenv.mkDerivation rec { - pname = "qbe"; - version = "unstable-2019-07-11"; + pname = "qbe-unstable"; + version = "2019-07-11"; src = fetchgit { url = "git://c9x.me/qbe.git"; diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/development/compilers/spasm-ng/default.nix index 8eb0ddb59ef72..9b380c7df72ad 100644 --- a/pkgs/development/compilers/spasm-ng/default.nix +++ b/pkgs/development/compilers/spasm-ng/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }: stdenv.mkDerivation rec { - pname = "spasm-ng"; + pname = "spasm-ng-unstable"; - version = "unstable-2020-08-03"; + version = "2020-08-03"; src = fetchFromGitHub { owner = "alberthdev"; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 30e260eee4650..243766d0367cd 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation rec { - pname = "icon-lang"; - version = "unstable-2020-02-05"; + pname = "icon-lang-unstable"; + version = "2020-02-05"; src = fetchFromGitHub { owner = "gtownsend"; repo = "icon"; diff --git a/pkgs/development/libraries/adslib/default.nix b/pkgs/development/libraries/adslib/default.nix index 49b54960b7e68..49d59f0d7cd54 100644 --- a/pkgs/development/libraries/adslib/default.nix +++ b/pkgs/development/libraries/adslib/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "adslib"; - version = "unstable-2020-08-28"; + pname = "adslib-unstable"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "stlehmann"; diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/development/libraries/alure2/default.nix index fa42c4fd53a3d..b8af8588a2dff 100644 --- a/pkgs/development/libraries/alure2/default.nix +++ b/pkgs/development/libraries/alure2/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, openal, libvorbis, opusfile, libsndfile }: stdenv.mkDerivation rec { - pname = "alure2"; - version = "unstable-2020-02-06"; + pname = "alure2-unstable"; + version = "2020-02-06"; src = fetchFromGitHub { owner = "kcat"; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index a0089e3104418..a4a033b536dee 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { - pname = "raul"; - version = "unstable-2019-12-09"; - name = "${pname}-${version}"; + pname = "raul-unstable"; + version = "2019-12-09"; src = fetchgit { url = "https://gitlab.com/drobilla/raul.git"; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 8e8e455e59a6f..e333c7a33985a 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -18,8 +18,8 @@ }: stdenv.mkDerivation rec { - pname = "beignet"; - version = "unstable-2018.08.20"; + pname = "beignet-unstable"; + version = "2018-08-20"; src = fetchFromGitHub { owner = "intel"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ]; passthru.utests = stdenv.mkDerivation { - pname = "beignet-utests"; + pname = "beignet-utests-unstable"; inherit version src; preConfigure = '' diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 740e43216984a..f480e598d5d86 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }: stdenv.mkDerivation rec { - version = "unstable-2019-10-09"; - pname = "boxfort"; + version = "2019-10-09"; + pname = "boxfort-unstable"; src = fetchFromGitHub { owner = "Snaipe"; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 3fe78e6d02e9d..86b48b6124055 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, lib, stdenv, boost, cmake, libX11, libGL, libGLU }: stdenv.mkDerivation rec { - pname = "coin"; - version = "2020-12-07-unstable"; + pname = "coin-unstable"; + version = "2020-12-07"; src = fetchFromGitHub { owner = "coin3d"; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 3d46028ec4388..39ba562e781fc 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -12,8 +12,8 @@ }: stdenv.mkDerivation rec { - pname = "dee"; - version = "unstable-2017-06-16"; + pname = "dee-unstable"; + version = "2017-06-16"; outputs = [ "out" "dev" "py" ]; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index bf6c030589b92..df178a47e3d5d 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }: stdenv.mkDerivation rec { - pname = "ganv"; - version = "unstable-2019-12-30"; + pname = "ganv-unstable"; + version = "2019-12-30"; src = fetchgit { - url = "https://gitlab.com/drobilla/${pname}.git"; + url = "https://gitlab.com/drobilla/ganv.git"; fetchSubmodules = true; rev = "90bd022f8909f92cc5290fdcfc76c626749e1186"; sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix index bc4c14beb4587..dbd58949df0b1 100644 --- a/pkgs/development/libraries/gdk-pixbuf/xlib.nix +++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix @@ -11,8 +11,8 @@ }: stdenv.mkDerivation rec { - pname = "gdk-pixbuf-xlib"; - version = "2020-06-11-unstable"; + pname = "gdk-pixbuf-xlib-unstable"; + version = "2020-06-11"; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/development/libraries/gsmlib/default.nix index ec6646d98f572..eb9ed32fbce4c 100644 --- a/pkgs/development/libraries/gsmlib/default.nix +++ b/pkgs/development/libraries/gsmlib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - pname = "gsmlib"; - version = "unstable-2017-10-06"; + pname = "gsmlib-unstable"; + version = "2017-10-06"; src = fetchFromGitHub { owner = "x-logLT"; repo = "gsmlib"; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 265289f06f383..442ebfbff5aa7 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -1,8 +1,8 @@ { lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: mkDerivation rec { - version = "unstable-20-06-26"; - pname = "herqq"; + version = "20-06-26"; + pname = "herqq-unstable"; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase unzip qtmultimedia ]; diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix index 950639850db52..4080edac5c19e 100644 --- a/pkgs/development/libraries/libelfin/default.nix +++ b/pkgs/development/libraries/libelfin/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, python3, substituteAll }: stdenv.mkDerivation rec { - pname = "libelfin"; - version = "unstable-2018-08-25"; + pname = "libelfin-unstable"; + version = "2018-08-25"; src = fetchFromGitHub { owner = "aclements"; diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix index 7a40c1a83da55..476948fd099df 100644 --- a/pkgs/development/libraries/liberio/default.nix +++ b/pkgs/development/libraries/liberio/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation rec { - pname = "liberio"; - version = "unstable-2019-12-11"; + pname = "liberio-unstable"; + version = "2019-12-11"; src = fetchFromGitHub { owner = "EttusResearch"; diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/development/libraries/libevdevplus/default.nix index 66c5f1b06964f..8bdaf639f3c11 100644 --- a/pkgs/development/libraries/libevdevplus/default.nix +++ b/pkgs/development/libraries/libevdevplus/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { - pname = "libevdevplus"; - version = "unstable-2019-10-01"; + pname = "libevdevplus-unstable"; + version = "2019-10-01"; src = fetchFromGitHub { owner = "YukiWorkshop"; diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index f82401f524fad..d25948a42af13 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation { - pname = "libgumath"; - version = "unstable-2019-08-01"; + pname = "libgumath-unstable"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "xnd-project"; diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index 2440082cce9d7..170d458956b4d 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }: stdenv.mkDerivation rec { - pname = "libminc"; - version = "unstable-2020-07-17"; + pname = "libminc-unstable"; + version = "2020-07-17"; owner = "BIC-MNI"; diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 1f0709af6cfc1..c1755ff576b0f 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -3,8 +3,8 @@ }: stdenv.mkDerivation { - pname = "libndtypes"; - version = "unstable-2019-08-01"; + pname = "libndtypes-unstable"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "xnd-project"; diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix index 567598500d612..bf89d4c3c801b 100644 --- a/pkgs/development/libraries/libnest2d/default.nix +++ b/pkgs/development/libraries/libnest2d/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, clipper, nlopt, boost, python3 }: stdenv.mkDerivation rec { - version = "2020-10-09-unstable"; - pname = "libnest2d"; + version = "2020-10-09"; + pname = "libnest2d-unstable"; # This revision is waiting to be merged upstream # Once it has been merged, this should be switched to it diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 217a83bcebc3d..11dd1c6b7c2a4 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation rec { - pname = "libraspberrypi"; - version = "unstable-2020-11-30"; + pname = "libraspberrypi-unstable"; + version = "2020-11-30"; src = fetchFromGitHub { owner = "raspberrypi"; diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix index 920315bb1bc24..c616d93ec0526 100644 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -5,8 +5,8 @@ with lib; stdenv.mkDerivation rec { - pname = "libtgvoip"; - version = "unstable-2020-03-02"; + pname = "libtgvoip-unstable"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "telegramdesktop"; diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index f8dfa80a95979..88ac37df17a33 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchgit, cmake, pkg-config, json_c }: stdenv.mkDerivation { - pname = "libubox"; - version = "unstable-2020-01-20"; + pname = "libubox-unstable"; + version = "2020-01-20"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index f6fb9a13e4cd0..165a0f3d563f5 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -13,8 +13,8 @@ }: stdenv.mkDerivation { - pname = "libunity"; - version = "unstable-2019-03-19"; + pname = "libunity-unstable"; + version = "2019-03-19"; outputs = [ "out" "dev" "py" ]; diff --git a/pkgs/development/libraries/libuvc/default.nix b/pkgs/development/libraries/libuvc/default.nix index e7ff4bb7f288d..f29dcbcc4c8fc 100644 --- a/pkgs/development/libraries/libuvc/default.nix +++ b/pkgs/development/libraries/libuvc/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation rec { - pname = "libuvc"; - version = "unstable-2020-11-29"; + pname = "libuvc-unstable"; + version = "2020-11-29"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 1fac0d86d4c72..639a9588b05d8 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation { - pname = "libxnd"; - version = "unstable-2019-08-01"; + pname = "libxnd-unstable"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "xnd-project"; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index 6aacfc5ea2fa1..cccf2cab0b8ca 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, curl }: stdenv.mkDerivation { - pname = "libykclient"; - version = "unstable-2019-03-18"; + pname = "libykclient-unstable"; + version = "2019-03-18"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubico-c-client"; diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix index 3ebfc21095d16..9278c889a67f5 100644 --- a/pkgs/development/libraries/libzra/default.nix +++ b/pkgs/development/libraries/libzra/default.nix @@ -4,8 +4,8 @@ }: stdenv.mkDerivation rec { - pname = "libzra"; - version = "unstable-2020-09-11"; + pname = "libzra-unstable"; + version = "2020-09-11"; src = fetchFromGitHub { owner = "zraorg"; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 08842889f8651..8faf19d049425 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -9,10 +9,10 @@ }: stdenv.mkDerivation rec { - pname = "msopenh264"; + pname = "msopenh264-unstable"; # Using master branch for linphone-desktop caused a chain reaction that many # of its dependencies needed to use master branch too. - version = "unstable-2020-03-03"; + version = "2020-03-03"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 45b0abdee71b9..7b6465abe8e1b 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -3,8 +3,8 @@ }: stdenv.mkDerivation rec { - pname = "multipart-parser-c"; - version = "unstable-2015-12-14"; + pname = "multipart-parser-c-unstable"; + version = "2015-12-14"; src = fetchFromGitHub { owner = "iafonov"; diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix index 02f0cd671f280..b6b4d8f40f09c 100644 --- a/pkgs/development/libraries/mumlib/default.nix +++ b/pkgs/development/libraries/mumlib/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config , boost, openssl, log4cpp, libopus, protobuf }: with lib; stdenv.mkDerivation { - pname = "mumlib"; - version = "unstable-2018-12-12"; + pname = "mumlib-unstable"; + version = "2018-12-12"; src = fetchFromGitHub { owner = "slomkowski"; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index 9470b812586a3..72faa2969231f 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation { - pname = "mutest"; - version = "unstable-2019-08-26"; + pname = "mutest-unstable"; + version = "2019-08-26"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 676245967202e..d44b77325e286 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { - pname = "nvidia-texture-tools"; - version = "unstable-2019-10-27"; + pname = "nvidia-texture-tools-unstable"; + version = "2019-10-27"; src = fetchFromGitHub { owner = "castano"; diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 8bbde9796d9a8..ac0cb19e634cf 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -56,8 +56,8 @@ let inherit (if buildWithPatches then passthru else llvmPkgs) clang-unwrapped spirv-llvm-translator; in stdenv.mkDerivation rec { - pname = "opencl-clang"; - version = "unstable-2019-08-16"; + pname = "opencl-clang-unstable"; + version = "2019-08-16"; inherit passthru; diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 4df98c3026e59..7888b5422dbc1 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "rapidcheck"; - version = "unstable-2020-12-19"; + pname = "rapidcheck-unstable"; + version = "2020-12-19"; src = fetchFromGitHub { owner = "emil-e"; diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix index bc2de6e882f9e..a917ed5b3679c 100644 --- a/pkgs/development/libraries/science/biology/bicgl/default.nix +++ b/pkgs/development/libraries/science/biology/bicgl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }: stdenv.mkDerivation rec { - pname = "bicgl"; - version = "unstable-2018-04-06"; + pname = "bicgl-unstable"; + version = "2018-04-06"; owner = "BIC-MNI"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/${owner}/${pname}"; + homepage = "https://github.com/${owner}/bicgl"; description = "Brain Imaging Centre graphics library"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix index 0bdcbf5a828a9..e0ee5cefba434 100644 --- a/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, libminc, netpbm }: stdenv.mkDerivation rec { - pname = "bicpl"; - version = "unstable-2017-09-10"; + pname = "bicpl-unstable"; + version = "2017-09-10"; owner = "BIC-MNI"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # internal_volume_io.h: No such file or directory meta = with lib; { - homepage = "https://github.com/${owner}/${pname}"; + homepage = "https://github.com/${owner}/bicpl"; description = "Brain Imaging Centre programming library"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/development/libraries/science/biology/gifticlib/default.nix index 306324129cbdf..b18689176a1c3 100644 --- a/pkgs/development/libraries/science/biology/gifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/gifticlib/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, expat, nifticlib, zlib }: stdenv.mkDerivation rec { - pname = "gifticlib"; - version = "unstable-2020-07-07"; + pname = "gifticlib-unstable"; + version = "2020-07-07"; src = fetchFromGitHub { owner = "NIFTI-Imaging"; diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/development/libraries/science/biology/oobicpl/default.nix index 626e6475ba189..61f49a8a1d79a 100644 --- a/pkgs/development/libraries/science/biology/oobicpl/default.nix +++ b/pkgs/development/libraries/science/biology/oobicpl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, libminc, bicpl, arguments, pcre-cpp }: stdenv.mkDerivation rec { - pname = "oobicpl"; - version = "unstable-2016-03-02"; + pname = "oobicpl-unstable"; + version = "2016-03-02"; owner = "BIC-MNI"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" ]; meta = with lib; { - homepage = "https://github.com/${owner}/${pname}"; + homepage = "https://github.com/${owner}/oobicpl"; description = "Brain Imaging Centre object-oriented programming library (and tools)"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix index a20f6973384ad..5a1a63574c226 100644 --- a/pkgs/development/libraries/science/electronics/qcsxcad/default.nix +++ b/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -9,8 +9,8 @@ }: mkDerivation { - pname = "qcsxcad"; - version = "unstable-2020-01-04"; + pname = "qcsxcad-unstable"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "thliebig"; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index d57cc91f26e28..e6914f59a2ce5 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -9,8 +9,8 @@ }: stdenv.mkDerivation rec { - pname = "smpeg2"; - version = "unstable-2017-10-18"; + pname = "smpeg2-unstable"; + version = "2017-10-18"; src = fetchsvn { url = "svn://svn.icculus.org/smpeg/trunk"; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 2be6c66214546..8eefa26356251 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, lib, stdenv, coin3d, qtbase, cmake, pkg-config }: stdenv.mkDerivation rec { - pname = "soqt"; - version = "2020-12-05-unstable"; + pname = "soqt-unstable"; + version = "2020-12-05"; src = fetchFromGitHub { owner = "coin3d"; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 5ea23aae8791f..0cb12653ffe56 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -1,8 +1,8 @@ { fetchhg, lib, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }: stdenv.mkDerivation { - pname = "soxt"; - version = "unstable-2019-06-14"; + pname = "soxt-unstable"; + version = "2019-06-14"; src = fetchhg { url = "https://bitbucket.org/Coin3D/soxt"; diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix index 9d86017e084ea..ef08dcab9d558 100644 --- a/pkgs/development/libraries/sycl-info/default.nix +++ b/pkgs/development/libraries/sycl-info/default.nix @@ -12,8 +12,8 @@ }: stdenv.mkDerivation rec { - pname = "sycl-info"; - version = "unstable-2019-11-19"; + pname = "sycl-info-unstable"; + version = "2019-11-19"; src = fetchFromGitHub { owner = "codeplaysoftware"; diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/development/libraries/ticpp/default.nix index 20de3d7f2b892..30dd50c507426 100644 --- a/pkgs/development/libraries/ticpp/default.nix +++ b/pkgs/development/libraries/ticpp/default.nix @@ -4,8 +4,8 @@ }: stdenv.mkDerivation { - pname = "ticpp"; - version = "unstable-2019-01-09"; + pname = "ticpp-unstable"; + version = "2019-01-09"; src = fetchFromGitHub { owner = "wxFormBuilder"; diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index db947d373a2dd..974a946e981cc 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, cmake, fetchgit, libubox, libjson }: stdenv.mkDerivation { - pname = "ubus"; - version = "unstable-2020-01-05"; + pname = "ubus-unstable"; + version = "2020-01-05"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix index 0a5af8b907b8b..1539b1faf260c 100644 --- a/pkgs/development/libraries/uci/default.nix +++ b/pkgs/development/libraries/uci/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, cmake, fetchgit, pkg-config, libubox }: stdenv.mkDerivation { - pname = "uci"; - version = "unstable-2020-04-27"; + pname = "uci-unstable"; + version = "2020-04-27"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index 1289b03618c6f..1343d8925e461 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -3,8 +3,8 @@ , pam, yubikey-personalization, libyubikey, libykclient }: stdenv.mkDerivation rec { - pname = "yubico-pam"; - version = "unstable-2019-07-01"; + pname = "yubico-pam-unstable"; + version = "2019-07-01"; src = fetchFromGitHub { owner = "Yubico"; repo = pname; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index eec969f99caf4..a66dd0f0e13c7 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -88,7 +88,8 @@ with super; }); ljsyscall = super.ljsyscall.override(rec { - version = "unstable-20180515"; + pname = "ljsyscall-unstable"; + version = "2018-05-15"; # package hasn't seen any release for a long time src = pkgs.fetchFromGitHub { owner = "justincormack"; diff --git a/pkgs/development/misc/rappel/default.nix b/pkgs/development/misc/rappel/default.nix index 67e202a005fc9..df5f2b0b1e171 100644 --- a/pkgs/development/misc/rappel/default.nix +++ b/pkgs/development/misc/rappel/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation rec { - pname = "rappel"; - version = "unstable-2019-09-09"; + pname = "rappel-unstable"; + version = "2019-09-09"; src = fetchFromGitHub { owner = "yrp604"; diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix index d0cb663fb74ba..bbe799b6b4bb3 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, libusb1 }: stdenv.mkDerivation { - pname = "rpiboot"; - version = "unstable-2020-10-20"; + pname = "rpiboot-unstable"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "raspberrypi"; diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix index 87fd72b7567a0..5a7d58683d969 100644 --- a/pkgs/development/ocaml-modules/npy/default.nix +++ b/pkgs/development/ocaml-modules/npy/default.nix @@ -1,14 +1,14 @@ { lib, buildDunePackage, fetchFromGitHub, numpy, camlzip }: buildDunePackage rec { - pname = "npy"; - version = "unstable-2019-04-02"; + pname = "npy-unstable"; + version = "2019-04-02"; minimumOCamlVersion = "4.06"; src = fetchFromGitHub { owner = "LaurentMazare"; - repo = "${pname}-ocaml"; + repo = "npy-ocaml"; rev = "c051086bfea6bee58208098bcf1c2f725a80a1fb"; sha256 = "06mgrnm7xiw2lhqvbdv2zmd65sqfdnjd7j4qmcswanmplm17yhvb"; }; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index d3d6097b4462d..bfef54bcf76af 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -2,8 +2,8 @@ , alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }: buildDunePackage rec { - pname = "phylogenetics"; - version = "unstable-2020-11-23"; + pname = "phylogenetics-unstable"; + version = "2020-11-23"; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 3e06af881c560..8d791b85b18a7 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -15,7 +15,7 @@ let param = version = "5.0+4.03.0"; sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; }; "4.04" = { - version = "unstable-20161114"; + version = "2016-11-14"; rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac"; sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl"; }; "4.05" = { diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 7fd9bca3a7964..e37beee33bcdc 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -6,8 +6,8 @@ }: if !(pythonOlder "3.3") then null else buildPythonPackage { - pname = "backports.shutil_get_terminal_size"; - version = "unstable-2016-02-21"; + pname = "backports.shutil_get_terminal_size-unstable"; + version = "2016-02-21"; # there have been numerous fixes commited since the initial release. # Most notably fixing a problem where the backport would always return diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix index 8a63f78728e26..4dd9f59f3b9e2 100644 --- a/pkgs/development/python-modules/glasgow/default.nix +++ b/pkgs/development/python-modules/glasgow/default.nix @@ -17,8 +17,8 @@ }: buildPythonPackage rec { - pname = "glasgow"; - version = "unstable-2020-06-29"; + pname = "glasgow-unstable"; + version = "2020-06-29"; # python software/setup.py --version realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}"; diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix index 22e6743582c25..1003db11394c1 100644 --- a/pkgs/development/python-modules/gpyopt/default.nix +++ b/pkgs/development/python-modules/gpyopt/default.nix @@ -2,8 +2,8 @@ , numpy, scipy, gpy, emcee, nose }: buildPythonPackage rec { - pname = "GPyOpt"; - version = "unstable-2019-09-25"; + pname = "GPyOpt-unstable"; + version = "2019-09-25"; src = fetchFromGitHub { repo = pname; diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 3af8e97ba71bd..48abed344ffb2 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -5,8 +5,8 @@ }: buildPythonPackage rec { - pname = "gtimelog"; - version = "unstable-2020-05-16"; + pname = "gtimelog-unstable"; + version = "2020-05-16"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix index 7d6437f41a866..0fa7572adf514 100644 --- a/pkgs/development/python-modules/kinparse/default.nix +++ b/pkgs/development/python-modules/kinparse/default.nix @@ -7,8 +7,8 @@ }: buildPythonPackage { - pname = "kinparse"; - version = "unstable-2019-12-18"; + pname = "kinparse-unstable"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "xesscorp"; diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix index 79900197133a2..881be6f0fd98b 100644 --- a/pkgs/development/python-modules/nbmerge/default.nix +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -6,8 +6,8 @@ }: buildPythonPackage rec { - pname = "nbmerge"; - version = "unstable-2017-10-23"; + pname = "nbmerge-unstable"; + version = "2017-10-23"; src = fetchFromGitHub { owner = "jbn"; diff --git a/pkgs/development/python-modules/nix-kernel/default.nix b/pkgs/development/python-modules/nix-kernel/default.nix index 5758e60fa3fc6..304e865f46464 100644 --- a/pkgs/development/python-modules/nix-kernel/default.nix +++ b/pkgs/development/python-modules/nix-kernel/default.nix @@ -8,8 +8,8 @@ }: buildPythonPackage rec { - pname = "nix-kernel"; - version = "unstable-2020-04-26"; + pname = "nix-kernel-unstable"; + version = "2020-04-26"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix index 55f70f74db94a..6c2e55d7638f3 100644 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -7,8 +7,8 @@ }: buildPythonPackage rec { - pname = "nmigen-boards"; - version = "unstable-2020-02-06"; + pname = "nmigen-boards-unstable"; + version = "2020-02-06"; # python setup.py --version realVersion = "0.1.dev92+g${lib.substring 0 7 src.rev}"; diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix index 4c15e65e62b29..42a867504217c 100644 --- a/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/pkgs/development/python-modules/nmigen-soc/default.nix @@ -7,8 +7,8 @@ }: buildPythonPackage rec { - pname = "nmigen-soc"; - version = "unstable-2020-02-08"; + pname = "nmigen-soc-unstable"; + version = "2020-02-08"; # python setup.py --version realVersion = "0.1.dev24+g${lib.substring 0 7 src.rev}"; diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 4a2327bf9288d..dcd6a5809ab69 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -15,8 +15,8 @@ }: buildPythonPackage rec { - pname = "nmigen"; - version = "unstable-2020-04-02"; + pname = "nmigen-unstable"; + version = "2020-04-02"; # python setup.py --version realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index 4057ba1de8adb..f0f9be63397b7 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -9,8 +9,9 @@ }: buildPythonPackage { - version = "unstable-20160819"; - pname = "nxt-python"; + version = "2016-08-19"; + pname = "nxt-python-unstable"; + disabled = isPy3k; src = fetchgit { diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index df65547a256d2..8b9d0a436a714 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -9,8 +9,8 @@ }: buildPythonPackage rec { - pname = "oauthlib"; - version = "unstable-2020-05-08"; + pname = "oauthlib-unstable"; + version = "2020-05-08"; # master supports pyjwt==1.7.1 src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index ffa9bdacd2d13..d4b27114e9f57 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, nose }: buildPythonPackage { - pname = "ptable"; - version = "unstable-2019-06-14"; + pname = "ptable-unstable"; + version = "2019-06-14"; # https://github.com/kxxoling/PTable/issues/27 src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/py3buddy/default.nix b/pkgs/development/python-modules/py3buddy/default.nix index b8a25480799b3..5e221a8c7dde0 100644 --- a/pkgs/development/python-modules/py3buddy/default.nix +++ b/pkgs/development/python-modules/py3buddy/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation rec { - pname = "py3buddy"; - version = "unstable-2019-09-29"; + pname = "py3buddy-unstable"; + version = "2019-09-29"; src = fetchFromGitHub { owner = "armijnhemel"; diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index a02861c68cda8..fe9b69f75f1b8 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -5,8 +5,8 @@ }: buildPythonPackage rec { - version = "unstable-20160819"; - pname = "pybluez"; + version = "2016-08-19"; + pname = "pybluez-unstable"; propagatedBuildInputs = [ pkgs.bluez ]; diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index a17388b34b5cf..5fd75a36bbd2a 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -4,8 +4,8 @@ }: buildPythonPackage { - pname = "pyfantom"; - version = "unstable-2013-12-18"; + pname = "pyfantom-unstable"; + version = "2013-12-18"; src = fetchgit { url = "http://git.ni.fr.eu.org/pyfantom.git"; diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix index 3b35ce3e71663..3b56a460d966c 100644 --- a/pkgs/development/python-modules/pymaging/default.nix +++ b/pkgs/development/python-modules/pymaging/default.nix @@ -4,8 +4,8 @@ }: buildPythonPackage { - pname = "pymaging"; - version = "unstable-2016-11-16"; + pname = "pymaging-unstable"; + version = "2016-11-16"; src = fetchFromGitHub { owner = "ojii"; diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index 64ea5b4ff5b0a..dc6bda1741f7b 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -5,8 +5,8 @@ }: buildPythonPackage { - pname = "pymaging-png"; - version = "unstable-2016-11-16"; + pname = "pymaging-png-unstable"; + version = "2016-11-16"; src = fetchFromGitHub { owner = "ojii"; diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix index dcd35132c2ed0..fb9699288f6be 100644 --- a/pkgs/development/python-modules/pyspinel/default.nix +++ b/pkgs/development/python-modules/pyspinel/default.nix @@ -3,8 +3,8 @@ }: buildPythonPackage rec { - pname = "pyspinel"; - version = "unstable-2020-06-19"; # no versioned release since 2018 + pname = "pyspinel-unstable"; + version = "2020-06-19"; # no versioned release since 2018 disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytest-ordering/default.nix b/pkgs/development/python-modules/pytest-ordering/default.nix index 6cd1ed227976f..281092e98aff9 100644 --- a/pkgs/development/python-modules/pytest-ordering/default.nix +++ b/pkgs/development/python-modules/pytest-ordering/default.nix @@ -2,8 +2,8 @@ , pytest }: buildPythonPackage rec { - pname = "pytest-ordering"; - version = "unstable-2019-06-19"; + pname = "pytest-ordering-unstable"; + version = "2019-06-19"; # Pypi lacks tests/ # Resolves PytestUnknownMarkWarning from pytest diff --git a/pkgs/development/python-modules/python-csxcad/default.nix b/pkgs/development/python-modules/python-csxcad/default.nix index 885208e0e61ca..f768f8a36351a 100644 --- a/pkgs/development/python-modules/python-csxcad/default.nix +++ b/pkgs/development/python-modules/python-csxcad/default.nix @@ -9,8 +9,8 @@ }: buildPythonPackage rec { - pname = "python-csxcad"; - version = "unstable-2020-02-18"; + pname = "python-csxcad-unstable"; + version = "2020-02-18"; src = fetchFromGitHub { owner = "thliebig"; diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index e129bf4521955..c078ed654a290 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -17,8 +17,8 @@ let }; in buildPythonPackage rec { - pname = "python-mapnik"; - version = "unstable-2020-02-24"; + pname = "python-mapnik-unstable"; + version = "2020-02-24"; src = pkgs.fetchFromGitHub { owner = "mapnik"; diff --git a/pkgs/development/python-modules/python-openems/default.nix b/pkgs/development/python-modules/python-openems/default.nix index dd669cf547545..fa5cef992a4a6 100644 --- a/pkgs/development/python-modules/python-openems/default.nix +++ b/pkgs/development/python-modules/python-openems/default.nix @@ -11,8 +11,8 @@ }: buildPythonPackage rec { - pname = "python-openems"; - version = "unstable-2020-02-15"; + pname = "python-openems-unstable"; + version = "2020-02-15"; src = fetchFromGitHub { owner = "thliebig"; diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix index fa82027777f64..225508e84c8da 100644 --- a/pkgs/development/python-modules/python-unshare/default.nix +++ b/pkgs/development/python-modules/python-unshare/default.nix @@ -4,10 +4,10 @@ }: buildPythonPackage { - pname = "python-unshare"; + pname = "python-unshare-unstable"; # pypi version doesn't support Python 3 and the package didn't update for a long time: # https://github.com/TheTincho/python-unshare/pull/8 - version = "unstable-2018-05-20"; + version = "2018-05-20"; src = fetchFromGitHub { owner = "TheTincho"; diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix index 8e168bf8181a6..b44d87527f21a 100644 --- a/pkgs/development/python-modules/pytricia/default.nix +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -4,8 +4,8 @@ }: buildPythonPackage rec { - pname = "pytricia"; - version = "unstable-2019-01-16"; + pname = "pytricia-unstable"; + version = "2019-01-16"; src = fetchFromGitHub { owner = "jsommers"; diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix index 7923565c3f4ff..151f5cce06fa1 100644 --- a/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -11,8 +11,8 @@ }: buildPythonPackage rec { - pname = "scikit-fuzzy"; - version = "unstable-2020-10-03"; + pname = "scikit-fuzzy-unstable"; + version = "2020-10-03"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/skidl/default.nix b/pkgs/development/python-modules/skidl/default.nix index 3d2007732e8cf..0500e17f7e426 100644 --- a/pkgs/development/python-modules/skidl/default.nix +++ b/pkgs/development/python-modules/skidl/default.nix @@ -12,8 +12,8 @@ }: buildPythonPackage rec { - pname = "skidl"; - version = "unstable-2020-09-15"; + pname = "skidl-unstable"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "xesscorp"; diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index a7520c62a62c9..ad60de5cb319c 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -7,8 +7,8 @@ }: buildPythonPackage { - pname = "slob"; - version = "unstable-2016-11-03"; + pname = "slob-unstable"; + version = "2016-11-03"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index 883d541f81203..b37aa4f07205d 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -7,8 +7,8 @@ }: buildPythonPackage { - pname = "tess"; - version = "unstable-2019-05-07"; + pname = "tess-unstable"; + version = "2019-05-07"; src = fetchFromGitHub { owner = "wackywendell"; diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix index 2c8f6dd803129..c9457de3ea98f 100644 --- a/pkgs/development/python-modules/traittypes/default.nix +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -13,8 +13,8 @@ }: buildPythonPackage rec { - pname = "traittypes"; - version = "unstable-2019-06-23"; + pname = "traittypes-unstable"; + version = "2019-06-23"; disabled = isPy27; diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix index 8b21e64e9a7ec..093ec5c18baea 100644 --- a/pkgs/development/python-modules/transforms3d/default.nix +++ b/pkgs/development/python-modules/transforms3d/default.nix @@ -9,8 +9,8 @@ }: buildPythonPackage rec { - pname = "transforms3d"; - version = "unstable-2019-12-17"; + pname = "transforms3d-unstable"; + version = "2019-12-17"; disabled = isPy27; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 4cd16a80a943b..7f5b8f4a03050 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -2,8 +2,8 @@ , pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { - pname = "panopticon"; - version = "unstable-20171202"; + pname = "panopticon-unstable"; + version = "2017-12-02"; src = fetchFromGitHub { owner = "das-labor"; @@ -27,11 +27,11 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = '' - mkdir -p $out/share/${pname} $out/bin - cp -R qml $out/share/${pname} - mv $out/bin/${pname} $out/share/${pname} - chmod +x $out/share/${pname} - makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} + mkdir -p $out/share/panopticon $out/bin + cp -R qml $out/share/panopticon + mv $out/bin/panopticon $out/share/panopticon + chmod +x $out/share/panopticon + makeWrapper $out/share/panopticon/panopticon $out/bin/panopticon ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix index 42e382c8bcad2..081d1863ec737 100644 --- a/pkgs/development/tools/analysis/pev/default.nix +++ b/pkgs/development/tools/analysis/pev/default.nix @@ -1,8 +1,8 @@ { stdenv, openssl, fetchFromGitHub }: stdenv.mkDerivation { - pname = "pev"; - version = "unstable-2020-05-23"; + pname = "pev-unstable"; + version = "2020-05-23"; src = fetchFromGitHub { owner = "merces"; diff --git a/pkgs/development/tools/analysis/rr/unstable.nix b/pkgs/development/tools/analysis/rr/unstable.nix index 82b644f76ae6a..5bdb0d09655f5 100644 --- a/pkgs/development/tools/analysis/rr/unstable.nix +++ b/pkgs/development/tools/analysis/rr/unstable.nix @@ -12,7 +12,8 @@ let in rr.overrideAttrs (old: { - version = "unstable-2020-10-04"; + pname = "rr-unstable"; + version = "2020-10-04"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index daa68b1b93113..bb155170f0f28 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -2,8 +2,8 @@ , makeWrapper, nix-prefetch-scripts }: buildGoPackage rec { - pname = "dep2nix"; - version = "unstable-2019-04-02"; + pname = "dep2nix-unstable"; + version = "2019-04-02"; goPackagePath = "github.com/nixcloud/dep2nix"; diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index ef99bbd01c31e..775652f248d13 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { - pname = "easyjson"; - version = "unstable-2019-06-26"; + pname = "easyjson-unstable"; + version = "2019-06-26"; goPackagePath = "github.com/mailru/easyjson"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 077dc8b87f997..083c738b8a444 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -7,8 +7,8 @@ } : stdenv.mkDerivation { - pname = "fusee-launcher"; - version = "unstable-2018-07-14"; + pname = "fusee-launcher-unstable"; + version = "2018-07-14"; src = fetchFromGitHub { owner = "Cease-and-DeSwitch"; diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix index 9ad85e840bad8..c6d0c5c1353fd 100644 --- a/pkgs/development/tools/glpaper/default.nix +++ b/pkgs/development/tools/glpaper/default.nix @@ -2,8 +2,8 @@ , libX11, libGL }: stdenv.mkDerivation { - name = "glpaper"; - version = "unstable-2020-03-30"; + pname = "glpaper-unstable"; + version = "2020-03-30"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/glpaper"; diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index f63a46793a375..773c540c7a187 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -7,8 +7,8 @@ }: stdenv.mkDerivation rec { - pname = "gnome-desktop-testing"; - version = "unstable-2019-12-11"; + pname = "gnome-desktop-testing-unstable"; + version = "2019-12-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 9256fab43bf85..1ffd7141afe1e 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage { - pname = "go-bindata"; - version = "unstable-2015-10-23"; + pname = "go-bindata-unstable"; + version = "2015-10-23"; goPackagePath = "github.com/jteeuwen/go-bindata"; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index f10ee426c0806..037a8e3355344 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - pname = "go-outline"; - version = "unstable-2018-11-22"; + pname = "go-outline-unstable"; + version = "2018-11-22"; rev = "7182a932836a71948db4a81991a494751eccfe77"; goPackagePath = "github.com/ramya-rao-a/go-outline"; diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix index 0f772134a0e2a..14d5ccf69c767 100644 --- a/pkgs/development/tools/gojsontoyaml/default.nix +++ b/pkgs/development/tools/gojsontoyaml/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "gojsontoyaml"; - version = "unstable-2020-06-02"; + pname = "gojsontoyaml-unstable"; + version = "2020-06-02"; src = fetchFromGitHub { owner = "brancz"; diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix index 667997ddff4de..18dd5696e77f5 100644 --- a/pkgs/development/tools/hobbes/default.nix +++ b/pkgs/development/tools/hobbes/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }: stdenv.mkDerivation { - name = "hobbes"; - version = "unstable-2020-05-19"; + pname = "hobbes-unstable"; + version = "2020-05-19"; src = fetchFromGitHub { owner = "morgan-stanley"; diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 428e6e444a215..f98d3d5dc5117 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchgit, dmd, dub }: stdenv.mkDerivation { - pname = "Literate"; - version = "unstable-2020-09-02"; + pname = "Literate-unstable"; + version = "2020-09-02"; src = fetchgit { url = "https://github.com/zyedidia/Literate.git"; diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index c49187273c465..2ff63f4be376e 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -6,8 +6,8 @@ with lib; stdenv.mkDerivation rec { - pname = "blackmagic"; - version = "unstable-2020-08-05"; + pname = "blackmagic-unstable"; + version = "2020-08-05"; # `git describe --always` firmwareVersion = "v1.6.1-539-gdd74ec8"; diff --git a/pkgs/development/tools/misc/cc-tool/default.nix b/pkgs/development/tools/misc/cc-tool/default.nix index 6be0ab2acb50b..58d4c5664946f 100644 --- a/pkgs/development/tools/misc/cc-tool/default.nix +++ b/pkgs/development/tools/misc/cc-tool/default.nix @@ -7,8 +7,8 @@ }: stdenv.mkDerivation rec { - pname = "cc-tool"; - version = "unstable-2020-05-19"; + pname = "cc-tool-unstable"; + version = "2020-05-19"; src = fetchFromGitHub { owner = "dashesy"; diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix index a121cc6709939..ac0c452580656 100644 --- a/pkgs/development/tools/misc/itm-tools/default.nix +++ b/pkgs/development/tools/misc/itm-tools/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, rustPlatform, pkg-config }: rustPlatform.buildRustPackage rec { - pname = "itm-tools"; - version = "unstable-2019-11-15"; + pname = "itm-tools-unstable"; + version = "2019-11-15"; src = fetchFromGitHub { owner = "japaric"; diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/development/tools/misc/mdctags/default.nix index ac61702160125..0556ed9bc37d4 100644 --- a/pkgs/development/tools/misc/mdctags/default.nix +++ b/pkgs/development/tools/misc/mdctags/default.nix @@ -1,8 +1,8 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage { - pname = "mdctags"; - version = "unstable-2020-06-11"; # v0.1.0 does not build with our rust version + pname = "mdctags-unstable"; + version = "2020-06-11"; # v0.1.0 does not build with our rust version src = fetchFromGitHub { owner = "wsdjeg"; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index b086b3cdc48f0..7e601321477ce 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: stdenv.mkDerivation { - pname = "universal-ctags"; - version = "unstable-2019-07-30"; + pname = "universal-ctags-unstable"; + version = "2019-07-30"; src = fetchFromGitHub { owner = "universal-ctags"; diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/development/tools/mmixware/default.nix index b6d03f4567124..b019917fe8c2a 100644 --- a/pkgs/development/tools/mmixware/default.nix +++ b/pkgs/development/tools/mmixware/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitLab, tetex }: stdenv.mkDerivation { - pname = "mmixware"; - version = "unstable-2019-02-19"; + pname = "mmixware-unstable"; + version = "2019-02-19"; src = fetchFromGitLab { domain = "gitlab.lrz.de"; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index 82ed82a67bdce..bbd1ba861b8b1 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -7,8 +7,8 @@ }: mkDerivation { - pname = "ofono-phonesim"; - version = "unstable-2019-11-18"; + pname = "ofono-phonesim-unstable"; + version = "2019-11-18"; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git"; diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index 16e832a99b84d..83ceeaafefbdb 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, openssh }: stdenv.mkDerivation { - pname = "rdocker"; - version = "unstable-2018-07-17"; + pname = "rdocker-unstable"; + version = "2018-07-17"; src = fetchFromGitHub { owner = "dvddarias"; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 19cc3fdf58046..5cfe74dbf5176 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }: rustPlatform.buildRustPackage rec { - pname = "racerd"; - version = "unstable-2019-09-02"; + pname = "racerd-unstable"; + version = "2019-09-02"; src = fetchFromGitHub { owner = "jwilm"; diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index d48787ea017af..18d4045e1db80 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -7,8 +7,8 @@ }: buildGoModule { - pname = "vgo2nix"; - version = "unstable-2020-11-07"; + pname = "vgo2nix-unstable"; + version = "2020-11-07"; src = fetchFromGitHub { owner = "nix-community"; diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index 5c78d730d203e..75dc52ba76e6b 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation { - pname = "wxFormBuilder"; - version = "unstable-2020-08-18"; + pname = "wxFormBuilder-unstable"; + version = "2020-08-18"; src = fetchFromGitHub { owner = "wxFormBuilder"; diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index d707caaec5a7d..a7d9483cb251f 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -2,8 +2,8 @@ buildGoPackage { - pname = "yaml2json"; - version = "unstable-2017-05-03"; + pname = "yaml2json-unstable"; + version = "2017-05-03"; goPackagePath = "github.com/bronze1man/yaml2json"; goDeps = ./deps.nix; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 0206821f38738..34d6be1663afc 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -7,8 +7,8 @@ with lib; stdenv.mkDerivation rec { # master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix. - pname = "assaultcube"; - version = "unstable-2018-05-20"; + pname = "assaultcube-unstable"; + version = "2018-05-20"; src = fetchFromGitHub { owner = "assaultcube"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { exec = pname; }; - gamedatadir = "/share/games/${pname}"; + gamedatadir = "/share/games/assaultcube"; installPhase = '' @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png - makeWrapper $out/bin/ac_client $out/bin/${pname} \ + makeWrapper $out/bin/ac_client $out/bin/assaultcube \ --run "cd $out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init" fi if (test -e source/src/ac_server) then cp source/src/ac_server $bindir - makeWrapper $out/bin/ac_server $out/bin/${pname}-server \ + makeWrapper $out/bin/ac_server $out/bin/assaultcube-server \ --run "cd $out/$gamedatadir" --add-flags "-Cconfig/servercmdline.txt" fi ''; diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index e911709dffcc3..b7f52137acba8 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "frogatto-data"; - version = "unstable-2018-12-18"; + pname = "frogatto-data-unstable"; + version = "2018-12-18"; src = fetchFromGitHub { owner = "frogatto"; diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index fb09847908da6..38f7e9eccff32 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -14,9 +14,10 @@ let genericName = "frogatto"; categories = "Game;ArcadeGame;"; }; - version = "unstable-2020-12-04"; + pname = "frogatto-unstable"; + version = "2020-12-04"; in buildEnv { - name = "frogatto-${version}"; + name = "${pname}-${version}"; # i don't know why this is needed buildInputs = [ makeWrapper ]; paths = [ engine data desktopItem ]; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 4ebf22b46b0e0..94006d8fcc4e6 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -3,8 +3,8 @@ , glew, zlib, icu, pkg-config, cairo, libvpx }: stdenv.mkDerivation { - pname = "anura-engine"; - version = "unstable-2018-11-28"; + pname = "anura-engine-unstable"; + version = "2018-11-28"; src = fetchFromGitHub { owner = "anura-engine"; diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix index 8e2fa41f4200e..c5d8dbef54721 100644 --- a/pkgs/games/gnome-hexgl/default.nix +++ b/pkgs/games/gnome-hexgl/default.nix @@ -10,8 +10,8 @@ }: stdenv.mkDerivation rec { - pname = "gnome-hexgl"; - version = "unstable-2020-07-24"; + pname = "gnome-hexgl-unstable"; + version = "2020-07-24"; src = fetchFromGitHub { owner = "alexlarsson"; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 7d63510aa991b..df862d7e393a7 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -3,8 +3,8 @@ , python3Packages, gnome3 }: buildPythonApplication { - pname = "gscrabble"; - version = "unstable-2019-03-11"; + pname = "gscrabble-unstable"; + version = "2019-03-11"; src = fetchFromGitHub { owner = "RaaH"; diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index b15bb43a45176..5b0edd1f0affa 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -3,8 +3,8 @@ , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: stdenv.mkDerivation rec { - pname = "gweled"; - version = "unstable-2018-02-15"; + pname = "gweled-unstable"; + version = "2018-02-15"; src = fetchbzr { url = "lp:gweled"; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 60609759559df..5418e57752752 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,8 +1,8 @@ {lib, stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer , pkg-config, libGLU, libGL, git, jsoncpp }: stdenv.mkDerivation rec { - pname = "pingus"; - version = "unstable-0.7.6.0.20191104"; + pname = "pingus-unstable"; + version = "2019-11-04"; nativeBuildInputs = [ cmake pkg-config git ]; buildInputs = [ SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ]; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index ea8c8aaeac87d..a6580ece6017e 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -8,8 +8,8 @@ }: mkDerivation { - pname = "qgo"; - version = "unstable-2017-12-18"; + pname = "qgo-unstable"; + version = "2017-12-18"; meta = with lib; { description = "A Go client based on Qt5"; diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index 24ff228379107..bd07ce95130e1 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -25,8 +25,8 @@ }: stdenv.mkDerivation rec { - pname = "sm64ex"; - version = "unstable-2020-06-19"; + pname = "sm64ex-unstable"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "sm64pc"; diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/soldat-unstable/default.nix index d48cf3048ee5c..e85d8b435d7d0 100644 --- a/pkgs/games/soldat-unstable/default.nix +++ b/pkgs/games/soldat-unstable/default.nix @@ -5,8 +5,8 @@ let base = stdenv.mkDerivation rec { - pname = "soldat-base"; - version = "unstable-2020-11-26"; + pname = "soldat-base-unstable"; + version = "2020-11-26"; src = fetchFromGitHub { name = "base"; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index 6b52194ffcaeb..3aa91693ab8ec 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation { - pname = "warmux"; - version = "unstable-2017-10-20"; + pname = "warmux-unstable"; + version = "2017-10-20"; src = fetchFromGitHub { owner = "fluxer"; diff --git a/pkgs/misc/cups/drivers/carps-cups/default.nix b/pkgs/misc/cups/drivers/carps-cups/default.nix index 32e92da160847..f271588fb9130 100644 --- a/pkgs/misc/cups/drivers/carps-cups/default.nix +++ b/pkgs/misc/cups/drivers/carps-cups/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation { - pname = "carps-cups"; - version = "unstable-2018-03-05"; + pname = "carps-cups-unstable"; + version = "2018-03-05"; src = fetchFromGitHub { owner = "ondrej-zary"; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index ae3a083148ba8..cf17c9a771ff6 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -11,8 +11,8 @@ let fi ''; in stdenv.mkDerivation rec { - pname = "utsushi"; - version = "unstable-2021-01-01"; + pname = "utsushi-unstable"; + version = "2021-01-01"; src = fetchFromGitLab { owner = pname; diff --git a/pkgs/misc/emulators/duckstation/default.nix b/pkgs/misc/emulators/duckstation/default.nix index 29b867f0e9e3b..148070afeede6 100644 --- a/pkgs/misc/emulators/duckstation/default.nix +++ b/pkgs/misc/emulators/duckstation/default.nix @@ -1,8 +1,8 @@ { lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, SDL2, qtbase , wrapQtAppsHook, qttools, ninja, gtk3 }: mkDerivation rec { - pname = "duckstation"; - version = "unstable-2020-12-29"; + pname = "duckstation-unstable"; + version = "2020-12-29"; src = fetchFromGitHub { owner = "stenzek"; diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/misc/emulators/emu2/default.nix index eef361ecd0378..b00bddf666ab4 100644 --- a/pkgs/misc/emulators/emu2/default.nix +++ b/pkgs/misc/emulators/emu2/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "emu2"; - version = "unstable-2020-06-04"; + pname = "emu2-unstable"; + version = "2020-06-04"; src = fetchFromGitHub { owner = "dmsc"; diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/misc/emulators/oberon-risc-emu/default.nix index 749e3549bf80f..2156ddaf51601 100644 --- a/pkgs/misc/emulators/oberon-risc-emu/default.nix +++ b/pkgs/misc/emulators/oberon-risc-emu/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, SDL2 }: stdenv.mkDerivation { - pname = "oberon-risc-emu"; - version = "unstable-2020-08-18"; + pname = "oberon-risc-emu-unstable"; + version = "2020-08-18"; src = fetchFromGitHub { owner = "pdewacht"; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 7f46d9a0034da..0c8a6f63bffdf 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -27,8 +27,8 @@ }: stdenv.mkDerivation { - pname = "pcsx2"; - version = "unstable-2020-11-13"; + pname = "pcsx2-unstable"; + version = "2020-11-13"; src = fetchFromGitHub { owner = "PCSX2"; diff --git a/pkgs/misc/emulators/simplenes/default.nix b/pkgs/misc/emulators/simplenes/default.nix index d073098507ee2..6362515a78bc1 100644 --- a/pkgs/misc/emulators/simplenes/default.nix +++ b/pkgs/misc/emulators/simplenes/default.nix @@ -5,8 +5,8 @@ }: stdenv.mkDerivation rec { - pname = "simplenes"; - version = "unstable-2019-03-13"; + pname = "simplenes-unstable"; + version = "2019-03-13"; src = fetchFromGitHub { owner = "amhndu"; diff --git a/pkgs/misc/lguf-brightness/default.nix b/pkgs/misc/lguf-brightness/default.nix index efdc8e151482b..54765d15ae5ef 100644 --- a/pkgs/misc/lguf-brightness/default.nix +++ b/pkgs/misc/lguf-brightness/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, cmake, libusb1, ncurses5 }: stdenv.mkDerivation rec { - pname = "lguf-brightness"; + pname = "lguf-brightness-unstable"; - version = "unstable-2018-02-11"; + version = "2018-02-11"; src = fetchFromGitHub { owner = "periklis"; diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index 9ef7013fbfd1d..8b1bff929a112 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libusb1 }: stdenv.mkDerivation { - pname = "rkdeveloptool"; - version = "unstable-2019-07-01"; + pname = "rkdeveloptool-unstable"; + version = "2019-07-01"; src = fetchFromGitHub { owner = "rockchip-linux"; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 0d3a954b9b430..3cdc39c2bcd1b 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -54,8 +54,8 @@ in rec { inherit mkDerivation; battery = mkDerivation { - pluginName = "battery"; - version = "unstable-2019-07-04"; + pluginName = "battery-unstable"; + version = "2019-07-04"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-battery"; @@ -65,8 +65,8 @@ in rec { }; continuum = mkDerivation { - pluginName = "continuum"; - version = "unstable-2020-10-16"; + pluginName = "continuum-unstable"; + version = "2020-10-16"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-continuum"; @@ -95,8 +95,8 @@ in rec { }; copycat = mkDerivation { - pluginName = "copycat"; - version = "unstable-2020-01-09"; + pluginName = "copycat-unstable"; + version = "2020-01-09"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-copycat"; @@ -106,8 +106,8 @@ in rec { }; cpu = mkDerivation { - pluginName = "cpu"; - version = "unstable-2020-07-25"; + pluginName = "cpu-unstable"; + version = "2020-07-25"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-cpu"; @@ -128,8 +128,8 @@ in rec { }; dracula = mkDerivation rec { - pluginName = "dracula"; - version = "unstable-2020-12-28"; + pluginName = "dracula-unstable"; + version = "2020-12-28"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; @@ -160,8 +160,8 @@ in rec { }; fpp = mkDerivation { - pluginName = "fpp"; - version = "unstable-2016-03-08"; + pluginName = "fpp-unstable"; + version = "2016-03-08"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-fpp"; @@ -175,9 +175,9 @@ in rec { }; fzf-tmux-url = mkDerivation { - pluginName = "fzf-tmux-url"; + pluginName = "fzf-tmux-url-unstable"; rtpFilePath = "fzf-url.tmux"; - version = "unstable-2019-12-02"; + version = "2019-12-02"; src = fetchFromGitHub { owner = "wfxr"; repo = "tmux-fzf-url"; @@ -187,9 +187,9 @@ in rec { }; gruvbox = mkDerivation { - pluginName = "gruvbox"; + pluginName = "gruvbox-unstable"; rtpFilePath = "gruvbox-tpm.tmux"; - version = "unstable-2019-05-05"; + version = "2019-05-05"; src = fetchFromGitHub { owner = "egel"; repo = "tmux-gruvbox"; @@ -223,8 +223,8 @@ in rec { }; logging = mkDerivation { - pluginName = "logging"; - version = "unstable-2019-04-19"; + pluginName = "logging-unstable"; + version = "2019-04-19"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-logging"; @@ -234,8 +234,8 @@ in rec { }; net-speed = mkDerivation { - pluginName = "net-speed"; - version = "unstable-2018-12-02"; + pluginName = "net-speed-unstable"; + version = "2018-12-02"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-net-speed"; @@ -256,8 +256,8 @@ in rec { }; maildir-counter = mkDerivation { - pluginName = "maildir-counter"; - version = "unstable-2016-11-25"; + pluginName = "maildir-counter-unstable"; + version = "2016-11-25"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-maildir-counter"; @@ -267,8 +267,8 @@ in rec { }; online-status = mkDerivation { - pluginName = "online-status"; - version = "unstable-2018-11-30"; + pluginName = "online-status-unstable"; + version = "2018-11-30"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-online-status"; @@ -278,8 +278,8 @@ in rec { }; open = mkDerivation { - pluginName = "open"; - version = "unstable-2019-12-02"; + pluginName = "open-unstable"; + version = "2019-12-02"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-open"; @@ -289,9 +289,9 @@ in rec { }; onedark-theme = mkDerivation { - pluginName = "onedark-theme"; + pluginName = "onedark-theme-unstable"; rtpFilePath = "tmux-onedark-theme.tmux"; - version = "unstable-2020-06-07"; + version = "2020-06-07"; src = fetchFromGitHub { owner = "odedlaz"; repo = "tmux-onedark-theme"; @@ -301,8 +301,8 @@ in rec { }; pain-control = mkDerivation { - pluginName = "pain-control"; - version = "unstable-2020-02-18"; + pluginName = "pain-control-unstable"; + version = "2020-02-18"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-pain-control"; @@ -326,9 +326,9 @@ in rec { }; power-theme = mkDerivation { - pluginName = "power"; + pluginName = "power-unstable"; rtpFilePath = "tmux-power.tmux"; - version = "unstable-2020-11-18"; + version = "2020-11-18"; src = pkgs.fetchFromGitHub { owner = "wfxr"; repo = "tmux-power"; @@ -338,8 +338,8 @@ in rec { }; prefix-highlight = mkDerivation { - pluginName = "prefix-highlight"; - version = "unstable-2020-03-26"; + pluginName = "prefix-highlight-unstable"; + version = "2020-03-26"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-prefix-highlight"; @@ -349,8 +349,8 @@ in rec { }; resurrect = mkDerivation { - pluginName = "resurrect"; - version = "unstable-2020-09-18"; + pluginName = "resurrect-unstable"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-resurrect"; @@ -386,8 +386,8 @@ in rec { }; sensible = mkDerivation { - pluginName = "sensible"; - version = "unstable-2017-09-05"; + pluginName = "sensible-unstable"; + version = "2017-09-05"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-sensible"; @@ -400,8 +400,8 @@ in rec { }; sessionist = mkDerivation { - pluginName = "sessionist"; - version = "unstable-2017-12-03"; + pluginName = "sessionist-unstable"; + version = "2017-12-03"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-sessionist"; @@ -411,8 +411,8 @@ in rec { }; sidebar = mkDerivation { - pluginName = "sidebar"; - version = "unstable-2018-11-30"; + pluginName = "sidebar-unstable"; + version = "2018-11-30"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-sidebar"; @@ -422,8 +422,8 @@ in rec { }; sysstat = mkDerivation { - pluginName = "sysstat"; - version = "unstable-2017-12-12"; + pluginName = "sysstat-unstable"; + version = "2017-12-12"; src = fetchFromGitHub { owner = "samoshkin"; repo = "tmux-plugin-sysstat"; @@ -452,8 +452,8 @@ in rec { }; tmux-colors-solarized = mkDerivation { - pluginName = "tmuxcolors"; - version = "unstable-2019-07-14"; + pluginName = "tmuxcolors-unstable"; + version = "2019-07-14"; src = fetchFromGitHub { owner = "seebi"; repo = "tmux-colors-solarized"; @@ -463,9 +463,9 @@ in rec { }; tmux-fzf = mkDerivation { - pluginName = "tmux-fzf"; + pluginName = "tmux-fzf-unstable"; rtpFilePath = "main.tmux"; - version = "unstable-2020-12-07"; + version = "2020-12-07"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; @@ -499,8 +499,8 @@ in rec { }; urlview = mkDerivation { - pluginName = "urlview"; - version = "unstable-2016-01-06"; + pluginName = "urlview-unstable"; + version = "2016-01-06"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-urlview"; @@ -514,8 +514,8 @@ in rec { }; vim-tmux-focus-events = mkDerivation { - pluginName = "vim-tmux-focus-events"; - version = "unstable-2020-10-05"; + pluginName = "vim-tmux-focus-events-unstable"; + version = "2020-10-05"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "vim-tmux-focus-events"; @@ -533,9 +533,9 @@ in rec { }; vim-tmux-navigator = mkDerivation { - pluginName = "vim-tmux-navigator"; + pluginName = "vim-tmux-navigator-unstable"; rtpFilePath = "vim-tmux-navigator.tmux"; - version = "unstable-2019-12-10"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; @@ -545,8 +545,8 @@ in rec { }; yank = mkDerivation { - pluginName = "yank"; - version = "unstable-2019-12-02"; + pluginName = "yank-unstable"; + version = "2019-12-02"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-yank"; diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix index 5c0fb9549100b..b4acb6271889d 100755 --- a/pkgs/misc/uq/default.nix +++ b/pkgs/misc/uq/default.nix @@ -4,8 +4,8 @@ }: rustPlatform.buildRustPackage rec { - pname = "uq"; - version = "unstable-2018-05-27"; + pname = "uq-unstable"; + version = "2018-05-27"; src = fetchFromGitHub { owner = "lostutils"; diff --git a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix index ea9d8399667ac..eeafe24be535e 100644 --- a/pkgs/os-specific/darwin/osx-cpu-temp/default.nix +++ b/pkgs/os-specific/darwin/osx-cpu-temp/default.nix @@ -3,8 +3,8 @@ }: stdenv.mkDerivation rec { - pname = "osx-cpu-temp"; - version = "unstable-2020-12-04"; + pname = "osx-cpu-temp-unstable"; + version = "2020-12-04"; src = fetchFromGitHub rec { name = "osx-cpu-temp-source"; diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index d684e24db9148..d695e02cb99ae 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -48,8 +48,8 @@ let in stdenv.mkDerivation rec { - pname = "anbox"; - version = "unstable-2020-11-29"; + pname = "anbox-unstable"; + version = "2020-11-29"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/os-specific/linux/asus-wmi-sensors/default.nix b/pkgs/os-specific/linux/asus-wmi-sensors/default.nix index 3098cbb72538e..19719cda8d49c 100644 --- a/pkgs/os-specific/linux/asus-wmi-sensors/default.nix +++ b/pkgs/os-specific/linux/asus-wmi-sensors/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - name = "asus-wmi-sensors-${version}-${kernel.version}"; - version = "unstable-2019-11-07"; + name = "asus-wmi-sensors-unstable-${version}-${kernel.version}"; + version = "2019-11-07"; # The original was deleted from github, but this seems to be an active fork src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/os-specific/linux/catfs/default.nix index 0ca585fab47b4..13f918c2dcbc4 100644 --- a/pkgs/os-specific/linux/catfs/default.nix +++ b/pkgs/os-specific/linux/catfs/default.nix @@ -5,8 +5,8 @@ }: rustPlatform.buildRustPackage rec { - pname = "catfs"; - version = "unstable-2020-03-21"; + pname = "catfs-unstable"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "kahing"; diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 6b5f66f825bde..3116647124994 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -3,8 +3,8 @@ assert lib.versionAtLeast kernel.version "3.5"; stdenv.mkDerivation rec { - pname = "digimend"; - version = "unstable-2019-06-18"; + pname = "digimend-unstable"; + version = "2019-06-18"; src = fetchFromGitHub { owner = "digimend"; diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 163001638cda7..82468a23ef47f 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -16,13 +16,13 @@ let # still works. srcParams = if (lib.versionAtLeast kernel.version "4.8") then { # Use mainline branch - version = "unstable-2020-04-16"; + version = "2020-04-16"; rev = "82626d4892eeb9eb704538bf0dc49a00725ff451"; sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx"; } else { # Use master branch (broken on 4.8) - version = "unstable-2016-05-02"; + version = "2016-05-02"; rev = "5a7083bd98b38ef3bd223f7ee531d58f4fb0fe7c"; sha256 = "0d455kajvn5xav9iilqy7s1qvsy4yb8vzjjxx7bvcgp7aj9ljvdp"; } @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { - name = "facetimehd-${version}-${kernel.version}"; + name = "facetimehd-unstable-${version}-${kernel.version}"; version = srcParams.version; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index f48895fc017ea..a9d298e7213e6 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -14,8 +14,8 @@ }: stdenv.mkDerivation rec { - pname = "kmscon"; - version = "unstable-2018-09-07"; + pname = "kmscon-unstable"; + version = "2018-09-07"; src = fetchFromGitHub { owner = "Aetf"; diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix index 7b23719c791c3..e2c60277269a8 100644 --- a/pkgs/os-specific/linux/ledger-udev-rules/default.nix +++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "ledger-udev-rules"; - version = "unstable-2019-05-30"; + pname = "ledger-udev-rules-unstable"; + version = "2019-05-30"; src = fetchFromGitHub { owner = "LedgerHQ"; diff --git a/pkgs/os-specific/linux/numworks-udev-rules/default.nix b/pkgs/os-specific/linux/numworks-udev-rules/default.nix index aae7507f50cdd..71c43f46b8ef9 100644 --- a/pkgs/os-specific/linux/numworks-udev-rules/default.nix +++ b/pkgs/os-specific/linux/numworks-udev-rules/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - pname = "numworks-udev-rules"; - version = "unstable-2020-08-31"; + pname = "numworks-udev-rules-unstable"; + version = "2020-08-31"; udevRules = ./50-numworks-calculator.rules; dontUnpack = true; diff --git a/pkgs/os-specific/linux/pcimem/default.nix b/pkgs/os-specific/linux/pcimem/default.nix index dda4d0fff0b92..3afd4f6c5e10f 100644 --- a/pkgs/os-specific/linux/pcimem/default.nix +++ b/pkgs/os-specific/linux/pcimem/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "pcimem"; - version = "unstable-2018-08-29"; + pname = "pcimem-unstable"; + version = "2018-08-29"; src = fetchFromGitHub { owner = "billfarrow"; diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 20bb590895b93..fdc99900036d3 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { - name = "rtl8821cu-${kernel.version}-${version}"; - version = "unstable-2020-12-21"; + pname = "rtl8821cu-${kernel.version}-unstable"; + version = "2020-12-21"; src = fetchFromGitHub { owner = "brektrou"; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index fb94b14d9eab4..85fbe0974599f 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, kernel, bc }: stdenv.mkDerivation rec { - name = "rtl88x2bu-${kernel.version}-${version}"; - version = "unstable-2020-08-20"; + pname = "rtl88x2bu-${kernel.version}-unstable"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "cilynx"; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 1b2415dd80521..82aa968f55baa 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchgit, fetchurl, fetchpatch, nasm, perl, python3, libuuid, mtools, makeWrapper }: stdenv.mkDerivation { - pname = "syslinux"; - version = "unstable-20190207"; + pname = "syslinux-unstable"; + version = "2019-02-07"; # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. # Same issue here https://www.syslinux.org/archives/2019-February/026330.html diff --git a/pkgs/os-specific/linux/trezor-udev-rules/default.nix b/pkgs/os-specific/linux/trezor-udev-rules/default.nix index e5d20171c5cbe..d24481ac5d804 100644 --- a/pkgs/os-specific/linux/trezor-udev-rules/default.nix +++ b/pkgs/os-specific/linux/trezor-udev-rules/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - pname = "trezor-udev-rules"; - version = "unstable-2019-07-17"; + pname = "trezor-udev-rules-unstable"; + version = "2019-07-17"; udevRules = fetchurl { # let's pin the latest commit in the repo which touched the udev rules file diff --git a/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/pkgs/os-specific/linux/zsa-udev-rules/default.nix index ac69dc13b4746..44877cf1cde4c 100644 --- a/pkgs/os-specific/linux/zsa-udev-rules/default.nix +++ b/pkgs/os-specific/linux/zsa-udev-rules/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "zsa-udev-rules"; - version = "unstable-2020-12-16"; + pname = "zsa-udev-rules-unstable"; + version = "2020-12-16"; # TODO: use version and source from nixpkgs/pkgs/development/tools/wally-cli/default.nix after next release src = fetchFromGitHub { diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 0c6fe81877564..73165c4b570be 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -4,8 +4,8 @@ }: buildGoModule { - pname = "demoit"; - version = "unstable-2020-06-11"; + pname = "demoit-unstable"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "dgageot"; diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/servers/dns/https-dns-proxy/default.nix index c32d3eca22637..af005fcb79447 100644 --- a/pkgs/servers/dns/https-dns-proxy/default.nix +++ b/pkgs/servers/dns/https-dns-proxy/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, cmake, gtest, c-ares, curl, libev }: stdenv.mkDerivation rec { - pname = "https-dns-proxy"; + pname = "https-dns-proxy-unstable"; # there are no stable releases (yet?) - version = "unstable-20200419"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "aarond10"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm555 -t $out/bin https_dns_proxy - install -Dm444 -t $out/share/doc/${pname} ../{LICENSE,README}.* + install -Dm444 -t $out/share/doc/https-dns-proxy ../{LICENSE,README}.* ''; # upstream wants to add tests and the gtest framework is in place, so be ready diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index 745cf96df46ad..d02bcc33ecaa2 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -1,8 +1,8 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule { - pname = "echoip"; - version = "unstable-2019-07-12"; + pname = "echoip-unstable"; + version = "2019-07-12"; src = fetchFromGitHub { owner = "mpolden"; diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/servers/gemini/molly-brown/default.nix index 354412a4b73f0..a97780de391c4 100644 --- a/pkgs/servers/gemini/molly-brown/default.nix +++ b/pkgs/servers/gemini/molly-brown/default.nix @@ -1,8 +1,8 @@ { lib, buildGoPackage, fetchgit, nixosTests }: buildGoPackage rec { - pname = "molly-brown"; - version = "unstable-2020-08-19"; + pname = "molly-brown-unstable"; + version = "2020-08-19"; rev = "48f9a206c03c0470e1c132b9667c6daa3583dada"; goPackagePath = "tildegit.org/solderpunk/molly-brown"; diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index 31ddd18638381..0e1709ce427c3 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, apacheHttpd, apr, cairo, iniparser, mapnik }: stdenv.mkDerivation rec { - pname = "mod_tile"; - version = "unstable-2017-01-08"; + pname = "mod_tile-unstable"; + version = "2017-01-08"; src = fetchFromGitHub { owner = "openstreetmap"; diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index 0ae030ba59d1b..aa86c5ebf6b74 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -10,8 +10,8 @@ }: stdenv.mkDerivation rec { - pname = "solanum"; - version = "unstable-2020-12-14"; + pname = "solanum-unstable"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "solanum-ircd"; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 4680c37c85e37..3891e0799f158 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -2,10 +2,10 @@ with python3Packages; buildPythonApplication rec { - pname = "isso"; + pname = "isso-unstable"; # Can not use 0.12.2 because of: # https://github.com/posativ/isso/issues/617 - version = "unstable-2020-09-14"; + version = "2020-09-14"; # no tests on PyPI src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 1f9c38922ebcc..71cb72c61c75c 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { - pname = "lndmon"; - version = "unstable-2020-12-04"; + pname = "lndmon-unstable"; + version = "2020-12-04"; src = fetchFromGitHub { owner = "lightninglabs"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index c94be3490fa7b..f00a993cb684f 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,8 +1,8 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish, nixosTests }: buildGoModule rec { - pname = "prometheus_varnish_exporter"; - version = "unstable-2020-03-26"; + pname = "prometheus_varnish_exporter-unstable"; + version = "2020-03-26"; src = fetchFromGitHub { owner = "jonnenauha"; diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix index b4d1fda40901c..188e5f6d97b01 100644 --- a/pkgs/servers/mumsi/default.nix +++ b/pkgs/servers/mumsi/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost , log4cpp, pjsip, openssl, alsaLib, mumlib }: with lib; stdenv.mkDerivation { - pname = "mumsi"; - version = "unstable-2018-12-12"; + pname = "mumsi-unstable"; + version = "2018-12-12"; src = fetchFromGitHub { owner = "slomkowski"; diff --git a/pkgs/servers/pim6sd/default.nix b/pkgs/servers/pim6sd/default.nix index 6752a8089af33..9b5b01ca6ce67 100644 --- a/pkgs/servers/pim6sd/default.nix +++ b/pkgs/servers/pim6sd/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, lib, autoreconfHook, yacc, flex }: stdenv.mkDerivation rec { - pname = "pim6sd"; - version = "unstable-2019-05-31"; + pname = "pim6sd-unstable"; + version = "2019-05-31"; src = fetchFromGitHub { owner = "troglobit"; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index b89ac17250085..c9d54754cc9c4 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation { - pname = "pgjwt"; - version = "unstable-2017-04-24"; + pname = "pgjwt-unstable"; + version = "2017-04-24"; src = fetchFromGitHub { owner = "michelp"; diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 60dde01e9c638..b70e1adf02f7a 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchhg }: stdenv.mkDerivation { - pname = "u9fs"; - version = "unstable-2020-11-21"; + pname = "u9fs-unstable"; + version = "2020-11-21"; src = fetchhg { url = "https://code.9front.org/hg/plan9front"; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 316e3a524972d..ff445144c3c6f 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "webmetro"; - version = "unstable-20180426"; + pname = "webmetro-unstable"; + version = "2018-04-26"; src = fetchFromGitHub { owner = "Tangent128"; diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 77691e99b2550..2d45cb6813139 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { - pname = "ion"; - version = "unstable-2020-03-22"; + pname = "ion-unstable"; + version = "2020-03-22"; src = fetchFromGitHub { owner = "redox-os"; diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index f8d4376017bda..6384221ab7d52 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -2,8 +2,8 @@ libXi }: stdenv.mkDerivation rec { - pname = "xcape"; - version = "unstable-2018-03-01"; + pname = "xcape-unstable"; + version = "2018-03-01"; src = fetchFromGitHub { owner = "alols"; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index f10510051edb7..237b25ddf56d6 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { - pname = "xdg-utils"; - version = "unstable-2020-10-21"; + pname = "xdg-utils-unstable"; + version = "2020-10-21"; src = fetchgit { - url = "https://gitlab.freedesktop.org/xdg/${pname}.git"; + url = "https://gitlab.freedesktop.org/xdg/xdg-utils.git"; rev = "d11b33ec7f24cfb1546f6b459611d440013bdc72"; sha256 = "sha256-8PtXfI8hRneEpnUvIV3M+6ACjlkx0w/NEiJFdGbbHnQ="; }; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index f72692c845c7f..c121b0c4f9c0a 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -126,13 +126,13 @@ let }; in pythonPackages.buildPythonApplication rec { - pname = "beets"; + pname = "beets-unstable"; # While there is a stable version, 1.4.9, it is more than 1000 commits behind # master and lacks many bug fixes and improvements[1]. Also important, # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2020-12-22"; + version = "2020-12-22"; src = fetchFromGitHub { owner = "beetbox"; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 770e898f2eec5..b0ece70a33ebd 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -43,11 +43,11 @@ # python3Packages.buildPythonApplication rec { - pname = "tts"; + pname = "tts-unstable"; # until https://github.com/mozilla/TTS/issues/424 is resolved # we treat released models as released versions: # https://github.com/mozilla/TTS/wiki/Released-Models - version = "unstable-2020-06-17"; + version = "2020-06-17"; src = fetchFromGitHub { owner = "mozilla"; diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index d70efa1d2248f..ebc6c07aad6e3 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -1,8 +1,8 @@ { buildGoPackage, fetchFromGitHub, lib, stdenv, openssh, makeWrapper }: buildGoPackage rec { - pname = "diskrsync"; - version = "unstable-2019-01-02"; + pname = "diskrsync-unstable"; + version = "2019-01-02"; src = fetchFromGitHub { owner = "dop251"; diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix index 815dedc998d52..c7025cb949a71 100644 --- a/pkgs/tools/backup/easysnap/default.nix +++ b/pkgs/tools/backup/easysnap/default.nix @@ -1,8 +1,8 @@ {lib, stdenv, fetchFromGitHub, zfs }: stdenv.mkDerivation { - pname = "easysnap"; - version = "unstable-2020-04-04"; + pname = "easysnap-unstable"; + version = "2020-04-04"; src = fetchFromGitHub { owner = "sjau"; diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/tools/backup/iceshelf/default.nix index eb5e883bdacf1..3bc1d39703543 100644 --- a/pkgs/tools/backup/iceshelf/default.nix +++ b/pkgs/tools/backup/iceshelf/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub, git, awscli, python3 }: python3.pkgs.buildPythonApplication rec { - pname = "iceshelf"; - version = "unstable-2019-07-03"; + pname = "iceshelf-unstable"; + version = "2019-07-03"; format = "other"; @@ -20,9 +20,9 @@ python3.pkgs.buildPythonApplication rec { ]; installPhase = '' - mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages} + mkdir -p $out/bin $out/share/doc/iceshelf $out/${python3.sitePackages} cp -v iceshelf iceshelf-restore $out/bin - cp -v iceshelf.sample.conf $out/share/doc/${pname}/ + cp -v iceshelf.sample.conf $out/share/doc/iceshelf/ cp -rv modules $out/${python3.sitePackages} ''; diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/tools/backup/zfsbackup/default.nix index 5cdb39c3ecb05..35e31686041e7 100644 --- a/pkgs/tools/backup/zfsbackup/default.nix +++ b/pkgs/tools/backup/zfsbackup/default.nix @@ -1,8 +1,8 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - pname = "zfsbackup"; - version = "unstable-2020-09-30"; + pname = "zfsbackup-unstable"; + version = "2020-09-30"; rev = "092f80846b23e02f99d2aa72d9d889eabfdcb053"; goPackagePath = "github.com/someone1/zfsbackup-go"; diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix index 70fcedde858af..b862db7ef8308 100644 --- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix +++ b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, substituteAll }: stdenv.mkDerivation rec { - pname = "srt-to-vtt-cl"; - version = "unstable-2019-01-03"; + pname = "srt-to-vtt-cl-unstable"; + version = "2019-01-03"; src = fetchFromGitHub { owner = "nwoltman"; diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index e99f3fec163ef..dd04ef2b341a5 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, gtk3, libdivsufsort, pkg-config, wrapGAppsHook }: stdenv.mkDerivation { - pname = "flips"; - version = "unstable-2020-10-02"; + pname = "flips-unstable"; + version = "2020-10-02"; src = fetchFromGitHub { owner = "Alcaro"; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 2787b87964fd1..fbcc9fb185022 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -2,8 +2,8 @@ python3.pkgs.buildPythonApplication rec { - pname = "ubidump"; - version = "unstable-2019-09-11"; + pname = "ubidump-unstable"; + version = "2019-09-11"; src = fetchFromGitHub { owner = "nlitsme"; diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/tools/graphics/amber/default.nix index f5156dd08abfc..39765c476a308 100644 --- a/pkgs/tools/graphics/amber/default.nix +++ b/pkgs/tools/graphics/amber/default.nix @@ -44,8 +44,8 @@ let in stdenv.mkDerivation rec { - pname = "amber"; - version = "unstable-2020-09-23"; + pname = "amber-unstable"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/tools/graphics/exifprobe/default.nix b/pkgs/tools/graphics/exifprobe/default.nix index 7331ac69185ae..6156d58a4fe4f 100644 --- a/pkgs/tools/graphics/exifprobe/default.nix +++ b/pkgs/tools/graphics/exifprobe/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "exifprobe"; - version = "unstable-2018-06-19"; + pname = "exifprobe-unstable"; + version = "2018-06-19"; src = fetchFromGitHub { owner = "hfiguiere"; diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/pkgs/tools/graphics/jpegexiforient/default.nix index 9397f46fd2c5f..12d9532711b80 100644 --- a/pkgs/tools/graphics/jpegexiforient/default.nix +++ b/pkgs/tools/graphics/jpegexiforient/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - pname = "jpegexiforient"; - version = "unstable-2002-02-17"; + pname = "jpegexiforient-unstable"; + version = "2002-02-17"; src = fetchurl { url = "http://sylvana.net/jpegcrop/jpegexiforient.c"; sha256 = "1v0f42cvs0397g9v46p294ldgxwbp285npg6npgnlnvapk6nzh5s"; diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/tools/graphics/piglit/default.nix index 0a4dfc4bafc58..539e64d8fc8a7 100644 --- a/pkgs/tools/graphics/piglit/default.nix +++ b/pkgs/tools/graphics/piglit/default.nix @@ -19,8 +19,8 @@ }: stdenv.mkDerivation rec { - pname = "piglit"; - version = "unstable-2020-10-23"; + pname = "piglit-unstable"; + version = "2020-10-23"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix index 349303346f429..cd413b7ae0fc7 100644 --- a/pkgs/tools/graphics/yaxg/default.nix +++ b/pkgs/tools/graphics/yaxg/default.nix @@ -2,8 +2,8 @@ maim, slop, ffmpeg_3, byzanz, libnotify, xdpyinfo }: stdenv.mkDerivation rec { - pname = "yaxg"; - version = "unstable-2018-05-03"; + pname = "yaxg-unstable"; + version = "2018-05-03"; src = fetchFromGitHub { owner = "DanielFGray"; diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index 8ec6146a02095..ae64b2b803d63 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -6,8 +6,8 @@ stdenv, fetchFromGitHub, pkg-config, which, gtk2, gtk3, qt4, qt5, libXtst, lib, # so we do not enable these input method at this moment stdenv.mkDerivation { - name = "hime"; - version = "unstable-2020-06-27"; + pname = "hime-unstable"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "hime-ime"; diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index bc3bbc8276dd7..169ea74b47f8f 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -4,10 +4,10 @@ }: stdenv.mkDerivation rec { - pname = "bcunit"; + pname = "bcunit-unstable"; # Latest release 3.0.2 is missing some functions needed by bctoolbox. See: # https://gitlab.linphone.org/BC/public/bcunit/issues/1 - version = "unstable-2019-11-19"; + version = "2019-11-19"; nativeBuildInputs = [ cmake ]; src = fetchFromGitLab { diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index cda58e80d87c6..496c75f0ace68 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -3,8 +3,8 @@ with python3Packages; buildPythonApplication rec { - pname = "bonfire"; - version = "unstable-2017-01-19"; + pname = "bonfire-unstable"; + version = "2017-01-19"; # use latest git version with --endpoint flag # https://github.com/blue-yonder/bonfire/pull/18 diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 3f2218ac871db..0dbdb6ba901b3 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -9,8 +9,8 @@ }: stdenv.mkDerivation { - pname = "cht.sh"; - version = "unstable-2020-08-06"; + pname = "cht.sh-unstable"; + version = "2020-08-06"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index 6dad6173ed4b9..776aed3335243 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { - pname = "cod"; - version = "unstable-2020-09-10"; + pname = "cod-unstable"; + version = "2020-09-10"; src = fetchFromGitHub { owner = "dim-an"; diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix index a855dac5f124b..d964acb2922cb 100644 --- a/pkgs/tools/misc/codebraid/default.nix +++ b/pkgs/tools/misc/codebraid/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - pname = "codebraid"; - version = "0.5.0-unstable-2020-08-14"; + pname = "codebraid-unstable"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "gpoore"; diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix index 69b689fb8244e..480c55cdc98c9 100644 --- a/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -1,7 +1,7 @@ { lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - pname = "dpt-rp1-py"; - version = "unstable-2018-10-16"; + pname = "dpt-rp1-py-unstable"; + version = "2018-10-16"; src = fetchFromGitHub { owner = "janten"; diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index 89ac21db5f57d..79e97cfb3869b 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -7,9 +7,9 @@ , modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync }: let - version = "unstable-2018-03-15"; + version = "2018-03-15"; in stdenv.mkDerivation { - pname = "edid-generator"; + pname = "edid-generator-unstable"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix index 2463ee5a6e99e..4247efc9510fe 100644 --- a/pkgs/tools/misc/fffuu/default.nix +++ b/pkgs/tools/misc/fffuu/default.nix @@ -1,8 +1,8 @@ { mkDerivation, haskellPackages, fetchFromGitHub, lib }: mkDerivation { - pname = "fffuu"; - version = "unstable-2018-05-26"; + pname = "fffuu-unstable"; + version = "2018-05-26"; src = fetchFromGitHub { owner = "diekmann"; diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/tools/misc/g933-utils/default.nix index 9cb056097726f..3ead7a1fb7e4e 100644 --- a/pkgs/tools/misc/g933-utils/default.nix +++ b/pkgs/tools/misc/g933-utils/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkg-config }: rustPlatform.buildRustPackage rec { - pname = "g933-utils"; - version = "unstable-2019-08-04"; + pname = "g933-utils-unstable"; + version = "2019-08-04"; src = fetchFromGitHub { owner = "ashkitten"; diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index b7bd7678535c1..0bec3a61f2e9b 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { - pname = "loop"; - version = "unstable-2020-07-08"; + pname = "loop-unstable"; + version = "2020-07-08"; src = fetchFromGitHub { owner = "Miserlou"; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index b97a0e42ee000..f1a3fa14b8334 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -4,8 +4,8 @@ # adding this to services.udev.packages on NixOS stdenv.mkDerivation { - pname = "ltunify"; - version = "unstable-20180330"; + pname = "ltunify-unstable"; + version = "2018-03-30"; src = fetchFromGitHub { owner = "Lekensteyn"; diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/tools/misc/sta/default.nix index aa27ddf08384b..f3b748fdc64df 100644 --- a/pkgs/tools/misc/sta/default.nix +++ b/pkgs/tools/misc/sta/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation { - pname = "sta"; - version = "unstable-2016-01-25"; + pname = "sta-unstable"; + version = "2016-01-25"; src = fetchFromGitHub { owner = "simonccarter"; diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix index 83dad9ebe7f83..f9342572d2c56 100644 --- a/pkgs/tools/misc/urn-timer/default.nix +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -11,8 +11,8 @@ }: stdenv.mkDerivation { - pname = "urn-timer"; - version = "unstable-2017-08-20"; + pname = "urn-timer-unstable"; + version = "2017-08-20"; src = fetchFromGitHub { owner = "3snowp7im"; diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index 28c4508525ec1..841882d33df16 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: stdenv.mkDerivation rec { - pname = "venus"; - version = "unstable-2011-02-18"; + pname = "venus-unstable"; + version = "2011-02-18"; src = fetchFromGitHub { owner = "rubys"; diff --git a/pkgs/tools/misc/vimv/default.nix b/pkgs/tools/misc/vimv/default.nix index 2b056cd079a72..f9d0a0d6dcd2e 100644 --- a/pkgs/tools/misc/vimv/default.nix +++ b/pkgs/tools/misc/vimv/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, bash, fetchFromGitHub }: stdenv.mkDerivation { - pname = "vimv"; - version = "unstable-2019-10-31"; + pname = "vimv-unstable"; + version = "2019-10-31"; src = fetchFromGitHub { owner = "thameera"; repo = "vimv"; diff --git a/pkgs/tools/misc/xilinx-bootgen/default.nix b/pkgs/tools/misc/xilinx-bootgen/default.nix index 5d0c80c55bfb9..1a561268b028e 100644 --- a/pkgs/tools/misc/xilinx-bootgen/default.nix +++ b/pkgs/tools/misc/xilinx-bootgen/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation { - pname = "xilinx-bootgen"; - version = "unstable-2019-10-23"; + pname = "xilinx-bootgen-unstable"; + version = "2019-10-23"; src = fetchFromGitHub { owner = "xilinx"; diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/tools/misc/zabbixctl/default.nix index 15add8ed19196..c7eb1bd23d51e 100644 --- a/pkgs/tools/misc/zabbixctl/default.nix +++ b/pkgs/tools/misc/zabbixctl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - pname = "zabbixctl"; - version = "unstable-2019-07-06"; + pname = "zabbixctl-unstable"; + version = "2019-07-06"; goPackagePath = "github.com/kovetskiy/zabbixctl"; diff --git a/pkgs/tools/misc/zalgo/default.nix b/pkgs/tools/misc/zalgo/default.nix index 71cc7f8b7ddbc..c0f54445f47b3 100644 --- a/pkgs/tools/misc/zalgo/default.nix +++ b/pkgs/tools/misc/zalgo/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "zalgo"; - version = "unstable-2020-08-26"; + pname = "zalgo-unstable"; + version = "2020-08-26"; src = fetchFromGitHub { owner = "lunasorcery"; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 226cfb9ce8ef5..b243c76c87cb2 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, zlib, nettools, nixosTests }: stdenv.mkDerivation rec { - pname = "iodine"; - version = "unstable-2019-09-27"; + pname = "iodine-unstable"; + version = "2019-09-27"; src = fetchFromGitHub { owner = "yarrick"; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 746a99ede59ff..6a679d3aac17b 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -3,8 +3,8 @@ with python3Packages; buildPythonApplication rec { - pname = "linkchecker"; - version = "unstable-2020-08-15"; + pname = "linkchecker-unstable"; + version = "2020-08-15"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix index f102995a3cc5f..82dfbe446d7f2 100644 --- a/pkgs/tools/networking/mmsd/default.nix +++ b/pkgs/tools/networking/mmsd/default.nix @@ -7,8 +7,8 @@ }: stdenv.mkDerivation rec { - pname = "mmsd"; - version = "unstable-2019-07-15"; + pname = "mmsd-unstable"; + version = "2019-07-15"; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git"; diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index efa05591f521e..9f5252701e0ec 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -1,8 +1,8 @@ { runCommand, lib, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }: stdenv.mkDerivation { - pname = "netifd"; - version = "unstable-2020-07-11"; + pname = "netifd-unstable"; + version = "2020-07-11"; src = fetchgit { url = "https://git.openwrt.org/project/netifd.git"; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 87069d3c3c808..8f1230155e534 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -2,10 +2,10 @@ , withGnome ? true, gnome3, fetchpatch, libnma, glib }: let - pname = "NetworkManager-iodine"; - version = "unstable-2019-11-05"; + pname = "NetworkManager-iodine-unstable"; + version = "2019-11-05"; in stdenv.mkDerivation { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "NetworkManager-iodine${if withGnome then "-gnome" else ""}-${version}"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/tools/networking/network-manager/sstp/default.nix b/pkgs/tools/networking/network-manager/sstp/default.nix index d00c0e3e55f8a..d4500be71493d 100644 --- a/pkgs/tools/networking/network-manager/sstp/default.nix +++ b/pkgs/tools/networking/network-manager/sstp/default.nix @@ -17,10 +17,10 @@ , withGnome ? true }: let - pname = "NetworkManager-sstp"; - version = "unstable-2020-04-20"; + pname = "NetworkManager-sstp-unstable"; + version = "2020-04-20"; in stdenv.mkDerivation { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + name = "NetworkManager-sstp${if withGnome then "-gnome" else ""}-${version}"; src = fetchFromGitHub { owner = "enaess"; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 0f7a37e8831e3..287c8375e9959 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -3,8 +3,8 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation { - version = "unstable-2018-10-08"; - pname = "openconnect_pa"; + version = "2018-10-08"; + pname = "openconnect_pa-unstable"; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 4ab93b7574a7f..0a8e9e07f74ad 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -9,8 +9,8 @@ assert httpServer -> libpng != null; assert client -> libX11 != null; stdenv.mkDerivation rec { - pname = "amule"; - version = "unstable-20201006"; + pname = "amule-unstable"; + version = "2020-10-06"; src = fetchFromGitHub { owner = "amule-project"; diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 861e9c0383bb7..df0308f44b552 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }: stdenv.mkDerivation rec { - pname = "packetdrill"; - version = "unstable-2020-08-22"; + pname = "packetdrill-unstable"; + version = "2020-08-22"; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/tools/networking/py-wmi-client/default.nix b/pkgs/tools/networking/py-wmi-client/default.nix index 7a2774002891f..b519a7c8157cf 100644 --- a/pkgs/tools/networking/py-wmi-client/default.nix +++ b/pkgs/tools/networking/py-wmi-client/default.nix @@ -1,8 +1,8 @@ { lib, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { - pname = "py-wmi-client"; - version = "unstable-20160601"; + pname = "py-wmi-client-unstable"; + version = "2016-06-01"; src = fetchFromGitHub { owner = "dlundgren"; diff --git a/pkgs/tools/networking/rdrview/default.nix b/pkgs/tools/networking/rdrview/default.nix index 8f51039570531..75eca05af0b12 100644 --- a/pkgs/tools/networking/rdrview/default.nix +++ b/pkgs/tools/networking/rdrview/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, libxml2, curl, libseccomp }: stdenv.mkDerivation { - name = "rdrview"; - version = "unstable-2020-12-22"; + pname = "rdrview-unstable"; + version = "2020-12-22"; src = fetchFromGitHub { owner = "eafer"; diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix index 17a55d86b9a37..f1fc4fb880541 100644 --- a/pkgs/tools/networking/uqmi/default.nix +++ b/pkgs/tools/networking/uqmi/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchgit, cmake, perl, libubox, json_c }: stdenv.mkDerivation { - pname = "uqmi"; - version = "unstable-2019-06-27"; + pname = "uqmi-unstable"; + version = "2019-06-27"; src = fetchgit { url = "https://git.openwrt.org/project/uqmi.git"; diff --git a/pkgs/tools/networking/wstunnel/default.nix b/pkgs/tools/networking/wstunnel/default.nix index 161b08a7d39e0..cf920c9cf81cd 100644 --- a/pkgs/tools/networking/wstunnel/default.nix +++ b/pkgs/tools/networking/wstunnel/default.nix @@ -7,8 +7,8 @@ }: mkDerivation rec { - pname = "wstunnel"; - version = "unstable-2020-07-12"; + pname = "wstunnel-unstable"; + version = "2020-07-12"; src = fetchFromGitHub { owner = "erebe"; diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index 393043df67588..5ea839f4043ab 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -3,8 +3,8 @@ with lib; stdenv.mkDerivation { - pname = "b2sum"; - version = "unstable-2018-06-11"; + pname = "b2sum-unstable"; + version = "2018-06-11"; src = fetchzip { url = "https://github.com/BLAKE2/BLAKE2/archive/320c325437539ae91091ce62efec1913cd8093c2.tar.gz"; diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index 9276c9b116773..394ab04d4071c 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -7,8 +7,8 @@ , gnugrep }: stdenv.mkDerivation { - pname = "bash-supergenpass"; - version = "unstable-2018-04-18"; + pname = "bash-supergenpass-unstable"; + version = "2018-04-18"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/tools/security/crowbar/default.nix index 2f197421e1f71..a68e06286917b 100644 --- a/pkgs/tools/security/crowbar/default.nix +++ b/pkgs/tools/security/crowbar/default.nix @@ -8,8 +8,8 @@ }: python3Packages.buildPythonApplication rec { - pname = "crowbar"; - version = "unstable-2020-04-23"; + pname = "crowbar-unstable"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "galkan"; diff --git a/pkgs/tools/security/doona/default.nix b/pkgs/tools/security/doona/default.nix index e0f459ad7453d..c21833ef1c867 100644 --- a/pkgs/tools/security/doona/default.nix +++ b/pkgs/tools/security/doona/default.nix @@ -4,8 +4,8 @@ }: stdenv.mkDerivation rec { - pname = "doona"; - version = "unstable-2019-03-08"; + pname = "doona-unstable"; + version = "2019-03-08"; src = fetchFromGitHub { owner = "wireghoul"; diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix index 5baeb71ce8992..4279ec30f0e6f 100644 --- a/pkgs/tools/security/hash_extender/default.nix +++ b/pkgs/tools/security/hash_extender/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation { - pname = "hash_extender"; - version = "unstable-2020-03-24"; + pname = "hash_extender-unstable"; + version = "2020-03-24"; src = fetchFromGitHub { owner = "iagox86"; diff --git a/pkgs/tools/security/onesixtyone/default.nix b/pkgs/tools/security/onesixtyone/default.nix index 374d1322246bf..317432a41bdc4 100644 --- a/pkgs/tools/security/onesixtyone/default.nix +++ b/pkgs/tools/security/onesixtyone/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "onesixtyone"; - version = "unstable-2019-12-26"; + pname = "onesixtyone-unstable"; + version = "2019-12-26"; src = fetchFromGitHub { owner = "trailofbits"; diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix index 113d17b09b537..61510ed94926f 100644 --- a/pkgs/tools/system/yeshup/default.nix +++ b/pkgs/tools/system/yeshup/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - pname = "yeshup"; - version = "unstable-2013-10-29"; + pname = "yeshup-unstable"; + version = "2013-10-29"; src = fetchFromGitHub { owner = "RhysU"; diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index 1d3f14ea336ea..32a69d7ca93e2 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -8,8 +8,8 @@ let ({ name, gawkextlib, extraBuildInputs ? [ ], doCheck ? true }: let is_extension = !isNull gawkextlib; in stdenv.mkDerivation rec { - pname = "gawkextlib-${name}"; - version = "unstable-2019-11-21"; + pname = "gawkextlib-${name}-unstable"; + version = "2019-11-21"; src = fetchgit { url = "git://git.code.sf.net/p/gawkextlib/code"; diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix index 4f70f972b683b..df31bd18d1b64 100644 --- a/pkgs/tools/text/rosie/default.nix +++ b/pkgs/tools/text/rosie/default.nix @@ -6,8 +6,8 @@ }: stdenv.mkDerivation rec { - pname = "rosie"; - version = "unstable-2020-01-11"; + pname = "rosie-unstable"; + version = "2020-01-11"; src = fetchgit { url = "https://gitlab.com/rosie-pattern-language/rosie"; rev = "670e9027563609ba2ea31e14e2621a1302742795"; diff --git a/pkgs/tools/typesetting/docbookrx/default.nix b/pkgs/tools/typesetting/docbookrx/default.nix index a41276ea4328c..9eef19f91a3e0 100644 --- a/pkgs/tools/typesetting/docbookrx/default.nix +++ b/pkgs/tools/typesetting/docbookrx/default.nix @@ -24,8 +24,8 @@ let in stdenv.mkDerivation { - pname = "docbookrx"; - version = "unstable-2018-05-02"; + pname = "docbookrx-unstable"; + version = "2018-05-02"; buildInputs = [ env.wrappedRuby ]; diff --git a/pkgs/tools/typesetting/tex/latexrun/default.nix b/pkgs/tools/typesetting/tex/latexrun/default.nix index 3a163a5682d6e..855795bd1c8a0 100644 --- a/pkgs/tools/typesetting/tex/latexrun/default.nix +++ b/pkgs/tools/typesetting/tex/latexrun/default.nix @@ -1,8 +1,8 @@ { lib, stdenvNoCC, fetchFromGitHub, python3 }: stdenvNoCC.mkDerivation { - pname = "latexrun"; - version = "unstable-2015-11-18"; + pname = "latexrun-unstable"; + version = "2015-11-18"; src = fetchFromGitHub { owner = "aclements"; repo = "latexrun"; diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/tools/typesetting/tex/pplatex/default.nix index 1a0293255d8e9..d59127f2b7277 100644 --- a/pkgs/tools/typesetting/tex/pplatex/default.nix +++ b/pkgs/tools/typesetting/tex/pplatex/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre }: stdenv.mkDerivation { - pname = "pplatex"; - version = "unstable-2015-09-14"; + pname = "pplatex-unstable"; + version = "2015-09-14"; src = fetchFromGitHub { owner = "stefanhepp"; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 9ae97cdf35a05..b831d0de93f4d 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -81,8 +81,8 @@ rec { }); xmlmirror = pkgs.buildEmscriptenPackage rec { - pname = "xmlmirror"; - version = "unstable-2016-06-05"; + pname = "xmlmirror-unstable"; + version = "2016-06-05"; buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; nativeBuildInputs = [ pkg-config zlib ]; @@ -114,7 +114,7 @@ rec { installPhase = '' mkdir -p $out/share - mkdir -p $doc/share/${pname} + mkdir -p $doc/share/xmlmirror cp Demo* $out/share cp -R codemirror-5.12 $out/share @@ -125,7 +125,7 @@ rec { cp *.html $out/share cp *.json $out/share cp *.rng $out/share - cp README.md $doc/share/${pname} + cp README.md $doc/share/xmlmirror ''; checkPhase = ''