From 533a80b695989977e8701cf7bb665ba185e9ce80 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 20 Oct 2023 11:49:29 -0300 Subject: ciscoPacketTracer: move to by-name Signed-off-by: lucasew --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4176c9d68d..2c11bc99f87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30919,10 +30919,6 @@ with pkgs; clapper = callPackage ../applications/video/clapper { }; - ciscoPacketTracer7 = callPackage ../applications/networking/cisco-packet-tracer/7.nix { }; - - ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { }; - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { }; cligh = python3Packages.callPackage ../development/tools/github/cligh { }; -- cgit 1.4.1 From fee543007f9a601c22e03fcf8963151220c0fd7c Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 20:37:35 -0300 Subject: whatsapp-emoji-font: move to by-name Signed-off-by: lucasew --- pkgs/by-name/wh/whatsapp-emoji-font/package.nix | 46 +++++++++++++++++++++++++ pkgs/data/fonts/whatsapp-emoji/default.nix | 46 ------------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 46 insertions(+), 48 deletions(-) create mode 100644 pkgs/by-name/wh/whatsapp-emoji-font/package.nix delete mode 100644 pkgs/data/fonts/whatsapp-emoji/default.nix (limited to 'pkgs/top-level') diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix new file mode 100644 index 00000000000..5e34282891b --- /dev/null +++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix @@ -0,0 +1,46 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, imagemagick +, nix-update-script +, pngquant +, python3Packages +, which +, zopfli +}: + +stdenvNoCC.mkDerivation rec { + pname = "whatsapp-emoji-linux"; + version = "2.23.2.72-1"; + + src = fetchFromGitHub { + rev = "refs/tags/${version}"; + owner = "dmlls"; + repo = "whatsapp-emoji-linux"; + hash = "sha256-dwX+y8jCpR+SyiH13Os9VeXLDwmAYB7ARW2lAMl/7RE="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + imagemagick + pngquant + python3Packages.nototools + which + zopfli + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "WhatsApp Emoji for GNU/Linux"; + homepage = "https://github.com/dmlls/whatsapp-emoji-linux"; + maintainers = [ lib.maintainers.lucasew ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.unfree; + }; +} diff --git a/pkgs/data/fonts/whatsapp-emoji/default.nix b/pkgs/data/fonts/whatsapp-emoji/default.nix deleted file mode 100644 index 5e34282891b..00000000000 --- a/pkgs/data/fonts/whatsapp-emoji/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, imagemagick -, nix-update-script -, pngquant -, python3Packages -, which -, zopfli -}: - -stdenvNoCC.mkDerivation rec { - pname = "whatsapp-emoji-linux"; - version = "2.23.2.72-1"; - - src = fetchFromGitHub { - rev = "refs/tags/${version}"; - owner = "dmlls"; - repo = "whatsapp-emoji-linux"; - hash = "sha256-dwX+y8jCpR+SyiH13Os9VeXLDwmAYB7ARW2lAMl/7RE="; - }; - - makeFlags = [ - "PREFIX=$(out)" - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - imagemagick - pngquant - python3Packages.nototools - which - zopfli - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "WhatsApp Emoji for GNU/Linux"; - homepage = "https://github.com/dmlls/whatsapp-emoji-linux"; - maintainers = [ lib.maintainers.lucasew ]; - sourceProvenance = [ lib.sourceTypes.fromSource ]; - license = lib.licenses.unfree; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c11bc99f87..f96e72cf5a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30214,8 +30214,6 @@ with pkgs; vollkorn = callPackage ../data/fonts/vollkorn { }; - whatsapp-emoji-font = callPackage ../data/fonts/whatsapp-emoji { }; - weather-icons = callPackage ../data/fonts/weather-icons { }; whitesur-cursors = callPackage ../data/icons/whitesur-cursors { }; -- cgit 1.4.1 From 185d0d9900c0cff028bb0cf5b91f41d5e8a62fed Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 22 Oct 2023 20:40:03 -0300 Subject: cockpit: move to by-name Signed-off-by: lucasew --- pkgs/by-name/co/cockpit/package.nix | 230 ++++++++++++++++++++++++++++ pkgs/by-name/co/cockpit/update.sh | 8 + pkgs/servers/monitoring/cockpit/default.nix | 230 ---------------------------- pkgs/servers/monitoring/cockpit/update.sh | 8 - pkgs/top-level/all-packages.nix | 2 - 5 files changed, 238 insertions(+), 240 deletions(-) create mode 100644 pkgs/by-name/co/cockpit/package.nix create mode 100755 pkgs/by-name/co/cockpit/update.sh delete mode 100644 pkgs/servers/monitoring/cockpit/default.nix delete mode 100755 pkgs/servers/monitoring/cockpit/update.sh (limited to 'pkgs/top-level') diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix new file mode 100644 index 00000000000..f73f391f71b --- /dev/null +++ b/pkgs/by-name/co/cockpit/package.nix @@ -0,0 +1,230 @@ +{ lib +, stdenv +, fetchzip +, fetchurl +, fetchFromGitHub +, autoreconfHook +, bashInteractive +, cacert +, coreutils +, dbus +, docbook_xml_dtd_43 +, docbook_xsl +, findutils +, gettext +, git +, glib +, glibc +, glib-networking +, gnused +, gnutls +, json-glib +, krb5 +, libssh +, libxcrypt +, libxslt +, makeWrapper +, nodejs +, nixosTests +, openssh +, openssl +, pam +, pkg-config +, polkit +, python3Packages +, ripgrep +, runtimeShell +, systemd +, udev +, xmlto +}: + +let + pythonWithGobject = python3Packages.python.withPackages (p: with p; [ + pygobject3 + ]); +in + +stdenv.mkDerivation rec { + pname = "cockpit"; + version = "287"; + + src = fetchFromGitHub { + owner = "cockpit-project"; + repo = "cockpit"; + rev = "refs/tags/${version}"; + sha256 = "sha256-tIZOI3jiMRaGHMXS1mA1Tom9ij3L/VuxDUJdnEc7SSc="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoreconfHook + makeWrapper + docbook_xml_dtd_43 + docbook_xsl + findutils + gettext + git + (lib.getBin libxslt) + nodejs + openssl + pam + pkg-config + pythonWithGobject.python + python3Packages.setuptools + systemd + ripgrep + xmlto + ]; + + buildInputs = [ + (lib.getDev glib) + libxcrypt + gnutls + json-glib + krb5 + libssh + polkit + udev + ]; + + postPatch = '' + # Instead of requiring Internet access to do an npm install to generate the package-lock.json + # it copies the package-lock.json already present in the node_modules folder fetched as a git + # submodule. + echo "#!/bin/sh" > test/node_modules + + substituteInPlace src/tls/cockpit-certificate-helper.in \ + --replace 'COCKPIT_CONFIG="@sysconfdir@/cockpit"' 'COCKPIT_CONFIG=/etc/cockpit' + + substituteInPlace src/tls/cockpit-certificate-ensure.c \ + --replace '#define COCKPIT_SELFSIGNED_PATH PACKAGE_SYSCONF_DIR COCKPIT_SELFSIGNED_FILENAME' '#define COCKPIT_SELFSIGNED_PATH "/etc" COCKPIT_SELFSIGNED_FILENAME' + + substituteInPlace src/common/cockpitconf.c \ + --replace 'const char *cockpit_config_dirs[] = { PACKAGE_SYSCONF_DIR' 'const char *cockpit_config_dirs[] = { "/etc"' + + # instruct users with problems to create a nixpkgs issue instead of nagging upstream directly + substituteInPlace configure.ac \ + --replace 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25' + + patchShebangs \ + test/common/pixel-tests \ + test/common/run-tests \ + test/common/tap-cdp \ + test/static-code \ + tools/escape-to-c \ + tools/make-compile-commands \ + tools/node-modules \ + tools/termschutz \ + tools/webpack-make.js + + for f in node_modules/.bin/*; do + patchShebangs $(realpath $f) + done + + export HOME=$(mktemp -d) + + cp node_modules/.package-lock.json package-lock.json + + substituteInPlace src/systemd_ctypes/libsystemd.py \ + --replace libsystemd.so.0 ${systemd}/lib/libsystemd.so.0 + + for f in pkg/**/*.js pkg/**/*.jsx test/**/* src/**/*; do + # some files substituteInPlace report as missing and it's safe to ignore them + substituteInPlace "$(realpath "$f")" \ + --replace '"/usr/bin/' '"' \ + --replace '"/bin/' '"' || true + done + + substituteInPlace src/common/Makefile-common.am \ + --replace 'TEST_PROGRAM += test-pipe' "" # skip test-pipe because it hangs the build + + substituteInPlace test/pytest/*.py \ + --replace "'bash" "'${bashInteractive}/bin/bash" + + echo "m4_define(VERSION_NUMBER, [${version}])" > version.m4 + ''; + + configureFlags = [ + "--enable-prefix-only=yes" + "--disable-pcp" # TODO: figure out how to package its dependency + "--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin" + "--with-admin-group=root" # TODO: really? Maybe "wheel"? + ]; + + enableParallelBuilding = true; + + preBuild = '' + patchShebangs \ + tools/test-driver + ''; + + postBuild = '' + chmod +x \ + src/systemd/update-motd \ + src/tls/cockpit-certificate-helper \ + src/ws/cockpit-desktop + + patchShebangs \ + src/systemd/update-motd \ + src/tls/cockpit-certificate-helper \ + src/ws/cockpit-desktop + + PATH=${pythonWithGobject}/bin patchShebangs src/client/cockpit-client + + substituteInPlace src/ws/cockpit-desktop \ + --replace ' /bin/bash' ' ${runtimeShell}' + ''; + + fixupPhase = '' + runHook preFixup + + wrapProgram $out/libexec/cockpit-certificate-helper \ + --prefix PATH : ${lib.makeBinPath [ coreutils openssl ]} \ + --run 'cd $(mktemp -d)' + + wrapProgram $out/share/cockpit/motd/update-motd \ + --prefix PATH : ${lib.makeBinPath [ gnused ]} + + substituteInPlace $out/share/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ + --replace /usr $out + + runHook postFixup + ''; + + doCheck = true; + checkInputs = [ + bashInteractive + cacert + dbus + glib-networking + openssh + python3Packages.pytest + python3Packages.vulture + ]; + checkPhase = '' + export GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules + export G_DEBUG=fatal-criticals + export G_MESSAGES_DEBUG=cockpit-ws,cockpit-wrapper,cockpit-bridge + export PATH=$PATH:$(pwd) + + cockpit-bridge --version + make pytest -j$NIX_BUILD_CORES || true + make check -j$NIX_BUILD_CORES || true + test/static-code + npm run eslint + npm run stylelint + ''; + + passthru = { + tests = { inherit (nixosTests) cockpit; }; + updateScript = ./update.sh; + }; + + meta = with lib; { + description = "Web-based graphical interface for servers"; + homepage = "https://cockpit-project.org/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/by-name/co/cockpit/update.sh b/pkgs/by-name/co/cockpit/update.sh new file mode 100755 index 00000000000..c1834db9d39 --- /dev/null +++ b/pkgs/by-name/co/cockpit/update.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -eu -o pipefail + +version="$(curl --silent "https://api.github.com/repos/cockpit-project/cockpit/releases" | jq '.[0].tag_name' --raw-output)" + +update-source-version cockpit "$version" diff --git a/pkgs/servers/monitoring/cockpit/default.nix b/pkgs/servers/monitoring/cockpit/default.nix deleted file mode 100644 index f73f391f71b..00000000000 --- a/pkgs/servers/monitoring/cockpit/default.nix +++ /dev/null @@ -1,230 +0,0 @@ -{ lib -, stdenv -, fetchzip -, fetchurl -, fetchFromGitHub -, autoreconfHook -, bashInteractive -, cacert -, coreutils -, dbus -, docbook_xml_dtd_43 -, docbook_xsl -, findutils -, gettext -, git -, glib -, glibc -, glib-networking -, gnused -, gnutls -, json-glib -, krb5 -, libssh -, libxcrypt -, libxslt -, makeWrapper -, nodejs -, nixosTests -, openssh -, openssl -, pam -, pkg-config -, polkit -, python3Packages -, ripgrep -, runtimeShell -, systemd -, udev -, xmlto -}: - -let - pythonWithGobject = python3Packages.python.withPackages (p: with p; [ - pygobject3 - ]); -in - -stdenv.mkDerivation rec { - pname = "cockpit"; - version = "287"; - - src = fetchFromGitHub { - owner = "cockpit-project"; - repo = "cockpit"; - rev = "refs/tags/${version}"; - sha256 = "sha256-tIZOI3jiMRaGHMXS1mA1Tom9ij3L/VuxDUJdnEc7SSc="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - autoreconfHook - makeWrapper - docbook_xml_dtd_43 - docbook_xsl - findutils - gettext - git - (lib.getBin libxslt) - nodejs - openssl - pam - pkg-config - pythonWithGobject.python - python3Packages.setuptools - systemd - ripgrep - xmlto - ]; - - buildInputs = [ - (lib.getDev glib) - libxcrypt - gnutls - json-glib - krb5 - libssh - polkit - udev - ]; - - postPatch = '' - # Instead of requiring Internet access to do an npm install to generate the package-lock.json - # it copies the package-lock.json already present in the node_modules folder fetched as a git - # submodule. - echo "#!/bin/sh" > test/node_modules - - substituteInPlace src/tls/cockpit-certificate-helper.in \ - --replace 'COCKPIT_CONFIG="@sysconfdir@/cockpit"' 'COCKPIT_CONFIG=/etc/cockpit' - - substituteInPlace src/tls/cockpit-certificate-ensure.c \ - --replace '#define COCKPIT_SELFSIGNED_PATH PACKAGE_SYSCONF_DIR COCKPIT_SELFSIGNED_FILENAME' '#define COCKPIT_SELFSIGNED_PATH "/etc" COCKPIT_SELFSIGNED_FILENAME' - - substituteInPlace src/common/cockpitconf.c \ - --replace 'const char *cockpit_config_dirs[] = { PACKAGE_SYSCONF_DIR' 'const char *cockpit_config_dirs[] = { "/etc"' - - # instruct users with problems to create a nixpkgs issue instead of nagging upstream directly - substituteInPlace configure.ac \ - --replace 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25' - - patchShebangs \ - test/common/pixel-tests \ - test/common/run-tests \ - test/common/tap-cdp \ - test/static-code \ - tools/escape-to-c \ - tools/make-compile-commands \ - tools/node-modules \ - tools/termschutz \ - tools/webpack-make.js - - for f in node_modules/.bin/*; do - patchShebangs $(realpath $f) - done - - export HOME=$(mktemp -d) - - cp node_modules/.package-lock.json package-lock.json - - substituteInPlace src/systemd_ctypes/libsystemd.py \ - --replace libsystemd.so.0 ${systemd}/lib/libsystemd.so.0 - - for f in pkg/**/*.js pkg/**/*.jsx test/**/* src/**/*; do - # some files substituteInPlace report as missing and it's safe to ignore them - substituteInPlace "$(realpath "$f")" \ - --replace '"/usr/bin/' '"' \ - --replace '"/bin/' '"' || true - done - - substituteInPlace src/common/Makefile-common.am \ - --replace 'TEST_PROGRAM += test-pipe' "" # skip test-pipe because it hangs the build - - substituteInPlace test/pytest/*.py \ - --replace "'bash" "'${bashInteractive}/bin/bash" - - echo "m4_define(VERSION_NUMBER, [${version}])" > version.m4 - ''; - - configureFlags = [ - "--enable-prefix-only=yes" - "--disable-pcp" # TODO: figure out how to package its dependency - "--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin" - "--with-admin-group=root" # TODO: really? Maybe "wheel"? - ]; - - enableParallelBuilding = true; - - preBuild = '' - patchShebangs \ - tools/test-driver - ''; - - postBuild = '' - chmod +x \ - src/systemd/update-motd \ - src/tls/cockpit-certificate-helper \ - src/ws/cockpit-desktop - - patchShebangs \ - src/systemd/update-motd \ - src/tls/cockpit-certificate-helper \ - src/ws/cockpit-desktop - - PATH=${pythonWithGobject}/bin patchShebangs src/client/cockpit-client - - substituteInPlace src/ws/cockpit-desktop \ - --replace ' /bin/bash' ' ${runtimeShell}' - ''; - - fixupPhase = '' - runHook preFixup - - wrapProgram $out/libexec/cockpit-certificate-helper \ - --prefix PATH : ${lib.makeBinPath [ coreutils openssl ]} \ - --run 'cd $(mktemp -d)' - - wrapProgram $out/share/cockpit/motd/update-motd \ - --prefix PATH : ${lib.makeBinPath [ gnused ]} - - substituteInPlace $out/share/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ - --replace /usr $out - - runHook postFixup - ''; - - doCheck = true; - checkInputs = [ - bashInteractive - cacert - dbus - glib-networking - openssh - python3Packages.pytest - python3Packages.vulture - ]; - checkPhase = '' - export GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules - export G_DEBUG=fatal-criticals - export G_MESSAGES_DEBUG=cockpit-ws,cockpit-wrapper,cockpit-bridge - export PATH=$PATH:$(pwd) - - cockpit-bridge --version - make pytest -j$NIX_BUILD_CORES || true - make check -j$NIX_BUILD_CORES || true - test/static-code - npm run eslint - npm run stylelint - ''; - - passthru = { - tests = { inherit (nixosTests) cockpit; }; - updateScript = ./update.sh; - }; - - meta = with lib; { - description = "Web-based graphical interface for servers"; - homepage = "https://cockpit-project.org/"; - license = licenses.lgpl21; - maintainers = with maintainers; [ lucasew ]; - }; -} diff --git a/pkgs/servers/monitoring/cockpit/update.sh b/pkgs/servers/monitoring/cockpit/update.sh deleted file mode 100755 index c1834db9d39..00000000000 --- a/pkgs/servers/monitoring/cockpit/update.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts - -set -eu -o pipefail - -version="$(curl --silent "https://api.github.com/repos/cockpit-project/cockpit/releases" | jq '.[0].tag_name' --raw-output)" - -update-source-version cockpit "$version" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f96e72cf5a7..521c047295b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26305,8 +26305,6 @@ with pkgs; clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; - cockpit = callPackage ../servers/monitoring/cockpit { }; - codeowners = callPackage ../development/tools/codeowners { }; couchdb3 = callPackage ../servers/http/couchdb/3.nix { }; -- cgit 1.4.1