mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-12 08:43:06 +00:00
Merge master into staging-next
This commit is contained in:
commit
5aa88e2354
@ -9,21 +9,21 @@
|
|||||||
, appstream-glib
|
, appstream-glib
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, glib
|
, glib
|
||||||
, gtk3
|
, gtk4
|
||||||
, libhandy
|
, libadwaita
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, gst_all_1
|
, gst_all_1
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "blanket";
|
pname = "blanket";
|
||||||
version = "0.5.0";
|
version = "0.6.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rafaelmardojai";
|
owner = "rafaelmardojai";
|
||||||
repo = "blanket";
|
repo = "blanket";
|
||||||
rev = version;
|
rev = "refs/tags/${version}";
|
||||||
sha256 = "00i821zqfbigxmc709322r16z75qsw4rg23yhv35gza9sl65bzkg";
|
sha256 = "sha256-4gthT1x76IfXWkLaLMPtFS4TRlRGk5Enbu/k1jAHzwE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -37,8 +37,8 @@ python3Packages.buildPythonApplication rec {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib
|
glib
|
||||||
gtk3
|
gtk4
|
||||||
libhandy
|
libadwaita
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
gst_all_1.gstreamer
|
gst_all_1.gstreamer
|
||||||
gst_all_1.gst-plugins-base
|
gst_all_1.gst-plugins-base
|
||||||
|
@ -19,16 +19,16 @@ let
|
|||||||
maintainers = with maintainers; [ fliegendewurst ];
|
maintainers = with maintainers; [ fliegendewurst ];
|
||||||
};
|
};
|
||||||
|
|
||||||
version = "0.50.2";
|
version = "0.50.3";
|
||||||
|
|
||||||
desktopSource = {
|
desktopSource = {
|
||||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||||
sha256 = "0fljza5afpjxgrzgskjhs7w86aa51d88xzv2h43666638j3c5mvk";
|
sha256 = "sha256-0N2+NcdZGxaj4LcG5edyd3ry+0dSQSfUQRqZEYFfWqQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
serverSource = {
|
serverSource = {
|
||||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||||
sha256 = "0jqpi1gc48jxvc68yzx80jp553haihybj3g3c5ymvqmgivwn7n4c";
|
sha256 = "sha256-za32yRhusReoGIRdbfx30CPH63BVXz2Z7jkhxtb7XSo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mill";
|
pname = "mill";
|
||||||
version = "0.10.2";
|
version = "0.10.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
||||||
hash = "sha256-lx5saJdGsMS7DLaUngoauzFS1UG4QYvrELEvTjIa1oQ=";
|
hash = "sha256-pTQigt8sG+4AzDc3Fav/Qn27CNH0lIHuQ3QMA5uMdqI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
Loading…
Reference in New Issue
Block a user