Commit 83a5e12e authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents bd8d4dc8 ae29fc75
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@

- The `ephemeral` package was removed due to upstream archival in early 2022.

- The `vocal` package was removed due to upstream archival. The upstream developer suggests using `gnome-podcasts` or `kasts` instead.

- [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided.
  The `name` argument will become mandatory in a future release.

+7 −10
Original line number Diff line number Diff line
@@ -6,22 +6,19 @@
  nix-update-script,
  cosmic-comp,
}:
let
  version = "1.1.0";
in
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-ext-ctl";
  inherit version;
  version = "1.4.0";

  src = fetchFromGitHub {
    owner = "cosmic-utils";
    repo = "cosmic-ctl";
    tag = "v${version}";
    hash = "sha256-dcUzrJcwJpzbYPuqdHgm43NYbaowsFmFP4sS0cfzNAg=";
    tag = "v${finalAttrs.version}";
    hash = "sha256-4UbmzBKxJwpyzucPRguQV1078961goiQlhtDjOGz1kA=";
  };

  useFetchCargoVendor = true;
  cargoHash = "sha256-EReo2hkBaIO1YOBx4D9rQSXlx+3NK5VQtj59jfZZI/0=";
  cargoHash = "sha256-53lpHzHQ6SoZzd+h6O0NvSJHsPgbW0/kqnDrM5D6SWQ=";

  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
@@ -31,11 +28,11 @@ rustPlatform.buildRustPackage {

  meta = {
    description = "CLI for COSMIC Desktop configuration management";
    changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${version}";
    changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${finalAttrs.version}";
    homepage = "https://github.com/cosmic-utils/cosmic-ctl";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ HeitorAugustoLN ];
    mainProgram = "cosmic-ctl";
    inherit (cosmic-comp.meta) platforms;
  };
}
})
+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@

gcc14Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprlang";
  version = "0.6.0";
  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = "hyprlang";
    rev = "v${finalAttrs.version}";
    hash = "sha256-oj8V4kvzor5AOStzj4/B4W1ZIObAPxT9K4NfXx7dyKE=";
    hash = "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=";
  };

  nativeBuildInputs = [
+58 −0
Original line number Diff line number Diff line
{
  lib,
  python3Packages,
  fetchFromGitHub,
  versionCheckHook,
  nix-update-script,
}:
let
  version = "1.2.1";
in
python3Packages.buildPythonApplication {
  pname = "letsdns";
  inherit version;
  pyproject = true;

  src = fetchFromGitHub {
    owner = "LetsDNS";
    repo = "letsdns";
    tag = version;
    hash = "sha256-TwGVm7sEOPvUqtvaAuIU/X5W3H4VAC8dskNunt8UO0I=";
  };

  build-system = [
    python3Packages.setuptools
  ];

  nativeCheckInputs = [
    python3Packages.pytestCheckHook
    versionCheckHook
  ];

  dependencies = with python3Packages; [
    cryptography
    dnspython
    requests
  ];

  disabledTestPaths = [
    # These tests require upstream certificates
    "tests/test_action.py"
  ];

  env = {
    UNITTEST_CONF = "tests/citest.conf";
  };

  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Manage DANE TLSA records in DNS servers";
    homepage = "https://www.letsdns.de/";
    downloadPage = "https://github.com/LetsDNS/letsdns";
    changelog = "https://github.com/LetsDNS/letsdns/releases/tag/${version}";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ rseichter ];
    mainProgram = "letsdns";
  };
}

pkgs/by-name/vo/vocal/package.nix

deleted100644 → 0
+0 −98
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch,
  nix-update-script,
  cmake,
  ninja,
  vala,
  pkg-config,
  pantheon,
  gtk3,
  glib,
  glib-networking,
  libxml2,
  webkitgtk_4_0,
  clutter-gtk,
  clutter-gst,
  libunity,
  libnotify,
  sqlite,
  gst_all_1,
  json-glib,
  libgee,
  wrapGAppsHook3,
}:

stdenv.mkDerivation rec {
  pname = "vocal";
  version = "2.4.2";

  src = fetchFromGitHub {
    owner = "needle-and-thread";
    repo = pname;
    rev = version;
    sha256 = "1c4n89rdl9r13kmmh2qymmy9sa6shjwai7df48k2kfn0pnzq5mad";
  };

  nativeBuildInputs = [
    cmake
    libxml2
    ninja
    vala
    pkg-config
    wrapGAppsHook3
  ];

  buildInputs = with gst_all_1; [
    clutter-gst
    clutter-gtk
    glib
    gst-plugins-base
    gst-plugins-good
    gstreamer
    gtk3
    json-glib
    libgee
    libnotify
    libunity
    pantheon.granite
    sqlite
    webkitgtk_4_0
    glib-networking
  ];

  patches = [
    # granite 6.0.0 removed about dialogs
    # see: https://github.com/needle-and-thread/vocal/issues/483
    (fetchpatch {
      name = "remove-about.patch";
      url = "https://raw.githubusercontent.com/archlinux/svntogit-community/03543ffdb6cd52ce1a8293f3303225b3afac2431/trunk/remove-about.patch";
      sha256 = "sha256-yGD7BYOTmqs4h+Odh/mB3fI1HM7GDO6F+QaHpRUD5p4=";
    })
  ];

  postPatch = ''
    # Fix build with vala 0.56
    # https://github.com/needle-and-thread/vocal/pull/503
    substituteInPlace src/Vocal.vala \
      --replace "public const OptionEntry[] app_options" "private const OptionEntry[] app_options"
  '';

  passthru = {
    updateScript = nix-update-script { };
  };

  meta = with lib; {
    description = "Podcast client for the modern free desktop";
    longDescription = ''
      Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that independent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals.
    '';
    homepage = "https://github.com/needle-and-thread/vocal";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
    platforms = platforms.linux;
    mainProgram = "com.github.needleandthread.vocal";
  };
}
Loading