From ad4ea38ddfe5889c0faa4ab6c0b531542b40f803 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Sun, 17 Mar 2024 23:11:45 +0800 Subject: godns: migrate to by-name --- pkgs/by-name/go/godns/package.nix | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/go/godns/package.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix new file mode 100644 index 000000000000..a41d1993270b --- /dev/null +++ b/pkgs/by-name/go/godns/package.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "godns"; + version = "3.0.7"; + + src = fetchFromGitHub { + owner = "TimothyYe"; + repo = "godns"; + rev = "refs/tags/v${version}"; + hash = "sha256-7zgvrEVt8xg54NijcqnXoZcXetzOu9h3Ucw7w03YagU="; + }; + + vendorHash = "sha256-veDrGB6gjUa8G/UyKzEgH2ItGGEPlXDePahq2XP2nAo="; + + # Some tests require internet access, broken in sandbox + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A dynamic DNS client tool supports AliDNS, Cloudflare, Google Domains, DNSPod, HE.net & DuckDNS & DreamHost, etc"; + homepage = "https://github.com/TimothyYe/godns"; + changelog = "https://github.com/TimothyYe/godns/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ yinfeng ]; + mainProgram = "godns"; + }; +} -- cgit 1.4.1 From ad87dc75d6cef7a82fef5153d6bc8141e916c5a1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Mar 2024 00:23:38 +0100 Subject: opencflite: 476.19.0 -> 635.21.8 --- pkgs/by-name/op/opencflite/package.nix | 43 ++++++++++++++++++++++++++ pkgs/os-specific/darwin/opencflite/default.nix | 21 ------------- pkgs/top-level/darwin-packages.nix | 2 -- 3 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 pkgs/by-name/op/opencflite/package.nix delete mode 100644 pkgs/os-specific/darwin/opencflite/default.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/op/opencflite/package.nix b/pkgs/by-name/op/opencflite/package.nix new file mode 100644 index 000000000000..0da9e52e81d6 --- /dev/null +++ b/pkgs/by-name/op/opencflite/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + icu, + libkqueue, + libuuid, + tzdata, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "opencflite"; + version = "635.21.8"; + + src = fetchFromGitHub { + owner = "gerickson"; + repo = "opencflite"; + rev = "opencflite-${version}"; + hash = "sha256-ijyj4SFYQ0wZAFM2ehNnR9+yu5yDTSVW3VBycBT9l+A="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + icu + libkqueue + libuuid + tzdata + zlib + ]; + + enableParallelBuilding = true; + + meta = { + description = "Cross platform port of the macOS CoreFoundation"; + homepage = "https://github.com/gerickson/opencflite"; + license = lib.licenses.apsl20; + maintainers = with lib.maintainers; [ wegank ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix deleted file mode 100644 index 937d0763feff..000000000000 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, icu, libuuid, tzdata }: - -stdenv.mkDerivation rec { - pname = "opencflite"; - version = "476.19.0"; - - src = fetchurl { - url = "mirror://sourceforge/opencflite/${pname}-${version}.tar.gz"; - sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v"; - }; - - configureFlags = [ "--with-uuid=${libuuid.dev}" ]; - buildInputs = [ icu tzdata.dev ]; - enableParallelBuilding = true; - - meta = { - description = "Cross platform port of the macOS CoreFoundation"; - homepage = "https://sourceforge.net/projects/opencflite/"; - license = lib.licenses.apsl20; - }; -} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 8fb08c90f70f..1b479e9294bc 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -175,8 +175,6 @@ impure-cmds // appleSourcePackages // chooseLibs // { inherit (apple_sdk_11_0.libs) simd; }; - opencflite = callPackage ../os-specific/darwin/opencflite { }; - openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith { inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers; }; -- cgit 1.4.1 From 2dc55fedc7740ace4286ad567538a90234ad5102 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Sun, 17 Mar 2024 23:36:02 +0800 Subject: godns: 3.0.7 -> 3.1.5 --- pkgs/by-name/go/godns/package.nix | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix index a41d1993270b..0e5e155523d6 100644 --- a/pkgs/by-name/go/godns/package.nix +++ b/pkgs/by-name/go/godns/package.nix @@ -1,25 +1,50 @@ { lib , buildGoModule , fetchFromGitHub +, nodejs +, npmHooks +, fetchNpmDeps , nix-update-script }: buildGoModule rec { pname = "godns"; - version = "3.0.7"; + version = "3.1.5"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-7zgvrEVt8xg54NijcqnXoZcXetzOu9h3Ucw7w03YagU="; + hash = "sha256-kdClyeU0hR0ymVLn9xe/kYVJE/9P/hAz/5UwRAQ2KCU="; }; - vendorHash = "sha256-veDrGB6gjUa8G/UyKzEgH2ItGGEPlXDePahq2XP2nAo="; + vendorHash = "sha256-kSREFNIGH0MXiyKMp1LmrLkhKBhovvNRz46LTXT2XME="; + npmDeps = fetchNpmDeps { + src = "${src}/web"; + hash = "sha256-2yeqLly0guU/kpX+yH/QOoDGzyJTxkTaCt8EleJhybU="; + }; + + npmRoot = "web"; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + overrideModAttrs = oldAttrs: { + # Do not add `npmConfigHook` to `goModules` + nativeBuildInputs = lib.remove npmHooks.npmConfigHook oldAttrs.nativeBuildInputs; + # Do not run `preBuild` when building `goModules` + preBuild = null; + }; # Some tests require internet access, broken in sandbox doCheck = false; + preBuild = '' + npm --prefix="$npmRoot" run build + go generate ./... + ''; + ldflags = [ "-s" "-w" -- cgit 1.4.1 From 4bb2a7c78500a5bc0874fbf420ff173fba88d1ad Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 19 Mar 2024 09:34:41 -0300 Subject: renode: 1.14.0 -> 1.15.0 Signed-off-by: Otavio Salvador --- pkgs/by-name/re/renode/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index 33646daac8c5..7ea55e0fff98 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renode"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { - url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-1wfVHtCYc99ACz8m2XEg1R0nIDh9xP4ffV/vxeeEHxE="; + url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-portable.tar.gz"; + hash = "sha256-w3HKYctW1LmiAse/27Y1Gmz9hDprQ1CK7+TXIexCrkg="; }; nativeBuildInputs = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Virtual development framework for complex embedded systems"; - homepage = "https://renode.org"; + homepage = "https://renode.io"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ otavio ]; platforms = [ "x86_64-linux" ]; -- cgit 1.4.1 From 22ed6e2804ae2cbcfb05e15be895dfa6e804afd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Mar 2024 18:00:02 +0000 Subject: renode-dts2repl: unstable-2024-03-12 -> unstable-2024-03-19 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 24736a889e51..8f277a02e220 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "unstable-2024-03-12"; + version = "unstable-2024-03-19"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "eff98d616e3541e54ca783c84f598c9e348a76a8"; - hash = "sha256-qNHj5WOSca04ceGeRNa60M6cH9/rRHLEF1YX75yYDO8="; + rev = "dc4160a3a4c23aee846625ac9115fe2cbb91fe42"; + hash = "sha256-cy4XLKKiWqEvWWDHmj2bhp38pbtSxp+P92r7NxueAaE="; }; nativeBuildInputs = [ -- cgit 1.4.1 From e6b54890095c2ed4467511276d26ecbd68ae48d8 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 20 Mar 2024 09:23:50 +0100 Subject: satty: 0.11.2 -> 0.11.3 --- pkgs/by-name/sa/satty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 67f69ab79cfb..31e860de8440 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-bUDKRAp3/ByxWRzpoD0qGInxQuEfVIeYJ/pCcAEfH14="; + hash = "sha256-TKpotVVjXWm2uue4a4QEqVH/qHKSsegL2MNcsnk0CHw="; }; - cargoHash = "sha256-aH08BJK4uOEUrpoMfVGwGnuzncHHW6w6jjxnk4Xz5zo="; + cargoHash = "sha256-0AyzjKkTNZwGCT73Xo5AY7rPJwQ9GgAxtMf6lJnrTSA="; nativeBuildInputs = [ copyDesktopItems -- cgit 1.4.1 From ea012e17f7c3b4d06d45bdc21574635f6a0c92d3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Mar 2024 00:39:50 +0100 Subject: maloader: unstable-2014-02-25 -> 0-unstable-2018-05-02 --- pkgs/by-name/ma/maloader/package.nix | 63 ++++++++++++++++++++++++++++ pkgs/os-specific/darwin/maloader/default.nix | 40 ------------------ pkgs/top-level/darwin-packages.nix | 3 -- 3 files changed, 63 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/ma/maloader/package.nix delete mode 100644 pkgs/os-specific/darwin/maloader/default.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ma/maloader/package.nix b/pkgs/by-name/ma/maloader/package.nix new file mode 100644 index 000000000000..bb0f744f37b6 --- /dev/null +++ b/pkgs/by-name/ma/maloader/package.nix @@ -0,0 +1,63 @@ +{ + lib, + llvmPackages, + fetchFromGitHub, + opencflite, + libuuid, + zlib, +}: + +let + stdenv = llvmPackages.libcxxStdenv; +in +stdenv.mkDerivation { + pname = "maloader"; + version = "0-unstable-2018-05-02"; + + src = fetchFromGitHub { + owner = "shinh"; + repo = "maloader"; + rev = "464a90fdfd06a54c9da5d1a3725ed6229c0d3d60"; + hash = "sha256-0N3+tr8XUsn3WhJNsPVknumBrfMgDawTEXVRkIs/IV8="; + }; + + postPatch = '' + substituteInPlace ld-mac.cc \ + --replace-fail 'loadLibMac(mypath)' 'loadLibMac("${placeholder "out"}/lib/")' \ + --replace-fail 'libCoreFoundation.so' '${opencflite}/lib/libCoreFoundation.so' + substituteInPlace libmac/stack_protector-obsd.c \ + --replace-fail 'sys/sysctl.h' 'linux/sysctl.h' + ''; + + buildInputs = [ + libuuid + zlib + ]; + + buildFlags = [ + "USE_LIBCXX=1" + "release" + ]; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument"; + + installPhase = '' + runHook preInstall + + install -vD libmac.so "$out/lib/libmac.so" + + for bin in extract macho2elf ld-mac; do + install -vD "$bin" "$out/bin/$bin" + done + + runHook postInstall + ''; + + meta = { + description = "Mach-O loader for Linux"; + homepage = "https://github.com/shinh/maloader"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ wegank ]; + inherit (opencflite.meta) platforms; + }; +} diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix deleted file mode 100644 index c59f854b8475..000000000000 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, opencflite, clang, libcxx }: - -stdenv.mkDerivation { - pname = "maloader"; - version = "unstable-2014-02-25"; - - src = fetchFromGitHub { - owner = "shinh"; - repo = "maloader"; - rev = "5f220393e0b7b9ad0cf1aba0e89df2b42a1f0442"; - sha256 = "0dd1pn07x1y8pyn5wz8qcl1c1xwghyya4d060m3y9vx5dhv9xmzw"; - }; - - postPatch = '' - sed -i \ - -e '/if.*loadLibMac.*mypath/s|mypath|"'"$out/lib/"'"|' \ - -e 's|libCoreFoundation\.so|${opencflite}/lib/&|' \ - ld-mac.cc - ''; - - env.NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1"; - buildInputs = [ clang libcxx ]; - buildFlags = [ "USE_LIBCXX=1" "release" ]; - - installPhase = '' - install -vD libmac.so "$out/lib/libmac.so" - - for bin in extract macho2elf ld-mac; do - install -vD "$bin" "$out/bin/$bin" - done - ''; - - meta = { - description = "Mach-O loader for Linux"; - homepage = "https://github.com/shinh/maloader"; - license = lib.licenses.bsd2; - platforms = lib.platforms.linux; - broken = true; # 2018-09-08, no succesful build since 2017-08-21 - }; -} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 1b479e9294bc..a6c98831eee6 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -153,9 +153,6 @@ impure-cmds // appleSourcePackages // chooseLibs // { propagatedBuildInputs = [ self.signingUtils ]; } ../os-specific/darwin/signing-utils/auto-sign-hook.sh; - maloader = callPackage ../os-specific/darwin/maloader { - }; - insert_dylib = callPackage ../os-specific/darwin/insert_dylib { }; iosSdkPkgs = callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix { -- cgit 1.4.1 From 0cb0e9ab0c3438a9375d80642e647f3a93f771ee Mon Sep 17 00:00:00 2001 From: ocfox Date: Sun, 11 Feb 2024 23:12:30 +0800 Subject: strictdoc: 0.0.40 -> 0.0.49 --- pkgs/by-name/st/strictdoc/package.nix | 76 +++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/st/strictdoc/package.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix new file mode 100644 index 000000000000..18bc6db8c215 --- /dev/null +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -0,0 +1,76 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "strictdoc"; + version = "0.0.49"; + pyproject = true; + + src = fetchFromGitHub { + owner = "strictdoc-project"; + repo = "strictdoc"; + rev = version; + hash = "sha256-WtDplupXBtq39oKyo31p5NgXMWtbWgxtpnKn4qCJz3I="; + }; + + nativeBuildInputs = [ + python3.pkgs.hatchling + python3.pkgs.pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + docutils + fastapi + graphviz + html5lib + jinja2 + lxml + pybtex + pygments + datauri + python-multipart + selenium + requests + spdx-tools + webdriver-manager + reqif + setuptools + textx + toml + uvicorn + websockets + xlrd + xlsxwriter + ]; + + passthru.optional-dependencies = with python3.pkgs; { + development = [ + invoke + tox + ]; + nuitka = [ + nuitka + ordered-set + ]; + }; + + pythonRelaxDeps = [ + "python-datauri" + "xlsxwriter" + "lxml" + ]; + + pythonImportsCheck = [ "strictdoc" ]; + + meta = with lib; { + description = "Software for technical documentation and requirements management"; + homepage = "https://github.com/strictdoc-project/strictdoc"; + changelog = "https://github.com/strictdoc-project/strictdoc/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ yuu ]; + mainProgram = "strictdoc"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9bca9f2acfa..cd28b3db8b71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39147,8 +39147,6 @@ with pkgs; jflap = callPackage ../applications/science/engineering/jflap { }; - strictdoc = python3.pkgs.callPackage ../applications/science/engineering/strictdoc { }; - ### SCIENCE / ELECTRONICS adms = callPackage ../applications/science/electronics/adms { }; -- cgit 1.4.1 From e0f091354852825bdb859855b07a53ec095b73ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Mar 2024 12:10:05 +0000 Subject: uxn: unstable-2024-03-16 -> unstable-2024-03-18 --- pkgs/by-name/ux/uxn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 0569d11fa1f2..2ce14ff19f80 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "unstable-2024-03-16"; + version = "unstable-2024-03-18"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "5d3cf8b61457fea833d3e232297b378ba54c8350"; - hash = "sha256-PXXsMKAPRUs4/Y4s/NBorcJmv7RtNK7UlRgmyowrm3A="; + rev = "250aecc920a6f12d2d5479a5230a31630dac2a1e"; + hash = "sha256-nhKlcuhXkrhecRwVIuSf+jOmFbX0NMhmmc5pj6MCNdQ="; }; outputs = [ "out" "projects" ]; -- cgit 1.4.1 From b6cb26876d8e9e9a02030568df827c3c9580e781 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 20 Mar 2024 08:50:47 -0400 Subject: slimserver: add updatescript, move to by-name --- pkgs/by-name/sl/slimserver/package.nix | 165 +++++++++++++++++++++++++++++++++ pkgs/by-name/sl/slimserver/update.nu | 14 +++ pkgs/servers/slimserver/default.nix | 163 -------------------------------- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 179 insertions(+), 165 deletions(-) create mode 100644 pkgs/by-name/sl/slimserver/package.nix create mode 100755 pkgs/by-name/sl/slimserver/update.nu delete mode 100644 pkgs/servers/slimserver/default.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix new file mode 100644 index 000000000000..1c7891dde38a --- /dev/null +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -0,0 +1,165 @@ +{ faad2 +, fetchFromGitHub +, flac +, lame +, lib +, makeWrapper +, monkeysAudio +, nixosTests +, perlPackages +, sox +, stdenv +, wavpack +, zlib +, enableUnfreeFirmware ? false +}: + +let + binPath = lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio)); + libPath = lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]; +in +perlPackages.buildPerlPackage rec { + pname = "slimserver"; + version = "8.4.0"; + + src = fetchFromGitHub { + owner = "Logitech"; + repo = "slimserver"; + rev = version; + hash = "sha256-92mKchgAWRIrNOeK/zXUYRqIAk6THdtz1zQe3fg2kE0="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = with perlPackages; [ + AnyEvent + ArchiveZip + AsyncUtil + AudioScan + CarpClan + CGI + ClassAccessor + ClassAccessorChained + ClassC3 + # ClassC3Componentised # Error: DBIx::Class::Row::throw_exception(): DBIx::Class::Relationship::BelongsTo::belongs_to(): Can't infer join condition for track + ClassDataInheritable + ClassInspector + ClassISA + ClassMember + ClassSingleton + ClassVirtual + ClassXSAccessor + CompressRawZlib + CryptOpenSSLRSA + DataDump + DataPage + DataURIEncode + DBDSQLite + DBI + # DBIxClass # https://github.com/Logitech/slimserver/issues/138 + DigestSHA1 + EncodeDetect + EV + ExporterLite + FileBOM + FileCopyRecursive + FileNext + FileReadBackwards + FileSlurp + FileWhich + HTMLParser + HTTPCookies + HTTPDaemon + HTTPMessage + ImageScale + IOAIO + IOInterface + IOSocketSSL + IOString + JSONXS + JSONXSVersionOneAndTwo + # LogLog4perl # Internal error: Root Logger not initialized. + LWP + LWPProtocolHttps + MP3CutGapless + NetHTTP + NetHTTPSNB + PathClass + ProcBackground + # SQLAbstract # DBI Exception: DBD::SQLite::db prepare_cached failed: no such function: ARRAY + SQLAbstractLimit + SubName + TemplateToolkit + TextUnidecode + TieCacheLRU + TieCacheLRUExpires + TieRegexpHash + TimeDate + URI + URIFind + UUIDTiny + XMLParser + XMLSimple + YAMLLibYAML + ] + # ++ (lib.optional stdenv.isDarwin perlPackages.MacFSEvents) + ++ (lib.optional stdenv.isLinux perlPackages.LinuxInotify2); + + prePatch = '' + # remove vendored binaries + rm -rf Bin + + # remove most vendored modules, keeping necessary ones + mkdir -p CPAN_used/Class/C3/ CPAN_used/SQL + rm -r CPAN/SQL/Abstract/Limit.pm + cp -rv CPAN/Class/C3/Componentised.pm CPAN_used/Class/C3/ + cp -rv CPAN/DBIx CPAN_used/ + cp -rv CPAN/Log CPAN_used/ + cp -rv CPAN/SQL/* CPAN_used/SQL/ + rm -r CPAN + mv CPAN_used CPAN + + # another set of vendored/modified modules exist in lib, more selectively cleaned for now + rm -rf lib/Audio + + ${lib.optionalString (!enableUnfreeFirmware) '' + # remove unfree firmware + rm -rf Firmware + ''} + + touch Makefile.PL + ''; + + doCheck = false; + + installPhase = '' + cp -r . $out + wrapProgram $out/slimserver.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" + wrapProgram $out/scanner.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" + mkdir $out/bin + ln -s $out/slimserver.pl $out/bin/slimserver + ''; + + outputs = [ "out" ]; + + passthru = { + tests = { + inherit (nixosTests) slimserver; + }; + + updateScript = ./update.nu; + }; + + meta = with lib; { + homepage = "https://github.com/Logitech/slimserver"; + changelog = "https://github.com/Logitech/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; + description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; + # the firmware is not under a free license, so we do not include firmware in the default package + # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt + license = if enableUnfreeFirmware then licenses.unfree else licenses.gpl2Only; + mainProgram = "slimserver"; + maintainers = with maintainers; [ adamcstephens jecaro ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/by-name/sl/slimserver/update.nu b/pkgs/by-name/sl/slimserver/update.nu new file mode 100755 index 000000000000..546363507e36 --- /dev/null +++ b/pkgs/by-name/sl/slimserver/update.nu @@ -0,0 +1,14 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i nu -p nushell common-updater-scripts + +# get latest tag, but drop versions 10.0 tags since they are 10+ years old +let latest_tag = list-git-tags --url=https://github.com/logitech/slimserver | lines | find --invert 10.0 | sort --natural | last + +let current_version = nix eval --raw -f default.nix slimserver | str trim + +if $latest_tag != $current_version { + update-source-version slimserver $latest_tag $"--file=(pwd)/pkgs/by-name/sl/slimserver/package.nix" + {before: $current_version, after: $latest_tag} +} else { + "No new version" +} diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix deleted file mode 100644 index 1703c03dee26..000000000000 --- a/pkgs/servers/slimserver/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ faad2 -, fetchFromGitHub -, flac -, lame -, lib -, makeWrapper -, monkeysAudio -, nixosTests -, perl538Packages -, sox -, stdenv -, wavpack -, zlib -, enableUnfreeFirmware ? false -}: - -let - perlPackages = perl538Packages; - - binPath = lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio)); - libPath = lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]; -in -perlPackages.buildPerlPackage rec { - pname = "slimserver"; - version = "8.4.0"; - - src = fetchFromGitHub { - owner = "Logitech"; - repo = "slimserver"; - rev = version; - hash = "sha256-92mKchgAWRIrNOeK/zXUYRqIAk6THdtz1zQe3fg2kE0="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = with perlPackages; [ - AnyEvent - ArchiveZip - AsyncUtil - AudioScan - CarpClan - CGI - ClassAccessor - ClassAccessorChained - ClassC3 - # ClassC3Componentised # Error: DBIx::Class::Row::throw_exception(): DBIx::Class::Relationship::BelongsTo::belongs_to(): Can't infer join condition for track - ClassDataInheritable - ClassInspector - ClassISA - ClassMember - ClassSingleton - ClassVirtual - ClassXSAccessor - CompressRawZlib - CryptOpenSSLRSA - DataDump - DataPage - DataURIEncode - DBDSQLite - DBI - # DBIxClass # https://github.com/Logitech/slimserver/issues/138 - DigestSHA1 - EncodeDetect - EV - ExporterLite - FileBOM - FileCopyRecursive - FileNext - FileReadBackwards - FileSlurp - FileWhich - HTMLParser - HTTPCookies - HTTPDaemon - HTTPMessage - ImageScale - IOAIO - IOInterface - IOSocketSSL - IOString - JSONXS - JSONXSVersionOneAndTwo - # LogLog4perl # Internal error: Root Logger not initialized. - LWP - LWPProtocolHttps - MP3CutGapless - NetHTTP - NetHTTPSNB - PathClass - ProcBackground - # SQLAbstract # DBI Exception: DBD::SQLite::db prepare_cached failed: no such function: ARRAY - SQLAbstractLimit - SubName - TemplateToolkit - TextUnidecode - TieCacheLRU - TieCacheLRUExpires - TieRegexpHash - TimeDate - URI - URIFind - UUIDTiny - XMLParser - XMLSimple - YAMLLibYAML - ] - # ++ (lib.optional stdenv.isDarwin perlPackages.MacFSEvents) - ++ (lib.optional stdenv.isLinux perlPackages.LinuxInotify2); - - prePatch = '' - # remove vendored binaries - rm -rf Bin - - # remove most vendored modules, keeping necessary ones - mkdir -p CPAN_used/Class/C3/ CPAN_used/SQL - rm -r CPAN/SQL/Abstract/Limit.pm - cp -rv CPAN/Class/C3/Componentised.pm CPAN_used/Class/C3/ - cp -rv CPAN/DBIx CPAN_used/ - cp -rv CPAN/Log CPAN_used/ - cp -rv CPAN/SQL/* CPAN_used/SQL/ - rm -r CPAN - mv CPAN_used CPAN - - # another set of vendored/modified modules exist in lib, more selectively cleaned for now - rm -rf lib/Audio - - ${lib.optionalString (!enableUnfreeFirmware) '' - # remove unfree firmware - rm -rf Firmware - ''} - - touch Makefile.PL - ''; - - doCheck = false; - - installPhase = '' - cp -r . $out - wrapProgram $out/slimserver.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" - wrapProgram $out/scanner.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" - mkdir $out/bin - ln -s $out/slimserver.pl $out/bin/slimserver - ''; - - outputs = [ "out" ]; - - passthru.tests = { - inherit (nixosTests) slimserver; - }; - - meta = with lib; { - homepage = "https://github.com/Logitech/slimserver"; - changelog = "https://github.com/Logitech/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; - description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; - # the firmware is not under a free license, so we do not include firmware in the default package - # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt - license = if enableUnfreeFirmware then licenses.unfree else licenses.gpl2Only; - mainProgram = "slimserver"; - maintainers = with maintainers; [ adamcstephens jecaro ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bed6d9d7adab..a336121637f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26953,8 +26953,6 @@ with pkgs; sipwitch = callPackage ../servers/sip/sipwitch { }; - slimserver = callPackage ../servers/slimserver { }; - smcroute = callPackage ../servers/smcroute { }; snipe-it = callPackage ../by-name/sn/snipe-it/package.nix { -- cgit 1.4.1 From e660562087ea3aae56b3b490f683d7a184be00a3 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 20 Mar 2024 12:56:10 +0000 Subject: slimserver: 8.4.0 -> 8.5.0 --- pkgs/by-name/sl/slimserver/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index 1c7891dde38a..ce77c6b18725 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -20,13 +20,13 @@ let in perlPackages.buildPerlPackage rec { pname = "slimserver"; - version = "8.4.0"; + version = "8.5.0"; src = fetchFromGitHub { owner = "Logitech"; repo = "slimserver"; rev = version; - hash = "sha256-92mKchgAWRIrNOeK/zXUYRqIAk6THdtz1zQe3fg2kE0="; + hash = "sha256-yDJVqZ0+qVm4r/wmQK/hf9uRJaN56WQMO28RE59mNNI="; }; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From b2f79605c3ca8298697d191d29729bc060a774c6 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 20 Mar 2024 08:59:44 -0400 Subject: slimserver: Logitech -> LMS-Community --- pkgs/by-name/sl/slimserver/package.nix | 10 +++++----- pkgs/by-name/sl/slimserver/update.nu | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index ce77c6b18725..94b13c99e9dc 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -23,7 +23,7 @@ perlPackages.buildPerlPackage rec { version = "8.5.0"; src = fetchFromGitHub { - owner = "Logitech"; + owner = "LMS-Community"; repo = "slimserver"; rev = version; hash = "sha256-yDJVqZ0+qVm4r/wmQK/hf9uRJaN56WQMO28RE59mNNI="; @@ -56,7 +56,7 @@ perlPackages.buildPerlPackage rec { DataURIEncode DBDSQLite DBI - # DBIxClass # https://github.com/Logitech/slimserver/issues/138 + # DBIxClass # https://github.com/LMS-Community/slimserver/issues/138 DigestSHA1 EncodeDetect EV @@ -151,11 +151,11 @@ perlPackages.buildPerlPackage rec { }; meta = with lib; { - homepage = "https://github.com/Logitech/slimserver"; - changelog = "https://github.com/Logitech/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; + homepage = "https://github.com/LMS-Community/slimserver"; + changelog = "https://github.com/LMS-Community/slimserver/blob/${version}/Changelog${lib.versions.major version}.html"; description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; # the firmware is not under a free license, so we do not include firmware in the default package - # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt + # https://github.com/LMS-Community/slimserver/blob/public/8.3/License.txt license = if enableUnfreeFirmware then licenses.unfree else licenses.gpl2Only; mainProgram = "slimserver"; maintainers = with maintainers; [ adamcstephens jecaro ]; diff --git a/pkgs/by-name/sl/slimserver/update.nu b/pkgs/by-name/sl/slimserver/update.nu index 546363507e36..556ed236bb68 100755 --- a/pkgs/by-name/sl/slimserver/update.nu +++ b/pkgs/by-name/sl/slimserver/update.nu @@ -2,7 +2,7 @@ #!nix-shell -i nu -p nushell common-updater-scripts # get latest tag, but drop versions 10.0 tags since they are 10+ years old -let latest_tag = list-git-tags --url=https://github.com/logitech/slimserver | lines | find --invert 10.0 | sort --natural | last +let latest_tag = list-git-tags --url=https://github.com/LMS-Community/slimserver | lines | find --invert 10.0 | sort --natural | last let current_version = nix eval --raw -f default.nix slimserver | str trim -- cgit 1.4.1 From f54aaa5ba85f98857ac58028f746ec484c3c4ea4 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Thu, 14 Mar 2024 01:01:04 +0000 Subject: rs-tftpd: init at 0.2.12 Co-authored-by: Adam C. Stephens <2071575+adamcstephens@users.noreply.github.com> --- pkgs/by-name/rs/rs-tftpd/package.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/rs/rs-tftpd/package.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix new file mode 100644 index 000000000000..43b010913ea8 --- /dev/null +++ b/pkgs/by-name/rs/rs-tftpd/package.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "rs-tftpd"; + version = "0.2.12"; + + src = fetchFromGitHub { + owner = "altugbakan"; + repo = "rs-tftpd"; + rev = version; + hash = "sha256-H67lXwX+4guHpdq0yTHe6tl1NxC41saNrM9g+yH5otk="; + }; + + cargoHash = "sha256-B5kduRuX9Lcdd31yj4PsDo8fyy0nabtmsiAXvc8RlYo="; + + meta = with lib; { + description = "TFTP Server Daemon implemented in Rust"; + homepage = "https://github.com/altugbakan/rs-tftpd"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "tftpd"; + }; +} -- cgit 1.4.1 From 86950a9c050afab2f84542c75309c45b46517324 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 19 Mar 2024 09:57:08 +0100 Subject: upiano: allow later textual releases --- pkgs/by-name/up/upiano/package.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/up/upiano/package.nix b/pkgs/by-name/up/upiano/package.nix index d13ff18bd425..351e80f0b6d0 100644 --- a/pkgs/by-name/up/upiano/package.nix +++ b/pkgs/by-name/up/upiano/package.nix @@ -6,19 +6,24 @@ python3.pkgs.buildPythonApplication rec { pname = "upiano"; version = "0.1.2"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "eliasdorneles"; repo = "upiano"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-5WhflvUCjzW4ZJ+PLUTMbKcUnQa3ChkDjl0R5YvjBWk="; forceFetchGit = true; fetchLFS = true; }; - nativeBuildInputs = [ - python3.pkgs.poetry-core + pythonRelaxDeps = [ + "textual" + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -26,7 +31,9 @@ python3.pkgs.buildPythonApplication rec { textual ]; - pythonImportsCheck = [ "upiano" ]; + pythonImportsCheck = [ + "upiano" + ]; meta = with lib; { description = "A Piano in your terminal"; -- cgit 1.4.1 From 5393cc5dc278c5595036025051003084a6d1336e Mon Sep 17 00:00:00 2001 From: toastal Date: Tue, 19 Mar 2024 21:56:03 +0700 Subject: soupault: mv to by-name --- pkgs/by-name/so/soupault/package.nix | 61 +++++++++++++++++++++++++++++ pkgs/tools/typesetting/soupault/default.nix | 61 ----------------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 61 insertions(+), 63 deletions(-) create mode 100644 pkgs/by-name/so/soupault/package.nix delete mode 100644 pkgs/tools/typesetting/soupault/default.nix (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix new file mode 100644 index 000000000000..639af4136729 --- /dev/null +++ b/pkgs/by-name/so/soupault/package.nix @@ -0,0 +1,61 @@ +{ lib +, fetchzip +, ocamlPackages +, soupault +, testers +}: + +let + pname = "soupault"; + + version = "4.9.0"; +in +ocamlPackages.buildDunePackage { + inherit pname version; + + minimalOCamlVersion = "4.13"; + + src = fetchzip { + urls = [ + "https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz" + "https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz" + ]; + hash = "sha256-vGTJUbAeYs/EYFykNSmCc4c9G66/Lz3BsUYnZQ8feFo="; + }; + + buildInputs = with ocamlPackages; [ + base64 + camomile + containers + csv + digestif + ezjsonm + fileutils + fmt + jingoo + lambdasoup + lua-ml + logs + markup + odate + otoml + re + spelll + tsort + yaml + ]; + + passthru.tests.version = testers.testVersion { + package = soupault; + command = "soupault --version-number"; + }; + + meta = { + description = "A tool that helps you create and manage static websites"; + homepage = "https://soupault.app/"; + changelog = "https://codeberg.org/PataphysicalSociety/soupault/src/branch/main/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toastal ]; + mainProgram = "soupault"; + }; +} diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix deleted file mode 100644 index 639af4136729..000000000000 --- a/pkgs/tools/typesetting/soupault/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, fetchzip -, ocamlPackages -, soupault -, testers -}: - -let - pname = "soupault"; - - version = "4.9.0"; -in -ocamlPackages.buildDunePackage { - inherit pname version; - - minimalOCamlVersion = "4.13"; - - src = fetchzip { - urls = [ - "https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz" - "https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz" - ]; - hash = "sha256-vGTJUbAeYs/EYFykNSmCc4c9G66/Lz3BsUYnZQ8feFo="; - }; - - buildInputs = with ocamlPackages; [ - base64 - camomile - containers - csv - digestif - ezjsonm - fileutils - fmt - jingoo - lambdasoup - lua-ml - logs - markup - odate - otoml - re - spelll - tsort - yaml - ]; - - passthru.tests.version = testers.testVersion { - package = soupault; - command = "soupault --version-number"; - }; - - meta = { - description = "A tool that helps you create and manage static websites"; - homepage = "https://soupault.app/"; - changelog = "https://codeberg.org/PataphysicalSociety/soupault/src/branch/main/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ toastal ]; - mainProgram = "soupault"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 039a0aa0b89d..7f263f553ab5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7722,8 +7722,6 @@ with pkgs; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - soupault = callPackage ../tools/typesetting/soupault { }; - stratisd = callPackage ../tools/filesystems/stratisd { }; stratis-cli = callPackage ../tools/filesystems/stratis-cli { }; -- cgit 1.4.1