diff options
-rw-r--r-- | pkgs/applications/audio/mopidy/gmusic.nix (renamed from pkgs/applications/audio/mopidy-gmusic/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/iris.nix (renamed from pkgs/applications/audio/mopidy-iris/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/local-images.nix (renamed from pkgs/applications/audio/mopidy-local-images/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/local-sqlite.nix (renamed from pkgs/applications/audio/mopidy-local-sqlite/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/moped.nix (renamed from pkgs/applications/audio/mopidy-moped/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/mopify.nix (renamed from pkgs/applications/audio/mopidy-mopify/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/musicbox-webclient.nix (renamed from pkgs/applications/audio/mopidy-musicbox-webclient/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/soundcloud.nix (renamed from pkgs/applications/audio/mopidy-soundcloud/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/spotify-tunigo.nix (renamed from pkgs/applications/audio/mopidy-spotify-tunigo/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/spotify.nix (renamed from pkgs/applications/audio/mopidy-spotify/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/youtube.nix (renamed from pkgs/applications/audio/mopidy-youtube/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/display-managers/lightdm/gtk-greeter.nix (renamed from pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/with-extensions.nix (renamed from pkgs/applications/editors/vscode-with-extensions/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/electrum/dash.nix (renamed from pkgs/applications/misc/electrum-dash/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/electrum/ltc.nix (renamed from pkgs/applications/misc/electrum-ltc/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/gnuradio/ais.nix (renamed from pkgs/applications/misc/gnuradio-ais/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/gnuradio/gsm.nix (renamed from pkgs/applications/misc/gnuradio-gsm/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/gnuradio/nacl.nix (renamed from pkgs/applications/misc/gnuradio-nacl/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/gnuradio/osmosdr.nix (renamed from pkgs/applications/misc/gnuradio-osmosdr/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/gnuradio/rds.nix (renamed from pkgs/applications/misc/gnuradio-rds/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/slic3r/prusa3d.nix (renamed from pkgs/applications/misc/slic3r-prusa3d/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/misc/xmrig/proxy.nix (renamed from pkgs/applications/misc/xmrig-proxy/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/dropbox/cli.nix (renamed from pkgs/applications/networking/dropbox-cli/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/virtualization/docker/distribution.nix (renamed from pkgs/applications/virtualization/docker-distribution/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 48 |
25 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy/gmusic.nix index e58cddd42942..e58cddd42942 100644 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy/iris.nix index 1c8b0af70e43..1c8b0af70e43 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy/iris.nix diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy/local-images.nix index 063821544aed..063821544aed 100644 --- a/pkgs/applications/audio/mopidy-local-images/default.nix +++ b/pkgs/applications/audio/mopidy/local-images.nix diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix index 7aebc43dabbb..7aebc43dabbb 100644 --- a/pkgs/applications/audio/mopidy-local-sqlite/default.nix +++ b/pkgs/applications/audio/mopidy/local-sqlite.nix diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy/moped.nix index 3754bf763b20..3754bf763b20 100644 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ b/pkgs/applications/audio/mopidy/moped.nix diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy/mopify.nix index d55e711cf330..d55e711cf330 100644 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index d2f525bffd1d..d2f525bffd1d 100644 --- a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index 098812961649..098812961649 100644 --- a/pkgs/applications/audio/mopidy-soundcloud/default.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix index 034a07bf027d..034a07bf027d 100644 --- a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy/spotify.nix index 64b5ee629b33..64b5ee629b33 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy/youtube.nix index d3eb8539a19c..d3eb8539a19c 100644 --- a/pkgs/applications/audio/mopidy-youtube/default.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 3227151ce21e..3227151ce21e 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode/with-extensions.nix index c54c8a4277f1..c54c8a4277f1 100644 --- a/pkgs/applications/editors/vscode-with-extensions/default.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum/dash.nix index c98efa547b39..c98efa547b39 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum/dash.nix diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum/ltc.nix index 7852e6eb790e..7852e6eb790e 100644 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ b/pkgs/applications/misc/electrum/ltc.nix diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio/ais.nix index dfb8415219c7..dfb8415219c7 100644 --- a/pkgs/applications/misc/gnuradio-ais/default.nix +++ b/pkgs/applications/misc/gnuradio/ais.nix diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio/gsm.nix index 6e0856ce66aa..6e0856ce66aa 100644 --- a/pkgs/applications/misc/gnuradio-gsm/default.nix +++ b/pkgs/applications/misc/gnuradio/gsm.nix diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio/nacl.nix index 28836958e98c..28836958e98c 100644 --- a/pkgs/applications/misc/gnuradio-nacl/default.nix +++ b/pkgs/applications/misc/gnuradio/nacl.nix diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio/osmosdr.nix index 355ca0e95449..355ca0e95449 100644 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ b/pkgs/applications/misc/gnuradio/osmosdr.nix diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio/rds.nix index 44ed89d9002d..44ed89d9002d 100644 --- a/pkgs/applications/misc/gnuradio-rds/default.nix +++ b/pkgs/applications/misc/gnuradio/rds.nix diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 1ee2bfab94c3..1ee2bfab94c3 100644 --- a/pkgs/applications/misc/slic3r-prusa3d/default.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix diff --git a/pkgs/applications/misc/xmrig-proxy/default.nix b/pkgs/applications/misc/xmrig/proxy.nix index 248f629f2e91..248f629f2e91 100644 --- a/pkgs/applications/misc/xmrig-proxy/default.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox/cli.nix index d3141675b418..d3141675b418 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox/cli.nix diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker/distribution.nix index 0af9abc852ef..0af9abc852ef 100644 --- a/pkgs/applications/virtualization/docker-distribution/default.nix +++ b/pkgs/applications/virtualization/docker/distribution.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ce580e1589b..44e6877090f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15227,7 +15227,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; }; - docker-distribution = callPackage ../applications/virtualization/docker-distribution { }; + docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { }; @@ -15293,9 +15293,9 @@ with pkgs; electrum = callPackage ../applications/misc/electrum { }; - electrum-dash = callPackage ../applications/misc/electrum-dash { }; + electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = callPackage ../applications/misc/electrum-ltc { }; + electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; elinks = callPackage ../applications/networking/browsers/elinks { }; @@ -15643,15 +15643,15 @@ with pkgs; extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ]; }; - gnuradio-nacl = callPackage ../applications/misc/gnuradio-nacl { }; + gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { }; - gnuradio-gsm = callPackage ../applications/misc/gnuradio-gsm { }; + gnuradio-gsm = callPackage ../applications/misc/gnuradio/gsm.nix { }; - gnuradio-ais = callPackage ../applications/misc/gnuradio-ais { }; + gnuradio-ais = callPackage ../applications/misc/gnuradio/ais.nix { }; - gnuradio-rds = callPackage ../applications/misc/gnuradio-rds { }; + gnuradio-rds = callPackage ../applications/misc/gnuradio/rds.nix { }; - gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; + gnuradio-osmosdr = callPackage ../applications/misc/gnuradio/osmosdr.nix { }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; @@ -16762,7 +16762,7 @@ with pkgs; xmrig = callPackage ../applications/misc/xmrig { }; - xmrig-proxy = callPackage ../applications/misc/xmrig-proxy { }; + xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; @@ -16782,27 +16782,27 @@ with pkgs; mopidy = callPackage ../applications/audio/mopidy { }; - mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { }; + mopidy-gmusic = callPackage ../applications/audio/mopidy/gmusic.nix { }; - mopidy-local-images = callPackage ../applications/audio/mopidy-local-images { }; + mopidy-local-images = callPackage ../applications/audio/mopidy/local-images.nix { }; - mopidy-local-sqlite = callPackage ../applications/audio/mopidy-local-sqlite { }; + mopidy-local-sqlite = callPackage ../applications/audio/mopidy/local-sqlite.nix { }; - mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; + mopidy-spotify = callPackage ../applications/audio/mopidy/spotify.nix { }; - mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; + mopidy-moped = callPackage ../applications/audio/mopidy/moped.nix { }; - mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { }; + mopidy-mopify = callPackage ../applications/audio/mopidy/mopify.nix { }; - mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy-spotify-tunigo { }; + mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy/spotify-tunigo.nix { }; - mopidy-youtube = callPackage ../applications/audio/mopidy-youtube { }; + mopidy-youtube = callPackage ../applications/audio/mopidy/youtube.nix { }; - mopidy-soundcloud = callPackage ../applications/audio/mopidy-soundcloud { }; + mopidy-soundcloud = callPackage ../applications/audio/mopidy/soundcloud.nix { }; - mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { }; + mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy/musicbox-webclient.nix { }; - mopidy-iris = callPackage ../applications/audio/mopidy-iris { }; + mopidy-iris = callPackage ../applications/audio/mopidy/iris.nix { }; motif = callPackage ../development/libraries/motif { }; @@ -17749,7 +17749,7 @@ with pkgs; dropbox = callPackage ../applications/networking/dropbox { }; - dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; + dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; insync = callPackage ../applications/networking/insync { }; @@ -17760,13 +17760,13 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; - lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { + lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) exo; }; slic3r = callPackage ../applications/misc/slic3r { }; - slic3r-prusa3d = callPackage ../applications/misc/slic3r-prusa3d { }; + slic3r-prusa3d = callPackage ../applications/misc/slic3r/prusa3d.nix { }; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; cura_stable = callPackage ../applications/misc/cura/stable.nix { @@ -18312,7 +18312,7 @@ with pkgs; vscode = callPackage ../applications/editors/vscode { }; - vscode-with-extensions = callPackage ../applications/editors/vscode-with-extensions {}; + vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix {}; vscode-utils = callPackage ../misc/vscode-extensions/vscode-utils.nix {}; |