Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
239c4e701d
49 changed files with 393 additions and 188 deletions
|
|
@ -55,6 +55,12 @@ in mkLicense lset) ({
|
|||
fullName = "GNU Affero General Public License v3.0 or later";
|
||||
};
|
||||
|
||||
aladdin = {
|
||||
spdxId = "Aladdin";
|
||||
fullName = "Aladdin Free Public License";
|
||||
free = false;
|
||||
};
|
||||
|
||||
amazonsl = {
|
||||
fullName = "Amazon Software License";
|
||||
url = "https://aws.amazon.com/asl/";
|
||||
|
|
|
|||
|
|
@ -139,6 +139,12 @@
|
|||
githubId = 241628;
|
||||
name = "Adam Russell";
|
||||
};
|
||||
aacebedo = {
|
||||
email = "alexandre@acebedo.fr";
|
||||
github = "aacebedo";
|
||||
githubId = 1217680;
|
||||
name = "Alexandre Acebedo";
|
||||
};
|
||||
aadibajpai = {
|
||||
email = "hello@aadibajpai.com";
|
||||
github = "aadibajpai";
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ let
|
|||
generateUnits
|
||||
targetToUnit
|
||||
serviceToUnit
|
||||
sliceToUnit
|
||||
socketToUnit
|
||||
timerToUnit
|
||||
pathToUnit;
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ in
|
|||
fwupd = callInstalledTest ./fwupd.nix {};
|
||||
gcab = callInstalledTest ./gcab.nix {};
|
||||
gdk-pixbuf = callInstalledTest ./gdk-pixbuf.nix {};
|
||||
geocode-glib = callInstalledTest ./geocode-glib.nix {};
|
||||
gjs = callInstalledTest ./gjs.nix {};
|
||||
glib-networking = callInstalledTest ./glib-networking.nix {};
|
||||
gnome-photos = callInstalledTest ./gnome-photos.nix {};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -29,29 +28,21 @@
|
|||
, json-glib
|
||||
, itstool
|
||||
, wrapGAppsHook
|
||||
, desktop-file-utils
|
||||
, gst_all_1
|
||||
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
|
||||
, check
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rhythmbox";
|
||||
version = "3.4.5";
|
||||
version = "3.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo=";
|
||||
sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix stuff linking against rhythmdb not finding libxml headers
|
||||
# included by rhythmdb.h header.
|
||||
# https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch";
|
||||
sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
meson
|
||||
|
|
@ -60,6 +51,7 @@ stdenv.mkDerivation rec {
|
|||
glib
|
||||
itstool
|
||||
wrapGAppsHook
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -95,9 +87,16 @@ stdenv.mkDerivation rec {
|
|||
libnotify
|
||||
] ++ gst_plugins;
|
||||
|
||||
postInstall = ''
|
||||
glib-compile-schemas "$out/share/glib-2.0/schemas"
|
||||
'';
|
||||
checkInputs = [
|
||||
check
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dtests=disabled"
|
||||
];
|
||||
|
||||
# Requires DISPLAY
|
||||
doCheck = false;
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deja-dup";
|
||||
version = "43.3";
|
||||
version = "43.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HOIBAzR+7OZ1RO+MSpCQKShcikdtWCjdMUO2rE2TxiM=";
|
||||
sha256 = "sha256-8eqrBQrMvS4cta5RP0ibo4Zc3B8hlkftxaRyvb6JuEY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"libjpeg-turbo": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
|
||||
"rev": "02959c3ee17abacfd1339ec22ea93301292ffd56",
|
||||
"sha256": "sha256-gs8JUT8AoKL+9vlmz3evq61+h2QxNcWqOHN4elb2Grc="
|
||||
"sha256": "sha256-cuSBVhHCX2Fh2SmmRpjinYtge8yaxcM06jlSXfvCywk="
|
||||
},
|
||||
"icu": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
"harfbuzz": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "a8b7f1880412c7f0c9ecdada0a4935011816c7dc",
|
||||
"sha256": "sha256-TQdgg0G8Dk10tg2MLv405nG8DAaPm7JiZjiZ6tOSGW4="
|
||||
"sha256": "sha256-QyVkeBVl45gygOylhnojcQuDIBp2DT2d7pD+OcX29VU="
|
||||
},
|
||||
"libpng": {
|
||||
"url": "https://skia.googlesource.com/third_party/libpng.git",
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
, swig
|
||||
, vtk
|
||||
, wrapQtAppsHook
|
||||
, wrapGAppsHook
|
||||
, xercesc
|
||||
, zlib
|
||||
}:
|
||||
|
|
@ -64,6 +65,7 @@ mkDerivation rec {
|
|||
pyside2-tools
|
||||
gfortran
|
||||
wrapQtAppsHook
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, pkgs, python3, fetchpatch, glibcLocales }:
|
||||
{ lib, stdenv, pkgs, python3, fetchpatch, glibcLocales, installShellFiles }:
|
||||
|
||||
with python3.pkgs; buildPythonApplication rec {
|
||||
pname = "khal";
|
||||
version = "0.10.4";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f";
|
||||
sha256 = "sha256-Tu+3rDAqJthgbbOSgXWHpO2UwnoVvy6iEWFKRk/PDHY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -26,7 +26,7 @@ with python3.pkgs; buildPythonApplication rec {
|
|||
pkginfo
|
||||
freezegun
|
||||
];
|
||||
nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed ];
|
||||
nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed installShellFiles ];
|
||||
checkInputs = [
|
||||
glibcLocales
|
||||
pytestCheckHook
|
||||
|
|
@ -34,8 +34,11 @@ with python3.pkgs; buildPythonApplication rec {
|
|||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
postInstall = ''
|
||||
# zsh completion
|
||||
install -D misc/__khal $out/share/zsh/site-functions/__khal
|
||||
# shell completions
|
||||
installShellCompletion --cmd khal \
|
||||
--bash <(_KHAL_COMPLETE=bash_source $out/bin/khal) \
|
||||
--fish <(_KHAL_COMPLETE=zsh_source $out/bin/khal) \
|
||||
--zsh <(_KHAL_COMPLETE=fish_source $out/bin/khal)
|
||||
|
||||
# man page
|
||||
PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \
|
||||
|
|
@ -48,14 +51,6 @@ with python3.pkgs; buildPythonApplication rec {
|
|||
|
||||
doCheck = !stdenv.isAarch64;
|
||||
|
||||
disabledTests = [
|
||||
# This test is failing due to https://github.com/pimutils/khal/issues/1065
|
||||
"test_print_ics_command"
|
||||
|
||||
# Mocking breaks in this testcase
|
||||
"test_import_from_stdin"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "http://lostpackets.de/khal/";
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "42.1";
|
||||
version = "42.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "6p6dLehwg4ewUqe+FqXmnOqfZ2jfrrRee9meRmNxYt4=";
|
||||
sha256 = "mXHp/aGqK9ZKdrMxcxNcZBWaSQssS8/757lUj+38eCw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
78
pkgs/applications/misc/swaysettings/default.nix
Normal file
78
pkgs/applications/misc/swaysettings/default.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, accountsservice
|
||||
, appstream-glib
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, json-glib
|
||||
, libgee
|
||||
, libhandy
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, stdenv
|
||||
, vala
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaysettings";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErikReider";
|
||||
repo = "SwaySettings";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2bbB+37t6chbdnOSpIolAsy7aD9i1UizWqkcF8Frfsk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
accountsservice
|
||||
dbus
|
||||
glib
|
||||
gobject-introspection
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
json-glib
|
||||
libgee
|
||||
libhandy
|
||||
libxml2
|
||||
pantheon.granite
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs /build/source/build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GUI for configuring your sway desktop";
|
||||
longDescription = ''
|
||||
Sway settings enables easy configuration of a sway desktop environment
|
||||
such as selection of application or icon themes.
|
||||
'';
|
||||
homepage = "https://github.com/ErikReider/SwaySettings";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.aacebedo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,6 +10,7 @@ let
|
|||
interpreter = (
|
||||
poetry2nix.mkPoetryPackages {
|
||||
projectDir = ./.;
|
||||
python = pkgs.python39;
|
||||
overrides = [
|
||||
poetry2nix.defaultPoetryOverrides
|
||||
(import ./poetry-git-overlay.nix { inherit pkgs; })
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@ python-versions = "*"
|
|||
|
||||
[[package]]
|
||||
name = "boto3"
|
||||
version = "1.24.6"
|
||||
version = "1.24.16"
|
||||
description = "The AWS SDK for Python"
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">= 3.7"
|
||||
|
||||
[package.dependencies]
|
||||
botocore = ">=1.27.6,<1.28.0"
|
||||
botocore = ">=1.27.16,<1.28.0"
|
||||
jmespath = ">=0.7.1,<2.0.0"
|
||||
s3transfer = ">=0.6.0,<0.7.0"
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
|
|||
|
||||
[[package]]
|
||||
name = "botocore"
|
||||
version = "1.27.6"
|
||||
version = "1.27.16"
|
||||
description = "Low-level, data-driven core of boto 3."
|
||||
category = "main"
|
||||
optional = false
|
||||
|
|
@ -51,7 +51,7 @@ crt = ["awscrt (==0.13.8)"]
|
|||
|
||||
[[package]]
|
||||
name = "certifi"
|
||||
version = "2022.5.18.1"
|
||||
version = "2022.6.15"
|
||||
description = "Python package for providing Mozilla's CA Bundle."
|
||||
category = "main"
|
||||
optional = false
|
||||
|
|
@ -116,7 +116,7 @@ python-versions = ">=3.5"
|
|||
|
||||
[[package]]
|
||||
name = "jmespath"
|
||||
version = "1.0.0"
|
||||
version = "1.0.1"
|
||||
description = "JSON Matching Expressions"
|
||||
category = "main"
|
||||
optional = false
|
||||
|
|
@ -463,8 +463,8 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
|
|||
|
||||
[metadata]
|
||||
lock-version = "1.1"
|
||||
python-versions = "^3.8"
|
||||
content-hash = "57d7c155ae4259912291b1315f9c2fd6c918fad9ef54d1e8011f800b649f9647"
|
||||
python-versions = "^3.9"
|
||||
content-hash = "781bb4378f4491b427372322c3ec71131ed7a28e0a166e0bc43969b016b5d926"
|
||||
|
||||
[metadata.files]
|
||||
apache-libcloud = [
|
||||
|
|
@ -476,16 +476,16 @@ boto = [
|
|||
{file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"},
|
||||
]
|
||||
boto3 = [
|
||||
{file = "boto3-1.24.6-py3-none-any.whl", hash = "sha256:1c13d555172cf88eb645af2429e4a7f42be85e365d6ffc110c952a556d3f8808"},
|
||||
{file = "boto3-1.24.6.tar.gz", hash = "sha256:4af6a8bc5110b5f9d2fbd00a3c110e4c4cc36fae78d05afa354831f5789e363b"},
|
||||
{file = "boto3-1.24.16-py3-none-any.whl", hash = "sha256:2c6f7e4103d41ca07d6b934a6612e4b9a2666eae36e8289f88726868534b8de2"},
|
||||
{file = "boto3-1.24.16.tar.gz", hash = "sha256:422c000ff2ee5226e89fe427a9c4c09db095d69c179a3bcc3cfba37cbc5e787e"},
|
||||
]
|
||||
botocore = [
|
||||
{file = "botocore-1.27.6-py3-none-any.whl", hash = "sha256:eeebe304161db6828413dc358ea80ece52f4ddbc8ecde4dd58978d5861a09293"},
|
||||
{file = "botocore-1.27.6.tar.gz", hash = "sha256:97c909a6ec5ad421573c18ae67fc6ea4232502cd30cffaf03bfcb584d9df652d"},
|
||||
{file = "botocore-1.27.16-py3-none-any.whl", hash = "sha256:f117d59899d21beeb200130d7af2090a8112d702a06e2c2794ef576bcea36773"},
|
||||
{file = "botocore-1.27.16.tar.gz", hash = "sha256:b3b9710902f675a11f5bfd46afda770150530876ae6541d099584462bf949fd1"},
|
||||
]
|
||||
certifi = [
|
||||
{file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"},
|
||||
{file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"},
|
||||
{file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"},
|
||||
{file = "certifi-2022.6.15.tar.gz", hash = "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d"},
|
||||
]
|
||||
cffi = [
|
||||
{file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"},
|
||||
|
|
@ -572,8 +572,8 @@ idna = [
|
|||
{file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
|
||||
]
|
||||
jmespath = [
|
||||
{file = "jmespath-1.0.0-py3-none-any.whl", hash = "sha256:e8dcd576ed616f14ec02eed0005c85973b5890083313860136657e24784e4c04"},
|
||||
{file = "jmespath-1.0.0.tar.gz", hash = "sha256:a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e"},
|
||||
{file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"},
|
||||
{file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"},
|
||||
]
|
||||
jsonpickle = [
|
||||
{file = "jsonpickle-2.2.0-py2.py3-none-any.whl", hash = "sha256:de7f2613818aa4f234138ca11243d6359ff83ae528b2185efdd474f62bcf9ae1"},
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ description = "NixOps 2.0"
|
|||
authors = ["Adam Hoese <adam.hose@tweag.io>"]
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = "^3.8"
|
||||
python = "^3.9"
|
||||
nixops = {git = "https://github.com/NixOS/nixops.git"}
|
||||
nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"}
|
||||
nixops-digitalocean = {git = "https://github.com/nix-community/nixops-digitalocean.git"}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ pkgs.mkShell {
|
|||
pkgs.poetry2nix.cli
|
||||
pkgs.pkg-config
|
||||
pkgs.libvirt
|
||||
pkgs.poetry
|
||||
pkgs.python39Packages.poetry
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
|||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.30.0";
|
||||
version = "0.30.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bZYm9T3NRNNtT8RDGwnXcXC7Rb/GuIxI/U06By4gR/w=";
|
||||
sha256 = "sha256-AdT3qL0frsTi4R4AbmZlPDx0Q2RixC3e4AyEMgGgnlc=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.44.2";
|
||||
version = "3.44.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "xXPzlxA8FybyS+Tz+f0gzrvJtEW6CysOt8lI/YQVBho=";
|
||||
sha256 = "hcysooh6+FvwSORzx7bELF9WQasFpbxM/Oo04rb1vhc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.44.2";
|
||||
version = "3.44.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "+scGznpXP42WdzfxWtDr66Q6h/48p1f4VBID2ZG+BjM=";
|
||||
sha256 = "U2sR9BM99vIW8nr5okgaGe164Ivi1KE7EoBhwmKjZJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "jellyfin-media-player";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-media-player";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eDCfqSNkKVm8MC4XA1NhQSByy9zhfyQRPM8OlSKcIvc=";
|
||||
sha256 = "sha256-piMqI4qxcNUSNC+0JE2KZ/cvlNgtxUOnSfrcWnBVzC0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,19 +1,16 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, python3Packages
|
||||
, gst_all_1
|
||||
, gtk3
|
||||
, gobject-introspection
|
||||
, libpeas
|
||||
, librsvg
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, libnotify
|
||||
, gsound
|
||||
, meson
|
||||
|
|
@ -21,15 +18,15 @@
|
|||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pitivi";
|
||||
version = "2021.05";
|
||||
version = "2022.06";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "z1aTxGxCqw2hSi5Zv89LyIBgS0HpzTqo0uvcYIJ7dcc=";
|
||||
sha256 = "Uz0448bSEcK9DpXiuWsPCDO98NXUd6zgffYRWDUGyDg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -37,13 +34,6 @@ python3Packages.buildPythonApplication rec {
|
|||
# and saves them to the generated binary. This would make the build-time
|
||||
# dependencies part of the closure so we remove it.
|
||||
./prevent-closure-contamination.patch
|
||||
|
||||
# Fix build with meson 0.61
|
||||
# https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/414
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c.patch";
|
||||
sha256 = "MC4naGnqhrYlFBFHZaSzbOzrqaNK5/Xv5jBmCu0fLQE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -61,9 +51,7 @@ python3Packages.buildPythonApplication rec {
|
|||
gtk3
|
||||
libpeas
|
||||
librsvg
|
||||
gnome-desktop
|
||||
gsound
|
||||
gnome.adwaita-icon-theme
|
||||
gsettings-desktop-schemas
|
||||
libnotify
|
||||
] ++ (with gst_all_1; [
|
||||
|
|
@ -77,14 +65,13 @@ python3Packages.buildPythonApplication rec {
|
|||
gst-devtools
|
||||
]);
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
pythonPath = with python3.pkgs; [
|
||||
pygobject3
|
||||
gst-python
|
||||
pyxdg
|
||||
numpy
|
||||
pycairo
|
||||
matplotlib
|
||||
dbus-python
|
||||
librosa
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -15,5 +15,7 @@ in
|
|||
stdenv.mkDerivation (args // {
|
||||
name = "${name}-source";
|
||||
installPhase = "cp -r . $out";
|
||||
outputs = [ "out" ];
|
||||
separateDebugInfo = false;
|
||||
phases = ["unpackPhase" "patchPhase" "installPhase"];
|
||||
})
|
||||
|
|
|
|||
42
pkgs/data/fonts/u001/default.nix
Normal file
42
pkgs/data/fonts/u001/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "u001";
|
||||
version = "unstable-2016-08-01"; # date in the zip file, actual creation date unknown
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fontlibrary.org/assets/downloads/u001/3ea00b3c0c8fa6ce4373e5766fafd651/u001.zip";
|
||||
sha256 = "sha256-7H32pfr0g68XP5B48VUY99e6fbd7rhH6fEnCKNXWEkU=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
TTF_DIR=$out/share/fonts/truetype
|
||||
|
||||
mkdir -p $TTF_DIR
|
||||
|
||||
# We’ll adjust the nonstandard naming convention here
|
||||
cp u001-reg.ttf $TTF_DIR/U001-Regular.ttf
|
||||
cp u001-ita.ttf $TTF_DIR/U001-Italic.ttf
|
||||
cp u001-bol.ttf $TTF_DIR/U001-Bold.ttf
|
||||
cp u001-bolita.ttf $TTF_DIR/U001-BoldItalic.ttf
|
||||
cp u001con-reg.ttf $TTF_DIR/U001Condensed-Regular.ttf
|
||||
cp u001con-ita.ttf $TTF_DIR/U001Condensed-Italic.ttf
|
||||
cp u001con-bol.ttf $TTF_DIR/U001Condensed-Bold.ttf
|
||||
cp u001con-bolita.ttf $TTF_DIR/U001Condensed-BoldItalic.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Univers-like typeface that comes with GhostPDL made by URW++";
|
||||
homepage = "https://fontlibrary.org/en/font/u001";
|
||||
license = licenses.aladdin;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ toastal ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,7 +13,6 @@
|
|||
, gtk3
|
||||
, gtksourceview4
|
||||
, gtk-vnc
|
||||
, freerdp
|
||||
, libvirt
|
||||
, spice-gtk
|
||||
, python3
|
||||
|
|
@ -55,16 +54,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "42.1";
|
||||
version = "42.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "lvXQEbdQjbVhvw0WbA6p6LEhgFxA5dnzYRkkXBUXIIA=";
|
||||
sha256 = "98K8oU3K4oONsR+iyA4jQI41SBeK+GGg1NDcxql4ABU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix path to libgovf-0.1.so (and libgtk-frdp-0.1.so when enabling rdp meson option)
|
||||
# in the gir file. We patch gobject-introspection to hardcode absolute paths but
|
||||
# Fix path to libgovf-0.1.so in the gir file. We patch gobject-introspection to hardcode absolute paths but
|
||||
# our Meson patch will only pass the info when install_dir is absolute as well.
|
||||
./fix-gir-lib-path.patch
|
||||
];
|
||||
|
|
@ -93,7 +91,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
acl
|
||||
cyrus_sasl
|
||||
freerdp
|
||||
gdbm
|
||||
glib
|
||||
glib-networking
|
||||
|
|
|
|||
|
|
@ -9,14 +9,3 @@
|
|||
)
|
||||
|
||||
govf_dep = declare_dependency(
|
||||
--- a/subprojects/gtk-frdp/src/meson.build
|
||||
+++ b/subprojects/gtk-frdp/src/meson.build
|
||||
@@ -50,7 +50,7 @@ gtk_frdp_lib = shared_library('gtk-frdp-' + api_version,
|
||||
gtk_frdp_sources,
|
||||
dependencies: gtk_frdp_deps,
|
||||
install: true,
|
||||
- install_dir: libdir
|
||||
+ install_dir: get_option ('prefix') / libdir
|
||||
)
|
||||
|
||||
gtk_frdp_dep = declare_dependency(
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-maps";
|
||||
version = "42.2";
|
||||
version = "42.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Xm0bDKfMk56pGq39pWM6hl6oX6VlADaGGyv+8L/QabE=";
|
||||
sha256 = "sha256-5FZGf6zzyP0QyThrXnTEPZWVrZ+3Ulf32gFK+YPWnNE=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.44.2";
|
||||
version = "3.44.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Ltcq/k1rsXD4co+uoJB/7hAhLf3nqfq4L7zIPQ8i8Cg=";
|
||||
sha256 = "kEOrU/NB2hAxXFUDhKazIEMBk/yNeGHdJcTpsuC+Qls=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calculator";
|
||||
version = "42.1";
|
||||
version = "42.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "700k5Cpl3IYOYgbztHC30jPCripNSWXYhZqp6oo5Ws0=";
|
||||
sha256 = "M9qxvKQ2WNZlIJWLD2dMsK0xhc/TDBLkWef2lIHFxqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sushi";
|
||||
version = "41.2";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "tZ+0LJllxzYfdilt0qNARatlUGXqQUPeWsiyygyq6l4=";
|
||||
sha256 = "RdjbevRaeXhOejRYjRSeqVXIvkS7gqNuiWgpQFt8iCA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,31 +1,63 @@
|
|||
{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome, libsoup, json-glib, glib }:
|
||||
{ fetchurl
|
||||
, lib
|
||||
, stdenv
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, gobject-introspection
|
||||
, gnome
|
||||
, libsoup
|
||||
, json-glib
|
||||
, glib
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geocode-glib";
|
||||
version = "3.26.2";
|
||||
version = "3.26.3";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1";
|
||||
url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz";
|
||||
sha256 = "Hf6ug7kOzMobbPfc98XjsxeCjPC1YgXERx7w+RGZl2Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config gettext gtk-doc docbook_xsl gobject-introspection ];
|
||||
buildInputs = [ glib libsoup json-glib ];
|
||||
|
||||
patches = [
|
||||
./installed-tests-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests"
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
gtk-doc
|
||||
docbook-xsl-nons
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libsoup
|
||||
json-glib
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dsoup2=${lib.boolToString (lib.versionOlder libsoup.version "2.99")}"
|
||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
tests = {
|
||||
installed-tests = nixosTests.installed-tests.geocode-glib;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,20 @@
|
|||
--- a/geocode-glib/tests/meson.build
|
||||
+++ b/geocode-glib/tests/meson.build
|
||||
@@ -1,4 +1,4 @@
|
||||
-install_dir = get_option('libexecdir') + '/installed-tests/geocode-glib'
|
||||
+install_dir = '@installedTests@/libexec/installed-tests/geocode-glib'
|
||||
-install_dir = get_option('prefix') / get_option('datadir') / 'installed-tests' / library_name
|
||||
+install_dir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / library_name
|
||||
|
||||
e = executable('geo-uri',
|
||||
'geo-uri.c',
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -1,6 +1,9 @@
|
||||
option('enable-installed-tests',
|
||||
type: 'boolean', value: true,
|
||||
description: 'Build & install test programs')
|
||||
+option('installed_test_prefix',
|
||||
+ type: 'string', value: '',
|
||||
+ description: 'Prefix for installed tests')
|
||||
option('enable-introspection',
|
||||
type: 'boolean', value: true,
|
||||
description: 'Whether to enable the introspection generation')
|
||||
|
|
|
|||
|
|
@ -1,29 +1,28 @@
|
|||
{ lib, buildDunePackage, fetchurl
|
||||
, ppx_sexp_conv, ppx_cstruct
|
||||
, mirage-crypto, mirage-crypto-rng, mirage-crypto-pk
|
||||
, mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk
|
||||
, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf
|
||||
, rresult, mtime, logs, fmt, cmdliner, base64, hacl_x25519
|
||||
, rresult, mtime, logs, fmt, cmdliner, base64
|
||||
, zarith
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "awa";
|
||||
version = "0.0.5";
|
||||
version = "0.1.0";
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz";
|
||||
sha256 = "14hqzmikp3hlynhs0wnwj2491106if183swsl7ldk4215a0b7ms4";
|
||||
sha256 = "sha256-aPnFDp52oYVHr/56lFw0gtVJ0KvHawyM5FGtpHPOVY8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ppx_cstruct ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mirage-crypto mirage-crypto-rng mirage-crypto-pk x509
|
||||
mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509
|
||||
cstruct cstruct-sexp sexplib mtime
|
||||
logs base64 hacl_x25519 zarith
|
||||
logs base64 zarith
|
||||
ppx_sexp_conv eqaf
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,14 @@
|
|||
buildDunePackage {
|
||||
pname = "awa-lwt";
|
||||
|
||||
inherit (awa) version src useDune2;
|
||||
inherit (awa) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awa cstruct mtime lwt cstruct-unix mirage-crypto-rng
|
||||
awa cstruct mtime lwt mirage-crypto-rng
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ cstruct-unix ];
|
||||
|
||||
meta = awa.meta // { mainProgram = "awa_lwt_server"; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
{ buildDunePackage, awa
|
||||
, cstruct, mtime, lwt, mirage-flow, mirage-clock, logs
|
||||
, duration, mirage-time
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "awa-mirage";
|
||||
|
||||
inherit (awa) version src useDune2;
|
||||
inherit (awa) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awa cstruct mtime lwt mirage-flow mirage-clock logs
|
||||
duration mirage-time
|
||||
];
|
||||
|
||||
inherit (awa) meta;
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
{ lib, buildDunePackage, fetchurl, benchmark, cstruct
|
||||
, alcotest , eqaf, hex, ppx_blob, ppx_deriving_yojson, stdlib-shims, yojson }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "hacl_x25519";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/hacl/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "sha256-gWdUqOj5c50ObZjO1uULAmoo1ZIyRFxQUaZuQzLMVy0=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
propagatedBuildInputs = [ eqaf cstruct ];
|
||||
checkInputs = [ alcotest benchmark hex ppx_blob ppx_deriving_yojson stdlib-shims yojson ];
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Primitives for Elliptic Curve Cryptography taken from Project Everest";
|
||||
homepage = "https://github.com/mirage/hacl";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sternenseemann ];
|
||||
};
|
||||
}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aesara";
|
||||
version = "2.7.3";
|
||||
version = "2.7.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "aesara-devs";
|
||||
repo = "aesara";
|
||||
rev = "refs/tags/rel-${version}";
|
||||
hash = "sha256-LeZEWKSfVmU7k7qMjniUjwoDJ5xJUHoYux7Qy5/w4Cg=";
|
||||
hash = "sha256-gLIBO1AzU8OTCPcZQN1A7vGi3L9fqzCXQsPek/+dsQc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asf-search";
|
||||
version = "3.2.2";
|
||||
version = "4.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "asfadmin";
|
||||
repo = "Discovery-asf_search";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9fJp4P2cD11ppU80Av/aJOcqpaBwuYgdWWBTMo/HCeo=";
|
||||
hash = "sha256-58roOxLFTu7WddgifuvaMoFlEh+iHrrL0rSJjAw35d0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "2.1.1";
|
||||
version = "3.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MX4qWvM7V5xCibpwsaf/2JGOrWYfETHxNmZ6tyeFmKc=";
|
||||
hash = "sha256-nRbpQxf2I+X9tgm7wZ1CGdlepDPvvwPpRjjLoDAR/k0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.93";
|
||||
version = "2.1.94";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7aXpKbGjJrkMS6l2B6jR1XWn7t3WLyztePEyMQaJkbk=";
|
||||
hash = "sha256-TG73+WAcRjY0NC+n2Q3ASCfTG03dL5yz+QOmY93WmME=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyjet";
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
|
||||
# tests not included in pypi tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0EI/dbanVDvILawnnK/Ce/5n/cD4Fv7VQEZfF9yPQio=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-0g0fCf0FIwde5Vsc/BJxjgMcs5llpD8JqOgFbMjOooc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywayland";
|
||||
version = "0.4.12";
|
||||
version = "0.4.13";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IAwBzV+wvQYgoJK1+GjAHm2aXWE2iVaMV2cduMtCkx8=";
|
||||
sha256 = "sha256-x075CncvfjzbIsGMj2EwFpigpwlysqBZpoK08DW9iBo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pip-audit";
|
||||
version = "2.3.4";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trailofbits";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-11lcF+ITvZmB5UKgGWJdXJE45Kh5rD98UOg9a648dKc=";
|
||||
hash = "sha256-l1oefdveAmmkRKnEOvdVp4efYd/nFkyDyVP5dxAG1CI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-bindgen-cli";
|
||||
version = "0.2.80";
|
||||
version = "0.2.81";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-f3XRVuK892TE6xP7eq3aKpl9d3fnOFxLh+/K59iWPAg=";
|
||||
sha256 = "sha256-DUcY22b9+PD6RD53CwcoB+ynGulYTEYjkkonDNeLbGM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-WJ5hPw2mzZB+GMoqo3orhl4fCFYKWXOWqaFj1EMrb2Q=";
|
||||
cargoSha256 = "sha256-mfVQ6rSzCgwYrN9WwydEpkm6k0E3302Kfs/LaGzRSHE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, readline }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hilbish";
|
||||
version = "1.0.4";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rosettea";
|
||||
repo = "Hilbish";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JVAyE6iSfRres2YalQF3CWK5Jtn5HoW6p6RHVbwzoVQ=";
|
||||
sha256 = "sha256-n4+qUCbjqxLmGuCQ0QTscJ3me0UZUP/7ggvGp1pNkfg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Bmst1oJMuSXGvL8Syw6v2BqrbO5McHKkTufFs6iuxzs=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-j7YAt7+kUJXdd/9LaRZny3MxYdd+0n5G3AffeDMo5DY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
@ -24,13 +26,9 @@ buildGoModule rec {
|
|||
mkdir -p "$out/share/hilbish"
|
||||
|
||||
cp .hilbishrc.lua $out/share/hilbish/
|
||||
cp -r docs -t $out/share/hilbish
|
||||
cp -r docs -t $out/share/hilbish/
|
||||
cp -r libs -t $out/share/hilbish/
|
||||
cp -r prelude/ $out/share/hilbish/
|
||||
|
||||
# segfaults and it's already been generated upstream
|
||||
# we copy the docs over with the above cp command
|
||||
rm $out/bin/docgen
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -39,6 +37,5 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/Rosettea/Hilbish";
|
||||
maintainers = with maintainers; [ fortuneteller2k ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux; # only officially supported on Linux
|
||||
};
|
||||
}
|
||||
|
|
|
|||
62
pkgs/tools/misc/trackma/default.nix
Normal file
62
pkgs/tools/misc/trackma/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
, glib
|
||||
, gtk3
|
||||
, withCurses ? false
|
||||
, withGtk ? false
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "trackma";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "z411";
|
||||
repo = "trackma";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-drc39ID4WYBQ/L2py57CB5OkQNfRKNigPQW0Lp8GIMc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals withGtk [ wrapGAppsHook ];
|
||||
|
||||
buildInputs = lib.optionals withGtk [ glib gobject-introspection gtk3 ];
|
||||
|
||||
propagatedBuildInputs = [ python3.pkgs.urllib3 python3.pkgs.dbus-python ]
|
||||
++ lib.optionals withGtk [ python3.pkgs.pillow python3.pkgs.pygobject3 python3.pkgs.pycairo ]
|
||||
++ lib.optionals withCurses [ python3.pkgs.urwid ]
|
||||
++ lib.optionals stdenv.isLinux [ python3.pkgs.pyinotify ];
|
||||
|
||||
# broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
dontWrapGApps = true; # prevent double wrapping
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "trackma" ];
|
||||
|
||||
# FIXME(trackma-qt): https://github.com/NixOS/nixpkgs/pull/179715#issuecomment-1171371059
|
||||
postDist = ''
|
||||
rm $out/bin/trackma-qt
|
||||
${lib.optionalString (!withGtk) "rm $out/bin/trackma-gtk"}
|
||||
${lib.optionalString (!withCurses) "rm $out/bin/trackma-curses"}
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/z411/trackma";
|
||||
description = "Open multi-site list manager for Unix-like systems (ex-wMAL)";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ WeebSorceress ];
|
||||
};
|
||||
}
|
||||
8
pkgs/tools/misc/trackma/update.sh
Executable file
8
pkgs/tools/misc/trackma/update.sh
Executable file
|
|
@ -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/z411/trackma/releases" | jq '.[0].tag_name' --raw-output)"
|
||||
|
||||
update-source-version trackma "${version:1}"
|
||||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yara";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/6EMnNVNSgeYHrbPF3QDS5oc0eLaggKNuZi2pXx/CqY=";
|
||||
hash = "sha256-HWLyDhFQHHmXUaAKp7EZ3ZsXlbwCEoJj4Q0qAtxwN1Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sirula";
|
||||
version = "unstable-2021-10-12";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DorianRudolph";
|
||||
repo = "sirula";
|
||||
rev = "b300cabde03ec4d8c28ed84e318166b675fb4a77";
|
||||
sha256 = "0pxdgjpqaf1bq1y1flafg0ksk8548rif6pfbw0lp31p655pq95c8";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C5mVO10+jD4TDg6R9rVJO6fdDiOD5tT+bEaI53WVdFA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "175rl09jmnj8pd5isyp2chnn66vdz1c16fgqhnjsxvbcasmn8vdj";
|
||||
cargoSha256 = "sha256-pxVEa3m7SWMwOAcR/jRKzEc6MH6YkNfTW0cm6Nid6Zo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11206,6 +11206,12 @@ with pkgs;
|
|||
|
||||
toybox = callPackage ../tools/misc/toybox { };
|
||||
|
||||
trackma = callPackage ../tools/misc/trackma { };
|
||||
|
||||
trackma-curses = trackma.override { withCurses = true; };
|
||||
|
||||
trackma-gtk = trackma.override { withGtk = true; };
|
||||
|
||||
tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
|
||||
|
||||
tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };
|
||||
|
|
@ -25375,6 +25381,8 @@ with pkgs;
|
|||
|
||||
uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { inherit (xorg) fonttosfnt mkfontdir; };
|
||||
|
||||
u001-font = callPackage ../data/fonts/u001 { };
|
||||
|
||||
vanilla-dmz = callPackage ../data/icons/vanilla-dmz { };
|
||||
|
||||
vdrsymbols = callPackage ../data/fonts/vdrsymbols { };
|
||||
|
|
@ -35838,4 +35846,6 @@ with pkgs;
|
|||
mictray = callPackage ../tools/audio/mictray { };
|
||||
|
||||
swift-corelibs-libdispatch = callPackage ../development/libraries/swift-corelibs-libdispatch { };
|
||||
|
||||
swaysettings = callPackage ../applications/misc/swaysettings { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -502,8 +502,6 @@ let
|
|||
|
||||
hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { };
|
||||
|
||||
hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { };
|
||||
|
||||
hacl-star = callPackage ../development/ocaml-modules/hacl-star { };
|
||||
hacl-star-raw = callPackage ../development/ocaml-modules/hacl-star/raw.nix { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue