mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-05 22:06:00 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a098648f8d
@ -3172,6 +3172,11 @@
|
||||
githubId = 18648043;
|
||||
name = "Daniel Cartwright";
|
||||
};
|
||||
chewblacka = {
|
||||
github = "chewblacka";
|
||||
githubId = 18430320;
|
||||
name = "John Garcia";
|
||||
};
|
||||
Chili-Man = {
|
||||
email = "dr.elhombrechile@gmail.com";
|
||||
name = "Diego Rodriguez";
|
||||
@ -8414,11 +8419,6 @@
|
||||
githubId = 31008330;
|
||||
name = "Jann Marc Villablanca";
|
||||
};
|
||||
jgarcia = {
|
||||
github = "chewblacka";
|
||||
githubId = 18430320;
|
||||
name = "John Garcia";
|
||||
};
|
||||
jgart = {
|
||||
email = "jgart@dismail.de";
|
||||
github = "jgarte";
|
||||
@ -12740,6 +12740,13 @@
|
||||
githubId = 1386642;
|
||||
name = "Noah Brenowitz";
|
||||
};
|
||||
nbsp = {
|
||||
email = "aoife@enby.space";
|
||||
matrix = "@nbsp:enby.space";
|
||||
github = "enbyspace";
|
||||
githubId = 57151943;
|
||||
name = "aoife cassidy";
|
||||
};
|
||||
ncfavier = {
|
||||
email = "n@monade.li";
|
||||
matrix = "@ncfavier:matrix.org";
|
||||
@ -16354,13 +16361,6 @@
|
||||
fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE";
|
||||
}];
|
||||
};
|
||||
sfr = {
|
||||
email = "sol@solfisher.com";
|
||||
matrix = "@sfr:enby.space";
|
||||
github = "solfisher";
|
||||
githubId = 57151943;
|
||||
name = "Sol Fisher Romanoff";
|
||||
};
|
||||
sfrijters = {
|
||||
email = "sfrijters@gmail.com";
|
||||
github = "SFrijters";
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alsa-scarlett-gui";
|
||||
version = "unstable-2022-08-11";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geoffreybennett";
|
||||
repo = pname;
|
||||
rev = "65c0f6aa432501355803a823be1d3f8aafe907a8";
|
||||
rev = version;
|
||||
sha256 = "sha256-wzBOPTs8PTHzu5RpKwKhx552E7QnDx2Zn4OFaes8Q2I=";
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kakoune-unwrapped";
|
||||
@ -9,6 +9,18 @@ stdenv.mkDerivation rec {
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RR3kw39vEjsg+6cIY6cK2i3ecGHlr1yzuBKaDtGlOGo=";
|
||||
};
|
||||
patches = [
|
||||
# Use explicit target types for gather calls to bypass clang regression
|
||||
#
|
||||
# Since clang-16 there has been a regression in the P0522R0 support.
|
||||
# (Bug report at https://github.com/llvm/llvm-project/issue/63281)
|
||||
#
|
||||
# Closes mawww/kakoune#4892
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mawww/kakoune/commit/7577fa1b668ea81eb9b7b9af690a4161187129dd.patch";
|
||||
hash = "sha256-M0jKaEDhkpvX+n7k8Jf2lWaRNy8bqZ1kRHR4eG4npss=";
|
||||
})
|
||||
];
|
||||
makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -49,7 +49,7 @@ perlPackages.buildPerlPackage rec {
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://github.com/get-iplayer/get_iplayer";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ rika jgarcia ];
|
||||
maintainers = with maintainers; [ rika chewblacka ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -29,7 +29,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
configureFlags = [ "--enable-doxygen" ];
|
||||
configureFlags = [
|
||||
"--enable-doxygen"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
"CFLAGS=-Wno-error=strict-prototypes"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# remove useless man pages about directories
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, makeDesktopItem, fetchurl, jdk19, wrapGAppsHook, glib }:
|
||||
{ lib, stdenv, makeDesktopItem, fetchurl, jdk21, wrapGAppsHook, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "5.0.3";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
|
||||
hash = "sha256-NST5d5dzO26ifKStbgD7qNbumUMQhfUFNE472LR1z5k=";
|
||||
hash = "sha256-Q1387Su6bmBkXvcrTgWtYZb9z/pKHiOTfUkUNHN8ItY=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ glib ];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--set JAVA_HOME "${jdk19}" --set PDFSAM_JAVA_PATH "${jdk19}")
|
||||
gappsWrapperArgs+=(--set JAVA_HOME "${jdk21}" --set PDFSAM_JAVA_PATH "${jdk21}")
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let
|
||||
in
|
||||
{
|
||||
pname = "remnote";
|
||||
version = "1.12.64";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage";
|
||||
hash = "sha256-Pvz3bBpv4wN2NXxuKNNraCuOqvvtYOyg5PTSwMpL3cw=";
|
||||
hash = "sha256-ovM7MnRqzy/mgz+h87hqIuvquODIfmxjdJG1NZYobbk=";
|
||||
};
|
||||
appexec = appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
@ -44,7 +44,7 @@ in
|
||||
meta = with lib; {
|
||||
description = "A note-taking application focused on learning and productivity";
|
||||
homepage = "https://remnote.com/";
|
||||
maintainers = with maintainers; [ max-niederman jgarcia ];
|
||||
maintainers = with maintainers; [ max-niederman chewblacka ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "remnote";
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shavee";
|
||||
version = "0.5.1";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ashuio";
|
||||
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iNGn5KknSNgazFSu6Nur7AkKVb6qKMxuFwTdCz5djWU=";
|
||||
cargoHash = "sha256-tnIqhZpqdy8pV4L6KF5v19ufpWRpMX5gTPlWWbwB3RU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -27,12 +27,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tuba";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GeopJr";
|
||||
repo = "Tuba";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1XbgsdIcnlXJtNEzDgEfHVJHF9naz3HplCPc2cKFUWw=";
|
||||
hash = "sha256-m38ur7IxQsI46iMpveEXW3OZONbTI7xNq96XSocxxbs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ channel, version, revision, sha256 }:
|
||||
{ channel, version, revision, hash }:
|
||||
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb";
|
||||
inherit sha256;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -128,13 +128,13 @@ stdenv.mkDerivation rec {
|
||||
--set-rpath "${libPath.libGLESv2}" \
|
||||
opt/microsoft/${shortName}/libGLESv2.so
|
||||
|
||||
patchelf \
|
||||
--set-rpath "${libPath.libsmartscreenn}" \
|
||||
opt/microsoft/${shortName}/libsmartscreenn.so
|
||||
|
||||
patchelf \
|
||||
--set-rpath "${libPath.liboneauth}" \
|
||||
opt/microsoft/${shortName}/liboneauth.so
|
||||
'' + lib.optionalString (lib.versionOlder version "120") ''
|
||||
patchelf \
|
||||
--set-rpath "${libPath.libsmartscreenn}" \
|
||||
opt/microsoft/${shortName}/libsmartscreenn.so
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "119.0.2151.44";
|
||||
version = "119.0.2151.72";
|
||||
revision = "1";
|
||||
sha256 = "sha256-QY9Dk4tcpuNJGVcAcaIaVXAT95K87rK7ZQo7COMDpVU=";
|
||||
hash = "sha256-thBx/+6thNXXKppA11IOG5EiMx7pA9FA3vSkwa9+F0o=";
|
||||
};
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "119.0.2151.44";
|
||||
version = "120.0.2210.22";
|
||||
revision = "1";
|
||||
sha256 = "sha256-aLiitzCoMvJH2xAfo9bO7lEPMqKlb++BdJkrWx61SMc=";
|
||||
hash = "sha256-GayVVZbtGLQmmXu+k4wdsD+rPwGiSPHnQwzVYyKWhHM=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "120.0.2186.2";
|
||||
version = "121.0.2220.3";
|
||||
revision = "1";
|
||||
sha256 = "sha256-L/rtOddk4bt8ffkRnq0BYcVjrSb7RmDaay85S5vixSM=";
|
||||
hash = "sha256-M3r+SLp3lQ7oWDYoM7aNZDC5wbMxFZggsu0Iuyyw/cw=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@ def nix_expressions(latest: dict[str, Packages]):
|
||||
channel = "{channel}";
|
||||
version = "{version}";
|
||||
revision = "{revision}";
|
||||
sha256 = "{sri}";
|
||||
hash = "{sri}";
|
||||
}};'''
|
||||
)
|
||||
channel_strs.append(channel_str)
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
hash = "sha256-wFtMMphHz8JBX4hpgD85wn4G7Qs4/nwRcrW12A1tQm4=";
|
||||
hash = "sha256-0l4/isk2DKZ0HBxeuUN+RqB3o/3fWdhFSFCnQ2OiO6Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -33,6 +33,6 @@ stdenv.mkDerivation {
|
||||
homepage = "http://myrepos.branchable.com/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ antono henrytill ];
|
||||
maintainers = with lib.maintainers; [ antono ];
|
||||
};
|
||||
}
|
||||
|
||||
27
pkgs/by-name/be/betula/package.nix
Normal file
27
pkgs/by-name/be/betula/package.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, fetchFromSourcehut
|
||||
, buildGoModule
|
||||
}: buildGoModule rec {
|
||||
pname = "betula";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~bouncepaw";
|
||||
repo = "betula";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MH6YeWG94YVBgx5Es3oMJ9A/hAPPBXpAcIdCJV3HX78=";
|
||||
};
|
||||
vendorHash = "sha256-wiMIhoSO7nignNWY16OpDYZCguRbcEwwO/HggKSC5jM=";
|
||||
|
||||
CGO_ENABLED = 1;
|
||||
# These tests use internet, so are failing in Nix build.
|
||||
# See also: https://todo.sr.ht/~bouncepaw/betula/91
|
||||
checkFlags = "-skip=TestTitles|TestHEntries";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Single-user self-hosted bookmarking software";
|
||||
homepage = "https://betula.mycorrhiza.wiki/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ GoldsteinE ];
|
||||
};
|
||||
}
|
||||
@ -69,7 +69,7 @@ perlPackages.buildPerlPackage rec {
|
||||
license = licenses.gpl1Plus;
|
||||
homepage = "https://github.com/dave-theunsub/clamtk";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jgarcia ShamrockLee ];
|
||||
maintainers = with maintainers; [ chewblacka ShamrockLee ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
33
pkgs/by-name/gc/gcli/package.nix
Normal file
33
pkgs/by-name/gc/gcli/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, curl
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, byacc
|
||||
, flex
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcli";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "herrhotzenplotz";
|
||||
repo = "gcli";
|
||||
rev = version;
|
||||
hash = "sha256-ry+T39gFVPfHazAbv97UFpMIH1Dbbw6tZwsn9V4uRec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config byacc flex ];
|
||||
buildInputs = [ curl ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Portable Git(Hub|Lab|ea) CLI tool";
|
||||
homepage = "https://herrhotzenplotz.de/gcli/";
|
||||
changelog = "https://github.com/herrhotzenplotz/gcli/releases/tag/${version}";
|
||||
license = licenses.bsd2;
|
||||
mainProgram = "gcli";
|
||||
maintainers = with maintainers; [ kenran ];
|
||||
};
|
||||
}
|
||||
@ -16,16 +16,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "incus-unwrapped";
|
||||
version = "0.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "incus";
|
||||
rev = "refs/tags/incus-${version}";
|
||||
hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4fxQHtvRULTyKJTGdo42qwWQUSIWqbqOO1Wf8daBP/s=";
|
||||
vendorHash = "sha256-TwrHWjBd6Hn7CQMxFhHobopeefCvYeDz8fAPYmTKV9M=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace internal/usbid/load.go \
|
||||
@ -36,6 +36,7 @@ buildGoModule rec {
|
||||
"cmd/incus-agent"
|
||||
"cmd/incus-migrate"
|
||||
"cmd/lxd-to-incus"
|
||||
"test/mini-oidc"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -84,7 +85,7 @@ buildGoModule rec {
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"-vr" "incus-\(.*\)"
|
||||
"-vr" "v\(.*\)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
27
pkgs/by-name/kg/kgeotag/package.nix
Normal file
27
pkgs/by-name/kg/kgeotag/package.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ cmake, extra-cmake-modules, fetchFromGitLab, lib, libsForQt5 }:
|
||||
|
||||
libsForQt5.mkDerivation rec {
|
||||
pname = "kgeotag";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
repo = "kgeotag";
|
||||
owner = "graphics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-az/kXEhD/RGfxOMiLEcb651WVPcyBSa8B2sWOF7bz8E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
buildInputs = [ libsForQt5.libkexiv2 libsForQt5.marble ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://kgeotag.kde.org/";
|
||||
description = "A stand-alone photo geotagging program";
|
||||
changelog = "https://invent.kde.org/graphics/kgeotag/-/blob/master/CHANGELOG.rst";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ cimm ];
|
||||
mainProgram = "kgeotag";
|
||||
};
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
From d7f7ae55a54437616174f80fb8faa80ae4ffcda4 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Stephens <adam@valkor.net>
|
||||
Date: Fri, 27 Oct 2023 13:26:11 -0400
|
||||
Subject: [PATCH] lxd-to-incus: query systemd instead of assuming service file
|
||||
path
|
||||
|
||||
Signed-off-by: Adam Stephens <adam@valkor.net>
|
||||
---
|
||||
cmd/lxd-to-incus/targets.go | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go
|
||||
index f2b405e0e4..ed84d3ebce 100644
|
||||
--- a/cmd/lxd-to-incus/targets.go
|
||||
+++ b/cmd/lxd-to-incus/targets.go
|
||||
@@ -25,7 +25,8 @@ func (s *targetSystemd) Present() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
- if !util.PathExists("/lib/systemd/system/incus.service") {
|
||||
+ _, err := subprocess.RunCommand("systemctl", "list-unit-files", "incus.service")
|
||||
+ if err != nil {
|
||||
return false
|
||||
}
|
||||
|
||||
@ -6,29 +6,25 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lxd-to-incus";
|
||||
version = "0.2";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "incus";
|
||||
rev = "refs/tags/incus-${version}";
|
||||
hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch
|
||||
];
|
||||
|
||||
modRoot = "cmd/lxd-to-incus";
|
||||
|
||||
vendorHash = "sha256-J95b4fm+VwndoxS8RQF8V8ufI3RjclqzAskEd3ut4bU=";
|
||||
vendorHash = "sha256-/ONflpW1HGvXooPF+Xui8q4xFu/Zq5br+Vjm9d2gm5U=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"-vr" "incus-\(.*\)"
|
||||
"-vr" "v\(.*\)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec {
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sfr";
|
||||
owner = "~nbsp";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs=";
|
||||
@ -15,9 +15,9 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "a pretty good mpd client";
|
||||
homepage = "https://sr.ht/~sfr/mus";
|
||||
homepage = "https://sr.ht/~nbsp/mus";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfr ];
|
||||
maintainers = with maintainers; [ nbsp ];
|
||||
mainProgram = "mus";
|
||||
};
|
||||
}
|
||||
@ -81,7 +81,7 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = "https://github.com/bpozdena/OneDriveGUI";
|
||||
description = "A simple GUI for Linux OneDrive Client, with multi-account support";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ jgarcia ];
|
||||
maintainers = with maintainers; [ chewblacka ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ in
|
||||
meta = with lib; {
|
||||
description = "M+ Outline Fonts (legacy OSDN release)";
|
||||
homepage = "https://mplus-fonts.osdn.jp";
|
||||
maintainers = with maintainers; [ henrytill uakci ];
|
||||
maintainers = with maintainers; [ uakci ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.mit;
|
||||
};
|
||||
@ -53,7 +53,7 @@ in
|
||||
meta = with lib; {
|
||||
description = "M+ Outline Fonts (GitHub release)";
|
||||
homepage = "https://mplusfonts.github.io";
|
||||
maintainers = with maintainers; [ henrytill uakci ];
|
||||
maintainers = with maintainers; [ uakci ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.ofl;
|
||||
};
|
||||
|
||||
@ -1,22 +1,32 @@
|
||||
{ coq, mkCoqDerivation, mathcomp, lib, version ? null }:
|
||||
{ fetchurl, coq, mkCoqDerivation, mathcomp, lib, version ? null }:
|
||||
|
||||
mkCoqDerivation {
|
||||
let
|
||||
namePrefix = [ "coq" "mathcomp" ];
|
||||
pname = "word";
|
||||
fetcher = { domain, owner, repo, rev, sha256, ...}:
|
||||
fetchurl {
|
||||
url = "https://${domain}/${owner}/${repo}/releases/download/${rev}/${lib.concatStringsSep "-" (namePrefix ++ [ pname ])}-${rev}.tbz";
|
||||
inherit sha256;
|
||||
};
|
||||
in
|
||||
|
||||
mkCoqDerivation {
|
||||
inherit namePrefix pname fetcher;
|
||||
owner = "jasmin-lang";
|
||||
repo = "coqword";
|
||||
useDune = true;
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."2.1".sha256 = "sha256-oN/zvnePq64Nt7l/zIDLdhb4t9ayKxnZCsn+pzqS030=";
|
||||
release."2.0".sha256 = "sha256-x9AEFadlYiIIOxAhjv4Vc/dxdRZC7AdWQ6AByvLOFDk=";
|
||||
release."1.1".sha256 = "sha256:0jb28vgkr4xpg9d6k85rq7abpx5ch612iw9ps5w8q80q1jpjlc4z";
|
||||
release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg";
|
||||
release."3.0".sha256 = "sha256-xEgx5HHDOimOJbNMtIVf/KG3XBemOS9XwoCoW6btyJ4=";
|
||||
release."2.2".sha256 = "sha256-8BB6SToCrMZTtU78t2K+aExuxk9O1lCqVQaa8wabSm8=";
|
||||
release."2.1".sha256 = "sha256-895gZzwwX8hN9UUQRhcgRlphHANka9R0PRotfmSEelA=";
|
||||
release."2.0".sha256 = "sha256-ySg3AviGGY5jXqqn1cP6lTw3aS5DhawXEwNUgj7pIjA=";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.12" "8.18") (isGe "1.12") ]; out = "2.1"; }
|
||||
{ cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "3.0"; }
|
||||
{ cases = [ (range "8.12" "8.18") (range "1.12" "1.18") ]; out = "2.2"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];
|
||||
|
||||
@ -151,7 +151,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://racket-lang.org/";
|
||||
changelog = "https://github.com/racket/racket/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ henrytill vrthra ];
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://racket-lang.org/";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ henrytill vrthra ];
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ];
|
||||
broken = stdenv.isDarwin; # No support yet for setting FFI lookup path
|
||||
};
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "drogon";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drogonframework";
|
||||
repo = "drogon";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-KZRW/ra84RegCCT6J0k+N7XqZF+xW+Ecq2TVdPZnM7M=";
|
||||
sha256 = "sha256-6F+LRcoBqHEbweqbVFHlR3I9nj1NaYty8zKcR4ZHKxg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
|
||||
MYSQL_DIR = libmysqlclient;
|
||||
MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPOCO_UNBUNDLED=ON"
|
||||
configureFlags = [
|
||||
"--unbundled"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git a/cmake/redis++.pc.in b/cmake/redis++.pc.in
|
||||
index c98b990..46849b6 100644
|
||||
--- a/cmake/redis++.pc.in
|
||||
+++ b/cmake/redis++.pc.in
|
||||
@@ -1,7 +1,5 @@
|
||||
-prefix=@CMAKE_INSTALL_PREFIX@
|
||||
-exec_prefix=${prefix}
|
||||
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
-includedir=${prefix}/include
|
||||
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
||||
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||
|
||||
Name: redis++
|
||||
Description: This is a Redis client, based on hiredis and written in C++11. It supports scritpting, pub/sub, pipeline, transaction, Redis Cluster, Redis Sentinel, connection pool, ACL, SSL and thread safety.
|
||||
@ -8,15 +8,19 @@ assert enableShared || enableStatic;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "redis-plus-plus";
|
||||
version = "1.3.7";
|
||||
version = "1.3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sewenew";
|
||||
repo = "redis-plus-plus";
|
||||
rev = version;
|
||||
sha256 = "sha256-QCNN85syxw2EGPdyTV3bL0txcHl7t2YhsKwK9lgnexY=";
|
||||
sha256 = "sha256-lupS4WoJ4r0Vsh3sEGSuka0TtEBo2FPX2eks2blqRGk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Fix-pkg-config-paths.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
propagatedBuildInputs = [ hiredis ];
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx-themes";
|
||||
version = "0.4.10";
|
||||
version = "0.4.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Djelibeybi";
|
||||
repo = "aiolifx-themes";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zpUvbG/89MeZ50565MVjehSTnLmOKScBA07yBjZ521I=";
|
||||
hash = "sha256-pldmkdkDI6RFMcBOF1MtQBddOo+uF23CMHPztEV+kf0=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "altair";
|
||||
version = "5.1.2";
|
||||
version = "5.2.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "altair-viz";
|
||||
repo = "altair";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-30M+rt5IfD4hvK5CwaW8HfQacDBPjowff/f9o7iido0=";
|
||||
hash = "sha256-uTG+V0SQgAQtMjvrVvKVKgIBT9qO+26EPRxQCEXj/gc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "certbot";
|
||||
version = "2.6.0";
|
||||
version = "2.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CbYamk1+NvcyS6w7pOjpD5lqWHCk+VJqF9R3xYxzpQk=";
|
||||
hash = "sha256-BZ7JqAciwbmkpbzR/qZHAraLJWWXNRN3Er4XvfU5kYs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, setuptools
|
||||
, python-dateutil
|
||||
, pytz
|
||||
, regex
|
||||
@ -21,19 +21,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dateparser";
|
||||
version = "1.1.8";
|
||||
version = "1.2.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scrapinghub";
|
||||
repo = "dateparser";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-52g8defF5bsisBv2QoyUymXcf0sljOI9PjeR4l0Pw6k=";
|
||||
hash = "sha256-mnL44hojebOwP6qtEBHs5QM4uRmLuGlVNr+sM3jZEKE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
pytz
|
||||
@ -76,6 +80,7 @@ buildPythonPackage rec {
|
||||
description = "Date parsing library designed to parse dates from HTML pages";
|
||||
homepage = "https://github.com/scrapinghub/dateparser";
|
||||
license = licenses.bsd3;
|
||||
mainProgram = "dateparser-download";
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,20 +1,18 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, networkx
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "importlab";
|
||||
version = "0.7";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "importlab";
|
||||
rev = "676d17cd41ac68de6ebb48fb71780ad6110c4ae3";
|
||||
hash = "sha256-O8y1c65NQ+19BnGnUnWrA0jYUqF+726CFAcWzHFOiHE=";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-s4k4U7H26wJ9pQnDtA5nh+ld1mtLZvGzYTqtd1VuFGU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ networkx ];
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pubnub";
|
||||
version = "7.3.1";
|
||||
version = "7.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = "python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-V6yw/OscTGwrFcjHEhwtaT7txWLqbVj0uYjuoSAtP2E=";
|
||||
hash = "sha256-J6vwdOI/GM/K0TxRwIgkXibNAc+n9wVCpmMkzMhBepw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rapidgzip";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gtxF9V7OQb34Z0cCuTh/Lbe1ttCbdaY0zpM3KHHGGuw=";
|
||||
hash = "sha256-dTVQTxzgjHAUuoWA2+asMI5g2fIWvHEl46bdTIAxAvg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nasm ];
|
||||
@ -27,6 +27,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python library for parallel decompression and seeking within compressed gzip files";
|
||||
homepage = "https://github.com/mxmlnkn/rapidgzip";
|
||||
changelog = "https://github.com/mxmlnkn/rapidgzip/blob/rapidgzip-v${version}/python/rapidgzip/CHANGELOG.md";
|
||||
license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952
|
||||
maintainers = with lib.maintainers; [ mxmlnkn ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tarpaulin";
|
||||
version = "0.27.1";
|
||||
version = "0.27.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xd009642";
|
||||
repo = "tarpaulin";
|
||||
rev = version;
|
||||
hash = "sha256-Mr1thOGqpLcMUBbmD6YzU9WlyOvlPHSqyiU/wtb4edo=";
|
||||
hash = "sha256-NvpWWk/Rr1Hnekc8vrjmOXknRe9sUFQFwPi0obGfXEA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UrDyAS/SIrXWsYucmjj6URjqjjWB40wxLF0rXHmB2Tw=";
|
||||
cargoHash = "sha256-KuYh1td9O9rSnxtPSYX5zp4A71IQkUJDVR0VaIZOh7g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -139,7 +139,7 @@ in stdenv.mkDerivation {
|
||||
description = "A package manager for OCaml";
|
||||
homepage = "https://opam.ocaml.org/";
|
||||
changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES";
|
||||
maintainers = [ maintainers.henrytill maintainers.marsam ];
|
||||
maintainers = [ maintainers.marsam ];
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -129,7 +129,7 @@ print <<'EOF';
|
||||
description = "A package manager for OCaml";
|
||||
homepage = "https://opam.ocaml.org/";
|
||||
changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES";
|
||||
maintainers = [ maintainers.henrytill maintainers.marsam ];
|
||||
maintainers = [ maintainers.marsam ];
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oxlint";
|
||||
version = "0.0.17";
|
||||
version = "0.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "web-infra-dev";
|
||||
repo = "oxc";
|
||||
rev = "oxlint_v${version}";
|
||||
hash = "sha256-s+D9+gHJLldTaMHr+XahppNHYL62V1J9iOgRZkr/p9Q=";
|
||||
hash = "sha256-WvNPfEgeBBbzhyJsMPpqhhkZ8GRn3mCq7HVaoVrCm2U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NQ/s39x/LLQoiW7p2x65l1oBkDal46g5/G6r4Ttpgsw=";
|
||||
cargoHash = "sha256-nWaa3JzACy6ftfm/qEfdBOxK3j4QJof7MtFI8GIpUxY=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
367
pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
generated
367
pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-shuttle";
|
||||
version = "0.33.0";
|
||||
version = "0.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shuttle-hq";
|
||||
repo = "shuttle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9MdEB7T+ZJuI5sGbHkhibhqKiGZYmURbaarBsU4gQMk=";
|
||||
hash = "sha256-SAad1GS092a9LBzlnf1UMLGwKsNBOgWP0gjoW2M0SH4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.17.5";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x0TPbqwoCaXUlrjYQ47+x5KohsiK5yCrI2Q8yA2K8Zs=";
|
||||
hash = "sha256-JZZJQGWPqb+jAqofEij/43ZZMOyT/2aU8rxmq72r0E4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FK6tTAbhP1f4VasG9HCahbMTDrJ9A6zXt/T6cs3HOZE=";
|
||||
cargoHash = "sha256-PKfIQkLXq7gdg3wCqlue2UsaUP/jAz85JyoFjGwqwQY=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "r2modman";
|
||||
version = "3.1.44";
|
||||
version = "3.1.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebkr";
|
||||
repo = "r2modmanPlus";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jiYrJtdM2LPwYDAgoGa0hGJcYNRiAKIuDuKZmSZ7OR4=";
|
||||
hash = "sha256-6o6iPDKKqCzt7H0a64HGTvEvwO6hjRh1Drl8o4x+4ew=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
||||
@ -37,10 +37,13 @@ maven.buildMavenPackage rec {
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/icons
|
||||
mkdir -p $out/share/applications
|
||||
|
||||
cp target/RuneLite.jar $out/share
|
||||
cp appimage/runelite.png $out/share/icons
|
||||
|
||||
ln -s ${desktop}/share/applications/RuneLite.desktop $out/share/applications/RuneLite.desktop
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/runelite \
|
||||
--prefix LD_LIBRARY_PATH : "${xorg.libXxf86vm}/lib" \
|
||||
--add-flags "-jar $out/share/RuneLite.jar"
|
||||
|
||||
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://t-rex.tileserver.ch/";
|
||||
changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
maintainers = teams.geospatial.members;
|
||||
mainProgram = "t_rex";
|
||||
platforms = platforms.unix;
|
||||
broken = true; # https://github.com/t-rex-tileserver/t-rex/issues/302
|
||||
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Allows you to compose wallpapers ('root pixmaps') for X";
|
||||
homepage = "https://github.com/himdel/hsetroot";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ henrytill shamilton ];
|
||||
maintainers = with maintainers; [ shamilton ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,32 +1,32 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xcwd";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schischi";
|
||||
repo = "xcwd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M6/1H6hI50Cvx40RTKzZXoUui0FGZfwe1IwdaxMJIQo=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-M6/1H6hI50Cvx40RTKzZXoUui0FGZfwe1IwdaxMJIQo=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
installPhase = ''
|
||||
install -D xcwd "$out/bin/xcwd"
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = ''
|
||||
A simple tool which print the current working directory of the currently focused window
|
||||
A simple tool which prints the current working directory of the currently focused window
|
||||
'';
|
||||
homepage = "https://github.com/schischi/xcwd";
|
||||
maintainers = [ maintainers.grburst ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "xcwd";
|
||||
maintainers = [ lib.maintainers.grburst ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.74.3";
|
||||
version = "0.74.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = "qovery-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2FgNH8EVIi4ifkURp2Znh8cPpgsW3m9rJGa7bJr86ZI=";
|
||||
hash = "sha256-QWXb4JBT/MgAsUyn4zaeSaauUDjV1b9mb7JYaoS2oqg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ilEG1relXYEFPR++oq35qcvnIcXkP4HRAjqxYr3U3XM=";
|
||||
|
||||
2
pkgs/tools/graphics/gifski/Cargo.lock
generated
2
pkgs/tools/graphics/gifski/Cargo.lock
generated
@ -318,7 +318,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gifski"
|
||||
version = "1.13.0"
|
||||
version = "1.13.1"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"crossbeam-channel",
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gifski";
|
||||
version = "1.13.0";
|
||||
version = "1.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageOptim";
|
||||
repo = "gifski";
|
||||
rev = version;
|
||||
hash = "sha256-Ij+bgL935uLCZeh8GQnTFlPIuUloNCn8LUdvMd+6okM=";
|
||||
hash = "sha256-JzQReCX1AfFhbVbSPOIAKAVvNoddrWFHaJ1AxlsIPA0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -44,6 +44,11 @@ rustPlatform.buildRustPackage rec {
|
||||
#
|
||||
checkType = "debug";
|
||||
|
||||
# Cargo.lock is outdated
|
||||
postPatch = ''
|
||||
cargo metadata --offline
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GIF encoder based on libimagequant (pngquant)";
|
||||
homepage = "https://gif.ski/";
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "timg";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hzeller";
|
||||
repo = "timg";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-e2Uy1jvS0+gdhto4Sgz6YlqEqXJ7KGUAA6iuixfvvJg=";
|
||||
hash = "sha256-u52ipc3I57ldKXjmXqFuIXIYIrs5c9TSvgs1HfIu44U=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
|
||||
name = "musl-fix-cplusplus-decls.patch";
|
||||
sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cmatsuoka/figlet/commit/9a50c1795bc32e5a698b855131ee87c8d7762c9e.patch";
|
||||
name = "unistd-on-darwin.patch";
|
||||
sha256 = "hyfY87N+yuAwjsBIjpgvcdJ1IbzlR4A2yUJQSzShCRI=";
|
||||
})
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
};
|
||||
|
||||
makeFlags = [ "prefix=$(out)" "CC:=$(CC)" "LD:=$(CC)" ];
|
||||
|
||||
postInstall = "cp -ar ${contributed}/* $out/share/figlet/";
|
||||
|
||||
@ -1,17 +1,27 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.3";
|
||||
version = "3.3-unstable-2023-05-08";
|
||||
pname = "httptunnel";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nocrew.org/software/httptunnel/${pname}-${version}.tar.gz";
|
||||
sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql";
|
||||
src = fetchFromGitHub {
|
||||
owner = "larsbrinkhoff";
|
||||
repo = "httptunnel";
|
||||
rev = "d8f91af976c97a6006a5bd1ad7149380c39ba454";
|
||||
hash = "sha256-fUaVHE3nxq3fU7DYCvaQTOoMzax/qFH8cMegFLLybNk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests";
|
||||
homepage = "http://www.nocrew.org/software/httptunnel";
|
||||
homepage = "http://www.gnu.org/software/httptunnel/httptunnel.html";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ koral ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -37,7 +37,7 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/Vanilla-OS/apx";
|
||||
changelog = "https://github.com/Vanilla-OS/apx/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ dit7ya jgarcia ];
|
||||
maintainers = with maintainers; [ dit7ya chewblacka ];
|
||||
mainProgram = "apx";
|
||||
};
|
||||
}
|
||||
|
||||
@ -34288,7 +34288,7 @@ with pkgs;
|
||||
pdfdiff = callPackage ../applications/misc/pdfdiff { };
|
||||
|
||||
pdfsam-basic = callPackage ../applications/misc/pdfsam-basic {
|
||||
jdk19 = openjdk19.override { enableJavaFX = true; };
|
||||
jdk21 = openjdk21.override { enableJavaFX = true; };
|
||||
};
|
||||
|
||||
mupdf = callPackage ../applications/misc/mupdf { };
|
||||
@ -40568,8 +40568,6 @@ with pkgs;
|
||||
|
||||
morph = callPackage ../tools/package-management/morph { };
|
||||
|
||||
mus = callPackage ../applications/audio/mus { };
|
||||
|
||||
muse = libsForQt5.callPackage ../applications/audio/muse { };
|
||||
|
||||
museeks = callPackage ../applications/audio/museeks { };
|
||||
|
||||
@ -806,7 +806,7 @@ let
|
||||
lwt_ppx = self.lwt_ppx.override { inherit ppxlib; };
|
||||
sedlex = self.sedlex.override { inherit ppxlib ppx_expect; };
|
||||
in callPackage ../development/ocaml-modules/bap {
|
||||
inherit (pkgs.llvmPackages) llvm;
|
||||
inherit (pkgs.llvmPackages_14) llvm;
|
||||
ezjsonm = self.ezjsonm.override { inherit sexplib0; };
|
||||
ppx_bitstring = self.ppx_bitstring.override { inherit ppxlib; };
|
||||
ocurl = self.ocurl.override { inherit lwt_ppx; };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user