gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various: migrate to by-name (#529310)

Browse Source
This commit is contained in:
Philip Taron
2026-06-11 04:51:08 +00:00
committed by GitHub
parent e4f9ba813d da61b3ddf3
commit cd265fd6b4
15 changed files with 103 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/OWNERS
-3
View File
@@ -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
pkgs/applications/blockchains/teos/default.nix
-78
View File
@@ -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";
};
};
}
pkgs/applications/misc/blucontrol/wrapper.nix → pkgs/by-name/bl/blucontrol/package.nix
+2 -2
View File
@@ -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";
pkgs/applications/misc/ding/dict.patch → pkgs/by-name/di/ding/dict.patch
View File
pkgs/applications/misc/ding/default.nix → pkgs/by-name/di/ding/package.nix
+7 -8
View File
@@ -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 ];
};
}
})
pkgs/applications/misc/mu-repo/default.nix → pkgs/by-name/mu/mu-repo/package.nix
+3 -3
View File
@@ -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";
};
}
})
pkgs/applications/misc/mwic/default.nix → pkgs/by-name/mw/mwic/package.nix
+6 -6
View File
@@ -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 ];
};
}
})
pkgs/applications/misc/parsec/bin.nix → pkgs/by-name/pa/parsec-bin/package.nix
+1 -1
View File
@@ -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 = [
pkgs/applications/editors/rednotebook/default.nix → pkgs/by-name/re/rednotebook/package.nix
View File
pkgs/applications/misc/stag/default.nix → pkgs/by-name/st/stag/package.nix
+2 -2
View File
@@ -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
pkgs/applications/version-management/svn2git/default.nix → pkgs/by-name/sv/svn2git/package.nix
+6 -6
View File
@@ -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";
};
}
})
pkgs/by-name/te/teos-watchtower-plugin/package.nix
+35
View File
@@ -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";
};
}
pkgs/by-name/te/teos/package.nix
+41
View File
@@ -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";
};
})
pkgs/applications/blockchains/teos/update.sh → pkgs/by-name/te/teos/update.sh
View File
pkgs/top-level/all-packages.nix
-32
View File
@@ -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;
};