Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
4dc869e403
@ -10186,6 +10186,12 @@
|
||||
email = "vq@erq.se";
|
||||
name = "Daniel Nilsson";
|
||||
};
|
||||
vrinek = {
|
||||
email = "vrinek@hey.com";
|
||||
github = "vrinek";
|
||||
name = "Kostas Karachalios";
|
||||
githubId = 81346;
|
||||
};
|
||||
vrthra = {
|
||||
email = "rahul@gopinath.org";
|
||||
github = "vrthra";
|
||||
|
||||
@ -17,7 +17,19 @@ nix-build '<nixpkgs/nixos/lib/eval-config.nix>' \
|
||||
img_path=$(echo gce/*.tar.gz)
|
||||
img_name=${IMAGE_NAME:-$(basename "$img_path")}
|
||||
img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g')
|
||||
img_family=$(echo "$img_id" | cut -d - -f1-4)
|
||||
|
||||
if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then
|
||||
gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name"
|
||||
gsutil acl ch -u AllUsers:R "gs://${BUCKET_NAME}/$img_name"
|
||||
|
||||
gcloud compute images create \
|
||||
"$img_id" \
|
||||
--source-uri "gs://${BUCKET_NAME}/$img_name" \
|
||||
--family="$img_family"
|
||||
|
||||
gcloud compute images add-iam-policy-binding \
|
||||
"$img_id" \
|
||||
--member='allAuthenticatedUsers' \
|
||||
--role='roles/compute.imageUser'
|
||||
fi
|
||||
|
||||
@ -5,5 +5,13 @@ let self = {
|
||||
"17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz";
|
||||
"18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz";
|
||||
"18.09" = "gs://nixos-cloud-images/nixos-image-18.09.1228.a4c4cbb613c-x86_64-linux.raw.tar.gz";
|
||||
latest = self."18.09";
|
||||
|
||||
# This format will be handled by the upcoming NixOPS 2.0 release.
|
||||
# The old images based on a GS object are deprecated.
|
||||
"20.09" = {
|
||||
project = "nixos-cloud";
|
||||
name = "nixos-image-20-09-3531-3858fbc08e6-x86-64-linux";
|
||||
};
|
||||
|
||||
latest = self."20.09";
|
||||
}; in self
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2
|
||||
{ mkDerivation, lib, fetchFromGitHub, pkg-config, qtscript, qmake, libjack2
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "jamulus";
|
||||
version = "3.7.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "corrados";
|
||||
owner = "jamulussoftware";
|
||||
repo = "jamulus";
|
||||
rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-8zCPT0jo4ExgmZWxGinumv3JauH4csM9DtuHmOiJQAM=";
|
||||
@ -20,7 +20,7 @@ mkDerivation rec {
|
||||
description = "Enables musicians to perform real-time jam sessions over the internet";
|
||||
longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details";
|
||||
homepage = "https://github.com/corrados/jamulus/wiki";
|
||||
license = lib.licenses.gpl2; # linked in git repo, at least
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.seb314 ];
|
||||
};
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
|
||||
, glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
|
||||
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
|
||||
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
|
||||
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa
|
||||
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
|
||||
}:
|
||||
|
||||
let
|
||||
@ -10,14 +10,14 @@ let
|
||||
# If an update breaks things, one of those might have valuable info:
|
||||
# https://aur.archlinux.org/packages/spotify/
|
||||
# https://community.spotify.com/t5/Desktop-Linux
|
||||
version = "1.1.46.916.g416cacf1";
|
||||
version = "1.1.55.494.gca75f788";
|
||||
# To get the latest stable revision:
|
||||
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
|
||||
# To get general information:
|
||||
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
|
||||
# More examples of api usage:
|
||||
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
|
||||
rev = "43";
|
||||
rev = "45";
|
||||
|
||||
deps = [
|
||||
alsaLib
|
||||
@ -34,12 +34,13 @@ let
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk2
|
||||
gtk3
|
||||
libdrm
|
||||
libgcrypt
|
||||
libnotify
|
||||
libpng
|
||||
libpulseaudio
|
||||
libxkbcommon
|
||||
mesa
|
||||
nss
|
||||
pango
|
||||
@ -78,11 +79,10 @@ stdenv.mkDerivation {
|
||||
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
|
||||
src = fetchurl {
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
|
||||
sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";
|
||||
sha512 = "5d61a2d5b26be651620ab5d18d3a204d8d7b09dcec8a733ddc176c44cb43e9176c4350933ebe4498b065ba219113f3226c13bea9659da738fe635f41d01db303";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ squashfsTools ];
|
||||
nativeBuildInputs = [ makeWrapper squashfsTools ];
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
@ -13,10 +13,10 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1px6x99cv8nb8lcy3vgcicr4ar0bfj5rfnc5a1yw8rs5p1qnflgw";
|
||||
x86_64-darwin = "0grzivqb2fyvwh0fjh9vr205fjcsrd1iqhkwk3mgv792zfrb7ksf";
|
||||
aarch64-linux = "0p0msxgc13kqmpq7wk61igc1qbgmgg9463s44dp4ii3630iyr4lw";
|
||||
armv7l-linux = "147lki1wr5nzsg1mq12jmdjq9qr6vbdpmzbpr5nrvq23cak94ff8";
|
||||
x86_64-linux = "0fpa3b807hy3wrb98h5s0p6ljya279bikv2qwq30nvr0f4zn48bk";
|
||||
x86_64-darwin = "0bw7pdzn0a0zr7x8fpwck7v73dq5vh71ja00z11mhjrkjnvmmd9k";
|
||||
aarch64-linux = "04wrqcmyamhwiwcyay1z0q0dvf6g7k3pcs93x7hahy16l65w7s2c";
|
||||
armv7l-linux = "1hkc9i4z021jwjn275w790bppfvi63g0cnwvkssqdh1c94939rhv";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
@ -25,7 +25,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.54.2";
|
||||
version = "1.54.3";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, gdal
|
||||
, cmake
|
||||
@ -19,7 +20,7 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "OpenOrienteering-Mapper";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
buildInputs = [
|
||||
gdal
|
||||
@ -38,14 +39,21 @@ mkDerivation rec {
|
||||
owner = "OpenOrienteering";
|
||||
repo = "mapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "13k9dirqm74lknhr8w121zr1hjd9gm1y73cj4rrj98rx44dzmk7b";
|
||||
sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
# See https://github.com/NixOS/nixpkgs/issues/86054
|
||||
src = ./fix-qttranslations-path.diff;
|
||||
inherit qttranslations;
|
||||
});
|
||||
patches = [
|
||||
# https://github.com/NixOS/nixpkgs/issues/86054
|
||||
(substituteAll {
|
||||
src = ./fix-qttranslations-path.diff;
|
||||
inherit qttranslations;
|
||||
})
|
||||
# https://github.com/OpenOrienteering/mapper/pull/1907
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch";
|
||||
sha256 = "1bkckapzccn6k0ri6bgrr0nhis9498fnwj7b32s2ysym8zcg0355";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Building the manual and bundling licenses fails
|
||||
@ -81,7 +89,8 @@ mkDerivation rec {
|
||||
and provides a free alternative to the existing proprietary solution.
|
||||
'';
|
||||
homepage = "https://www.openorienteering.org/apps/mapper/";
|
||||
license = licenses.gpl3;
|
||||
changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ mpickering sikmir ];
|
||||
};
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "8.0.28";
|
||||
version = "8.0.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
|
||||
hash = "sha256-okLeyok/5rihGXaQaUR06dGkpuqqW02qJ6q6VVLtZsE=";
|
||||
hash = "sha256-j+fp/f8nta+OOuOFU4mmUrGYlVmAqdaXO4rLJ0in+m8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "8.8";
|
||||
version = "8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "sha256-eAXMmjPcfnJA5w6w/SRc6T5KHss77t0JijTB6+ctjzo=";
|
||||
sha256 = "sha256-nl9iu8ezgMZ1wy2swDXYRDLlkSz1II+C65UUWNvGBxg=";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub, wrapQtAppsHook
|
||||
{ lib, mkDerivation, fetchFromGitHub
|
||||
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors
|
||||
, nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry
|
||||
, python3, pyotherside, python3Packages
|
||||
, python3, pyotherside
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
@ -16,12 +16,14 @@ mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake python3 qttools wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
qmake python3 qttools python3.pkgs.wrapPython
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kirigami2 qtquickcontrols2 qtlocation qtsensors
|
||||
nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry
|
||||
];
|
||||
propagatedBuildInputs = with python3Packages; [ gpxpy pyxdg ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pure-maps.pro \
|
||||
@ -30,10 +32,11 @@ mkDerivation rec {
|
||||
|
||||
qmakeFlags = [ "FLAVOR=kirigami" ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
postInstall = ''
|
||||
wrapQtApp $out/bin/pure-maps \
|
||||
--prefix PYTHONPATH : "$out/share"
|
||||
pythonPath = with python3.pkgs; [ gpxpy ];
|
||||
|
||||
preInstall = ''
|
||||
buildPythonPath "$pythonPath"
|
||||
qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,13 +4,13 @@ let
|
||||
arch = if stdenv.is64bit then "amd64" else "x86";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "teamspeak-server";
|
||||
version = "3.13.2";
|
||||
version = "3.13.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2";
|
||||
sha256 = if stdenv.is64bit
|
||||
then "1l9i9667wppwxbbnf6kxamnqlbxzkz9ync4rsypfla124b6cidpz"
|
||||
else "0qhd05abiycsgc16r1p6y8bfdrl6zji21xaqwdizpr0jb01z335g";
|
||||
then "sha256-+b9S0ekQmXF5KwvVcmHIDpp0iZRO2W1ls8eYhDzjUUw="
|
||||
else "sha256-Qu6xPzbUdqO93j353cfQILlFYqmwFSnFWG9TjniX0+c=";
|
||||
};
|
||||
|
||||
buildInputs = [ stdenv.cc.cc postgresql.lib ];
|
||||
|
||||
@ -1,25 +1,68 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, callPackage
|
||||
, mpv, python-mpv-jsonipc, jellyfin-apiclient-python
|
||||
, pillow, tkinter, pystray, jinja2, pywebview }:
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, copyDesktopItems
|
||||
, fetchPypi
|
||||
, makeDesktopItem
|
||||
, flask
|
||||
, jellyfin-apiclient-python
|
||||
, jinja2
|
||||
, mpv
|
||||
, pillow
|
||||
, pydantic
|
||||
, pyqtwebengine
|
||||
, pystray
|
||||
, python-mpv-jsonipc
|
||||
, pywebview
|
||||
, qt5
|
||||
, tkinter
|
||||
, werkzeug
|
||||
}:
|
||||
|
||||
let
|
||||
shaderPack = callPackage ./shader-pack.nix {};
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "jellyfin-mpv-shim";
|
||||
version = "1.7.1";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iwalton3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0alrh5h3f8pq9mrq09jmpqa0yslxsjqwij6kwn24ggbwc10zkq75";
|
||||
fetchSubmodules = true; # needed for display_mirror css file
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-bcTCp2K1zRgobBAi7A62VPogM6km+DixRERWEOm9Yu4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./disable-desktop-client.patch
|
||||
./disable-update-check.patch
|
||||
propagatedBuildInputs = [
|
||||
jellyfin-apiclient-python
|
||||
mpv
|
||||
pillow
|
||||
pydantic
|
||||
python-mpv-jsonipc
|
||||
|
||||
# gui dependencies
|
||||
pystray
|
||||
tkinter
|
||||
|
||||
# display_mirror dependencies
|
||||
jinja2
|
||||
pywebview
|
||||
|
||||
# desktop dependencies
|
||||
flask
|
||||
pyqtwebengine
|
||||
werkzeug
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Jellyfin Desktop";
|
||||
exec = "jellyfin-desktop";
|
||||
icon = "jellyfin-desktop";
|
||||
desktopName = "jellyfin-desktop";
|
||||
comment = "MPV-based desktop and cast client for Jellyfin";
|
||||
genericName = "MPV-based desktop and cast client for Jellyfin";
|
||||
categories = "Video;AudioVideo;TV;Player";
|
||||
})
|
||||
];
|
||||
|
||||
# override $HOME directory:
|
||||
@ -34,31 +77,27 @@ buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# link the default shader pack
|
||||
ln -s ${shaderPack} jellyfin_mpv_shim/default_shader_pack
|
||||
substituteInPlace jellyfin_mpv_shim/conf.py \
|
||||
--replace "check_updates: bool = True" "check_updates: bool = False" \
|
||||
--replace "notify_updates: bool = True" "notify_updates: bool = False"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jellyfin-apiclient-python
|
||||
mpv
|
||||
pillow
|
||||
python-mpv-jsonipc
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp jellyfin_mpv_shim/integration/jellyfin-256.png $out/share/pixmaps/jellyfin-desktop.png
|
||||
'';
|
||||
|
||||
# gui dependencies
|
||||
pystray
|
||||
tkinter
|
||||
|
||||
# display_mirror dependencies
|
||||
jinja2
|
||||
pywebview
|
||||
];
|
||||
postFixup = ''
|
||||
wrapQtApp $out/bin/jellyfin-desktop
|
||||
wrapQtApp $out/bin/jellyfin-mpv-desktop
|
||||
'';
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "jellyfin_mpv_shim" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/iwalton3/jellyfin-mpv-shim";
|
||||
homepage = "https://github.com/jellyfin/jellyfin-desktop";
|
||||
description = "Allows casting of videos to MPV via the jellyfin mobile and web app";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ jojosch ];
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/setup.py b/setup.py
|
||||
index a831959..2206e6e 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -25,7 +25,6 @@ setup(
|
||||
entry_points={
|
||||
'console_scripts': [
|
||||
'jellyfin-mpv-shim=jellyfin_mpv_shim.mpv_shim:main',
|
||||
- 'jellyfin-mpv-desktop=jellyfin_mpv_shim.mpv_shim:main_desktop',
|
||||
]
|
||||
},
|
||||
classifiers=[
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/jellyfin_mpv_shim/conf.py b/jellyfin_mpv_shim/conf.py
|
||||
index 0ab9326..ccedc17 100644
|
||||
--- a/jellyfin_mpv_shim/conf.py
|
||||
+++ b/jellyfin_mpv_shim/conf.py
|
||||
@@ -88,8 +88,8 @@ class Settings(object):
|
||||
"sync_revert_seek": True,
|
||||
"sync_osd_message": True,
|
||||
"screenshot_menu": True,
|
||||
- "check_updates": True,
|
||||
- "notify_updates": True,
|
||||
+ "check_updates": False,
|
||||
+ "notify_updates": False,
|
||||
"lang": None,
|
||||
"desktop_scale": 1.0,
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jellyfin-mpv-shim-shader-pack";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iwalton3";
|
||||
repo = "default-shader-pack";
|
||||
rev = "v${version}";
|
||||
sha256 = "04y8gvjy4v3773b1kyan4dxqcf86b56x7v33m2k246jbn0rl2pgr";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -a . $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/iwalton3/default-shader-pack";
|
||||
description = "Preconfigured set of MPV shaders and configurations for MPV Shim media clients";
|
||||
license = with licenses; [ mit lgpl3Plus unlicense ];
|
||||
maintainers = with maintainers; [ jojosch ];
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub
|
||||
{ lib, stdenv, fetchzip
|
||||
# build tools
|
||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
|
||||
, cmake
|
||||
, gfortran, m4, makeWrapper, patchelf, perl, which, python2, cmake
|
||||
# libjulia dependencies
|
||||
, libunwind, readline, utf8proc, zlib
|
||||
# standard library dependencies
|
||||
@ -19,8 +18,8 @@ with lib;
|
||||
let
|
||||
majorVersion = "1";
|
||||
minorVersion = "5";
|
||||
maintenanceVersion = "3";
|
||||
src_sha256 = "sha256:0jds8lrhk4hfdv7dg5p2ibzin9ivga7wrx7zwcmz6dqp3x792n1i";
|
||||
maintenanceVersion = "4";
|
||||
src_sha256 = "1ba1v7hakgj95xvhyff0zcp0574qv6vailjl48wl1f8w5k54lsw2";
|
||||
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
|
||||
in
|
||||
|
||||
@ -28,10 +27,10 @@ stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||
sha256 = src_sha256;
|
||||
};
|
||||
src = fetchzip {
|
||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||
sha256 = src_sha256;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-system-utf8proc-julia-1.3.patch
|
||||
|
||||
22
pkgs/development/compilers/julia/update-1.5.py
Executable file
22
pkgs/development/compilers/julia/update-1.5.py
Executable file
@ -0,0 +1,22 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python3 -p python3 python3Packages.requests
|
||||
|
||||
import os
|
||||
import re
|
||||
import requests
|
||||
import subprocess
|
||||
|
||||
latest = requests.get("https://api.github.com/repos/JuliaLang/julia/releases/latest").json()["tag_name"]
|
||||
assert latest[0] == "v"
|
||||
major, minor, patch = latest[1:].split(".")
|
||||
assert major == "1"
|
||||
# When a new minor version comes out we'll have to refactor/copy this update script.
|
||||
assert minor == "5"
|
||||
|
||||
sha256 = subprocess.check_output(["nix-prefetch-url", "--unpack", f"https://github.com/JuliaLang/julia/releases/download/v{major}.{minor}.{patch}/julia-{major}.{minor}.{patch}-full.tar.gz"], text=True).strip()
|
||||
|
||||
nix_path = os.path.join(os.path.dirname(__file__), "1.5.nix")
|
||||
nix0 = open(nix_path, "r").read()
|
||||
nix1 = re.sub("maintenanceVersion = \".*\";", f"maintenanceVersion = \"{patch}\";", nix0)
|
||||
nix2 = re.sub("src_sha256 = \".*\";", f"src_sha256 = \"{sha256}\";", nix1)
|
||||
open(nix_path, "w").write(nix2)
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, fetchFromGitHub, callPackage, wrapCCWith }:
|
||||
|
||||
let
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "llvm-project";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-5mQ8tN7A045JCF7tHKgAZAbyVmXOd6Wf0CVUiPA80YM=";
|
||||
hash = "sha256-DlId/dF5r0ULl2omYPCyu1Ic3XKlLL7ndiCA0RaF264=";
|
||||
};
|
||||
in rec {
|
||||
clang = wrapCCWith rec {
|
||||
|
||||
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${llvm.src}" ];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput include "$dev"
|
||||
moveToOutput lib "$dev"
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocclr";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ROCm-Developer-Tools";
|
||||
repo = "ROCclr";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-B27ff1b9JRhxFUsBt7CGuYaR87hvKbVSCERWD45d8tM=";
|
||||
hash = "sha256-2DI/PL29aiZcxOrGZBzXwAnNgZQpSDjyyGKgl+vDErk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake rocm-cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-comgr";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-CompilerSupport";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-JMzXg1Hw0iWcTnKu/NgW7rD8iagp724F01GaJbrJj9M=";
|
||||
hash = "sha256-LbQqyJxRqb6vpXiYSkRlF1FeqXJJXktPafGmYDDK02U=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/lib/comgr";
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-device-libs";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-Device-Libs";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-IAE8T/gmotXO/ADH3bxTjrpxWd2lRoj3o/rrSaEFNNo=";
|
||||
hash = "sha256-9p6PIXdHFIgHgNWZzqVz5O9i2Np0z/iyxodG2cLrpGs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-opencl-runtime";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-OpenCL-Runtime";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-kW5jTDlQtXQ0i4ADJEnmESxjcLCt4QZCYJ1ouIsk4YE=";
|
||||
hash = "sha256-+6h1E5uWNKjjaeO5ZIi854CWYi0QGQ5mVUHdi9+4vX4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake rocm-cmake ];
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-runtime";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCR-Runtime";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-8hNb0Yo9ApedOG7xrUr5rwiA/YsqDTcyr6dBRg8lXro=";
|
||||
hash = "sha256-Jxg3n203tV0L+UrmeQEuzX0TKpFu5An2cnuEA/F/SNY=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-thunk";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCT-Thunk-Interface";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-2kLSlGwX3pD8I5pXwV5L0k9l8OzJRkUvnAqv5E+gcd4=";
|
||||
hash = "sha256-gdto7BbrSRa3UiRNvTW1KLkHyjrcxdah4+L+1Gdm0wA=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
# Enable BLAS interface with 64-bit integer width.
|
||||
, blas64 ? false
|
||||
|
||||
# Target architecture, use "zen" or "zen2", optimization for Zen and
|
||||
# other families is pretty much mutually exclusive in the AMD fork of
|
||||
# BLIS.
|
||||
, withArchitecture ? "zen"
|
||||
# Target architecture. "amd64" compiles kernels for all Zen
|
||||
# generations. To build kernels for specific Zen generations,
|
||||
# use "zen", "zen2", or "zen3".
|
||||
, withArchitecture ? "amd64"
|
||||
|
||||
# Enable OpenMP-based threading.
|
||||
, withOpenMP ? true
|
||||
@ -20,13 +20,13 @@ let
|
||||
blasIntSize = if blas64 then "64" else "32";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "amd-blis";
|
||||
version = "2.2";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amd";
|
||||
repo = "blis";
|
||||
rev = version;
|
||||
sha256 = "1b2f5bwi0gkw2ih2rb7wfzn3m9hgg7k270kg43rmzpr2acpy86xa";
|
||||
hash = "sha256-bbbeo1yOKse9pzbsB6lQ7pULKdzu3G7zJzTUgPXiMZY=";
|
||||
};
|
||||
|
||||
inherit blas64;
|
||||
@ -36,7 +36,10 @@ in stdenv.mkDerivation rec {
|
||||
python3
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Tests currently fail with non-Zen CPUs due to a floating point
|
||||
# exception in one of the generic kernels. Try to re-enable the
|
||||
# next release.
|
||||
doCheck = false;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -51,8 +54,8 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libblas.so.3
|
||||
ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libcblas.so.3
|
||||
ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libblas.so.3
|
||||
ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libcblas.so.3
|
||||
ln -s $out/lib/libblas.so.3 $out/lib/libblas.so
|
||||
ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so
|
||||
'';
|
||||
|
||||
@ -135,6 +135,7 @@
|
||||
, "json-refs"
|
||||
, "json-server"
|
||||
, "jsonlint"
|
||||
, "kaput-cli"
|
||||
, "karma"
|
||||
, "lcov-result-merger"
|
||||
, "leetcode-cli"
|
||||
|
||||
1973
pkgs/development/node-packages/node-packages.nix
generated
1973
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,24 +1,23 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, requests
|
||||
{ lib, buildPythonPackage, fetchPypi, requests
|
||||
, websocket_client, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jellyfin-apiclient-python";
|
||||
version = "1.6.1";
|
||||
version = "1.7.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iwalton3";
|
||||
repo = "jellyfin-apiclient-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0f7czq83ic22fz1vnf0cavb7l3grcxxd5yyw9wcjz3g1j2d76735";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests websocket_client ];
|
||||
|
||||
doCheck = false; # no tests
|
||||
pythonImportsCheck = [ "jellyfin_apiclient_python" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/iwalton3/jellyfin-apiclient-python";
|
||||
homepage = "https://github.com/jellyfin/jellyfin-apiclient-python";
|
||||
description = "Python API client for Jellyfin";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ jojosch ];
|
||||
|
||||
@ -1,36 +1,26 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, six
|
||||
, fetchpatch
|
||||
, icu
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyICU";
|
||||
version = "2.3.1";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ddb2b453853b4c25db382bc5e8c4cde09b3f4696ef1e1494f8294e174f459cf4";
|
||||
sha256 = "0wb3v421i2fnnxdywam4ay8hqvnxlz0r2nrpx5lqy3rn6dlbz9d9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/python-team/modules/pyicu/raw/debian/2.2-2/"
|
||||
+ "debian/patches/icu_test.patch";
|
||||
sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ icu ]; # for icu-config
|
||||
buildInputs = [ icu ];
|
||||
checkInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ six ];
|
||||
checkInputs = [ pytestCheckHook six ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pypi.python.org/pypi/PyICU/";
|
||||
homepage = "https://github.com/ovalhub/pyicu/";
|
||||
description = "Python extension wrapping the ICU C++ API";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -24,15 +24,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-miio";
|
||||
version = "0.5.5.1";
|
||||
|
||||
version = "0.5.5.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3IBObrytkn6rLUT+wMlwzreqQ4AfCgxiMTJm2Iwm+5E=";
|
||||
sha256 = "sha256-lk7egCyj+vSsaXmxuWxlQuom8n3JEs/RIWwCuwTOXeI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -66,10 +64,12 @@ buildPythonPackage rec {
|
||||
pyyaml
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "miio" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for interfacing with Xiaomi smart appliances";
|
||||
homepage = "https://github.com/rytilahti/python-miio";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ flyfloh ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-cmake";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "rocm-cmake";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-1T0S2GWA/ojRZMRyWgtFQ2rzmIqvMvaa19jI4Fl9R44=";
|
||||
hash = "sha256-uK060F7d7/pTCNbGqdKCzxgPrPPbGjNwuUOt176z7EM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -12,13 +12,14 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "crate2nix";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub
|
||||
{
|
||||
owner = "kolloch";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
|
||||
} + "/crate2nix";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kolloch";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/crate2nix";
|
||||
|
||||
cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik=";
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stagit";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.codemadness.org/stagit";
|
||||
rev = version;
|
||||
sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm";
|
||||
sha256 = "1wlx5k0v464fr1ifjv04v7ccwb559s54xpsbxdda4whyx1v0fbq4";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://git.codemadness.org/stagit/file/README.html";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jb55 ];
|
||||
maintainers = with maintainers; [ jb55 sikmir ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wrangler";
|
||||
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
|
||||
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security libiconv ];
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, lib, fetchurl, makeWrapper, python3, nixosTests }:
|
||||
{ stdenv, lib, fetchurl, makeWrapper, python3, unrar, ffmpeg, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bazarr";
|
||||
version = "0.9.0.8";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
|
||||
sha256 = "sha256-Ecbx7FHpcEkcWBAKCtZPtQKX5ibvU4tajSJ5pyEboKc=";
|
||||
sha256 = "16mh7v8z5ijr75pvavcj6225w6bg12qy1d1w9vm2d5axnfm3wfbk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
||||
makeWrapper "${(python3.withPackages (ps: [ps.lxml ps.numpy])).interpreter}" \
|
||||
$out/bin/bazarr \
|
||||
--add-flags "$out/src/bazarr.py" \
|
||||
--suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]} \
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Subtitle manager for Sonarr and Radarr";
|
||||
homepage = "https://www.bazarr.media/";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ xwvvvvwx ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, apacheHttpd }:
|
||||
|
||||
if lib.versionAtLeast (lib.getVersion apacheHttpd) "2.4" then
|
||||
|
||||
throw "mod_evasive is not supported on Apache httpd 2.4"
|
||||
|
||||
else
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mod_evasive-1.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz";
|
||||
sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07";
|
||||
};
|
||||
|
||||
buildInputs = [ apacheHttpd ];
|
||||
|
||||
buildPhase = ''
|
||||
export APACHE_LIBEXECDIR=$out/modules
|
||||
export makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
|
||||
apxs -ca mod_evasive20.c
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/modules
|
||||
cp .libs/mod_evasive20.so $out/modules
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.zdziarski.com/blog/?page_id=442";
|
||||
description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "procs";
|
||||
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern replacement for ps written in Rust";
|
||||
|
||||
@ -1,20 +1,21 @@
|
||||
{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }:
|
||||
{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "borgbackup";
|
||||
version = "1.1.15";
|
||||
version = "1.1.16";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9";
|
||||
sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools-scm
|
||||
# For building documentation:
|
||||
sphinx guzzle_sphinx_theme
|
||||
];
|
||||
buildInputs = [
|
||||
libb2 lz4 zstd openssl python3.pkgs.setuptools_scm
|
||||
libb2 lz4 zstd openssl
|
||||
] ++ lib.optionals stdenv.isLinux [ acl ];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
cython llfuse
|
||||
@ -24,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
export BORG_OPENSSL_PREFIX="${openssl.dev}"
|
||||
export BORG_LZ4_PREFIX="${lz4.dev}"
|
||||
export BORG_LIBB2_PREFIX="${libb2}"
|
||||
export BORG_LIBZSTD_PREFIX="${zstd}"
|
||||
export BORG_LIBZSTD_PREFIX="${zstd.dev}"
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
@ -61,6 +62,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# 64 failures, needs pytest-benchmark
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) borgbackup;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deduplicating archiver with compression and encryption";
|
||||
homepage = "https://www.borgbackup.org";
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ytfzf";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pystardust";
|
||||
repo = "ytfzf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ATQRXYaIp1MKCO/EAPsopzFEZeNJzdk73/OcgjsMdkg=";
|
||||
sha256 = "sha256-286rN3g6leSnbZZ0VjWl43nhBAMPJDUMv7DhgVTsjKw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
diff --git a/ytfzf b/ytfzf
|
||||
index 5238682..c5c3a1a 100755
|
||||
index f7871c7..179c836 100755
|
||||
--- a/ytfzf
|
||||
+++ b/ytfzf
|
||||
@@ -757,23 +757,8 @@ clear_history () {
|
||||
@@ -829,23 +829,8 @@ send_notify () {
|
||||
}
|
||||
|
||||
update_ytfzf () {
|
||||
- branch="$1"
|
||||
- updatefile="/tmp/ytfzf-update"
|
||||
- local branch="$1"
|
||||
- local updatefile="/tmp/ytfzf-update"
|
||||
- curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile"
|
||||
-
|
||||
- if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then
|
||||
@ -27,4 +27,4 @@ index 5238682..c5c3a1a 100755
|
||||
+ exit 1
|
||||
}
|
||||
|
||||
|
||||
scrape_subscriptions () {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sniffglue";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kpcyrd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0lkz25z0qy1giss4rnhkx9fvsdd8ckf4z1gqw46zl664x96bb705";
|
||||
sha256 = "sha256-bvLkeC5Hm1enaWJtYmnnINgpSO3tlg1SsEzeMSF9OXk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "01ya9535whi2kviw57f25n8h05ckpb4bq1h7qav6srai97rm937s";
|
||||
cargoSha256 = "sha256-BUo3Y2tLvhOrk2w2GzYeWKpXH7TAOEdBI6vVtW2/cCs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Secure multithreaded packet sniffer";
|
||||
homepage = "https://github.com/kpcyrd/sniffglue";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xrelkd ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -2,22 +2,23 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sops";
|
||||
version = "3.6.1";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "mozilla";
|
||||
repo = pname;
|
||||
sha256 = "0xl53rs8jzq5yz4wi0vzsr6ajsaf2x2n1h3x7krk02a9839y6f18";
|
||||
sha256 = "1a0v1jgbz8n3dymzr2shg2ms9sxjwaci209ldzq8v4g737v10zgm";
|
||||
};
|
||||
|
||||
vendorSha256 = "1cpm06dyc6lb3a9apfggyi16alb2yijvyan1gbrl8r9fwlqvdpjk";
|
||||
vendorSha256 = "1qaml2h3c8fhmi8ahp2fmd0hagqp5xqaf8jxjh4mfmbv2is3yz1l";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mozilla/sops";
|
||||
description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
|
||||
changelog = "https://github.com/mozilla/sops/raw/v${version}/CHANGELOG.rst";
|
||||
maintainers = [ maintainers.marsam ];
|
||||
license = licenses.mpl20;
|
||||
};
|
||||
|
||||
@ -1,23 +1,45 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, python3 }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-smi";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROC-smi";
|
||||
repo = "rocm_smi_lib";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-0QqaBMkqRVEl89x3hvWQGAgt7LbtMZPhuf7KenQYHaQ=";
|
||||
hash = "sha256-LEaC1XhmyoVWrpL05MhgN02LVT2rLKdnw9g2QdfM/uE=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
postPatch = ''
|
||||
# Upstream ROCm is installed in an /opt directory. For this reason,
|
||||
# it does not completely follow FHS layout, creating top-level
|
||||
# rocm_smi, oam, and bindings top-level directories. Since rocm-smi
|
||||
# is a package that is typically installed, we change the paths to
|
||||
# follow FHS more closely.
|
||||
|
||||
installPhase = ''
|
||||
install -Dm0755 rocm_smi.py $out/bin/rocm-smi
|
||||
# rocm_smi libraries and headers go into lib and include. Bindings
|
||||
# go into lib/rocm_smi/bindings.
|
||||
substituteInPlace rocm_smi/CMakeLists.txt \
|
||||
--replace "DESTINATION rocm_smi/" "DESTINATION " \
|
||||
--replace "DESTINATION bindings" "DESTINATION lib/rocm_smi/bindings" \
|
||||
--replace "../rocm_smi/bindings/rsmiBindings.py" "../lib/rocm_smi/bindings/rsmiBindings.py" \
|
||||
--replace 'DESTINATION ''${ROCM_SMI}/' "DESTINATION "
|
||||
|
||||
# oam libraries and headers go into lib and include.
|
||||
substituteInPlace oam/CMakeLists.txt \
|
||||
--replace "DESTINATION oam/" "DESTINATION " \
|
||||
--replace 'DESTINATION ''${OAM_NAME}/' "DESTINATION "
|
||||
|
||||
# Update relative path to librocm_smi64 in the Python binding.
|
||||
substituteInPlace python_smi_tools/rsmiBindings.py \
|
||||
--replace "/../lib/librocm_smi64.so" "/../../librocm_smi64.so"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapPythonProgramsIn $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -25,6 +47,6 @@ buildPythonApplication rec {
|
||||
homepage = "https://github.com/RadeonOpenCompute/ROC-smi";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2836,6 +2836,7 @@ in
|
||||
|
||||
procs = callPackage ../tools/admin/procs {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin) libiconv;
|
||||
};
|
||||
|
||||
psrecord = python3Packages.callPackage ../tools/misc/psrecord {};
|
||||
@ -4033,6 +4034,7 @@ in
|
||||
|
||||
wrangler = callPackage ../development/tools/wrangler {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
|
||||
inherit (darwin) libiconv;
|
||||
};
|
||||
|
||||
wsl-open = callPackage ../tools/misc/wsl-open { };
|
||||
@ -18001,7 +18003,7 @@ in
|
||||
|
||||
mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { };
|
||||
|
||||
mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { };
|
||||
mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4";
|
||||
|
||||
mod_perl = callPackage ../servers/http/apache-modules/mod_perl { };
|
||||
|
||||
@ -18020,7 +18022,7 @@ in
|
||||
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
|
||||
};
|
||||
|
||||
apacheHttpdPackages_2_4 = dontRecurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
|
||||
apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
|
||||
apacheHttpdPackages = apacheHttpdPackages_2_4;
|
||||
|
||||
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user