Skip to content

Commit

Permalink
Merge staging-next into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jun 11, 2023
2 parents a4d88ee + d8fa49b commit eab5d79
Show file tree
Hide file tree
Showing 22 changed files with 289 additions and 76 deletions.
2 changes: 1 addition & 1 deletion doc/contributing/reviewing-contributions.chapter.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ When reviewing a pull request, please always be nice and polite. Controversial c

GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution.

pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.
Pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.

All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking.

Expand Down
82 changes: 82 additions & 0 deletions pkgs/applications/audio/muzika/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{ lib
, desktop-file-utils
, fetchFromGitHub
, fetchYarnDeps
, fixup_yarn_lock
, gjs
, glib-networking
, gobject-introspection
, gst_all_1
, gtk4
, libadwaita
, libsoup_3
, meson
, ninja
, pkg-config
, stdenv
, wrapGAppsHook4
, yarn
, nodejs
}:

stdenv.mkDerivation rec {
pname = "muzika";
version = "unstable-2023-06-07";

src = fetchFromGitHub {
owner = "vixalien";
repo = "muzika";
rev = "d0ca7eebad67082e73513ebd7ca04edb1fdec7ce";
hash = "sha256-ycnHpyYaUJZgproTLCWCVzsvnUisXlq3fqlij1KryWA=";
fetchSubmodules = true;
};

nativeBuildInputs = [
desktop-file-utils
gobject-introspection
meson
ninja
nodejs
pkg-config
wrapGAppsHook4
yarn
];

buildInputs = [
gjs
glib-networking
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gtk4
libadwaita
libsoup_3
];

yarnOfflineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-FvPEbYIydgfyKKsf2jnXUbPEhIboPi3wR7BWzEuo72Q=";
};

preConfigure = ''
export HOME="$PWD"
yarn config --offline set yarn-offline-mirror $yarnOfflineCache
${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
'';

mesonFlags = [
"-Dyarnrc=../.yarnrc"
];

postFixup = ''
sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'com.vixalien.muzika';" $out/bin/.com.vixalien.muzika-wrapped
ln -s $out/bin/com.vixalien.muzika $out/bin/muzika
'';

meta = with lib; {
description = "Elegant music streaming app";
homepage = "https://github.com/vixalien/muzika";
license = licenses.gpl3Only;
maintainers = with maintainers; [ onny ];
};
}
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/istioctl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

buildGoModule rec {
pname = "istioctl";
version = "1.17.2";
version = "1.18.0";

src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "sha256-YEkvY+Z+zM+9t+vnVk0gXJRTJd0u/Ryk3hYkbSHwP8M=";
sha256 = "sha256-vC8EE9v3U6FNbjxWb3At+gL4DUgBIb7MY2xBu7WNMKw=";
};
vendorHash = "sha256-LMmWhKwuy+HfqkLabTjlTd0f/6DYCGbEzpItQvckE9g=";
vendorHash = "sha256-YgRW/sVRQLqrtEFxC+bGHZEQoEro5bzNzqKv7c7iO4Y=";

nativeBuildInputs = [ installShellFiles ];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome/core/gnome-shell/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "44.1";
version = "44.2";

outputs = [ "out" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "C/vkOU0mdiUVTQjQFGe9vZnoFXUS/I30XVwC3bdVHKY=";
sha256 = "VfJ57GMDt8DIkkbs7YEkfIf8HHOUj0XrISpkchjRtj8=";
};

patches = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome/core/mutter/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@

stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
version = "44.1";
version = "44.2";

outputs = [ "out" "dev" "man" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
sha256 = "lzrq+rQvBvk0oJlPyEh4lYzbTSdmpMhnpczcVH3VcFY=";
sha256 = "N1ZtflXJPciJTpx/I6e6WHmoswuvZVWCIwCdK0Z0AqE=";
};

mesonFlags = [
Expand Down
14 changes: 7 additions & 7 deletions pkgs/development/compilers/dtc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
, libyaml
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "dtc";
version = "1.7.0";

src = fetchgit {
url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git";
rev = "refs/tags/v${version}";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc=";
};

Expand Down Expand Up @@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
})
];

env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;

nativeBuildInputs = [
meson
Expand All @@ -72,9 +72,9 @@ stdenv.mkDerivation rec {
# meson.build: bump version to 1.7.0
substituteInPlace libfdt/meson.build \
--replace "version: '1.6.0'," "version: '${version}',"
--replace "version: '1.6.0'," "version: '${finalAttrs.version}',"
substituteInPlace meson.build \
--replace "version: '1.6.0'," "version: '${version}',"
--replace "version: '1.6.0'," "version: '${finalAttrs.version}',"
'';

# Required for installation of Python library and is innocuous otherwise.
Expand All @@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
mesonAutoFeatures = "auto";
mesonFlags = [
(lib.mesonBool "static-build" stdenv.hostPlatform.isStatic)
(lib.mesonBool "tests" doCheck)
(lib.mesonBool "tests" finalAttrs.doCheck)
];

# Checks are broken on aarch64 darwin
Expand All @@ -97,4 +97,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.dezgeg ];
platforms = platforms.unix;
};
}
})
13 changes: 2 additions & 11 deletions pkgs/development/python-modules/click-command-tree/default.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, click
, pytestCheckHook
}:

buildPythonPackage rec {
pname = "click-command-tree";
version = "1.1.0";
version = "1.1.1";
format = "setuptools";

src = fetchFromGitHub {
owner = "whwright";
repo = pname;
rev = version;
hash = "sha256-vFOcn+ibyLZnhU3OQMtnHI04UqAY2/CCvhq4EEU4XFo=";
hash = "sha256-uBp7462LutL8aFRFix3pbVYbSf1af6k0nW0J0HhJa1U=";
};

patches = [
(fetchpatch {
name = "remove-setup-downloading-flake8.patch";
url = "https://github.com/whwright/click-command-tree/commit/1ecfcfa29bf01e1131e6ec712bd7338ac1283dc8.patch";
hash = "sha256-u5jsNfEo1+XNlkVGPCM/rsDPnYko6cr2z2si9nq+sLA=";
})
];

propagatedBuildInputs = [
click
];
Expand Down
16 changes: 12 additions & 4 deletions pkgs/development/python-modules/dnachisel/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
, numpy
, proglog
, pytestCheckHook
, pythonOlder
, python-codon-tables
, primer3
, genome-collector
Expand All @@ -15,13 +16,16 @@

buildPythonPackage rec {
pname = "dnachisel";
version = "3.2.10";
version = "3.2.11";
format = "setuptools";

disabled = pythonOlder "3.7";

src = fetchFromGitHub {
owner = "Edinburgh-Genome-Foundry";
repo = "DnaChisel";
rev = "refs/tags/v${version}";
hash = "sha256-YlNOvK7ZXUHYdRX1NFEdZ646NGLtGXU1YgAjN6RY2QE=";
hash = "sha256-rcZq/HhU1xIyQ1jM8+gO9ONDLBAxiUIByoWk2nMwuGA=";
};

propagatedBuildInputs = [
Expand Down Expand Up @@ -50,12 +54,16 @@ buildPythonPackage rec {
"test_avoid_phage_blast_matches"
"test_avoid_matches_with_list"
"test_avoid_matches_with_phage"
];
pythonImportsCheck = [ "dnachisel" ];
];

pythonImportsCheck = [
"dnachisel"
];

meta = with lib; {
homepage = "https://github.com/Edinburgh-Genome-Foundry/DnaChisel";
description = "Optimize DNA sequences under constraints";
changelog = "https://github.com/Edinburgh-Genome-Foundry/DnaChisel/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
};
Expand Down
16 changes: 8 additions & 8 deletions pkgs/development/python-modules/pymedio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,21 @@

buildPythonPackage rec {
pname = "pymedio";
version = "0.2.13";
version = "0.2.14";
format = "setuptools";

disabled = pythonOlder "3.9";

src = fetchFromGitHub {
owner = "jcreinhold";
repo = "pymedio";
rev = "refs/tags/v${version}";
hash = "sha256-iHbClOrtYkHT1Nar+5j/ig4Krya8LdQdFB4Mmm5B9bg=";
hash = "sha256-x3CHoWASDrUoCXfj73NF+0Y/3Mb31dK2Lh+o4OD9ryk=";
};

# relax Python dep to work with 3.10.x and 3.11.x
postPatch = ''
substituteInPlace setup.cfg --replace "!=3.10.*," "" --replace "!=3.11.*" ""
'';

propagatedBuildInputs = [ numpy ];
propagatedBuildInputs = [
numpy
];

nativeCheckInputs = [
pytestCheckHook
Expand All @@ -44,6 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Read medical image files into Numpy arrays";
homepage = "https://github.com/jcreinhold/pymedio";
changelog = "https://github.com/jcreinhold/pymedio/blob/v${version}/HISTORY.rst";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

buildGoModule rec {
pname = "dagger";
version = "0.6.0";
version = "0.6.1";

src = fetchFromGitHub {
owner = "dagger";
repo = "dagger";
rev = "v${version}";
hash = "sha256-NFQ1VPgY3WDwMsOi0wZ/b7sV/Ckv/WCeegSyLCnOPJM=";
hash = "sha256-9QQ6aDCkTWNq5KOSGF6FH6UQrOYa51ctW3CMcGrCJAQ=";
};

vendorHash = "sha256-KniHuJWkwZEzFcdtZUaYEoqcvmotbO+yuEB5L3Q3FGI=";
vendorHash = "sha256-r1E0JrwLDMlBINxtHKI5XfrG4kYWRcuep8CvtvVCqio=";
proxyVendor = true;

subPackages = [
Expand Down
26 changes: 26 additions & 0 deletions pkgs/development/tools/language-servers/neocmakelsp/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:

rustPlatform.buildRustPackage rec {
pname = "neocmakelsp";
version = "0.5.18";

src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "neocmakelsp";
rev = "v${version}";
hash = "sha256-3Bv1tRskxQ4Fk+gEGCYRq8WtkBHYP2VjirtTZ3SWJlQ=";
};

cargoHash = "sha256-O8E5PmXYrNOB8fXFs5ar30c1X5flIQZ/lrRSl/3XH+o=";

meta = with lib; {
description = "A cmake lsp based on tower-lsp and treesitter";
homepage = "https://github.com/Decodetalkers/neocmakelsp";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ rewine ];
};
}
34 changes: 34 additions & 0 deletions pkgs/development/tools/misc/ezno/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
}:

rustPlatform.buildRustPackage rec {
pname = "ezno";
version = "0.0.8";

src = fetchFromGitHub {
owner = "kaleidawave";
repo = "ezno";
rev = "release/ezno-${version}";
hash = "sha256-0yLEpNkl7KjBEGxNONtfMjVlWMSKGZ6TbYJMsCeQ3ms=";
};

cargoHash = "sha256-noMfKx6BsmWhAVI4r8LlC961Uwogv1JGMYSrNGlLGPQ=";

buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];

cargoBuildFlags = [ "--bin" "ezno" ];

meta = with lib; {
description = "A JavaScript compiler and TypeScript checker with a focus on static analysis and runtime performance";
homepage = "https://github.com/kaleidawave/ezno";
changelog = "https://github.com/kaleidawave/ezno/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}
Loading

0 comments on commit eab5d79

Please sign in to comment.