From 52893d527638be9ddeb3669796856508afff252e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Apr 2018 13:49:19 -0500 Subject: treewide: move "extensions" drvs to dir This cleans up the tree for pkgs/applications somewhat. Should not change any hashes. --- pkgs/applications/audio/mopidy-gmusic/default.nix | 28 ------ pkgs/applications/audio/mopidy-iris/default.nix | 34 ------- .../audio/mopidy-local-images/default.nix | 33 ------- .../audio/mopidy-local-sqlite/default.nix | 26 ------ pkgs/applications/audio/mopidy-moped/default.nix | 26 ------ pkgs/applications/audio/mopidy-mopify/default.nix | 23 ----- .../audio/mopidy-musicbox-webclient/default.nix | 24 ----- .../audio/mopidy-soundcloud/default.nix | 24 ----- .../audio/mopidy-spotify-tunigo/default.nix | 24 ----- pkgs/applications/audio/mopidy-spotify/default.nix | 23 ----- pkgs/applications/audio/mopidy-youtube/default.nix | 24 ----- pkgs/applications/audio/mopidy/gmusic.nix | 28 ++++++ pkgs/applications/audio/mopidy/iris.nix | 34 +++++++ pkgs/applications/audio/mopidy/local-images.nix | 33 +++++++ pkgs/applications/audio/mopidy/local-sqlite.nix | 26 ++++++ pkgs/applications/audio/mopidy/moped.nix | 26 ++++++ pkgs/applications/audio/mopidy/mopify.nix | 23 +++++ .../audio/mopidy/musicbox-webclient.nix | 24 +++++ pkgs/applications/audio/mopidy/soundcloud.nix | 24 +++++ pkgs/applications/audio/mopidy/spotify-tunigo.nix | 24 +++++ pkgs/applications/audio/mopidy/spotify.nix | 23 +++++ pkgs/applications/audio/mopidy/youtube.nix | 24 +++++ .../lightdm-gtk-greeter/default.nix | 51 ---------- .../display-managers/lightdm/gtk-greeter.nix | 51 ++++++++++ .../editors/vscode-with-extensions/default.nix | 82 ---------------- .../editors/vscode/with-extensions.nix | 82 ++++++++++++++++ pkgs/applications/misc/electrum-dash/default.nix | 46 --------- pkgs/applications/misc/electrum-ltc/default.nix | 55 ----------- pkgs/applications/misc/electrum/dash.nix | 46 +++++++++ pkgs/applications/misc/electrum/ltc.nix | 55 +++++++++++ pkgs/applications/misc/gnuradio-ais/default.nix | 40 -------- pkgs/applications/misc/gnuradio-gsm/default.nix | 39 -------- pkgs/applications/misc/gnuradio-nacl/default.nix | 39 -------- .../applications/misc/gnuradio-osmosdr/default.nix | 38 -------- pkgs/applications/misc/gnuradio-rds/default.nix | 38 -------- pkgs/applications/misc/gnuradio/ais.nix | 40 ++++++++ pkgs/applications/misc/gnuradio/gsm.nix | 39 ++++++++ pkgs/applications/misc/gnuradio/nacl.nix | 39 ++++++++ pkgs/applications/misc/gnuradio/osmosdr.nix | 38 ++++++++ pkgs/applications/misc/gnuradio/rds.nix | 38 ++++++++ pkgs/applications/misc/slic3r-prusa3d/default.nix | 103 --------------------- pkgs/applications/misc/slic3r/prusa3d.nix | 103 +++++++++++++++++++++ pkgs/applications/misc/xmrig-proxy/default.nix | 34 ------- pkgs/applications/misc/xmrig/proxy.nix | 34 +++++++ .../networking/dropbox-cli/default.nix | 42 --------- pkgs/applications/networking/dropbox/cli.nix | 42 +++++++++ .../virtualization/docker-distribution/default.nix | 23 ----- .../virtualization/docker/distribution.nix | 23 +++++ pkgs/top-level/all-packages.nix | 48 +++++----- 49 files changed, 943 insertions(+), 943 deletions(-) delete mode 100644 pkgs/applications/audio/mopidy-gmusic/default.nix delete mode 100644 pkgs/applications/audio/mopidy-iris/default.nix delete mode 100644 pkgs/applications/audio/mopidy-local-images/default.nix delete mode 100644 pkgs/applications/audio/mopidy-local-sqlite/default.nix delete mode 100644 pkgs/applications/audio/mopidy-moped/default.nix delete mode 100644 pkgs/applications/audio/mopidy-mopify/default.nix delete mode 100644 pkgs/applications/audio/mopidy-musicbox-webclient/default.nix delete mode 100644 pkgs/applications/audio/mopidy-soundcloud/default.nix delete mode 100644 pkgs/applications/audio/mopidy-spotify-tunigo/default.nix delete mode 100644 pkgs/applications/audio/mopidy-spotify/default.nix delete mode 100644 pkgs/applications/audio/mopidy-youtube/default.nix create mode 100644 pkgs/applications/audio/mopidy/gmusic.nix create mode 100644 pkgs/applications/audio/mopidy/iris.nix create mode 100644 pkgs/applications/audio/mopidy/local-images.nix create mode 100644 pkgs/applications/audio/mopidy/local-sqlite.nix create mode 100644 pkgs/applications/audio/mopidy/moped.nix create mode 100644 pkgs/applications/audio/mopidy/mopify.nix create mode 100644 pkgs/applications/audio/mopidy/musicbox-webclient.nix create mode 100644 pkgs/applications/audio/mopidy/soundcloud.nix create mode 100644 pkgs/applications/audio/mopidy/spotify-tunigo.nix create mode 100644 pkgs/applications/audio/mopidy/spotify.nix create mode 100644 pkgs/applications/audio/mopidy/youtube.nix delete mode 100644 pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix create mode 100644 pkgs/applications/display-managers/lightdm/gtk-greeter.nix delete mode 100644 pkgs/applications/editors/vscode-with-extensions/default.nix create mode 100644 pkgs/applications/editors/vscode/with-extensions.nix delete mode 100644 pkgs/applications/misc/electrum-dash/default.nix delete mode 100644 pkgs/applications/misc/electrum-ltc/default.nix create mode 100644 pkgs/applications/misc/electrum/dash.nix create mode 100644 pkgs/applications/misc/electrum/ltc.nix delete mode 100644 pkgs/applications/misc/gnuradio-ais/default.nix delete mode 100644 pkgs/applications/misc/gnuradio-gsm/default.nix delete mode 100644 pkgs/applications/misc/gnuradio-nacl/default.nix delete mode 100644 pkgs/applications/misc/gnuradio-osmosdr/default.nix delete mode 100644 pkgs/applications/misc/gnuradio-rds/default.nix create mode 100644 pkgs/applications/misc/gnuradio/ais.nix create mode 100644 pkgs/applications/misc/gnuradio/gsm.nix create mode 100644 pkgs/applications/misc/gnuradio/nacl.nix create mode 100644 pkgs/applications/misc/gnuradio/osmosdr.nix create mode 100644 pkgs/applications/misc/gnuradio/rds.nix delete mode 100644 pkgs/applications/misc/slic3r-prusa3d/default.nix create mode 100644 pkgs/applications/misc/slic3r/prusa3d.nix delete mode 100644 pkgs/applications/misc/xmrig-proxy/default.nix create mode 100644 pkgs/applications/misc/xmrig/proxy.nix delete mode 100644 pkgs/applications/networking/dropbox-cli/default.nix create mode 100644 pkgs/applications/networking/dropbox/cli.nix delete mode 100644 pkgs/applications/virtualization/docker-distribution/default.nix create mode 100644 pkgs/applications/virtualization/docker/distribution.nix (limited to 'pkgs') diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix deleted file mode 100644 index e58cddd42942..000000000000 --- a/pkgs/applications/audio/mopidy-gmusic/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-gmusic-${version}"; - version = "2.0.0"; - - src = fetchurl { - url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; - sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j"; - }; - - propagatedBuildInputs = [ - mopidy - pythonPackages.requests - pythonPackages.gmusicapi - pythonPackages.cachetools_1 - ]; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://www.mopidy.com/; - description = "Mopidy extension for playing music from Google Play Music"; - license = licenses.asl20; - maintainers = [ maintainers.jgillich ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix deleted file mode 100644 index 1c8b0af70e43..000000000000 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, pythonPackages, mopidy, mopidy-local-images }: - -pythonPackages.buildPythonApplication rec { - pname = "Mopidy-Iris"; - version = "3.16.3"; - - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "1zdlvrqlj1hapaxnskrbp9idziy3rcxhpqhw3x4q25cjbl8m0b0d"; - }; - - propagatedBuildInputs = [ - mopidy - mopidy-local-images - ] ++ (with pythonPackages; [ - configobj - pylast - spotipy - raven - tornado - ]); - - postPatch = "sed -i /tornado/d setup.py"; - - # no tests implemented - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://github.com/jaedb/Iris; - description = "A fully-functional Mopidy web client encompassing Spotify and many other backends"; - license = licenses.asl20; - maintainers = [ maintainers.rvolosatovs ]; - }; -} diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix deleted file mode 100644 index 063821544aed..000000000000 --- a/pkgs/applications/audio/mopidy-local-images/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-local-images-${version}"; - - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-local-images"; - rev = "v${version}"; - sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; - }; - - buildInputs = [ gobjectIntrospection ]; - - checkInputs = [ - pythonPackages.mock - ]; - - propagatedBuildInputs = [ - mopidy - pythonPackages.pykka - pythonPackages.uritools - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/mopidy/mopidy-local-images; - description = "Mopidy local library proxy extension for handling embedded album art"; - license = licenses.asl20; - maintainers = [ maintainers.rvolosatovs ]; - }; -} diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy-local-sqlite/default.nix deleted file mode 100644 index 7aebc43dabbb..000000000000 --- a/pkgs/applications/audio/mopidy-local-sqlite/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-local-sqlite-${version}"; - - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-local-sqlite"; - rev = "v${version}"; - sha256 = "1fjd9ydbfwd1n9b9zw8zjn4l7c5hpam2n0xs51pjkjn82m3zq9zv"; - }; - - propagatedBuildInputs = [ - mopidy - pythonPackages.uritools - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/mopidy/mopidy-local-sqlite; - description = "Mopidy SQLite local library extension"; - license = licenses.asl20; - maintainers = [ maintainers.rvolosatovs ]; - }; -} diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix deleted file mode 100644 index 3754bf763b20..000000000000 --- a/pkgs/applications/audio/mopidy-moped/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, pythonPackages, mopidy, glibcLocales }: - -pythonPackages.buildPythonApplication rec { - pname = "Mopidy-Moped"; - version = "0.7.1"; - - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ mopidy ]; - - # no tests implemented - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://github.com/martijnboland/moped; - description = "A web client for Mopidy"; - license = licenses.mit; - maintainers = [ maintainers.rickynils ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix deleted file mode 100644 index d55e711cf330..000000000000 --- a/pkgs/applications/audio/mopidy-mopify/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - pname = "Mopidy-Mopify"; - version = "1.6.1"; - - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c"; - }; - - propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; - - # no tests implemented - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://github.com/dirkgroenen/mopidy-mopify; - description = "A mopidy webclient based on the Spotify webbased interface"; - license = licenses.gpl3; - maintainers = [ maintainers.Gonzih ]; - }; -} diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix deleted file mode 100644 index d2f525bffd1d..000000000000 --- a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-musicbox-webclient-${version}"; - - version = "2.3.0"; - - src = fetchFromGitHub { - owner = "pimusicbox"; - repo = "mopidy-musicbox-webclient"; - rev = "v${version}"; - sha256 = "1jcfrwsi7axiph3jplqzmcqia9pc46xb2yf13d8h6lnh3h49rwvz"; - }; - - propagatedBuildInputs = [ mopidy ]; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Mopidy extension for playing music from SoundCloud"; - license = licenses.mit; - maintainers = [ maintainers.spwhitt ]; - }; -} diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy-soundcloud/default.nix deleted file mode 100644 index 098812961649..000000000000 --- a/pkgs/applications/audio/mopidy-soundcloud/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-soundcloud-${version}"; - - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-soundcloud"; - rev = "v${version}"; - sha256 = "13n44975n1wwcf7qg1c7drc2bavhjnr9hnq1v0n5hdgyx8ji67gi"; - }; - - propagatedBuildInputs = [ mopidy ]; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Mopidy extension for playing music from SoundCloud"; - license = licenses.mit; - maintainers = [ maintainers.spwhitt ]; - }; -} diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix deleted file mode 100644 index 034a07bf027d..000000000000 --- a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-spotify-tunigo-${version}"; - - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "trygveaa"; - repo = "mopidy-spotify-tunigo"; - rev = "v${version}"; - sha256 = "1jwk0b2iz4z09qynnhcr07w15lx6i1ra09s9lp48vslqcf2fp36x"; - }; - - propagatedBuildInputs = [ mopidy mopidy-spotify pythonPackages.tunigo ]; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Mopidy extension for providing the browse feature of Spotify"; - license = licenses.asl20; - maintainers = [ maintainers.spwhitt ]; - }; -} diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix deleted file mode 100644 index 64b5ee629b33..000000000000 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-spotify-${version}"; - version = "3.1.0"; - - src = fetchurl { - url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl"; - }; - - propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://www.mopidy.com/; - description = "Mopidy extension for playing music from Spotify"; - license = licenses.asl20; - maintainers = [ maintainers.rickynils ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy-youtube/default.nix deleted file mode 100644 index d3eb8539a19c..000000000000 --- a/pkgs/applications/audio/mopidy-youtube/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: - -pythonPackages.buildPythonApplication rec { - name = "mopidy-youtube-${version}"; - - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy-youtube"; - rev = "v${version}"; - sha256 = "06r3ikyg2ch5n7fbn3sgj04hk6icpfpk1r856qch41995k3bbfg7"; - }; - - propagatedBuildInputs = with pythonPackages; [ mopidy pafy ]; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Mopidy extension for playing music from YouTube"; - license = licenses.asl20; - maintainers = [ maintainers.spwhitt ]; - }; -} diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix new file mode 100644 index 000000000000..e58cddd42942 --- /dev/null +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-gmusic-${version}"; + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz"; + sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j"; + }; + + propagatedBuildInputs = [ + mopidy + pythonPackages.requests + pythonPackages.gmusicapi + pythonPackages.cachetools_1 + ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for playing music from Google Play Music"; + license = licenses.asl20; + maintainers = [ maintainers.jgillich ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix new file mode 100644 index 000000000000..1c8b0af70e43 --- /dev/null +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -0,0 +1,34 @@ +{ stdenv, pythonPackages, mopidy, mopidy-local-images }: + +pythonPackages.buildPythonApplication rec { + pname = "Mopidy-Iris"; + version = "3.16.3"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "1zdlvrqlj1hapaxnskrbp9idziy3rcxhpqhw3x4q25cjbl8m0b0d"; + }; + + propagatedBuildInputs = [ + mopidy + mopidy-local-images + ] ++ (with pythonPackages; [ + configobj + pylast + spotipy + raven + tornado + ]); + + postPatch = "sed -i /tornado/d setup.py"; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/jaedb/Iris; + description = "A fully-functional Mopidy web client encompassing Spotify and many other backends"; + license = licenses.asl20; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix new file mode 100644 index 000000000000..063821544aed --- /dev/null +++ b/pkgs/applications/audio/mopidy/local-images.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-local-images-${version}"; + + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-local-images"; + rev = "v${version}"; + sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; + }; + + buildInputs = [ gobjectIntrospection ]; + + checkInputs = [ + pythonPackages.mock + ]; + + propagatedBuildInputs = [ + mopidy + pythonPackages.pykka + pythonPackages.uritools + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mopidy/mopidy-local-images; + description = "Mopidy local library proxy extension for handling embedded album art"; + license = licenses.asl20; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix new file mode 100644 index 000000000000..7aebc43dabbb --- /dev/null +++ b/pkgs/applications/audio/mopidy/local-sqlite.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-local-sqlite-${version}"; + + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-local-sqlite"; + rev = "v${version}"; + sha256 = "1fjd9ydbfwd1n9b9zw8zjn4l7c5hpam2n0xs51pjkjn82m3zq9zv"; + }; + + propagatedBuildInputs = [ + mopidy + pythonPackages.uritools + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mopidy/mopidy-local-sqlite; + description = "Mopidy SQLite local library extension"; + license = licenses.asl20; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix new file mode 100644 index 000000000000..3754bf763b20 --- /dev/null +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -0,0 +1,26 @@ +{ stdenv, pythonPackages, mopidy, glibcLocales }: + +pythonPackages.buildPythonApplication rec { + pname = "Mopidy-Moped"; + version = "0.7.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4"; + }; + + LC_ALL = "en_US.UTF-8"; + buildInputs = [ glibcLocales ]; + propagatedBuildInputs = [ mopidy ]; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/martijnboland/moped; + description = "A web client for Mopidy"; + license = licenses.mit; + maintainers = [ maintainers.rickynils ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix new file mode 100644 index 000000000000..d55e711cf330 --- /dev/null +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + pname = "Mopidy-Mopify"; + version = "1.6.1"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "93ad2b3d38b1450c8f2698bb908b0b077a96b3f64cdd6486519e518132e23a5c"; + }; + + propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; + + # no tests implemented + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/dirkgroenen/mopidy-mopify; + description = "A mopidy webclient based on the Spotify webbased interface"; + license = licenses.gpl3; + maintainers = [ maintainers.Gonzih ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix new file mode 100644 index 000000000000..d2f525bffd1d --- /dev/null +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-musicbox-webclient-${version}"; + + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "pimusicbox"; + repo = "mopidy-musicbox-webclient"; + rev = "v${version}"; + sha256 = "1jcfrwsi7axiph3jplqzmcqia9pc46xb2yf13d8h6lnh3h49rwvz"; + }; + + propagatedBuildInputs = [ mopidy ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Mopidy extension for playing music from SoundCloud"; + license = licenses.mit; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix new file mode 100644 index 000000000000..098812961649 --- /dev/null +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-soundcloud-${version}"; + + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-soundcloud"; + rev = "v${version}"; + sha256 = "13n44975n1wwcf7qg1c7drc2bavhjnr9hnq1v0n5hdgyx8ji67gi"; + }; + + propagatedBuildInputs = [ mopidy ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Mopidy extension for playing music from SoundCloud"; + license = licenses.mit; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/spotify-tunigo.nix b/pkgs/applications/audio/mopidy/spotify-tunigo.nix new file mode 100644 index 000000000000..034a07bf027d --- /dev/null +++ b/pkgs/applications/audio/mopidy/spotify-tunigo.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-spotify-tunigo-${version}"; + + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "trygveaa"; + repo = "mopidy-spotify-tunigo"; + rev = "v${version}"; + sha256 = "1jwk0b2iz4z09qynnhcr07w15lx6i1ra09s9lp48vslqcf2fp36x"; + }; + + propagatedBuildInputs = [ mopidy mopidy-spotify pythonPackages.tunigo ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Mopidy extension for providing the browse feature of Spotify"; + license = licenses.asl20; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix new file mode 100644 index 000000000000..64b5ee629b33 --- /dev/null +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-spotify-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; + sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl"; + }; + + propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://www.mopidy.com/; + description = "Mopidy extension for playing music from Spotify"; + license = licenses.asl20; + maintainers = [ maintainers.rickynils ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix new file mode 100644 index 000000000000..d3eb8539a19c --- /dev/null +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-youtube-${version}"; + + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-youtube"; + rev = "v${version}"; + sha256 = "06r3ikyg2ch5n7fbn3sgj04hk6icpfpk1r856qch41995k3bbfg7"; + }; + + propagatedBuildInputs = with pythonPackages; [ mopidy pafy ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Mopidy extension for playing music from YouTube"; + license = licenses.asl20; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix deleted file mode 100644 index 3227151ce21e..000000000000 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, lightdm, pkgconfig, intltool -, hicolor-icon-theme, makeWrapper -, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported -, exo -}: - -#ToDo: bad icons with gtk2; -# avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from - -let - ver_branch = "2.0"; - version = "2.0.5"; -in -stdenv.mkDerivation rec { - name = "lightdm-gtk-greeter-${version}"; - - src = fetchurl { - url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; - sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm exo intltool makeWrapper ] - ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); - - configureFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; - - installFlags = [ - "localstatedir=\${TMPDIR}" - "sysconfdir=\${out}/etc" - ]; - - postInstall = '' - substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ - --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share" - ''; - - meta = with stdenv.lib; { - homepage = https://launchpad.net/lightdm-gtk-greeter; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ ocharles wkennington ]; - }; -} diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix new file mode 100644 index 000000000000..3227151ce21e --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, lightdm, pkgconfig, intltool +, hicolor-icon-theme, makeWrapper +, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported +, exo +}: + +#ToDo: bad icons with gtk2; +# avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from + +let + ver_branch = "2.0"; + version = "2.0.5"; +in +stdenv.mkDerivation rec { + name = "lightdm-gtk-greeter-${version}"; + + src = fetchurl { + url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; + sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lightdm exo intltool makeWrapper ] + ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); + + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + + installFlags = [ + "localstatedir=\${TMPDIR}" + "sysconfdir=\${out}/etc" + ]; + + postInstall = '' + substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ + --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" + wrapProgram "$out/sbin/lightdm-gtk-greeter" \ + --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share" + ''; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/lightdm-gtk-greeter; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ocharles wkennington ]; + }; +} diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode-with-extensions/default.nix deleted file mode 100644 index c54c8a4277f1..000000000000 --- a/pkgs/applications/editors/vscode-with-extensions/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript -, vscodeExtensions ? [] }: - -/* - `vscodeExtensions` - : A set of vscode extensions to be installed alongside the editor. Here's a an - example: - - ~~~ - vscode-with-extensions.override { - - # When the extension is already available in the default extensions set. - vscodeExtensions = with vscode-extensions; [ - bbenoist.Nix - ] - - # Concise version from the vscode market place when not available in the default set. - ++ vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "code-runner"; - publisher = "formulahendry"; - version = "0.6.33"; - sha256 = "166ia73vrcl5c9hm4q1a73qdn56m0jc7flfsk5p5q41na9f10lb0"; - } - ]; - } - ~~~ - - This expression should fetch - - the *nix* vscode extension from whatever source defined in the - default nixpkgs extensions set `vscodeExtensions`. - - - the *code-runner* vscode extension from the marketplace using the - following url: - - ~~~ - https://bbenoist.gallery.vsassets.io/_apis/public/gallery/publisher/bbenoist/extension/nix/1.0.1/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage - ~~~ - - The original `code` executable will be wrapped so that it uses the set of pre-installed / unpacked - extensions as its `--extensions-dir`. -*/ - -let - - wrappedPkgVersion = lib.getVersion vscode; - wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name; - - combinedExtensionsDrv = buildEnv { - name = "${wrappedPkgName}-extensions-${wrappedPkgVersion}"; - paths = vscodeExtensions; - }; - - wrappedExeName = "code"; - exeName = wrappedExeName; - - wrapperExeFile = writeScript "${exeName}" '' - #!${stdenv.shell} - exec ${vscode}/bin/${wrappedExeName} \ - --extensions-dir "${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" \ - "$@" - ''; - -in - -# When no extensions are requested, we simply redirect to the original -# non-wrapped vscode executable. -runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { - buildInputs = [ vscode which ]; - dontPatchELF = true; - dontStrip = true; - meta = vscode.meta; -} '' - mkdir -p "$out/bin" - ${if [] == vscodeExtensions - then '' - ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}" - '' - else '' - ln -sT "${wrapperExeFile}" "$out/bin/${exeName}" - ''} -'' diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix new file mode 100644 index 000000000000..c54c8a4277f1 --- /dev/null +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -0,0 +1,82 @@ +{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript +, vscodeExtensions ? [] }: + +/* + `vscodeExtensions` + : A set of vscode extensions to be installed alongside the editor. Here's a an + example: + + ~~~ + vscode-with-extensions.override { + + # When the extension is already available in the default extensions set. + vscodeExtensions = with vscode-extensions; [ + bbenoist.Nix + ] + + # Concise version from the vscode market place when not available in the default set. + ++ vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "code-runner"; + publisher = "formulahendry"; + version = "0.6.33"; + sha256 = "166ia73vrcl5c9hm4q1a73qdn56m0jc7flfsk5p5q41na9f10lb0"; + } + ]; + } + ~~~ + + This expression should fetch + - the *nix* vscode extension from whatever source defined in the + default nixpkgs extensions set `vscodeExtensions`. + + - the *code-runner* vscode extension from the marketplace using the + following url: + + ~~~ + https://bbenoist.gallery.vsassets.io/_apis/public/gallery/publisher/bbenoist/extension/nix/1.0.1/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage + ~~~ + + The original `code` executable will be wrapped so that it uses the set of pre-installed / unpacked + extensions as its `--extensions-dir`. +*/ + +let + + wrappedPkgVersion = lib.getVersion vscode; + wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name; + + combinedExtensionsDrv = buildEnv { + name = "${wrappedPkgName}-extensions-${wrappedPkgVersion}"; + paths = vscodeExtensions; + }; + + wrappedExeName = "code"; + exeName = wrappedExeName; + + wrapperExeFile = writeScript "${exeName}" '' + #!${stdenv.shell} + exec ${vscode}/bin/${wrappedExeName} \ + --extensions-dir "${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" \ + "$@" + ''; + +in + +# When no extensions are requested, we simply redirect to the original +# non-wrapped vscode executable. +runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { + buildInputs = [ vscode which ]; + dontPatchELF = true; + dontStrip = true; + meta = vscode.meta; +} '' + mkdir -p "$out/bin" + ${if [] == vscodeExtensions + then '' + ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}" + '' + else '' + ln -sT "${wrapperExeFile}" "$out/bin/${exeName}" + ''} +'' diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix deleted file mode 100644 index c98efa547b39..000000000000 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, python2Packages }: - -python2Packages.buildPythonApplication rec { - version = "2.9.3.1"; - name = "electrum-dash-${version}"; - - src = fetchurl { - url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz"; - #"https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz"; - sha256 = "9b7ac205f63fd4bfb15d77a34a4451ef82caecf096f31048a7603bd276dfc33e"; - }; - - propagatedBuildInputs = with python2Packages; [ - dnspython - ecdsa - pbkdf2 - protobuf - pyasn1 - pyasn1-modules - pycrypto - pyqt4 - qrcode - requests - pyaes - tlslite - x11_hash - mnemonic - jsonrpclib - - # plugins - trezor - ]; - - preInstall = '' - mkdir -p $out/share - sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py - pyrcc4 icons.qrc -o gui/qt/icons_rc.py - ''; - - meta = with stdenv.lib; { - description = "Electrum DASH"; - homepage = https://github.com/dashpay/electrum-dash; - license = licenses.gpl3; - maintainers = with maintainers; [ np ]; - }; -} diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix deleted file mode 100644 index 7852e6eb790e..000000000000 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, fetchurl -, python3Packages -}: - -python3Packages.buildPythonApplication rec { - name = "electrum-ltc-${version}"; - version = "3.1.2.1"; - - src = fetchurl { - url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "0sdql4k8g3py941rzdskm3k4hkwam4hzvg4qlvs0b5pw139mri86"; - }; - - propagatedBuildInputs = with python3Packages; [ - pyaes - ecdsa - pbkdf2 - requests - qrcode - py_scrypt - pyqt5 - protobuf - dnspython - jsonrpclib-pelix - pysocks - ]; - - preBuild = '' - sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc5 icons.qrc -o gui/qt/icons_rc.py - # Recording the creation timestamps introduces indeterminism to the build - sed -i '/Created: .*/d' gui/qt/icons_rc.py - ''; - - checkPhase = '' - $out/bin/electrum-ltc help >/dev/null - ''; - - meta = with stdenv.lib; { - description = "Litecoin thin client"; - longDescription = '' - Electrum-LTC is a simple, but powerful Litecoin wallet. A twelve-word - security passphrase (or “seed”) leaves intruders stranded and your peace - of mind intact. Keep it on paper, or in your head... and never worry - about losing your litecoins to theft or hardware failure. No waiting, no - lengthy blockchain downloads and no syncing to the network. - ''; - homepage = https://electrum-ltc.org/; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ asymmetric ]; - }; -} - diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix new file mode 100644 index 000000000000..c98efa547b39 --- /dev/null +++ b/pkgs/applications/misc/electrum/dash.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, python2Packages }: + +python2Packages.buildPythonApplication rec { + version = "2.9.3.1"; + name = "electrum-dash-${version}"; + + src = fetchurl { + url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz"; + #"https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz"; + sha256 = "9b7ac205f63fd4bfb15d77a34a4451ef82caecf096f31048a7603bd276dfc33e"; + }; + + propagatedBuildInputs = with python2Packages; [ + dnspython + ecdsa + pbkdf2 + protobuf + pyasn1 + pyasn1-modules + pycrypto + pyqt4 + qrcode + requests + pyaes + tlslite + x11_hash + mnemonic + jsonrpclib + + # plugins + trezor + ]; + + preInstall = '' + mkdir -p $out/share + sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py + pyrcc4 icons.qrc -o gui/qt/icons_rc.py + ''; + + meta = with stdenv.lib; { + description = "Electrum DASH"; + homepage = https://github.com/dashpay/electrum-dash; + license = licenses.gpl3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix new file mode 100644 index 000000000000..7852e6eb790e --- /dev/null +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchurl +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + name = "electrum-ltc-${version}"; + version = "3.1.2.1"; + + src = fetchurl { + url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; + sha256 = "0sdql4k8g3py941rzdskm3k4hkwam4hzvg4qlvs0b5pw139mri86"; + }; + + propagatedBuildInputs = with python3Packages; [ + pyaes + ecdsa + pbkdf2 + requests + qrcode + py_scrypt + pyqt5 + protobuf + dnspython + jsonrpclib-pelix + pysocks + ]; + + preBuild = '' + sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py + pyrcc5 icons.qrc -o gui/qt/icons_rc.py + # Recording the creation timestamps introduces indeterminism to the build + sed -i '/Created: .*/d' gui/qt/icons_rc.py + ''; + + checkPhase = '' + $out/bin/electrum-ltc help >/dev/null + ''; + + meta = with stdenv.lib; { + description = "Litecoin thin client"; + longDescription = '' + Electrum-LTC is a simple, but powerful Litecoin wallet. A twelve-word + security passphrase (or “seed”) leaves intruders stranded and your peace + of mind intact. Keep it on paper, or in your head... and never worry + about losing your litecoins to theft or hardware failure. No waiting, no + lengthy blockchain downloads and no syncing to the network. + ''; + homepage = https://electrum-ltc.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ asymmetric ]; + }; +} + diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio-ais/default.nix deleted file mode 100644 index dfb8415219c7..000000000000 --- a/pkgs/applications/misc/gnuradio-ais/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, cppunit, gnuradio-osmosdr -, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-ais-${version}"; - version = "2015-12-20"; - - src = fetchFromGitHub { - owner = "bistromath"; - repo = "gr-ais"; - # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 - "rev" = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; - "sha256" = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Gnuradio block for ais"; - homepage = https://github.com/bistromath/gr-ais; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio-gsm/default.nix deleted file mode 100644 index 6e0856ce66aa..000000000000 --- a/pkgs/applications/misc/gnuradio-gsm/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, cppunit, libosmocore, gnuradio-osmosdr -, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-gsm-${version}"; - version = "2016-08-25"; - - src = fetchFromGitHub { - owner = "ptrkrysik"; - repo = "gr-gsm"; - rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d"; - sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gnuradio-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") - done - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Gnuradio block for gsm"; - homepage = https://github.com/ptrkrysik/gr-gsm; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio-nacl/default.nix deleted file mode 100644 index 28836958e98c..000000000000 --- a/pkgs/applications/misc/gnuradio-nacl/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd -, makeWrapper, libsodium, cppunit -, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-nacl-${version}"; - version = "2015-11-05"; - - src = fetchFromGitHub { - owner = "stwunsch"; - repo = "gr-nacl"; - rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95"; - sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio uhd makeWrapper libsodium cppunit - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Gnuradio block for encryption"; - homepage = https://github.com/stwunsch/gr-nacl; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix deleted file mode 100644 index 355ca0e95449..000000000000 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd -, makeWrapper, hackrf, airspy -, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-osmosdr-${version}"; - version = "0.1.4"; - - src = fetchgit { - url = "git://git.osmocom.org/gr-osmosdr"; - rev = "refs/tags/v${version}"; - sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Gnuradio block for OsmoSDR and rtl-sdr"; - homepage = https://sdr.osmocom.org/trac/wiki/GrOsmoSDR; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor the-kenny ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio-rds/default.nix deleted file mode 100644 index 44ed89d9002d..000000000000 --- a/pkgs/applications/misc/gnuradio-rds/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, pythonSupport ? true, python, swig -}: - -assert pythonSupport -> python != null && swig != null; - -stdenv.mkDerivation rec { - name = "gnuradio-rds-${version}"; - version = "2016-08-27"; - - src = fetchFromGitHub { - owner = "bastibl"; - repo = "gr-rds"; - rev = "5246b75180808d47f321cb26f6c16d7c7a7af4fc"; - sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost gnuradio makeWrapper - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; - - postInstall = '' - for prog in "$out"/bin/*; do - wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") - done - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Gnuradio block for radio data system"; - homepage = https://github.com/bastibl/gr-rds; - license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ mog ]; - }; -} diff --git a/pkgs/applications/misc/gnuradio/ais.nix b/pkgs/applications/misc/gnuradio/ais.nix new file mode 100644 index 000000000000..dfb8415219c7 --- /dev/null +++ b/pkgs/applications/misc/gnuradio/ais.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, cppunit, gnuradio-osmosdr +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-ais-${version}"; + version = "2015-12-20"; + + src = fetchFromGitHub { + owner = "bistromath"; + repo = "gr-ais"; + # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 + "rev" = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; + "sha256" = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for ais"; + homepage = https://github.com/bistromath/gr-ais; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/gsm.nix b/pkgs/applications/misc/gnuradio/gsm.nix new file mode 100644 index 000000000000..6e0856ce66aa --- /dev/null +++ b/pkgs/applications/misc/gnuradio/gsm.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, cppunit, libosmocore, gnuradio-osmosdr +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-gsm-${version}"; + version = "2016-08-25"; + + src = fetchFromGitHub { + owner = "ptrkrysik"; + repo = "gr-gsm"; + rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d"; + sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gnuradio-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for gsm"; + homepage = https://github.com/ptrkrysik/gr-gsm; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/nacl.nix b/pkgs/applications/misc/gnuradio/nacl.nix new file mode 100644 index 000000000000..28836958e98c --- /dev/null +++ b/pkgs/applications/misc/gnuradio/nacl.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd +, makeWrapper, libsodium, cppunit +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-nacl-${version}"; + version = "2015-11-05"; + + src = fetchFromGitHub { + owner = "stwunsch"; + repo = "gr-nacl"; + rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95"; + sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio uhd makeWrapper libsodium cppunit + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for encryption"; + homepage = https://github.com/stwunsch/gr-nacl; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/osmosdr.nix b/pkgs/applications/misc/gnuradio/osmosdr.nix new file mode 100644 index 000000000000..355ca0e95449 --- /dev/null +++ b/pkgs/applications/misc/gnuradio/osmosdr.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd +, makeWrapper, hackrf, airspy +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-osmosdr-${version}"; + version = "0.1.4"; + + src = fetchgit { + url = "git://git.osmocom.org/gr-osmosdr"; + rev = "refs/tags/v${version}"; + sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for OsmoSDR and rtl-sdr"; + homepage = https://sdr.osmocom.org/trac/wiki/GrOsmoSDR; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ bjornfor the-kenny ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio/rds.nix b/pkgs/applications/misc/gnuradio/rds.nix new file mode 100644 index 000000000000..44ed89d9002d --- /dev/null +++ b/pkgs/applications/misc/gnuradio/rds.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-rds-${version}"; + version = "2016-08-27"; + + src = fetchFromGitHub { + owner = "bastibl"; + repo = "gr-rds"; + rev = "5246b75180808d47f321cb26f6c16d7c7a7af4fc"; + sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost gnuradio makeWrapper + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Gnuradio block for radio data system"; + homepage = https://github.com/bastibl/gr-rds; + license = licenses.gpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix deleted file mode 100644 index 1ee2bfab94c3..000000000000 --- a/pkgs/applications/misc/slic3r-prusa3d/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, - boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, - glew, eigen }: -let - AlienWxWidgets = perlPackages.buildPerlPackage rec { - name = "Alien-wxWidgets-0.69"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; - sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr"; - }; - propagatedBuildInputs = [ - pkgconfig perlPackages.ModulePluggable perlPackages.ModuleBuild - gtk2 gtk3 wxGTK30 - ]; - }; - - Wx = perlPackages.Wx.overrideAttrs (oldAttrs: { - propagatedBuildInputs = [ - perlPackages.ExtUtilsXSpp - AlienWxWidgets - ]; - }); - - WxGLCanvas = perlPackages.buildPerlPackage rec { - name = "Wx-GLCanvas-0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; - sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; - }; - propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ]; - doCheck = false; - }; -in -stdenv.mkDerivation rec { - name = "slic3r-prusa-edition-${version}"; - version = "1.39.1"; - - enableParallelBuilding = true; - - buildInputs = [ - cmake - perl - makeWrapper - eigen - glew - tbb - which - Wx - WxGLCanvas - ] ++ (with perlPackages; [ - boost - ClassXSAccessor - EncodeLocale - ExtUtilsMakeMaker - ExtUtilsTypemapsDefault - ExtUtilsXSpp - GrowlGNTP - ImportInto - IOStringy - locallib - LWP - MathClipper - MathConvexHullMonotoneChain - MathGeometryVoronoi - MathPlanePath - ModuleBuildWithXSpp - Moo - NetDBus - OpenGL - threads - XMLSAX - ]); - - prePatch = '' - sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp - ''; - - postInstall = '' - echo 'postInstall' - wrapProgram "$out/bin/slic3r-prusa3d" \ - --prefix PERL5LIB : "$out/lib/slic3r-prusa3d:$PERL5LIB" - - # it seems we need to copy the icons... - mkdir -p $out/bin/var - cp ../resources/icons/* $out/bin/var/ - cp -r ../resources $out/bin/ - ''; - - src = fetchFromGitHub { - owner = "prusa3d"; - repo = "Slic3r"; - sha256 = "0frkjgzmiy788ijkcqz3baxcrncqmk9s2vcd99hb8p2q13cg51ff"; - rev = "version_${version}"; - }; - - meta = with stdenv.lib; { - description = "G-code generator for 3D printer"; - homepage = https://github.com/prusa3d/Slic3r; - license = licenses.agpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ tweber ]; - }; -} diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix new file mode 100644 index 000000000000..1ee2bfab94c3 --- /dev/null +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, + glew, eigen }: +let + AlienWxWidgets = perlPackages.buildPerlPackage rec { + name = "Alien-wxWidgets-0.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr"; + }; + propagatedBuildInputs = [ + pkgconfig perlPackages.ModulePluggable perlPackages.ModuleBuild + gtk2 gtk3 wxGTK30 + ]; + }; + + Wx = perlPackages.Wx.overrideAttrs (oldAttrs: { + propagatedBuildInputs = [ + perlPackages.ExtUtilsXSpp + AlienWxWidgets + ]; + }); + + WxGLCanvas = perlPackages.buildPerlPackage rec { + name = "Wx-GLCanvas-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; + sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; + }; + propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ]; + doCheck = false; + }; +in +stdenv.mkDerivation rec { + name = "slic3r-prusa-edition-${version}"; + version = "1.39.1"; + + enableParallelBuilding = true; + + buildInputs = [ + cmake + perl + makeWrapper + eigen + glew + tbb + which + Wx + WxGLCanvas + ] ++ (with perlPackages; [ + boost + ClassXSAccessor + EncodeLocale + ExtUtilsMakeMaker + ExtUtilsTypemapsDefault + ExtUtilsXSpp + GrowlGNTP + ImportInto + IOStringy + locallib + LWP + MathClipper + MathConvexHullMonotoneChain + MathGeometryVoronoi + MathPlanePath + ModuleBuildWithXSpp + Moo + NetDBus + OpenGL + threads + XMLSAX + ]); + + prePatch = '' + sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp + ''; + + postInstall = '' + echo 'postInstall' + wrapProgram "$out/bin/slic3r-prusa3d" \ + --prefix PERL5LIB : "$out/lib/slic3r-prusa3d:$PERL5LIB" + + # it seems we need to copy the icons... + mkdir -p $out/bin/var + cp ../resources/icons/* $out/bin/var/ + cp -r ../resources $out/bin/ + ''; + + src = fetchFromGitHub { + owner = "prusa3d"; + repo = "Slic3r"; + sha256 = "0frkjgzmiy788ijkcqz3baxcrncqmk9s2vcd99hb8p2q13cg51ff"; + rev = "version_${version}"; + }; + + meta = with stdenv.lib; { + description = "G-code generator for 3D printer"; + homepage = https://github.com/prusa3d/Slic3r; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ tweber ]; + }; +} diff --git a/pkgs/applications/misc/xmrig-proxy/default.nix b/pkgs/applications/misc/xmrig-proxy/default.nix deleted file mode 100644 index 248f629f2e91..000000000000 --- a/pkgs/applications/misc/xmrig-proxy/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, libuuid -, donateLevel ? 0 -}: - -stdenv.mkDerivation rec { - name = "xmrig-proxy-${version}"; - version = "2.5.2"; - - src = fetchFromGitHub { - owner = "xmrig"; - repo = "xmrig-proxy"; - rev = "v${version}"; - sha256 = "1x10mrr58lc207zppzkjnhwah83kpxrqpa3idv01lyasv8mfkxzc"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd libuuid ]; - - # Set default donation level to 0%. Can be increased at runtime via --donate-level option. - postPatch = '' - substituteInPlace src/donate.h --replace "kDonateLevel = 2;" "kDonateLevel = ${toString donateLevel};" - ''; - - installPhase = '' - install -vD xmrig-proxy $out/bin/xmrig-proxy - ''; - - meta = with lib; { - description = "Monero (XMR) Stratum protocol proxy"; - homepage = "https://github.com/xmrig/xmrig-proxy"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ aij ]; - }; -} diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix new file mode 100644 index 000000000000..248f629f2e91 --- /dev/null +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, libuuid +, donateLevel ? 0 +}: + +stdenv.mkDerivation rec { + name = "xmrig-proxy-${version}"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "xmrig"; + repo = "xmrig-proxy"; + rev = "v${version}"; + sha256 = "1x10mrr58lc207zppzkjnhwah83kpxrqpa3idv01lyasv8mfkxzc"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libuv libmicrohttpd libuuid ]; + + # Set default donation level to 0%. Can be increased at runtime via --donate-level option. + postPatch = '' + substituteInPlace src/donate.h --replace "kDonateLevel = 2;" "kDonateLevel = ${toString donateLevel};" + ''; + + installPhase = '' + install -vD xmrig-proxy $out/bin/xmrig-proxy + ''; + + meta = with lib; { + description = "Monero (XMR) Stratum protocol proxy"; + homepage = "https://github.com/xmrig/xmrig-proxy"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ aij ]; + }; +} diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix deleted file mode 100644 index d3141675b418..000000000000 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, pkgconfig, fetchurl, python, dropbox }: -let - version = "2015.10.28"; - dropboxd = "${dropbox}/bin/dropbox"; -in -stdenv.mkDerivation { - name = "dropbox-cli-${version}"; - - src = fetchurl { - url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "1ai6vi5227z2ryxl403693xi63b42ylyfmzh8hbv4shp69zszm9c"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python ]; - - phases = "unpackPhase installPhase"; - - installPhase = '' - mkdir -p "$out/bin/" "$out/share/applications" - cp data/dropbox.desktop "$out/share/applications" - cp -a data/icons "$out/share/icons" - find "$out/share/icons" -type f \! -name '*.png' -delete - substitute "dropbox.in" "$out/bin/dropbox" \ - --replace '@PACKAGE_VERSION@' ${version} \ - --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ - --replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \ - --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' - sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox - chmod +x "$out/bin/"* - patchShebangs "$out/bin" - ''; - - meta = { - homepage = http://dropbox.com; - description = "Command line client for the dropbox daemon"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - # NOTE: Dropbox itself only works on linux, so this is ok. - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix new file mode 100644 index 000000000000..d3141675b418 --- /dev/null +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -0,0 +1,42 @@ +{ stdenv, pkgconfig, fetchurl, python, dropbox }: +let + version = "2015.10.28"; + dropboxd = "${dropbox}/bin/dropbox"; +in +stdenv.mkDerivation { + name = "dropbox-cli-${version}"; + + src = fetchurl { + url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; + sha256 = "1ai6vi5227z2ryxl403693xi63b42ylyfmzh8hbv4shp69zszm9c"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python ]; + + phases = "unpackPhase installPhase"; + + installPhase = '' + mkdir -p "$out/bin/" "$out/share/applications" + cp data/dropbox.desktop "$out/share/applications" + cp -a data/icons "$out/share/icons" + find "$out/share/icons" -type f \! -name '*.png' -delete + substitute "dropbox.in" "$out/bin/dropbox" \ + --replace '@PACKAGE_VERSION@' ${version} \ + --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ + --replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \ + --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' + sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox + chmod +x "$out/bin/"* + patchShebangs "$out/bin" + ''; + + meta = { + homepage = http://dropbox.com; + description = "Command line client for the dropbox daemon"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + # NOTE: Dropbox itself only works on linux, so this is ok. + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker-distribution/default.nix deleted file mode 100644 index 0af9abc852ef..000000000000 --- a/pkgs/applications/virtualization/docker-distribution/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "distribution-${version}"; - version = "2.6.2"; - rev = "v${version}"; - - goPackagePath = "github.com/docker/distribution"; - - src = fetchFromGitHub { - owner = "docker"; - repo = "distribution"; - inherit rev; - sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b"; - }; - - meta = with stdenv.lib; { - description = "The Docker toolset to pack, ship, store, and deliver content"; - license = licenses.asl20; - maintainers = [ maintainers.globin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix new file mode 100644 index 000000000000..0af9abc852ef --- /dev/null +++ b/pkgs/applications/virtualization/docker/distribution.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "distribution-${version}"; + version = "2.6.2"; + rev = "v${version}"; + + goPackagePath = "github.com/docker/distribution"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "distribution"; + inherit rev; + sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b"; + }; + + meta = with stdenv.lib; { + description = "The Docker toolset to pack, ship, store, and deliver content"; + license = licenses.asl20; + maintainers = [ maintainers.globin ]; + platforms = platforms.unix; + }; +} 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 {}; -- cgit 1.4.1