Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
956b399ffa
|
|
@ -1,4 +1,5 @@
|
|||
#! @runtimeShell@ -e
|
||||
# shellcheck shell=bash
|
||||
|
||||
# Shows the usage of this command to the user
|
||||
|
||||
|
|
@ -29,12 +30,12 @@ while [ $# -gt 0 ]; do
|
|||
nixBuildArgs+=("--option" "$1" "$2"); shift
|
||||
;;
|
||||
*)
|
||||
if [ ! -z "$networkExpr" ]; then
|
||||
if [ -n "$networkExpr" ]; then
|
||||
echo "Network expression already set!"
|
||||
showUsage
|
||||
exit 1
|
||||
fi
|
||||
networkExpr="$(readlink -f $1)"
|
||||
networkExpr="$(readlink -f "$1")"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -49,4 +50,4 @@ fi
|
|||
|
||||
# Build a network of VMs
|
||||
nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
|
||||
--argstr networkExpr $networkExpr "${nixBuildArgs[@]}"
|
||||
--argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#! @runtimeShell@
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -e
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#! @runtimeShell@
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -e
|
||||
shopt -s nullglob
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#! @runtimeShell@
|
||||
# shellcheck shell=bash
|
||||
|
||||
case "$1" in
|
||||
-h|--help)
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ let
|
|||
sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2021.1.1.16"; # "Android Studio Bumblebee (2021.1.1) Beta 3"
|
||||
sha256Hash = "pgmBWzq/5RHJTc41kzB43tbsjvrWx9BJ7UKsR8AO0V4=";
|
||||
version = "2021.1.1.17"; # "Android Studio Bumblebee (2021.1.1) Beta 4"
|
||||
sha256Hash = "5WLUgCmdrK0PArc4eQQTNbEokq4DReKRwsZOWKb+Td4=";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "2021.2.1.3"; # "Android Studio Chipmunk (2021.2.1) Canary 3"
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "stretchly";
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
|
||||
sha256 = "sha256-F6p+g0yuDMpNq+cVgA3ZhUwCIiIU1QfYM90lmaNnRWw=";
|
||||
sha256 = "sha256-/v74vDGxD5iiOPeBXPAaV42JpyBjeJSO/Lk88pCkDng=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/${pname}/
|
||||
mv resources/app.asar $out/share/${pname}/
|
||||
mv resources/app.asar* $out/share/${pname}/
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://hovancik.net/stretchly";
|
||||
downloadPage = "https://hovancik.net/stretchly/downloads/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ _1000101 ];
|
||||
maintainers = with maintainers; [ _1000101 oxalica ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,11 +93,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.31.91";
|
||||
version = "1.32.113";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "LuzflA96UQehLHUVYdPDTXs+YuFLEkpzTdO2liGrWtE=";
|
||||
sha256 = "PucDKfNPwos5LKzftdXR9Hkkf1UDzHULgyFIdjPiI4g=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@ let
|
|||
maintainers = with maintainers; [ fliegendewurst ];
|
||||
};
|
||||
|
||||
version = "0.48.6";
|
||||
version = "0.48.7";
|
||||
|
||||
desktopSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
sha256 = "1n7gm6mwzf5yyk8cpn70029p1iiv26bypyfi42sx14yyjvlny4rm";
|
||||
sha256 = "16clrn89mq2n30hb50y45s6qn5l7n1hj4b124wjxrkmmwpdbjwad";
|
||||
};
|
||||
|
||||
serverSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||
sha256 = "0z7cbw11mqf2mfv6ixnczg2i4jcdpvryzl0521ai26gq42jyyy0r";
|
||||
sha256 = "18zwplcai4s82pdy3l30862jdl22311qh78anrjz29fm6srx1y9l";
|
||||
};
|
||||
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
/*
|
||||
This derivation is impure: it relies on an Xcode toolchain being installed
|
||||
|
|
@ -8,15 +8,15 @@
|
|||
option set to `relaxed` or `false`.
|
||||
*/
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iterm2";
|
||||
version = "3.4.0";
|
||||
version = "3.4.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnachman";
|
||||
repo = "iTerm2";
|
||||
rev = "v${version}";
|
||||
sha256 = "09nhrmi25zxw3vp0wlib9kjr3p1j6am2zpwimdzqn0c80fq1lwvi";
|
||||
sha256 = "sha256-GOUdXBQCvM0oJ2/3zgKqDpfyCkHNwd1Qdopg5Mpyekg=";
|
||||
};
|
||||
|
||||
patches = [ ./disable_updates.patch ];
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cagebreak";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-repo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-tWfHJajAOYZJ73GckZWWTdVz75YmHA7t/qDhM7+tJgk=";
|
||||
hash = "sha256-YaLGRlvppTUCSHFlt3sEfHgN3pYHuc5oGt3dt0DDw3I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -63,14 +63,12 @@ stdenv.mkDerivation rec {
|
|||
"-Dxwayland=${lib.boolToString withXwayland}"
|
||||
];
|
||||
|
||||
# TODO: investigate why is this happening
|
||||
postPatch = ''
|
||||
# TODO: investigate why is this happening
|
||||
sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -d $out/share/cagebreak/
|
||||
install -m644 $src/examples/config $out/share/cagebreak/
|
||||
# Patch cagebreak to read its default configuration from $out/share/cagebreak
|
||||
sed -i "s|/etc/xdg/cagebreak|$out/share/cagebreak|" meson.build cagebreak.c
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString withXwayland ''
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
, meson
|
||||
, ninja
|
||||
, packagekit
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
, gnome-menus
|
||||
, libgee
|
||||
, wrapGAppsHook
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, granite
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = with lib; {
|
||||
description = "Photo viewer and organizer designed for elementary OS";
|
||||
homepage = "https://github.com/elementary/photos";
|
||||
license = licenses.lgpl21Plus;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, desktop-file-utils
|
||||
, nix-update-script
|
||||
, elementary-gtk-theme
|
||||
|
|
@ -13,7 +14,6 @@
|
|||
, libhandy
|
||||
, meson
|
||||
, ninja
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, substituteAll
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Networking Plug";
|
||||
homepage = "https://github.com/elementary/switchboard-plug-network";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,42 +1,30 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, libgee
|
||||
, evolution-data-server
|
||||
, glib
|
||||
, granite
|
||||
, gtk3
|
||||
, libaccounts-glib
|
||||
, libgdata
|
||||
, libhandy
|
||||
, libsignon-glib
|
||||
, json-glib
|
||||
, librest
|
||||
, webkitgtk
|
||||
, libsoup
|
||||
, sqlite
|
||||
, switchboard
|
||||
, evolution-data-server
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-onlineaccounts";
|
||||
version = "6.2.1";
|
||||
version = "6.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1q3f7zr04p2100mb255zy38il2i47l6vqdc9a9acjbk3n7q5sf92";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-L1SL8YbsYKdE+mvRW/fxjNoiyXRXTyV2ru7/tZzgTfM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -48,23 +36,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
evolution-data-server
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
json-glib
|
||||
libaccounts-glib
|
||||
libgdata
|
||||
libgee
|
||||
libhandy
|
||||
libsignon-glib
|
||||
libsoup
|
||||
librest
|
||||
sqlite # needed for camel-1.2
|
||||
switchboard
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers";
|
||||
PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services";
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Online Accounts Plug";
|
||||
|
|
@ -73,5 +58,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pantheon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, nixos-artwork
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, linkFarm
|
||||
, substituteAll
|
||||
, elementary-greeter
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, fetchpatch
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, desktop-file-utils
|
||||
, pkg-config
|
||||
, writeScript
|
||||
, pantheon
|
||||
, gnome-keyring
|
||||
, gnome-session
|
||||
, wingpanel
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, file-roller
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
, fetchpatch
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, gnome
|
||||
, pkg-config
|
||||
, meson
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, wrapGAppsHook
|
||||
, pkg-config
|
||||
, meson
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
, vala
|
||||
, pkg-config
|
||||
, libgee
|
||||
, pantheon
|
||||
, gtk3
|
||||
, glib
|
||||
, gettext
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -10,7 +11,6 @@
|
|||
, libgee
|
||||
, libhandy
|
||||
, libcanberra-gtk3
|
||||
, pantheon
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
geoclue2
|
||||
gtk3
|
||||
libgee
|
||||
];
|
||||
];
|
||||
|
||||
# This should be provided by a post_install.py script - See -> https://github.com/elementary/pantheon-agent-geoclue2/pull/21
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ stdenv.mkDerivation rec {
|
|||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://golang.org/";
|
||||
homepage = "https://go.dev/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members;
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ stdenv.mkDerivation rec {
|
|||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://golang.org/";
|
||||
homepage = "https://go.dev/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members;
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ stdenv.mkDerivation rec {
|
|||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://golang.org/";
|
||||
homepage = "https://go.dev/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members;
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ stdenv.mkDerivation rec {
|
|||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://golang.org/";
|
||||
homepage = "https://go.dev/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members ++ [ maintainers._3noch ];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
name = "go-${version}-${platform}-bootstrap";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://golang.org/dl/go${version}.${platform}.tar.gz";
|
||||
url = "https://go.dev/dl/go${version}.${platform}.tar.gz";
|
||||
sha256 = hashes.${platform} or (throw "Missing Go bootstrap hash for platform ${platform}");
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
BASEURL=https://golang.org/dl/
|
||||
BASEURL=https://go.dev/dl/
|
||||
VERSION=${1:-}
|
||||
|
||||
if [[ -z $VERSION ]]
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.66.0";
|
||||
version = "1.67.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-IhA6mk7s6AdONRpvQ5UgNbPJ+/k9hzCf2ochCVcy7NA=";
|
||||
hash = "sha256-zb/U3JmGRqni45BOqNd+UTJzQuODx6IBBbmZWFZmSY4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-F9JpGtQ7lwqguoZrzQR/faUOJxDCbW74JenPCFeEHdA=";
|
||||
hash = "sha256-2QGC7pCH8MWhDDVKrQ6b/EU9cuJWSZHgYSWaXYPYDiw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
|
||||
, glib, isocodes, gobject-introspection }:
|
||||
, glib, isocodes, gobject-introspection
|
||||
, withDoc ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxklavier";
|
||||
|
|
@ -13,14 +15,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./honor-XKB_CONFIG_ROOT.patch ];
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals withDoc [ "devdoc" ];
|
||||
|
||||
# TODO: enable xmodmap support, needs xmodmap DB
|
||||
propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl ];
|
||||
|
||||
buildInputs = [ gobject-introspection ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc docbook_xsl gobject-introspection ];
|
||||
|
||||
preAutoreconf = ''
|
||||
export NOCONFIGURE=1
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
"--with-xkb-base=${xkeyboard_config}/etc/X11/xkb"
|
||||
"--with-xkb-bin-base=${xorg.xkbcomp}/bin"
|
||||
"--disable-xmodmap-support"
|
||||
"--enable-gtk-doc"
|
||||
"${if withDoc then "--enable-gtk-doc" else "--disable-gtk-doc"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-plugins";
|
||||
version = "6.0.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shlevy";
|
||||
repo = "nix-plugins";
|
||||
rev = version;
|
||||
sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv";
|
||||
hash = "sha256-Zz8cPHK4w0qimYu6III6XfiKVQIzEMMV9P6ER5fveZY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, pillow
|
||||
, scikitimage
|
||||
, scipy
|
||||
, tensorflow_2
|
||||
, tensorflow
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
pillow
|
||||
scikitimage
|
||||
scipy
|
||||
tensorflow_2 # Keras only supports tensorflow 2 now
|
||||
tensorflow
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, aiohttp
|
||||
, netifaces
|
||||
, asynctest
|
||||
|
|
@ -12,6 +13,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "python-izone";
|
||||
version = "1.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
|
|
@ -33,10 +35,21 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pizone" ];
|
||||
patches = [
|
||||
# async_timeout 4.0.0 removes current_task, https://github.com/Swamp-Ig/pizone/pull/15
|
||||
(fetchpatch {
|
||||
name = "remove-current-task.patch";
|
||||
url = "https://github.com/Swamp-Ig/pizone/commit/988998cf009a39938e4ee37079337b0c187977f2.patch";
|
||||
sha256 = "nVCQBMc4ZE7CQsYC986wqvPPyA7zJ/g278jJrpaiAIw=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pizone"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A python interface to the iZone airconditioner controller";
|
||||
description = "Python interface to the iZone airconditioner controller";
|
||||
homepage = "https://github.com/Swamp-Ig/pizone";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
|
|
|
|||
28
pkgs/development/python-modules/rnginline/default.nix
Normal file
28
pkgs/development/python-modules/rnginline/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, lxml, docopt, six, pytestCheckHook, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rnginline";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-j4W4zwHA4yA6iAFVa/LDKp00eeCX3PbmWkjd2LSUGfk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lxml docopt six ];
|
||||
|
||||
checkInputs = [ pytestCheckHook mock ];
|
||||
|
||||
# Those tests does not succeed, a test dependency is likely missing but nothing is specified upstream
|
||||
disabledTestPaths = [
|
||||
"rnginline/test/test_cmdline.py"
|
||||
"rnginline/test/test_rnginline.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A Python library and command-line tool for loading multi-file RELAX NG schemas from arbitary URLs, and flattening them into a single RELAX NG schema";
|
||||
homepage = "https://github.com/h4l/rnginline";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.lesuisse ];
|
||||
};
|
||||
}
|
||||
|
|
@ -17,8 +17,8 @@
|
|||
, wheel
|
||||
, opt-einsum
|
||||
, backports_weakref
|
||||
, tensorflow-estimator_2
|
||||
, tensorflow-tensorboard_2
|
||||
, tensorflow-estimator
|
||||
, tensorflow-tensorboard
|
||||
, cudaSupport ? false
|
||||
, cudatoolkit
|
||||
, cudnn
|
||||
|
|
@ -70,8 +70,8 @@ in buildPythonPackage {
|
|||
opt-einsum
|
||||
google-pasta
|
||||
wrapt
|
||||
tensorflow-estimator_2
|
||||
tensorflow-tensorboard_2
|
||||
tensorflow-estimator
|
||||
tensorflow-tensorboard
|
||||
keras-applications
|
||||
keras-preprocessing
|
||||
h5py
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
# Python deps
|
||||
, buildPythonPackage, pythonOlder, python
|
||||
# Python libraries
|
||||
, numpy, tensorflow-tensorboard_2, absl-py
|
||||
, numpy, tensorflow-tensorboard, absl-py
|
||||
, setuptools, wheel, Keras, keras-preprocessing, google-pasta
|
||||
, opt-einsum, astunparse, h5py
|
||||
, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2
|
||||
, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator
|
||||
, dill, flatbuffers-python, tblib, typing-extensions
|
||||
# Common deps
|
||||
, git, pybind11, which, binutils, glibcLocales, cython, perl
|
||||
|
|
@ -94,8 +94,8 @@ let
|
|||
setuptools
|
||||
six
|
||||
tblib
|
||||
tensorflow-estimator_2
|
||||
tensorflow-tensorboard_2
|
||||
tensorflow-estimator
|
||||
tensorflow-tensorboard
|
||||
termcolor
|
||||
typing-extensions
|
||||
wheel
|
||||
|
|
@ -457,12 +457,12 @@ in buildPythonPackage {
|
|||
protobuf
|
||||
six
|
||||
tblib
|
||||
tensorflow-estimator_2
|
||||
tensorflow-estimator
|
||||
termcolor
|
||||
typing-extensions
|
||||
wrapt
|
||||
] ++ lib.optionals withTensorboard [
|
||||
tensorflow-tensorboard_2
|
||||
tensorflow-tensorboard
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bunyan-rs";
|
||||
version = "0.1.2";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LukeMathWalker";
|
||||
repo = "bunyan";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Rj0VoJMcl8UBuVNu88FwTNF1GBx8IEXxwLL8sGz9kVM=";
|
||||
sha256 = "sha256-oMk17twYfN8BwSfdG59uPOUoHNh7WLUEgIDoWTG15Yw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-UZAiXLbRhr2J7QFf7x+JbEjc6p2AoVHYMgyARuwaB7E=";
|
||||
cargoSha256 = "sha256-nzUFdpRdIVExV8OBdk/LEefj6O/L7yhj4eCpqU5WAJg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)";
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-1.1.45.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.48.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "1gqf8p253qwlsg66fzh6nb264ckmg2wrrvg7grcxxniki7whd759",
|
||||
"sha256": "1j26rrllmbk535xspqp3czl19ijbvyglxfa0ivpmw4wj2cm6796n",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.45/alpha/linux64",
|
||||
"version": "1.1.45"
|
||||
"url": "https://factorio.com/get-download/1.1.48/alpha/linux64",
|
||||
"version": "1.1.48"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.1.46.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.48.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "sha256-ikvtD5X0WRBVMsByXLXC5jtVZeIFQIsWlZ9vzomYdGU=",
|
||||
"sha256": "1j26rrllmbk535xspqp3czl19ijbvyglxfa0ivpmw4wj2cm6796n",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.46/alpha/linux64",
|
||||
"version": "1.1.46"
|
||||
"url": "https://factorio.com/get-download/1.1.48/alpha/linux64",
|
||||
"version": "1.1.48"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
|
|
@ -30,20 +30,20 @@
|
|||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-1.1.45.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.48.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "1ga35yricj5k2b00hwyb7jgpa0c4v73q3lj9sn424rjxixy6naxf",
|
||||
"sha256": "0hipzxaj322y4g1if44p818f7f5zmhg831xw6ahxnqg5g8kvf19y",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.45/headless/linux64",
|
||||
"version": "1.1.45"
|
||||
"url": "https://factorio.com/get-download/1.1.48/headless/linux64",
|
||||
"version": "1.1.48"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.1.46.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.48.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "sha256-xJ/NBwQR6tdwoAz/1RZmcGwutqETWgzyAlpg5ls2ba0=",
|
||||
"sha256": "0hipzxaj322y4g1if44p818f7f5zmhg831xw6ahxnqg5g8kvf19y",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.46/headless/linux64",
|
||||
"version": "1.1.46"
|
||||
"url": "https://factorio.com/get-download/1.1.48/headless/linux64",
|
||||
"version": "1.1.48"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.15.2";
|
||||
version = "5.15.4";
|
||||
release = "1";
|
||||
suffix = "xanmod${release}-tt";
|
||||
in
|
||||
|
|
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
|||
owner = "xanmod";
|
||||
repo = "linux";
|
||||
rev = modDirVersion;
|
||||
sha256 = "sha256-3tIwj+4xf/I5srEAqECbfH343J5nzCWViq1ZnidZI24=";
|
||||
sha256 = "sha256-N/Gvlc5lYSH77nz30cOrtIk1CVu112fv4aOKmfT25XM=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
|
|
|
|||
|
|
@ -29,14 +29,14 @@ let
|
|||
php80-unit = php80.override phpConfig;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
pname = "unit";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nginx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8Xv7YTvwuI0evBO1Te4oI1IoJ0AnK8OVZoZTYtfYKfw=";
|
||||
sha256 = "sha256-nh49Uz9iM5UbAfERUVGpR7ExuwJBgYC/CQk/QwjexqY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
INSTALL_PATH="${placeholder "out"}/share/fzf-tab";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zsh-fzf-tab";
|
||||
version = "unstable-2021-08-05";
|
||||
version = "unstable-2021-11-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aloxaf";
|
||||
repo = "fzf-tab";
|
||||
rev = "89a33154707c09789177a893e5a8ebbb131d5d3d";
|
||||
sha256 = "1g8011ldrghbw5ibchsp0p93r31cwyx2r1z5xplksd779jw79wdx";
|
||||
rev = "190500bf1de6a89416e2a74470d3b5cceab102ba";
|
||||
sha256 = "1dipsy0s67fr47ig5559bcp1h5yn8rdjshhs8zsq7j8plvvh99qb";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xob";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "florentc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0jbj61adwrpscfaadjman4hbyxhxv3ac8b4d88d623samx6kbvkk";
|
||||
sha256 = "1x4aafiyd9k4y8cmvn7rgfif3g5s5hhlbj5nz71qsyqg21nn7hrw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ xorg.libX11 libconfig ];
|
||||
buildInputs = [ xorg.libX11 xorg.libXrender libconfig ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
|
|
@ -20,16 +20,16 @@ stdenv.mkDerivation rec {
|
|||
description = "A lightweight overlay bar for the X Window System";
|
||||
longDescription = ''
|
||||
A lightweight configurable overlay volume/backlight/progress/anything bar
|
||||
for the X Window System. Each time a new value is read on the standard
|
||||
input, it is displayed as a tv-like bar over other windows. It then
|
||||
vanishes after a configurable amount of time. A value followed by a bang
|
||||
'!' is displayed using an alternate color to account for special states
|
||||
(e.g. muted audio). There is also support for overflows (when the value
|
||||
exceeds the maximum).
|
||||
for the X Window System (and Wayland compositors with XWayland). Each
|
||||
time a new value is read on the standard input, it is displayed as a
|
||||
tv-like bar over other windows. It then vanishes after a configurable
|
||||
amount of time. A value followed by a bang '!' is displayed using an
|
||||
alternate color to account for special states (e.g. muted audio). There
|
||||
is also support for overflows (when the value exceeds the maximum).
|
||||
'';
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ florentc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +1,32 @@
|
|||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "365.0.0";
|
||||
version = "365.0.1";
|
||||
googleCloudSdkPkgs = {
|
||||
x86_64-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-linux-x86_64.tar.gz";
|
||||
sha256 = "1h1z2ddhgrc74gnfaicvginl2yy7zjx8dlvkx017vsd3vijavl41";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.1-linux-x86_64.tar.gz";
|
||||
sha256 = "1c0gwc446y2r8hq8gyx9nwrma5y61nkfy5mc30jqr1kslvdkq00p";
|
||||
};
|
||||
x86_64-darwin =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-darwin-x86_64.tar.gz";
|
||||
sha256 = "0428pc85jlwsydn5nl7vya3rsbiww8z2jvc68wy1sdk7a1md01cy";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.1-darwin-x86_64.tar.gz";
|
||||
sha256 = "00nrwklm2cxyzrsqa9hidljqcd5w2gbyxwhyfsjzrdmr9qks7s2a";
|
||||
};
|
||||
aarch64-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-linux-arm.tar.gz";
|
||||
sha256 = "0ji29kd6cfyl59vlms77bnlqf95yh86g9c08wkx1f1kdavi78l0d";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.1-linux-arm.tar.gz";
|
||||
sha256 = "0sr8cp3pjz6i7yf2zb178r160hc2krk6qn37plhsqj16bqw8vs7v";
|
||||
};
|
||||
aarch64-darwin =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-darwin-arm.tar.gz";
|
||||
sha256 = "1rg996y4r24aif5vv6cnl3g7g6fknz8zv6m87ayl8x7yljrqcy27";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.1-darwin-arm.tar.gz";
|
||||
sha256 = "0pkdvhlab1rsja6jz68pnkw3w4rbiv3wh3si3w0lj1kkjzjr2rb3";
|
||||
};
|
||||
i686-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-linux-x86.tar.gz";
|
||||
sha256 = "0jvcridqlk2r5m6b22ldxi9g4mxfy120428ynw9rgpwx0chjmpi6";
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.1-linux-x86.tar.gz";
|
||||
sha256 = "1kqn15akwlqxybrhy4drkfsz5nj3grvmyifv8ffmv4wjc53m9www";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou
|
|||
|
||||
# Version of Google Cloud SDK from
|
||||
# https://cloud.google.com/sdk/docs/release-notes
|
||||
VERSION="365.0.0"
|
||||
VERSION="365.0.1"
|
||||
|
||||
function genMainSrc() {
|
||||
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
|
||||
|
|
|
|||
26
pkgs/tools/filesystems/httpdirfs/default.nix
Normal file
26
pkgs/tools/filesystems/httpdirfs/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, curl, expat, fuse, gumbo, libuuid }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "httpdirfs";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fangfufu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-rdeBlAV3t/si9x488tirUGLZRYAxh13zdRIQe0OPd+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ curl expat fuse gumbo libuuid ];
|
||||
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A FUSE filesystem for HTTP directory listings";
|
||||
homepage = "https://github.com/fangfufu/httpdirfs";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ sbruder schnusch ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue