diff --git a/ci/OWNERS b/ci/OWNERS index ec693ccd3e91..e08961b38210 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -402,9 +402,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/docker-tools* @roberth @jhol /doc/build-helpers/images/dockertools.section.md @roberth @jhol -# Blockchains -/pkgs/applications/blockchains @mmahut @RaghavSood - # Go /doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92 /pkgs/build-support/go @kalbasit @katexochen @Mic92 diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix deleted file mode 100644 index 4d687602ab13..000000000000 --- a/pkgs/applications/blockchains/teos/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - protobuf, - rustfmt, - pkg-config, - openssl, -}: - -let - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "talaia-labs"; - repo = "rust-teos"; - rev = "v${version}"; - hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY="; - }; - - meta = { - homepage = "https://github.com/talaia-labs/rust-teos"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ seberm ]; - }; - updateScript = ./update.sh; -in -{ - teos = rustPlatform.buildRustPackage { - pname = "teos"; - inherit version src; - - cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; - - buildAndTestSubdir = "teos"; - - nativeBuildInputs = [ - protobuf - rustfmt - ]; - - passthru.updateScript = updateScript; - - __darwinAllowLocalNetworking = true; - - meta = meta // { - description = "Lightning watchtower compliant with BOLT13, written in Rust"; - }; - }; - - teos-watchtower-plugin = rustPlatform.buildRustPackage { - pname = "teos-watchtower-plugin"; - inherit version src; - - cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; - - buildAndTestSubdir = "watchtower-plugin"; - - nativeBuildInputs = [ - pkg-config - protobuf - rustfmt - ]; - - buildInputs = [ - openssl - ]; - - passthru.updateScript = updateScript; - - __darwinAllowLocalNetworking = true; - - meta = meta // { - description = "Lightning watchtower plugin for clightning"; - mainProgram = "watchtower-client"; - }; - }; -} diff --git a/pkgs/applications/misc/blucontrol/wrapper.nix b/pkgs/by-name/bl/blucontrol/package.nix similarity index 90% rename from pkgs/applications/misc/blucontrol/wrapper.nix rename to pkgs/by-name/bl/blucontrol/package.nix index eb004835ae20..dfa595a6a1cb 100644 --- a/pkgs/applications/misc/blucontrol/wrapper.nix +++ b/pkgs/by-name/bl/blucontrol/package.nix @@ -2,11 +2,11 @@ stdenv, lib, makeWrapper, - ghcWithPackages, + haskellPackages, packages ? (_: [ ]), }: let - blucontrolEnv = ghcWithPackages (self: [ self.blucontrol ] ++ packages self); + blucontrolEnv = haskellPackages.ghcWithPackages (self: [ self.blucontrol ] ++ packages self); in stdenv.mkDerivation { pname = "blucontrol-with-packages"; diff --git a/pkgs/applications/misc/ding/dict.patch b/pkgs/by-name/di/ding/dict.patch similarity index 100% rename from pkgs/applications/misc/ding/dict.patch rename to pkgs/by-name/di/ding/dict.patch diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/by-name/di/ding/package.nix similarity index 89% rename from pkgs/applications/misc/ding/default.nix rename to pkgs/by-name/di/ding/package.nix index 5be85e033846..fb870dce115a 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/by-name/di/ding/package.nix @@ -1,7 +1,6 @@ { aspell, - aspellDicts_de, - aspellDicts_en, + aspellDicts, buildEnv, fetchurl, fortune, @@ -17,18 +16,18 @@ let name = "env-ding-aspell"; paths = [ aspell - aspellDicts_de - aspellDicts_en + aspellDicts.de + aspellDicts.en ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ding"; version = "1.9"; src = fetchurl { - url = "https://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${version}.tar.gz"; - sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; + url = "https://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${finalAttrs.version}.tar.gz"; + hash = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; }; nativeBuildInputs = [ makeWrapper ]; @@ -81,4 +80,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; # homepage says: unix-like except darwin maintainers = [ lib.maintainers.exi ]; }; -} +}) diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/by-name/mu/mu-repo/package.nix similarity index 85% rename from pkgs/applications/misc/mu-repo/default.nix rename to pkgs/by-name/mu/mu-repo/package.nix index 99f52a5901b3..9dc5e67e2e07 100644 --- a/pkgs/applications/misc/mu-repo/default.nix +++ b/pkgs/by-name/mu/mu-repo/package.nix @@ -7,7 +7,7 @@ mu-repo, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "mu-repo"; version = "1.9.0"; format = "setuptools"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "fabioz"; repo = "mu-repo"; - tag = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-aSRf0B/skoZLsn4dykWOFKVNtHYCsD9RtZ1frHDrcJU="; }; @@ -40,4 +40,4 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ sikmir ]; mainProgram = "mu"; }; -} +}) diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/by-name/mw/mwic/package.nix similarity index 70% rename from pkgs/applications/misc/mwic/default.nix rename to pkgs/by-name/mw/mwic/package.nix index 9aa8902f416d..46a1cfe0efeb 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/by-name/mw/mwic/package.nix @@ -2,25 +2,25 @@ lib, stdenv, fetchurl, - pythonPackages, + python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.7.10"; pname = "mwic"; src = fetchurl { - url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/jwilk/mwic/releases/download/${finalAttrs.version}/mwic-${finalAttrs.version}.tar.gz"; sha256 = "sha256-dmIHPehkxpSb78ymVpcPCu4L41coskrHQOg067dprOo="; }; makeFlags = [ "PREFIX=\${out}" ]; nativeBuildInputs = [ - pythonPackages.wrapPython + python3Packages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ pyenchant regex ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; -} +}) diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/by-name/pa/parsec-bin/package.nix similarity index 97% rename from pkgs/applications/misc/parsec/bin.nix rename to pkgs/by-name/pa/parsec-bin/package.nix index c483c5bb6488..05663920b9a2 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/by-name/pa/parsec-bin/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation { src = fetchurl { url = "https://web.archive.org/web/20250226223019/https://builds.parsec.app/package/parsec-linux.deb"; - sha256 = "sha256-8Wkbo6l1NGBPX2QMJszq+u9nLM96tu7WYRTQq6/CzM8="; + hash = "sha256-8Wkbo6l1NGBPX2QMJszq+u9nLM96tu7WYRTQq6/CzM8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/by-name/re/rednotebook/package.nix similarity index 100% rename from pkgs/applications/editors/rednotebook/default.nix rename to pkgs/by-name/re/rednotebook/package.nix diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/by-name/st/stag/package.nix similarity index 97% rename from pkgs/applications/misc/stag/default.nix rename to pkgs/by-name/st/stag/package.nix index f5507ba47824..51f6f6a05ba1 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/by-name/st/stag/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - curses, + ncurses, fetchpatch, }: @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ' -Werror ' ' ' ''; - buildInputs = [ curses ]; + buildInputs = [ ncurses ]; installPhase = '' make install PREFIX=$out diff --git a/pkgs/applications/version-management/svn2git/default.nix b/pkgs/by-name/sv/svn2git/package.nix similarity index 81% rename from pkgs/applications/version-management/svn2git/default.nix rename to pkgs/by-name/sv/svn2git/package.nix index c839b01239c0..e5aadb8e949a 100644 --- a/pkgs/applications/version-management/svn2git/default.nix +++ b/pkgs/by-name/sv/svn2git/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, ruby, makeWrapper, - git, + gitSVN, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "svn2git"; version = "2.4.0"; src = fetchFromGitHub { owner = "nirvdrum"; repo = "svn2git"; - rev = "v${version}"; - sha256 = "sha256-w649l/WO68vYYxZOBKzI8XhGFkaSwWx/O3oVOtnGg6w="; + tag = "v${finalAttrs.version}"; + hash = "sha256-w649l/WO68vYYxZOBKzI8XhGFkaSwWx/O3oVOtnGg6w="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/svn2git \ --set RUBYLIB $out/lib \ - --prefix PATH : ${git}/bin + --prefix PATH : ${gitSVN}/bin ''; meta = { @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "svn2git"; }; -} +}) diff --git a/pkgs/by-name/te/teos-watchtower-plugin/package.nix b/pkgs/by-name/te/teos-watchtower-plugin/package.nix new file mode 100644 index 000000000000..3da03f5357b4 --- /dev/null +++ b/pkgs/by-name/te/teos-watchtower-plugin/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + teos, + pkg-config, + protobuf, + rustfmt, + openssl, +}: + +rustPlatform.buildRustPackage { + pname = "teos-watchtower-plugin"; + inherit (teos) version src; + + cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; + + buildAndTestSubdir = "watchtower-plugin"; + + nativeBuildInputs = [ + pkg-config + protobuf + rustfmt + ]; + + buildInputs = [ + openssl + ]; + + __darwinAllowLocalNetworking = true; + + meta = teos.meta // { + description = "Lightning watchtower plugin for clightning"; + mainProgram = "watchtower-client"; + }; +} diff --git a/pkgs/by-name/te/teos/package.nix b/pkgs/by-name/te/teos/package.nix new file mode 100644 index 000000000000..707d9adc2949 --- /dev/null +++ b/pkgs/by-name/te/teos/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + protobuf, + rustfmt, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "teos"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "talaia-labs"; + repo = "rust-teos"; + tag = "v${finalAttrs.version}"; + hash = "sha256-UrzH9xmhVq12TcSUQ1AihCG1sNGcy/N8LDsZINVKFkY="; + }; + + cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; + + buildAndTestSubdir = "teos"; + + nativeBuildInputs = [ + protobuf + rustfmt + ]; + + passthru.updateScript = ./update.sh; + + __darwinAllowLocalNetworking = true; + + meta = { + homepage = "https://github.com/talaia-labs/rust-teos"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ seberm ]; + description = "Lightning watchtower compliant with BOLT13, written in Rust"; + }; +}) diff --git a/pkgs/applications/blockchains/teos/update.sh b/pkgs/by-name/te/teos/update.sh similarity index 100% rename from pkgs/applications/blockchains/teos/update.sh rename to pkgs/by-name/te/teos/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca543516cb3c..8944205f1b1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1207,10 +1207,6 @@ with pkgs; libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { }; - svn2git = callPackage ../applications/version-management/svn2git { - git = gitSVN; - }; - inherit (haskellPackages) git-annex; inherit (haskellPackages) git-brunch; @@ -1622,11 +1618,6 @@ with pkgs; inherit (haskellPackages) ghcWithPackages diagrams-builder; }; - ding = callPackage ../applications/misc/ding { - aspellDicts_de = aspellDicts.de; - aspellDicts_en = aspellDicts.en; - }; - discourse = callPackage ../servers/web-apps/discourse { }; discourseAllPlugins = discourse.override { @@ -8751,10 +8742,6 @@ with pkgs; bitwig-studio = bitwig-studio6; - blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix { - inherit (haskellPackages) ghcWithPackages; - }; - breezy = with python3Packages; toPythonApplication breezy; # calico-felix and calico-node have not been packaged due to libbpf, linking issues @@ -9414,8 +9401,6 @@ with pkgs; mpvScripts = callPackage ../by-name/mp/mpv/scripts.nix { }; - mu-repo = callPackage ../applications/misc/mu-repo { }; - murmur = (callPackages ../applications/networking/mumble { avahi = avahi-compat; @@ -9432,10 +9417,6 @@ with pkgs; mumble_overlay = (callPackages ../applications/networking/mumble { }).overlay; - mwic = callPackage ../applications/misc/mwic { - pythonPackages = python3Packages; - }; - netmaker = callPackage ../applications/networking/netmaker { subPackages = [ "." ]; }; netmaker-full = callPackage ../applications/networking/netmaker { }; @@ -9535,8 +9516,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; - pdfpc = callPackage ../applications/misc/pdfpc { inherit (gst_all_1) gstreamer @@ -9642,8 +9621,6 @@ with pkgs; withXineBackend = true; }; - rednotebook = callPackage ../applications/editors/rednotebook { }; - ringboard-wayland = callPackage ../by-name/ri/ringboard/package.nix { displayServer = "wayland"; }; ripcord = @@ -9682,10 +9659,6 @@ with pkgs; scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { }; - stag = callPackage ../applications/misc/stag { - curses = ncurses; - }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) // (callPackage ../applications/misc/sweethome3d/editors.nix { @@ -10222,11 +10195,6 @@ with pkgs; pycoin = with python3Packages; toPythonApplication pycoin; - inherit (callPackages ../applications/blockchains/teos { }) - teos - teos-watchtower-plugin - ; - vertcoind = vertcoin.override { withGui = false; };