Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
e15ff925b0
39 changed files with 377 additions and 245 deletions
|
|
@ -1,18 +1,17 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "mop";
|
||||
version = "0.2.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mop-tracker";
|
||||
repo = "mop";
|
||||
rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
|
||||
sha256 = "sha256-fX7G4M3gfv31Eb2HChTY4RfVF2U92000U4ZnFNML5X4=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oe8RG8E7xcp3ZqdDXYvpOVF3AfeSBFMherHD1YYFE/M=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/michaeldv/mop";
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-kLQH7mMmBSsS9av+KnnEuBwiH6hzBOSozrn+1X+8774=";
|
||||
|
||||
preConfigure = ''
|
||||
for i in *.go **/*.go; do
|
||||
|
|
@ -24,7 +23,7 @@ buildGoPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Simple stock tracker implemented in go";
|
||||
homepage = "https://github.com/mop-tracker/mop";
|
||||
homepage = "https://github.com/mop-tracker/mop";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
11
pkgs/applications/misc/mop/deps.nix
generated
11
pkgs/applications/misc/mop/deps.nix
generated
|
|
@ -1,11 +0,0 @@
|
|||
[
|
||||
{
|
||||
goPackagePath = "github.com/nsf/termbox-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/nsf/termbox-go";
|
||||
rev = "9aecf65084a5754f12d27508fa2e6ed56851953b";
|
||||
sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "driftctl";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snyk";
|
||||
repo = "driftctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cwI27hAfnSKT7P2rfM86tRtSKRR9bruRV9w440uGLIU=";
|
||||
sha256 = "sha256-C+3eXdSU4FdJVlFvZw8LH768Yx6xvlElV1wsKgoju4o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E=";
|
||||
vendorSha256 = "sha256-verxBwk83Xgg3XEMZpOXD3j3IgE7G4rHWJTj09BW74g=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "obs-studio";
|
||||
version = "27.2.1";
|
||||
version = "27.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obsproject";
|
||||
repo = "obs-studio";
|
||||
rev = version;
|
||||
sha256 = "sha256-RHPzSw7wjnAHk90N7g53LyIH3ozO/hyZV5hVZpZe+Ow=";
|
||||
sha256 = "sha256-iZekhsqvtlMeKX2bQ+w/womkOTDLbbP0MmoTzbvpNtU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gi-docgen
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, gnome
|
||||
, desktop-file-utils
|
||||
, appstream-glib
|
||||
|
|
@ -17,34 +15,20 @@
|
|||
, glib
|
||||
, atk
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghex";
|
||||
version = "4.beta.1";
|
||||
version = "42.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sBS/9cY++uHLGCbLeex8ZW697JJn3dK+HaM6tHBdwJ4=";
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Ly11VO8SimxoAJ2YY5TiBMMWeMU+HUpAnyGQmNS/ybs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with -Werror=format-security
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/3d35359f3a12b6abb4a3d8a12a0f39b7221be408.patch";
|
||||
sha256 = "4z9nUd+/eBOUGwl3MErse+FKLzGqtWKwkIzej57CnYk=";
|
||||
})
|
||||
# Build devhelp index.
|
||||
# https://gitlab.gnome.org/GNOME/ghex/-/merge_requests/25
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/b26a7b1135ea2fe956a9bc0669b3b6ed818716c3.patch";
|
||||
sha256 = "nYjjxds9GNWkW/RhXEe5zJzPF4TnLMsCELEqYR4dXTk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
|
|
@ -53,9 +37,8 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
gi-docgen
|
||||
python3
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -71,13 +54,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# mremap does not exist on darwin
|
||||
"-Dmmap-buffer-backend=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-connections";
|
||||
version = "42.0";
|
||||
version = "42.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-L3s5u0OPS2oM3Jn2JjGpXbI+W7JC7Gg5pMlQKchwJO0=";
|
||||
hash = "sha256-owbNw637XJd8nVJs3hhbQ0Acs6XPihpz5ek3TqFxxAk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,28 +1,78 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
|
||||
, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, desktop-file-utils
|
||||
, itstool
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, gtk3
|
||||
, libgtop
|
||||
, dnsutils
|
||||
, iputils
|
||||
, nmap
|
||||
, inetutils
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-nettool";
|
||||
version = "3.8.1";
|
||||
version = "42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "pU8p7vIDiu5pVRyLGcpPdY5eueIJCkvGtWM9/wGIdR8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
gtk3 wrapGAppsHook libgtop intltool itstool libxml2
|
||||
gnome.adwaita-icon-theme
|
||||
patches = [
|
||||
# Fix build with meson 0.61
|
||||
# https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-nettool/-/commit/1124c3e1fdb8472d30b7636500229aa16cdc1244.patch";
|
||||
sha256 = "fbpfL8Xb1GsadpQzAdmu8FSPs++bsGCVdcwnzQWttGY=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ nmap inetutils ];
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
itstool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libgtop
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x postinstall.py
|
||||
patchShebangs postinstall.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : "${lib.makeBinPath [
|
||||
dnsutils # for dig
|
||||
iputils # for ping
|
||||
nmap # for nmap
|
||||
inetutils # for ping6, traceroute, whois
|
||||
]}"
|
||||
)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
versionPolicy = "none";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -30,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool";
|
||||
description = "A collection of networking tools";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -143,9 +143,21 @@
|
|||
]
|
||||
},
|
||||
"42": {
|
||||
"applications-menu": [
|
||||
"apps-menu@gnome-shell-extensions.gcampax.github.com",
|
||||
"Applications_Menu@rmy.pobox.com"
|
||||
],
|
||||
"workspace-indicator": [
|
||||
"workspace-indicator@gnome-shell-extensions.gcampax.github.com",
|
||||
"horizontal-workspace-indicator@tty2.io"
|
||||
],
|
||||
"lock-keys": [
|
||||
"lockkeys@vaina.lt",
|
||||
"lockkeys@fawtytoo"
|
||||
],
|
||||
"wireguard-indicator": [
|
||||
"wireguard-indicator@gregos.me",
|
||||
"wireguard-indicator@atareao.es"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,15 @@
|
|||
# - Make a separate section for each GNOME version. Collisions will come back eventually
|
||||
# as the extensions are updated.
|
||||
{
|
||||
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
|
||||
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
|
||||
|
||||
"lockkeys@vaina.lt" = "lock-keys";
|
||||
"lockkeys@fawtytoo" = "lock-keys-2";
|
||||
|
||||
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
|
||||
"wireguard-indicator@atareao.es" = "wireguard-indicator";
|
||||
|
||||
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
|
||||
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
|
||||
|
||||
|
|
@ -15,24 +24,15 @@
|
|||
|
||||
# ####### GNOME 41 #######
|
||||
|
||||
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
|
||||
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
|
||||
|
||||
"floatingDock@sun.wxg@gmail.com" = "floating-dock-2";
|
||||
"floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock";
|
||||
|
||||
"lockkeys@vaina.lt" = "lock-keys";
|
||||
"lockkeys@fawtytoo" = "lock-keys-2";
|
||||
|
||||
"unredirect@vaina.lt" = "disable-unredirect-fullscreen-windows";
|
||||
"unredirect@aunetx" = "disable-unredirect-fullscreen-windows-2";
|
||||
|
||||
"fuzzy-clock@keepawayfromfire.co.uk" = "fuzzy-clock-2";
|
||||
"FuzzyClock@johngoetz" = "fuzzy-clock";
|
||||
|
||||
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
|
||||
"wireguard-indicator@atareao.es" = "wireguard-indicator";
|
||||
|
||||
# At the moment, ShutdownTimer@deminder is a fork of ShutdownTimer@neumann which adds new features
|
||||
# there seem to be upstream plans, so this should be checked periodically:
|
||||
# https://github.com/Deminder/ShutdownTimer https://github.com/neumann-d/ShutdownTimer/pull/46
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -192,6 +192,15 @@ stdenv.mkDerivation (rec {
|
|||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";
|
||||
sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
|
||||
})
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
|
||||
# Prevent the paths module from emitting symbols that we don't use
|
||||
# when building with separate outputs.
|
||||
#
|
||||
# These cause problems as they're not eliminated by GHC's dead code
|
||||
# elimination on aarch64-darwin. (see
|
||||
# https://github.com/NixOS/nixpkgs/issues/140774 for details).
|
||||
./cabal-paths.patch
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, hidapi
|
||||
|
|
@ -21,6 +22,15 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ hidapi libftdi1 libusb1 ]
|
||||
++ lib.optional stdenv.isLinux libgpiod;
|
||||
|
||||
patches = [
|
||||
# Patch is upstream, so can be removed when OpenOCD 0.12.0 or later is released.
|
||||
(fetchpatch
|
||||
{
|
||||
url = "https://github.com/openocd-org/openocd/commit/cff0e417da58adef1ceef9a63a99412c2cc87ff3.patch";
|
||||
sha256 = "Xxzf5miWy4S34sbQq8VQdAbY/oqGyhL/AJxiEPRuj3Q=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-jtag_vpi"
|
||||
"--enable-usb_blaster_libftdi"
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk-frdp";
|
||||
version = "unstable-2021-10-28";
|
||||
version = "unstable-2022-04-07";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "a44d84ec687f41ad37e43697b28a018f65780780";
|
||||
sha256 = "7J4jf3gDiorsc4zs6zwC+j/Zg0oZWKAFAz9vvJJ2CYM=";
|
||||
rev = "70cd7598cb201d58575445d4361263df9b864e73";
|
||||
sha256 = "ZyJoJl0WAwalPSkAQNkwDPnP+zLfMMP+ZdIKu2kdXVI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater {
|
||||
# The updater tries src.url by default, which does not exist for fetchFromGitHub (fetchurl).
|
||||
url = "${meta.homepage}.git";
|
||||
branch = "gtk-frdp-0-1";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.34.6";
|
||||
version = "2.36.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-a8j9A0qtBDKiRZzk/H7iWtZaSSTGGL+Nk7UrDBqEwfY=";
|
||||
sha256 = "sha256-uHfMofEFI19d1Xx6wrLCvjxraR/0RPk5JcclTPFWxk0=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ]
|
||||
++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ]
|
||||
++ lib.optionals (cudaSupport && lib.versionAtLeast cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ]
|
||||
++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ];
|
||||
|
||||
inherit doCheck;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -15,8 +15,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NDw2vqnOOeFpgvU9//1WIA0hI9zY7TkiquU6DJ70b5E=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mInpqQsH6GUyakA+74c3xvGRQvIFJ1rBa4bqWlJ9ea0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "autograd";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1i1ylf03b7220n8znk63zg6sgdd3py9wlh1pvqvy03g1fxsi8pd1";
|
||||
sha256 = "sha256-OD3g9TfvLji4X/lpJZOwz66JWMmzvUUbUsJV/ZFx/84=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy future ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awesomeversion";
|
||||
version = "22.2.0";
|
||||
version = "22.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FlJrk/PH3nBLakQfS+ruDwAPH/oo16JcfrtVRFgbUXY=";
|
||||
sha256 = "sha256-bloBP5cKZtvu96HSQ4AmZ5+VeSXGkmN/m4fuyHLrBws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c=";
|
||||
sha256 = "sha256-C2hAkWSb3h+lFC3pUIHlttme44Ugfae8opmFQbVWYTE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,25 +1,48 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, hidapi
|
||||
, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, ecpy
|
||||
, fetchPypi
|
||||
, future
|
||||
, hidapi
|
||||
, pillow
|
||||
, protobuf
|
||||
, pycrypto
|
||||
, pycryptodomex
|
||||
, pythonOlder
|
||||
, python-u2flib-host
|
||||
, websocket-client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ledgerblue";
|
||||
version = "0.1.41";
|
||||
version = "0.1.42";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7246a1a0442a63aff0b5de2796d306f0033e1937b3c9b9c2a92c9101cde4fe8d";
|
||||
hash = "sha256-UNquetZ1sCLO9T5p5b3jTSu+52xuc5XdyHNKsvvPdck=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket-client
|
||||
ecpy
|
||||
future
|
||||
hidapi
|
||||
pillow
|
||||
protobuf
|
||||
pycrypto
|
||||
pycryptodomex
|
||||
python-u2flib-host
|
||||
websocket-client
|
||||
];
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "ledgerblue" ];
|
||||
pythonImportsCheck = [
|
||||
"ledgerblue"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to communicate with Ledger Blue/Nano S";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycfmodel";
|
||||
version = "0.18.1";
|
||||
version = "0.18.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oP9u62PpnBCDAwE9LJHkm93f9eYyXbHai/gp62bL84M=";
|
||||
hash = "sha256-JZRM4CwO69BJBTm0LzA41oNv/iViIdU3Mq01Fa/KlUs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhaversion";
|
||||
version = "22.04.0";
|
||||
version = "22.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-ItemkSm85Sq3utEG28mvfS7gq95veeYwhHG6BpOUJJY=";
|
||||
sha256 = "sha256-adM6LUo8ycD/3G19JIl4DcuVK/f0/9V8AG82qgYO0uM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tfsec";
|
||||
version = "1.15.4";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IYmS3Q2WWkOYISx0jI8yggArk0fhl3WQWrsc+Zfg8gU=";
|
||||
sha256 = "sha256-lQo3rhPjKZV9XuuKYxd3jXqSiElj+O0DdERtmsMZMEw=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
|||
# "-extldflags '-fno-PIC -static'"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-dF7x3oA2q4IuoXn8tcQAdRKWooeLoeBsQ1sAhOGwwM8=";
|
||||
vendorSha256 = "sha256-n93ZP6sIyL5Q9UeDRXxm8KleDfUf2wd6JcTgSPtBGWg=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/tfsec"
|
||||
|
|
|
|||
|
|
@ -1,22 +1,39 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "konstraint";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plexsystems";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UHdmC6UoDxl/GfvUOmuBctPpxIYljOurnm1J3eEPFHA=";
|
||||
sha256 = "sha256-BoH/lT+kYiwOtW82mmhhLZY3Xk2pRZHmNrEKJzPiG54=";
|
||||
};
|
||||
vendorSha256 = "sha256-UssvmmZhq+SO3cPpZi3Diji7tIxrpyhqNIBajqzRjh8=";
|
||||
vendorSha256 = "sha256-G6WigkkKZj/k+kYlKItSfnoXN8UZ60lFEkZcQaI9J5c=";
|
||||
|
||||
# Exclude go within .github folder
|
||||
excludedPackages = ".github";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/plexsystems/konstraint/internal/commands.version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd konstraint \
|
||||
--bash <($out/bin/konstraint completion bash) \
|
||||
--fish <($out/bin/konstraint completion fish) \
|
||||
--zsh <($out/bin/konstraint completion zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/konstraint --help
|
||||
$out/bin/konstraint --version | grep "${version}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/plexsystems/konstraint";
|
||||
changelog = "https://github.com/plexsystems/konstraint/releases/tag/v${version}";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ocamlPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
pname = "opaline";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaapb";
|
||||
repo = "opaline";
|
||||
rev = "v${version}";
|
||||
sha256 = "1aj1fdqymq3pnr39h47hn3kxk5v9pnwx0jap1z2jzh78x970z21m";
|
||||
sha256 = "sha256-6htaiFIcRMUYWn0U7zTNfCyDaTgDEvPch2q57qzvND4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, genericUpdater
|
||||
, gitUpdater
|
||||
, common-updater-scripts
|
||||
, makeWrapper
|
||||
, rr
|
||||
|
|
@ -9,21 +9,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-rr";
|
||||
version = "0.1.3";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielzfranklin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "01m8fdz9as2fxnzs9csvbc76qxzbb98a66dh7w4a5q855v38g0zy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lQS+bp1u79iO8WGrkZSFEuonr1eYjxIQYhUvM/kBao4";
|
||||
};
|
||||
|
||||
cargoSha256 = "0fjs76n6bbbv83s213h2dgsszgxy4hbjsclyk9m81b3bfbmmb9sa";
|
||||
cargoSha256 = "sha256-PdKqWMxTtBJbNqITs3IjNcpijXy6MHitEY4jDp4jZro=";
|
||||
|
||||
passthru = {
|
||||
updateScript = genericUpdater {
|
||||
updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
versionLister = "${common-updater-scripts}/bin/list-git-tags";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "17.8.0";
|
||||
sha256 = "0jsf6sv42rzpizvil7g1gf9bskh8lx0gcxg0yzpr4hk7mx7i90br";
|
||||
version = "17.9.0";
|
||||
sha256 = "1q1rr9kvlk9rd35x3x206iy894hq2ywyhqxbb6grak6wcvdgcnan";
|
||||
patches = [
|
||||
./disable-darwin-v8-system-instrumentation.patch
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postfixadmin";
|
||||
version = "3.3.10";
|
||||
version = "3.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0xck6df96r4z8k2j8x20b8h2qvmzyrfsya82s4i7hfhrxii92d3w";
|
||||
sha256 = "sha256-jOO0AVcCmBxHLaWQOwvt7OFKAcAYPTVHTdQz1ZaYIqE=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -44,10 +44,10 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "xwayland";
|
||||
version = "22.1.0";
|
||||
version = "22.1.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-F1LW0Kkw5xKStaMI04EevVTYzGjKz/RN5lQmW4YXor8=";
|
||||
sha256 = "sha256-9dDgujfhm7h8YvYdpZcL0gSTnyEgYglkvtTMhJW6plc=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "es";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz";
|
||||
sha256 = "1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h";
|
||||
sha256 = "sha256-ySZIK0IITpA+uHHuHrDO/Ana5vGt64QI3Z6TMDXE9d0=";
|
||||
};
|
||||
|
||||
# The distribution tarball does not have a single top-level directory.
|
||||
|
|
|
|||
31
pkgs/shells/zsh/agkozak-zsh-prompt/default.nix
Normal file
31
pkgs/shells/zsh/agkozak-zsh-prompt/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ stdenvNoCC, lib, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "agkozak-zsh-prompt";
|
||||
version = "3.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agkozak";
|
||||
repo = "agkozak-zsh-prompt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TOfAWxw1uIV0hKV9o4EJjOlp+jmGWCONDex86ipegOY=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
plugindir="$out/share/zsh/site-functions"
|
||||
|
||||
mkdir -p "$plugindir"
|
||||
cp -r -- lib/*.zsh agkozak-zsh-prompt.plugin.zsh prompt_agkozak-zsh-prompt_setup "$plugindir"/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast, asynchronous Zsh prompt";
|
||||
homepage = "https://github.com/agkozak/agkozak-zsh-prompt";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ambroisie ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lf";
|
||||
version = "26";
|
||||
version = "27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gokcehan";
|
||||
repo = "lf";
|
||||
rev = "r${version}";
|
||||
sha256 = "0a2kybaajpmhlq708fsdyyab388lkmz17gfn0qcv352i2d4lli0s";
|
||||
hash = "sha256-CrtVw3HhrC+D3c4ltHX8FSQnDvBpQJ890oJHoD6qPt4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ujQh4aE++K/fn3PJqkAbTtwRyJPSI9TJQ1DvwLF9etU=";
|
||||
vendorSha256 = "sha256-evkQT624EGj6MUwx3/ajdIbUMYjA1QyOnIQFtTLt0Yo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@ let
|
|||
|
||||
in buildGoModule rec {
|
||||
pname = "datadog-agent";
|
||||
version = "7.33.1";
|
||||
version = "7.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = version;
|
||||
sha256 = "sha256-H8apgLdm90/gVsqcCSc3gymgUUP2AWcNPgV9394UUeQ=";
|
||||
sha256 = "sha256-F1BA+u5UdfakVtU/Xd9oHOAZ4ljpcchqvSR3De4qEN0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qIm9ZIQTNmKUtTMBsGzH0t4MrIAvksea9t7p5cC6ykk=";
|
||||
vendorSha256 = "sha256-nR+hazIQ1bk+C0lTtLJP/Jq434wk4o+YO/e2d+vgTDQ=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/agent"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
strictDeps = true;
|
||||
buildInputs = [ bash wget ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
patchShebangs --host ipfetch
|
||||
# Not only does `/usr` have to be replaced but also `/flags` needs to be added because with Nix the script is broken without this. The `/flags` is somehow not needed if you install via the install script in the source repository.
|
||||
substituteInPlace ./ipfetch --replace /usr/share/ipfetch $out/usr/share/ipfetch/flags
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnma";
|
||||
version = "1.8.36";
|
||||
version = "1.8.38";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "2ZQV9M3/ZCIwAZ7FzdKx+/HsVQqK6GUhn3VIKmQre3o=";
|
||||
sha256 = "Xtk+rhhFb/WopPQIF4we4ZjcjTpGxl+QdbEBkW5k6LQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "feroxbuster";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epi052";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RY9bFuALRaVXDrC0eIx0inPjRqNpRKNZf3mCrKIdGL8=";
|
||||
hash = "sha256-SRVCtyl0+GRQ6MUHDY3gi7eg0l42d74c+Ct7G70MJfw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0Zawlx/lhF7K8nOsHYKO84pnctVMpm3RfnAFCOltOqE=";
|
||||
cargoSha256 = "sha256-5SCJqVA5CEyILc5Ojr5ZsFiK8y6qfgggXyp9e8i5pdo=";
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jump";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gsamokovarov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8Lfta4qDXYVSHG3UI8iUA6vIjBe5OIX7n0LC4OW1qMU=";
|
||||
sha256 = "sha256-nI4n1WxgdGGP822APBOLZ5lNkjwL1KfP5bKUxfvXdnE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "memtester";
|
||||
version = "4.5.0";
|
||||
version = "4.5.1";
|
||||
|
||||
preConfigure = ''
|
||||
echo "$CC" > conf-cc
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz";
|
||||
sha256 = "0dxfwayns3hjjplkxkpkm1409lmjlpi4chcrahcvdbnl0q6jpmcf";
|
||||
sha256 = "sha256-HF/COCV2wISzFM/TNNEnpmwgvWOJLKyfRFvB2LTKWkc=";
|
||||
};
|
||||
|
||||
installFlags = [ "INSTALLPATH=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -16144,6 +16144,8 @@ with pkgs;
|
|||
|
||||
agg = callPackage ../development/libraries/agg { };
|
||||
|
||||
agkozak-zsh-prompt = callPackage ../shells/zsh/agkozak-zsh-prompt { };
|
||||
|
||||
alass = callPackage ../applications/video/alass { };
|
||||
|
||||
allegro = allegro4;
|
||||
|
|
|
|||
Loading…
Reference in a new issue