mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 21:40:12 +00:00
Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
@@ -928,8 +928,6 @@
|
||||
|
||||
- `buildNimSbom` was added as an alternative to `buildNimPackage`. `buildNimSbom` uses [SBOMs](https://cyclonedx.org/) to generate packages whereas `buildNimPackage` uses a custom JSON lockfile format.
|
||||
|
||||
- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific 4.8 versions; those will continue to be maintained.
|
||||
|
||||
## Detailed Migration Information {#sec-release-24.11-migration}
|
||||
|
||||
### `sound` options removal {#sec-release-24.11-migration-sound}
|
||||
|
||||
@@ -233,6 +233,8 @@
|
||||
|
||||
- `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel.
|
||||
|
||||
- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific older versions; those will continue to be maintained as long as other packages depend on them but may be removed in the future.
|
||||
|
||||
- `kanata` was updated to v1.7.0, which introduces several breaking changes.
|
||||
See the release notes of
|
||||
[v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)
|
||||
|
||||
@@ -55,6 +55,7 @@ in {
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.sockets.cockpit.wantedBy = [ "multi-user.target" ];
|
||||
systemd.sockets.cockpit.listenStreams = [ "" (toString cfg.port) ];
|
||||
|
||||
systemd.tmpfiles.rules = [ # From $out/lib/tmpfiles.d/cockpit-tmpfiles.conf
|
||||
"C /run/cockpit/inactive.motd 0640 root root - ${cfg.package}/share/cockpit/motd/inactive.motd"
|
||||
|
||||
@@ -21,10 +21,11 @@ import ./make-test-python.nix (
|
||||
};
|
||||
services.cockpit = {
|
||||
enable = true;
|
||||
port = 7890;
|
||||
openFirewall = true;
|
||||
settings = {
|
||||
WebService = {
|
||||
Origins = "https://server:9090";
|
||||
Origins = "https://server:7890";
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -65,7 +66,7 @@ import ./make-test-python.nix (
|
||||
driver.implicitly_wait(10)
|
||||
|
||||
log("Opening homepage")
|
||||
driver.get("https://server:9090")
|
||||
driver.get("https://server:7890")
|
||||
|
||||
|
||||
def wait_elem(by, query, timeout=10):
|
||||
@@ -107,7 +108,7 @@ import ./make-test-python.nix (
|
||||
driver.find_element(By.CSS_SELECTOR, 'button#login-button').click()
|
||||
|
||||
# driver.implicitly_wait(1)
|
||||
# driver.get("https://server:9090/system")
|
||||
# driver.get("https://server:7890/system")
|
||||
|
||||
log("Waiting dashboard to load")
|
||||
wait_title_contains("${user}@server")
|
||||
@@ -143,9 +144,9 @@ import ./make-test-python.nix (
|
||||
start_all()
|
||||
|
||||
server.wait_for_unit("sockets.target")
|
||||
server.wait_for_open_port(9090)
|
||||
server.wait_for_open_port(7890)
|
||||
|
||||
client.succeed("curl -k https://server:9090 -o /dev/stderr")
|
||||
client.succeed("curl -k https://server:7890 -o /dev/stderr")
|
||||
print(client.succeed("whoami"))
|
||||
client.succeed('PYTHONUNBUFFERED=1 selenium-script')
|
||||
'';
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
common-updater-scripts,
|
||||
gitMinimal,
|
||||
nix,
|
||||
nixfmt-classic,
|
||||
coreutils,
|
||||
gnused,
|
||||
callPackage,
|
||||
@@ -75,7 +74,6 @@ stdenv.mkDerivation rec {
|
||||
lib.makeBinPath [
|
||||
common-updater-scripts
|
||||
gitMinimal
|
||||
nixfmt-classic
|
||||
nix
|
||||
coreutils
|
||||
gnused
|
||||
@@ -87,9 +85,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
if [ ! "$oldVersion" = "$latestTag" ]; then
|
||||
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix"
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -4231,8 +4231,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "wikitext";
|
||||
publisher = "RoweWilsonFrederiskHolme";
|
||||
version = "3.8.2";
|
||||
hash = "sha256-rWifSoJSN37xPIaCQgPyXRz9tCX2Akahl/3CuqzXq94=";
|
||||
version = "4.0.1";
|
||||
hash = "sha256-DN7VRLr5IaqCdsbADriH0AuUODGL8OeZWbCSozQTboU=";
|
||||
};
|
||||
meta = {
|
||||
description = "Extension that helps users view and write MediaWiki's Wikitext files";
|
||||
|
||||
@@ -120,9 +120,9 @@ rec {
|
||||
|
||||
nomad_1_9 = generic {
|
||||
buildGoModule = buildGo123Module;
|
||||
version = "1.9.4";
|
||||
sha256 = "sha256-yhOyHfD5099dCY7lIJzTb8tQrqQ86N8HVtSk5mB7saY=";
|
||||
vendorHash = "sha256-Cxjgs4Hmv0sq11OpvYLnNcc76ojwqwcxMmCZT5Or0f4=";
|
||||
version = "1.9.5";
|
||||
sha256 = "sha256-NIv3QPSYoYrDQxxtNDHc3DdBLb45oUdA5Jyjke+XzD8=";
|
||||
vendorHash = "sha256-y4WBOSfkRYNQRWu5B/j2JBLPAxJ1fyLD0DEAjB10Sl8=";
|
||||
license = lib.licenses.bsl11;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "alt-tab-macos";
|
||||
version = "7.18.1";
|
||||
version = "7.19.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
|
||||
hash = "sha256-PMnA0G/CuofKR7mlWkcbQ+JVdGf91yQf7q8znFCIujY=";
|
||||
hash = "sha256-eT/HZDBDtOh9uQEffLhlBXfWuPSM/bnpgp5OFnSuCBk=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -1,15 +1,23 @@
|
||||
{ lib, fetchurl, appimageTools, makeWrapper, commandLineArgs ? "" }:
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
commandLineArgs ? "",
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "anytype";
|
||||
version = "0.43.8";
|
||||
version = "0.44.0";
|
||||
name = "Anytype-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
|
||||
hash = "sha256-inqJvx5K/k97X50E0FYlzJDKqrVjAU6ZKIVdCWHr8NI=";
|
||||
hash = "sha256-+Ae0xH6ipNZgIVrrAmgeG8bibm/I3NLiDMzS+fwf9RQ=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in appimageTools.wrapType2 {
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -29,6 +37,17 @@ in appimageTools.wrapType2 {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
# Prevent updating to versions with '-' in them.
|
||||
# Necessary since Anytype uses Electron-based 'MAJOR.MINOR.PATCH(-{alpha,beta})?' versioning scheme where each
|
||||
# {alpha,beta} version increases the PATCH version, releasing a new full release version in GitHub instead of a
|
||||
# pre-release version.
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"[^-]*"
|
||||
];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "P2P note-taking tool";
|
||||
homepage = "https://anytype.io/";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
{
|
||||
version = "1.16.1-3";
|
||||
arm64-hash = "sha256-VUbBHt9MzHZdbWJ4ak8T3vf5ZEi/gVTU89tKsJb+iu4=";
|
||||
x86_64-hash = "sha256-BkSreYgz3d2/Hw5lmH5IMCKxzqPO+Lb2vv6OuOkQOL0=";
|
||||
version = "1.16.2-2";
|
||||
arm64-hash = "sha256-re+QOxuFEBmymJ4Cbsv+1UEDxWACudGoHOpha8PIAso=";
|
||||
x86_64-hash = "sha256-89I47II8g4Q7CIwxmt797SzeZlAvVu2cTh05puWZ8+8=";
|
||||
}
|
||||
|
||||
@@ -3,21 +3,20 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargonode";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xosnrdev";
|
||||
repo = "cargonode";
|
||||
tag = version;
|
||||
hash = "sha256-xzBLuQRyKmd9k0sbBFV5amtFWwKqXR0CEsRv8SHiJcQ=";
|
||||
hash = "sha256-O5+wAM99m1rgQpwz36mkHEU/FvGnY6hBCKPMIGXCeCU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-v+Fs2VJrpnIOk9nPRanYYChlR7WOfkXF1kbYOKjOUYc=";
|
||||
cargoHash = "sha256-ZmWpqASh//iCg8blpbso3fhhqJzeOmxLXA1zyUobmwU=";
|
||||
|
||||
checkFlags = [
|
||||
# Skip test that requires network access
|
||||
@@ -35,7 +34,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Unified tooling for Node.js";
|
||||
mainProgram = "cargonode";
|
||||
homepage = "https://github.com/xosnrdev/cargonode";
|
||||
homepage = "https://github.com/xosnrdev/cargonode?tab=readme-ov-file#readme";
|
||||
changelog = "https://github.com/xosnrdev/cargonode/blob/${version}/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
asl20 # or
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdk";
|
||||
version = "5.0-20240619";
|
||||
version = "5.0-20250116";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://invisible-mirror.net/archives/cdk/cdk-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-Q28U6KdW5j3f9ZJ+73DJ3PceTFnVZYfiYwKk9yahnv8=";
|
||||
hash = "sha256-FQDUEiTVC3JyjMr+I8TuCWvIU1/W/bnodtpM3u3a3IM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -6,16 +6,19 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
_experimental-update-script-combinators,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "daed";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daeuniverse";
|
||||
repo = "daed";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-h1j91XIumuzuJnMxgkCjhuXYPLXoDuFFsfmDwmzlTEI=";
|
||||
hash = "sha256-5olEPaS/6ag69KUwBG8qXpyr1B2qrLK+vf13ZljHH+c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -24,7 +27,7 @@ let
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version src;
|
||||
hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY=";
|
||||
hash = "sha256-+yLpSbDzr1OV/bmUUg6drOvK1ok3cBd+RRV7Qrrlp+Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -34,23 +37,34 @@ let
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -R dist/* $out/
|
||||
|
||||
cp -R dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
inherit pname version src;
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
web
|
||||
;
|
||||
|
||||
sourceRoot = "${src.name}/wing";
|
||||
|
||||
vendorHash = "sha256-TBR3MmpTdwIwyekU+nrHhzsN31E30+Rqd3FoBL3dl4U=";
|
||||
vendorHash = "sha256-qB2qcJ82mFcVvjlYp/N9sqzwPotTROgymSX5NfEQMuY=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ clang ];
|
||||
@@ -81,6 +95,15 @@ buildGoModule rec {
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
passthru.updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script {
|
||||
attrPath = "daed.web";
|
||||
})
|
||||
(nix-update-script {
|
||||
extraArgs = [ "--version=skip" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Modern dashboard with dae";
|
||||
homepage = "https://github.com/daeuniverse/daed";
|
||||
|
||||
4829
pkgs/by-name/da/dash-mpd-cli/Cargo.lock
generated
4829
pkgs/by-name/da/dash-mpd-cli/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,33 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
protobuf,
|
||||
ffmpeg,
|
||||
libxslt,
|
||||
shaka-packager,
|
||||
}:
|
||||
|
||||
let
|
||||
# dash-mpd-cli looks for a binary named `shaka-packager`, while
|
||||
# shaka-packager provides `packager`.
|
||||
shaka-packager-wrapped = stdenvNoCC.mkDerivation {
|
||||
name = "shaka-packager-wrapped";
|
||||
phases = [ "installPhase" ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${lib.getExe shaka-packager} $out/bin/shaka-packager
|
||||
'';
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dash-mpd-cli";
|
||||
version = "0.2.23";
|
||||
version = "0.2.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emarsden";
|
||||
repo = "dash-mpd-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gRtt7iocGmnFpdTEMv/U4izeR/NtdYYXX3eFXW5LGYs=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Q4zzKdp8GROL8vHi8XETErqufSqgZH/zf/mqEH2lIzE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
patches = [
|
||||
./use-shaka-by-default.patch
|
||||
];
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
cargoHash = "sha256-R54Np08hYpDoidsHr3rmhpX/QZZkZHGcCSoKk6nw9R8=";
|
||||
|
||||
nativeBuildInputs = [ protobuf ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
protobuf
|
||||
];
|
||||
|
||||
# The tests depend on network access.
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/dash-mpd-cli \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
ffmpeg.bin
|
||||
libxslt.bin
|
||||
shaka-packager-wrapped
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Download media content from a DASH-MPEG or DASH-WebM MPD manifest";
|
||||
longDescription = ''
|
||||
|
||||
12
pkgs/by-name/da/dash-mpd-cli/use-shaka-by-default.patch
Normal file
12
pkgs/by-name/da/dash-mpd-cli/use-shaka-by-default.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff --git a/src/main.rs b/src/main.rs
|
||||
index f720d4c..a3c6c85 100644
|
||||
--- a/src/main.rs
|
||||
+++ b/src/main.rs
|
||||
@@ -325,6 +325,7 @@ async fn main () -> Result<()> {
|
||||
.value_name("APP")
|
||||
.num_args(1)
|
||||
.value_parser(["mp4decrypt", "shaka"])
|
||||
+ .default_value("shaka")
|
||||
.help("Application to use to decrypt encrypted media streams (either mp4decrypt or shaka)."))
|
||||
.arg(Arg::new("save-fragments")
|
||||
.long("save-fragments")
|
||||
@@ -18,9 +18,11 @@ buildGo123Module rec {
|
||||
|
||||
vendorHash = "sha256-ad0e/cxbcU/KfPDOdD46KdCcvns83dgGDAyLLQiGyiA=";
|
||||
|
||||
buildInputs = [ lm_sensors ];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \
|
||||
--replace-fail '"/etc/sensors3.conf"' '"${lm_sensors}/etc/sensors3.conf"'
|
||||
--replace-fail '"/etc/sensors3.conf"' '"${lib.getLib lm_sensors}/etc/sensors3.conf"'
|
||||
|
||||
# Uses /usr/bin/echo, and even if we patch that, it refuses to execute any
|
||||
# binary without being able to confirm that it's owned by root, which isn't
|
||||
@@ -28,9 +30,6 @@ buildGo123Module rec {
|
||||
rm internal/fans/cmd_test.go
|
||||
'';
|
||||
|
||||
CGO_CFLAGS = "-I ${lm_sensors}/include";
|
||||
CGO_LDFLAGS = "-L ${lm_sensors}/lib";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple daemon providing dynamic fan speed control based on temperature sensors";
|
||||
mainProgram = "fan2go";
|
||||
|
||||
7
pkgs/by-name/fr/freecad/README.md
Normal file
7
pkgs/by-name/fr/freecad/README.md
Normal file
@@ -0,0 +1,7 @@
|
||||
This package supports the following parameters:
|
||||
|
||||
- withWayland (default: true): when false, set QT_QPA_PLATFORM to xcb
|
||||
- spaceNavSupport (enabled by default on linux): whether to enable
|
||||
[spacenavd support](https://spacenav.sourceforge.net/)
|
||||
- ifcSupport (default: false): whether to enable ifc support through
|
||||
ifcopenshell
|
||||
@@ -23,6 +23,7 @@
|
||||
, pkg-config
|
||||
, python311Packages
|
||||
, spaceNavSupport ? stdenv.hostPlatform.isLinux
|
||||
, ifcSupport ? false
|
||||
, stdenv
|
||||
, swig
|
||||
, vtk
|
||||
@@ -47,6 +48,7 @@ let
|
||||
inherit (python311Packages)
|
||||
boost
|
||||
gitpython
|
||||
ifcopenshell
|
||||
matplotlib
|
||||
pivy
|
||||
ply
|
||||
@@ -126,6 +128,9 @@ freecad-utils.makeCustomizable (stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals spaceNavSupport [
|
||||
libspnav
|
||||
qtx11extras
|
||||
]
|
||||
++ lib.optionals ifcSupport [
|
||||
ifcopenshell
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
{
|
||||
callPackage,
|
||||
freecad,
|
||||
}:
|
||||
{
|
||||
python-path = callPackage ./python-path.nix { };
|
||||
modules = callPackage ./modules.nix { };
|
||||
withIfcSupport = freecad.override { ifcSupport = true; };
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
|
||||
jq,
|
||||
moreutils,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
nodejs,
|
||||
@@ -18,15 +20,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gale";
|
||||
version = "1.1.4";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kesomannen";
|
||||
repo = "gale";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-yAfQuLfucz522ln0YNMy8nppp2jk6tGJnP/WhK7JdhI=";
|
||||
hash = "sha256-bpeRbsbC1x1AXSyEPs1pUqwMouHQqJ/OtXXlNOVYcEA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
|
||||
'';
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
@@ -34,9 +40,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) pname version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
|
||||
hash = "sha256-u7UbC9TyEQwYpcVWt8/NsweDNWbQi6NuD9ay9gmMDjg=";
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-xaqNps2AimGWKSwtnfkP3RkLgTNlkaAUtOgDWpB2yEg=";
|
||||
};
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
@@ -44,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
npmHooks.npmConfigHook
|
||||
nodejs
|
||||
rustPlatform.cargoSetupHook
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitlab-ci-ls";
|
||||
version = "0.22.2";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alesbrelih";
|
||||
repo = "gitlab-ci-ls";
|
||||
rev = "${version}";
|
||||
hash = "sha256-xXatX0U4JBlsH1uLT9l5+FZj52zGyP9XztMa8eQ8eWk=";
|
||||
hash = "sha256-HpFdebG4pRa+g2ycOOfnWgN/+DcYdPHAN/RHBHN6S8A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yGxty10EJXLsNV4zW89X5W1y2jY/cWpmiJ9PgOtqKCo=";
|
||||
cargoHash = "sha256-CS3MkCumqHmTcRf/YJr/M8s7BoGos/ixXm97BCCXBvw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs =
|
||||
|
||||
@@ -4,7 +4,10 @@
|
||||
makeWrapper,
|
||||
fetchFromGitHub,
|
||||
|
||||
coreutils,
|
||||
git,
|
||||
gnugrep,
|
||||
gnused,
|
||||
openssh,
|
||||
inotify-tools,
|
||||
}:
|
||||
@@ -41,7 +44,10 @@ runCommand "gitwatch"
|
||||
wrapProgram $dest \
|
||||
--prefix PATH ';' ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
git
|
||||
gnugrep
|
||||
gnused
|
||||
inotify-tools
|
||||
openssh
|
||||
]
|
||||
|
||||
@@ -4,25 +4,22 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
testers,
|
||||
nix-update-script,
|
||||
go-task,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
version = "3.40.1";
|
||||
version = "3.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-task";
|
||||
repo = "task";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jQKPTKEzTfzqPlNlKFMduaAhvDsogRv3vCGtZ4KP/O4=";
|
||||
hash = "sha256-yJ9XTCS0BK+pcQvcbGR2ixwPODJKdfQnHgB1QoTFhzA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bw9NaJOMMKcKth0hRqNq8mqib/5zLpjComo0oj22A/U=";
|
||||
|
||||
doCheck = false;
|
||||
vendorHash = "sha256-DR9G+I6PYk8jrR0CZiPqtuULTMekATNSLjyHACOmlbk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -47,15 +44,14 @@ buildGoModule rec {
|
||||
--zsh <($out/bin/task --completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
version = testers.testVersion {
|
||||
package = go-task;
|
||||
};
|
||||
};
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/task";
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://taskfile.dev/";
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
wrapGAppsHook3,
|
||||
boost,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
ragel,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
lua,
|
||||
fetchpatch,
|
||||
lib,
|
||||
@@ -28,7 +27,12 @@ stdenv.mkDerivation rec {
|
||||
./dot-version.patch
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/1d53a9aace4bb60300e52458bb1577d248cb87cd/trunk/buildfix.diff";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/thezbyg/gpick/pull/227.patch";
|
||||
hash = "sha256-qYspUctvlPMEK/c2hMUxYc5EYdG//CBcN2PluTtXiFc=";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gpick/-/raw/0.3-2/buildfix.diff";
|
||||
hash = "sha256-DnRU90VPyFhLYTk4GPJoiVYadJgtYgjMS4MLgmpYLP0=";
|
||||
})
|
||||
];
|
||||
@@ -42,9 +46,9 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
gtk3
|
||||
ragel
|
||||
lua
|
||||
];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
gtk3,
|
||||
pythonPackages,
|
||||
python3Packages,
|
||||
glibcLocales,
|
||||
intltool,
|
||||
gexiv2,
|
||||
@@ -21,10 +21,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) buildPythonApplication pythonOlder;
|
||||
inherit (python3Packages) buildPythonApplication pythonOlder;
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
version = "5.2.3";
|
||||
version = "5.2.4";
|
||||
pname = "gramps";
|
||||
pyproject = true;
|
||||
|
||||
@@ -34,7 +34,7 @@ buildPythonApplication rec {
|
||||
owner = "gramps-project";
|
||||
repo = "gramps";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8=";
|
||||
hash = "sha256-Jue5V4pzfd1MaZwEhkGam+MhNjaisio7byMBPgGmiFg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -49,15 +49,15 @@ buildPythonApplication rec {
|
||||
intltool
|
||||
gettext
|
||||
gobject-introspection
|
||||
pythonPackages.setuptools
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
glibcLocales
|
||||
pythonPackages.unittestCheckHook
|
||||
pythonPackages.jsonschema
|
||||
pythonPackages.mock
|
||||
pythonPackages.lxml
|
||||
python3Packages.unittestCheckHook
|
||||
python3Packages.jsonschema
|
||||
python3Packages.mock
|
||||
python3Packages.lxml
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
@@ -76,7 +76,7 @@ buildPythonApplication rec {
|
||||
# Ghostscript support
|
||||
++ lib.optional enableGhostscript ghostscript;
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
berkeleydb
|
||||
pyicu
|
||||
pygobject3
|
||||
@@ -8,20 +8,20 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "granian";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emmett-framework";
|
||||
repo = "granian";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BuGavjNgA2xsp1f1KGQ9JYmAYVL779EC5jDzuRXAjYg=";
|
||||
hash = "sha256-OjyDwfp0d779oFQ7wUdR1eRPP35kcJa3wIdcYGrGGME=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-x/qyNnIUqEgh8fyzn7g4dw7KQxn71l+vlar04PaVI7c=";
|
||||
hash = "sha256-NiDGVQGKo+aku1is8OpRavuSalxLc5XfLai0XdtxUMA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
rustPlatform,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -17,6 +18,10 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
cargoHash = "sha256-rlKFS1ppUoyZ1X2PeG8tEB44Ysqi7kCLqR+ECVIdPjs=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "hdrop";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Schweber";
|
||||
repo = "hdrop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XpC/LLqB5EwvI2MwnR2x142UtG5WEt5Wwbhx6gdNJ68=";
|
||||
hash = "sha256-OX9kjGGdIvsaaGwNq7IbyD5B7AmlH1wHiR6P4uIOdi8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
gnused,
|
||||
makeWrapper,
|
||||
nix,
|
||||
nixfmt-classic,
|
||||
openjdk,
|
||||
writeScript,
|
||||
nixosTests,
|
||||
@@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
|
||||
gnused
|
||||
jq
|
||||
nix
|
||||
nixfmt-classic
|
||||
]
|
||||
}
|
||||
|
||||
@@ -70,9 +68,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
if [ ! "$oldVersion" = "$version" ]; then
|
||||
update-source-version jenkins "$version" "$hash"
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/by-name/je/jenkins/package.nix"
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "jenkins is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kirc";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcpcpc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-SXPtSFjGPLgORG9OCSCEStzNzdGZFzCx72YOrW288MU=";
|
||||
hash = "sha256-LiJZnFQMnyBEqeyyyqM56XXoYjbZPCWLfLX9OB/f+YM=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.153.0";
|
||||
version = "1.154.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kRyDmbz17zHCDfIvxejEvNZTRRF0bHApa3jT5hs4htM=";
|
||||
hash = "sha256-knlfcuZw7gPalLc/BSNvKmdweZAfd/QeBRNFX4OkOV8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "deltachat-core-rust";
|
||||
inherit version src;
|
||||
hash = "sha256-hPfWyJbBFFlh+Cy1ZrzJ9mq1nhEVr+GGTneMkqYfAtk=";
|
||||
hash = "sha256-Wbuz03gNlnQCu3p9rRdeZTCtIJqFUK71e8CmEOousFI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,9 +6,7 @@
|
||||
pkg-config,
|
||||
libnfc,
|
||||
openssl,
|
||||
libobjc ? null,
|
||||
IOKit,
|
||||
Security,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -17,7 +15,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libfreefare/libfreefare-0.4.0.tar.bz2";
|
||||
sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz";
|
||||
hash = "sha256-v6MdFKmaEkf17UkZXWNz3lEuPrdb8WJ2WLQM9/h2vGQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -30,16 +28,21 @@ stdenv.mkDerivation {
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libobjc
|
||||
IOKit
|
||||
Security
|
||||
darwin.libobjc
|
||||
darwin.apple_sdk
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Libfreefare project aims to provide a convenient API for MIFARE card manipulations";
|
||||
license = licenses.lgpl3;
|
||||
license = lib.licenses.lgpl3;
|
||||
homepage = "https://github.com/nfc-tools/libfreefare";
|
||||
maintainers = with maintainers; [ bobvanderlinden ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ bobvanderlinden ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libstudxml";
|
||||
version = "1.1.0-b.10+2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.codesynthesis.com/libstudxml/libstudxml.git";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OsjMhQ3u/wLhOay7qg9sQMEhnAOdrO30dsKQ8aDWUOo=";
|
||||
hash = "sha256-WMqO03ShZ5h3gqe3VQmdxE6JT4799kfdDbsqHVBzReI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -21,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"doc"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ build2 ];
|
||||
|
||||
# lib files are not marked as executable by default
|
||||
|
||||
@@ -2,34 +2,55 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
bash,
|
||||
bison,
|
||||
flex,
|
||||
which,
|
||||
perl,
|
||||
rrdtool,
|
||||
sensord ? false,
|
||||
rrdtool ? null,
|
||||
}:
|
||||
|
||||
assert sensord -> rrdtool != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lm-sensors";
|
||||
let
|
||||
version = "3.6.0";
|
||||
dashedVersion = lib.replaceStrings [ "." ] [ "-" ] version;
|
||||
tag = lib.replaceStrings [ "." ] [ "-" ] version;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "lm-sensors";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lm-sensors";
|
||||
repo = "lm-sensors";
|
||||
rev = "V${dashedVersion}";
|
||||
inherit tag;
|
||||
hash = "sha256-9lfHCcODlS7sZMjQhK0yQcCBEoGyZOChx/oM0CU37sY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compile failure on GCC 14 with `sensord` enabled.
|
||||
# From: https://github.com/lm-sensors/lm-sensors/pull/483
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lm-sensors/lm-sensors/pull/483/commits/7a6170f07d05cc6601b4668f211e9389f2e75286.patch";
|
||||
hash = "sha256-Q49quv3eXeMvY3jgZFs/F7Rljbq4YyehIDIlsgmloBQ=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
"out"
|
||||
"dev"
|
||||
"man"
|
||||
"doc"
|
||||
];
|
||||
|
||||
# Upstream build system have knob to enable and disable building of static
|
||||
# library, shared library is built unconditionally.
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
sed -i 'lib/Module.mk' -e '/LIBTARGETS :=/,+1d; /-m 755/ d'
|
||||
substituteInPlace prog/sensors/Module.mk --replace 'lib/$(LIBSHBASENAME)' ""
|
||||
substituteInPlace prog/sensors/Module.mk \
|
||||
--replace-fail 'lib/$(LIBSHBASENAME)' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,6 +58,7 @@ stdenv.mkDerivation rec {
|
||||
flex
|
||||
which
|
||||
];
|
||||
|
||||
# bash is required for correctly replacing the shebangs in all tools for cross-compilation.
|
||||
buildInputs = [
|
||||
bash
|
||||
@@ -45,35 +67,43 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"BINDIR=${placeholder "bin"}/bin"
|
||||
"SBINDIR=${placeholder "bin"}/bin"
|
||||
"INCLUDEDIR=${placeholder "dev"}/include"
|
||||
"MANDIR=${placeholder "man"}/share/man"
|
||||
# This is a dependency of the library.
|
||||
"ETCDIR=${placeholder "out"}/etc"
|
||||
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
] ++ lib.optional sensord "PROG_EXTRA=sensord";
|
||||
|
||||
installFlags = [
|
||||
"ETCDIR=${placeholder "out"}/etc"
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Making regexp to patch-out installing of .so symlinks from Makefile is
|
||||
# complicated, it is easier to remove them post-install.
|
||||
postInstall =
|
||||
''
|
||||
mkdir -p $out/share/doc/${pname}
|
||||
cp -r configs doc/* $out/share/doc/${pname}
|
||||
mkdir -p $doc/share/doc/lm_sensors
|
||||
cp -r configs doc/* $doc/share/doc/lm_sensors
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
rm $out/lib/*.so*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://hwmon.wiki.kernel.org/lm_sensors";
|
||||
changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES";
|
||||
changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/${tag}/CHANGES";
|
||||
description = "Tools for reading hardware sensors";
|
||||
license = with licenses; [
|
||||
license = with lib.licenses; [
|
||||
lgpl21Plus
|
||||
gpl2Plus
|
||||
];
|
||||
maintainers = with maintainers; [ pmy ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
pmy
|
||||
oxalica
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "sensors";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"version": "3.128.0",
|
||||
"version": "3.129.0",
|
||||
"assets": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.128.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-GP7n7oTuecRwstUOguaOhHx9HiwNoFO0BSWX2/AB6LI="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.129.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-kvyofs+kBXVJewdjloV/uwR8TMU3jhUbMF+wl7uyl/0="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.128.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-WExPypRI9eDpUXoCNkAeO5rsDHULZbpBWLYQxRdvN7I="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.129.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-Lk5s2puKkz4hK0I2aQJzfQ5w66ERUtCK1plO52f2OZQ="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
glfw,
|
||||
enableShared ? !stdenv.hostPlatform.isStatic,
|
||||
@@ -19,13 +20,23 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-/HCP6F7N+J97n4orlLxg/4agEoq4+rJdpeW/3q+DI1I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# clang no longer allows using -Ofast
|
||||
# see: https://github.com/codam-coding-college/MLX42/issues/147
|
||||
(fetchpatch {
|
||||
name = "replace-ofast-with-o3.patch";
|
||||
url = "https://github.com/codam-coding-college/MLX42/commit/ce254c3a19af8176787601a2ac3490100a5c4c61.patch";
|
||||
hash = "sha256-urL/WVOXinf7hWR5kH+bAVTcAzldkkWfY0+diSf7jHE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch =
|
||||
''
|
||||
patchShebangs --build ./tools
|
||||
''
|
||||
+ lib.optionalString enableShared ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "mlx42 STATIC" "mlx42 SHARED"
|
||||
--replace-fail "mlx42 STATIC" "mlx42 SHARED"
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monit";
|
||||
version = "5.34.3";
|
||||
version = "5.34.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz";
|
||||
sha256 = "sha256-Zp2Lld3sEk0URLpSZPZ/3q6OkOU7KSlxn0dQ/F/zumA=";
|
||||
sha256 = "sha256-72B8+qv9N2fUC5ueMgMvdIvuvE1oaDH2ER4OaPvRtGk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nawk";
|
||||
version = "20240728";
|
||||
version = "20250116";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onetrueawk";
|
||||
repo = "awk";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-LA7fdbMP3aKJ1QljoKWizqVg3ys3hd8tGaRsQnIO+Hc=";
|
||||
hash = "sha256-zRGMqMPkP801nZE/pG/NwsiOvv6dTQBcPtfTJCh1eiQ=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
common-updater-scripts,
|
||||
git,
|
||||
nix,
|
||||
nixfmt-classic,
|
||||
jq,
|
||||
coreutils,
|
||||
gnused,
|
||||
@@ -99,7 +98,6 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
cacert
|
||||
git
|
||||
nixfmt-classic
|
||||
nix
|
||||
jq
|
||||
coreutils
|
||||
@@ -111,11 +109,8 @@ stdenv.mkDerivation rec {
|
||||
latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')"
|
||||
|
||||
if [ ! "null" = "$latestSha" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix"
|
||||
latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')"
|
||||
update-source-version oh-my-zsh "$latestDate" --rev="$latestSha"
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open62541pp";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open62541pp";
|
||||
repo = "open62541pp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9sxfM1BH6f29JRckNJi+t2TWNvtHmfyc6WO93PR2ofY=";
|
||||
hash = "sha256-593UaEEqWaheqEBUl13ijuC25sNnuPe9a6gbBo7Zo+E=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
BUILD_CLIENT=1
|
||||
BUILD_RENDERER_OPENGL2=1
|
||||
BUILD_RENDERER_OPENGL2=0
|
||||
BUILD_SERVER=1
|
||||
USE_CURL_DLOPEN=0
|
||||
USE_FREETYPE=1
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "openlinkhub";
|
||||
version = "0.4.5";
|
||||
version = "0.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jurkovic-nikola";
|
||||
repo = "OpenLinkHub";
|
||||
tag = version;
|
||||
hash = "sha256-67dnZr83QCAy7fWrrbdSV3Yh8ProewZsL6Gv8Bnc3f4=";
|
||||
hash = "sha256-gsMzquVK4QVXZPHIeAuZW/vHW8tRBWcVAX+/fORDp+U=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
59
pkgs/by-name/op/openterface-qt/package.nix
Normal file
59
pkgs/by-name/op/openterface-qt/package.nix
Normal file
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
fetchFromGitHub,
|
||||
qt6,
|
||||
libusb1,
|
||||
}:
|
||||
stdenv.mkDerivation (final: {
|
||||
pname = "openterface-qt";
|
||||
version = "0.0.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "TechxArtisanStudio";
|
||||
repo = "Openterface_QT";
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-orSOEzyplV0d+faaaRpXeMOhwbnOFxir7DG3LdErCdI=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
qt6.wrapQtAppsHook
|
||||
qt6.qmake
|
||||
];
|
||||
buildInputs = [
|
||||
libusb1
|
||||
qt6.qtbase
|
||||
qt6.qtmultimedia
|
||||
qt6.qtserialport
|
||||
qt6.qtsvg
|
||||
];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp ./openterfaceQT $out/bin/
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp ./images/icon_256.png $out/share/pixmaps/${final.pname}.png
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "openterfaceQT";
|
||||
exec = "openterfaceQT";
|
||||
icon = final.pname;
|
||||
comment = final.meta.description;
|
||||
desktopName = "Openterface QT";
|
||||
categories = [ "Utility" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Openterface mini-KVM host application for linux";
|
||||
homepage = "https://github.com/TechxArtisanStudio/Openterface_QT";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "openterfaceQT";
|
||||
maintainers = with lib.maintainers; [ samw ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "orbiton";
|
||||
version = "2.68.6";
|
||||
version = "2.68.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "orbiton";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7h8U6Ye5Jyf0UmV/+6yHv9QBEtxYHlDBq+T09tmywnM=";
|
||||
hash = "sha256-x64sHd6d8zpOp9XWhjXkRfBqzyZWRC80QLZ8dYCgGjo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -50,7 +50,7 @@ buildGoModule rec {
|
||||
|
||||
meta = {
|
||||
description = "Config-free text editor and IDE limited to VT100";
|
||||
homepage = "https://orbiton.zip";
|
||||
homepage = "https://roboticoverlords.org/orbiton/";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
mainProgram = "o";
|
||||
|
||||
@@ -45,23 +45,6 @@ let
|
||||
packageOverrides = final: prev: {
|
||||
django = prev.django_5;
|
||||
|
||||
# TODO: drop after https://github.com/NixOS/nixpkgs/pull/306556 or similar got merged
|
||||
django-allauth = prev.django-allauth.overridePythonAttrs (
|
||||
{ src, nativeCheckInputs, ... }:
|
||||
let
|
||||
version = "65.0.2";
|
||||
in
|
||||
{
|
||||
inherit version;
|
||||
src = src.override {
|
||||
tag = version;
|
||||
hash = "sha256-GvYdExkNuySrg8ERnWOJxucFe5HVdPAcHfRNeqiVS7M=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = nativeCheckInputs ++ [ prev.fido2 ];
|
||||
}
|
||||
);
|
||||
|
||||
django-extensions = prev.django-extensions.overridePythonAttrs (_: {
|
||||
# fails with: TypeError: 'class Meta' got invalid attribute(s): index_together
|
||||
# probably because of django_5 but it is the latest version available and used like that in paperless-ngx
|
||||
@@ -232,6 +215,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
whoosh
|
||||
zxing-cpp
|
||||
]
|
||||
++ django-allauth.optional-dependencies.socialaccount
|
||||
++ redis.optional-dependencies.hiredis
|
||||
++ uvicorn.optional-dependencies.standard;
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "pbm";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
nugetHash = "sha256-R6dmF3HPI2BAcNGLCm6WwBlk4ev6T6jaiJUAWYKf2S4=";
|
||||
nugetHash = "sha256-2MoIpgBDrjbi2nInGxivgjLSnS/iyv01y0Yia8R/Gyc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI for managing Akka.NET applications and Akka.NET Clusters";
|
||||
|
||||
@@ -55,6 +55,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DBUILD_BUNDLE=OFF"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-incompatible-pointer-types"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.7.2";
|
||||
version = "1.8";
|
||||
pname = "pkgdiff";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lvc";
|
||||
repo = "pkgdiff";
|
||||
rev = version;
|
||||
sha256 = "1ahknyx0s54frbd3gqh070lkv3j1b344jrs6m6p1s1lgwbd70vnb";
|
||||
sha256 = "sha256-/xhORi/ZHC4B2z6UYPOvDzfgov1DcozRjX0K1WYrqXM=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "pmtiles";
|
||||
version = "1.22.3";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protomaps";
|
||||
repo = "go-pmtiles";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LKcJJXuQEGJ55uPattoSESxE1knlU2XXzdYrQIlX5aA=";
|
||||
hash = "sha256-W8TlMUAzEeHYrVxJTS3CeBkZzshpuDbFD8lC/ITJMKI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KRjMEH17cvSjtRP/qYeWRFUo6f6v1ZxEd+H3xvZ1udQ=";
|
||||
vendorHash = "sha256-Oi099KdfSSVDKuWektEucigwchjEHCsOxbCe48DICF8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-go";
|
||||
version = "1.36.1";
|
||||
version = "1.36.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protocolbuffers";
|
||||
repo = "protobuf-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+OFG7dUrxQveG+UmR9gKXxHUJYtVYb/FH1bWxgxwiOw=";
|
||||
hash = "sha256-yzrdZMWl5MBOAGCXP1VxVZNLCSFUWEURVYiDhRKSSRc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E=";
|
||||
|
||||
@@ -1,5 +1,18 @@
|
||||
{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }:
|
||||
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
mono,
|
||||
libmediainfo,
|
||||
sqlite,
|
||||
curl,
|
||||
makeWrapper,
|
||||
icu,
|
||||
dotnet-runtime,
|
||||
openssl,
|
||||
nixosTests,
|
||||
zlib,
|
||||
}:
|
||||
let
|
||||
pname = "prowlarr";
|
||||
|
||||
@@ -13,21 +26,25 @@ let
|
||||
else
|
||||
unsupported;
|
||||
|
||||
arch = {
|
||||
aarch64-darwin = "arm64";
|
||||
aarch64-linux = "arm64";
|
||||
x86_64-darwin = "x64";
|
||||
x86_64-linux = "x64";
|
||||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
arch =
|
||||
{
|
||||
aarch64-darwin = "arm64";
|
||||
aarch64-linux = "arm64";
|
||||
x86_64-darwin = "x64";
|
||||
x86_64-linux = "x64";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
hash = {
|
||||
aarch64-darwin = "sha256-N5BDsx9iunG5qUau6gJvdSFscPkNe5/35zMMfsvM+eE=";
|
||||
aarch64-linux = "sha256-cqSakzwokb4ym8852MYsoyAV3vS9eSyU4/xhHPtsD4o=";
|
||||
x86_64-darwin = "sha256-2x4k5c1HdNFzDmoEsrrQ3+s41+3wukSMJPHZJJKd/eE=";
|
||||
x86_64-linux = "sha256-OqZo+kFMTSklwPlj2hr7sAOXCh0HvqbeXWzfmScWXKU=";
|
||||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
hash =
|
||||
{
|
||||
aarch64-darwin = "sha256-N5BDsx9iunG5qUau6gJvdSFscPkNe5/35zMMfsvM+eE=";
|
||||
aarch64-linux = "sha256-cqSakzwokb4ym8852MYsoyAV3vS9eSyU4/xhHPtsD4o=";
|
||||
x86_64-darwin = "sha256-2x4k5c1HdNFzDmoEsrrQ3+s41+3wukSMJPHZJJKd/eE=";
|
||||
x86_64-linux = "sha256-OqZo+kFMTSklwPlj2hr7sAOXCh0HvqbeXWzfmScWXKU=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or unsupported;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "1.29.2.4915";
|
||||
|
||||
@@ -46,8 +63,17 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Prowlarr \
|
||||
--add-flags "$out/share/${pname}-${version}/Prowlarr.dll" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
|
||||
curl sqlite libmediainfo mono openssl icu zlib ]}
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
curl
|
||||
sqlite
|
||||
libmediainfo
|
||||
mono
|
||||
openssl
|
||||
icu
|
||||
zlib
|
||||
]
|
||||
}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -19,15 +19,15 @@ updateHash()
|
||||
hash=$(nix-prefetch-url --type sha256 $url)
|
||||
sriHash="$(nix hash to-sri --type sha256 $hash)"
|
||||
|
||||
sed -i "s|$system = \"sha256-[a-zA-Z0-9\/+-=]*\";|$system = \"$sriHash\";|g" "$dirname/default.nix"
|
||||
sed -i "s|$system = \"sha256-[a-zA-Z0-9\/+-=]*\";|$system = \"$sriHash\";|g" "$dirname/package.nix"
|
||||
}
|
||||
|
||||
updateVersion()
|
||||
{
|
||||
sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix"
|
||||
sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/package.nix"
|
||||
}
|
||||
|
||||
currentVersion=$(cd $dirname && nix eval --raw -f ../../.. prowlarr.version)
|
||||
currentVersion=$(cd $dirname && nix eval --raw -f ../../../.. prowlarr.version)
|
||||
|
||||
latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name")
|
||||
latestVersion="$(expr $latestTag : 'v\(.*\)')"
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rapidfuzz-cpp";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapidfuzz";
|
||||
repo = "rapidfuzz-cpp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tmk7H9F+IScYPlcbplcrqUU/+py0DFTO95QYdwz5gIc=";
|
||||
hash = "sha256-rCA4Rbf7VAcJmRH0KM0gfc3tZPSCBANf7znvoIlD9sk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
desktopToDarwinBundle,
|
||||
libsForQt5,
|
||||
makeDesktopItem,
|
||||
protobuf,
|
||||
python3Packages,
|
||||
system-config-printer,
|
||||
}:
|
||||
@@ -43,11 +44,16 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
substituteInPlace package_support/gnulinux/50-remarkable.rules \
|
||||
--replace-fail 'GROUP="yourgroup"' 'GROUP="users"'
|
||||
|
||||
# This must match the protobuf version imported at runtime, regenerate it
|
||||
rm src/model/update_metadata_pb2.py
|
||||
protoc --proto_path src/model src/model/update_metadata.proto --python_out=src/model
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
copyDesktopItems
|
||||
protobuf
|
||||
libsForQt5.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
@@ -66,7 +72,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pdfminer-six
|
||||
pikepdf
|
||||
pillow
|
||||
protobuf
|
||||
python3Packages.protobuf # otherwise it picks up protobuf from function args
|
||||
pyside2
|
||||
];
|
||||
|
||||
|
||||
@@ -32,6 +32,8 @@ buildGoModule rec {
|
||||
mv $out/bin/{app,reproxy}
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple edge server / reverse proxy";
|
||||
homepage = "https://reproxy.io/";
|
||||
|
||||
@@ -25,7 +25,7 @@ buildNpmPackage rec {
|
||||
hash = "sha256-xR+HVC1JVrPkgPhIJZxdTVG52+QbanmD1c/uO5l84oc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-h+48/9h7/cD8woyA0UCLtzKuE9jCrfpDk6IeoDWnYik=";
|
||||
npmDepsHash = "sha256-C8puCz/w5xkaR4QVXXOdoO8n4gNZrRWMcB9/f1DcuMc=";
|
||||
|
||||
patches = [
|
||||
# Adds support for electron versions >=28
|
||||
@@ -39,6 +39,9 @@ buildNpmPackage rec {
|
||||
(replaceVars ./mk.patch {
|
||||
inherit version;
|
||||
})
|
||||
|
||||
# would not build with nodejs_22 and above without this
|
||||
./update-nan.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
31
pkgs/by-name/ri/ride/update-nan.patch
Normal file
31
pkgs/by-name/ri/ride/update-nan.patch
Normal file
@@ -0,0 +1,31 @@
|
||||
diff --git a/package-lock.json b/package-lock.json
|
||||
index a0bd285..5a5ec59 100644
|
||||
--- a/package-lock.json
|
||||
+++ b/package-lock.json
|
||||
@@ -8034,9 +8034,10 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/nan": {
|
||||
- "version": "2.17.0",
|
||||
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
|
||||
- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
|
||||
+ "version": "2.22.0",
|
||||
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
|
||||
+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
|
||||
+ "license": "MIT",
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/nanomatch": {
|
||||
@@ -18258,9 +18259,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"nan": {
|
||||
- "version": "2.17.0",
|
||||
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
|
||||
- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
|
||||
+ "version": "2.22.0",
|
||||
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
|
||||
+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
|
||||
"optional": true
|
||||
},
|
||||
"nanomatch": {
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
python3,
|
||||
fetchpatch,
|
||||
fetchPypi,
|
||||
openssl,
|
||||
# Many Salt modules require various Python modules to be installed,
|
||||
@@ -21,6 +22,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
patches = [
|
||||
./fix-libcrypto-loading.patch
|
||||
(fetchpatch {
|
||||
name = "urllib.patch";
|
||||
url = "https://src.fedoraproject.org/rpms/salt/raw/1c6e7b7a88fb81902f5fcee32e04fa80713b81f8/f/urllib.patch";
|
||||
hash = "sha256-yldIurafduOAYpf2X0PcTQyyNjz5KKl/N7J2OTEF/c0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
common-updater-scripts,
|
||||
cacert,
|
||||
git,
|
||||
nixfmt-classic,
|
||||
nix,
|
||||
jq,
|
||||
coreutils,
|
||||
@@ -66,7 +65,6 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
cacert
|
||||
git
|
||||
nixfmt-classic
|
||||
nix
|
||||
jq
|
||||
coreutils
|
||||
@@ -76,12 +74,9 @@ stdenv.mkDerivation rec {
|
||||
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
|
||||
latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')"
|
||||
if [ ! "null" = "$latestSha" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix"
|
||||
latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')"
|
||||
update-source-version ${pname} "$latestSha" --version-key=rev
|
||||
update-source-version ${pname} "$latestDate" --ignore-same-hash
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
nix-update-script,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
@@ -9,21 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sirula";
|
||||
version = "1.0.0-unstable-2023-09-02";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DorianRudolph";
|
||||
repo = pname;
|
||||
rev = "b15efe85ef1fe50849a33e5919d53d05f4f66090";
|
||||
hash = "sha256-S0WbqY49nKaBUMWfgDKZxFLJuk7uFcnTfV8s86V0Zxs=";
|
||||
repo = "sirula";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rBaH2cIIaRoaw8Os60s4MknZywzDuGLagJiAvEYU4m8=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"osstrtools-0.2.2" = "sha256-Co4pcikfN4vtIVK7ZsRGCWMAhMJWNNVZe/AdN1nMlmQ=";
|
||||
};
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-7trHMGTWtf4IT7efyKIXM7n4x6j7n2V3I7ZXSSwvzys=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -32,11 +29,13 @@ rustPlatform.buildRustPackage rec {
|
||||
gtk-layer-shell
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Simple app launcher for wayland written in rust";
|
||||
homepage = "https://github.com/DorianRudolph/sirula";
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
license = [ lib.licenses.gpl3Plus ];
|
||||
maintainers = [ lib.maintainers.atagen ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
{ lib, python3Packages, fetchPypi, dbus }:
|
||||
{ lib, python3Packages, fetchFromGitHub, dbus }:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "spotify-cli-linux";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YW9HLcy50d44TRUEEkWAd92Gr2sTpRiu/w/bhF+LdBM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwittchen";
|
||||
repo = "spotify-cli-linux";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ko/as7wiBHawmyag9jFZqpPUZhb3p1+oYcl+26XyBZk=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -3,18 +3,22 @@
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
installShellFiles,
|
||||
symlinkJoin,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
metaCommon = {
|
||||
description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal";
|
||||
homepage = "https://docs.temporal.io/cli";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
buildGoModule rec {
|
||||
pname = "temporal-cli";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7wURMdi357w5S4s909PTUZanRzFyWM588DMY7iYWP88=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-umGwew8RwewlYJQD1psYSd9bu67cPEiHBJkQRJGjyGY=";
|
||||
|
||||
overrideModAttrs = old: {
|
||||
# https://gitlab.com/cznic/libc/-/merge_requests/10
|
||||
postBuild = ''
|
||||
@@ -22,110 +26,40 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
tctl-next = buildGoModule rec {
|
||||
pname = "tctl-next";
|
||||
version = "1.1.2";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7wURMdi357w5S4s909PTUZanRzFyWM588DMY7iYWP88=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-umGwew8RwewlYJQD1psYSd9bu67cPEiHBJkQRJGjyGY=";
|
||||
|
||||
inherit overrideModAttrs;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
excludedPackages = [
|
||||
"./cmd/docgen"
|
||||
"./tests"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/temporalio/cli/temporalcli.Version=${version}"
|
||||
];
|
||||
|
||||
# Tests fail with x86 on macOS Rosetta 2
|
||||
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd temporal \
|
||||
--bash <($out/bin/temporal completion bash) \
|
||||
--fish <($out/bin/temporal completion fish) \
|
||||
--zsh <($out/bin/temporal completion zsh)
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "temporal";
|
||||
};
|
||||
};
|
||||
|
||||
tctl = buildGoModule rec {
|
||||
pname = "tctl";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "tctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LX4hyPme+mkNmPvrTHIT5Ow3QM8BTAB7MXSY1fa8tSk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-294lnUKnXNrN6fJ+98ub7LwsJ9aT+FzWCB3nryfAlCI=";
|
||||
|
||||
inherit overrideModAttrs;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
excludedPackages = [ "./cmd/copyright" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd tctl \
|
||||
--bash <($out/bin/tctl completion bash) \
|
||||
--zsh <($out/bin/tctl completion zsh)
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "tctl";
|
||||
};
|
||||
};
|
||||
in
|
||||
symlinkJoin rec {
|
||||
pname = "temporal-cli";
|
||||
inherit (tctl-next) version;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
paths = [
|
||||
tctl-next
|
||||
tctl
|
||||
excludedPackages = [
|
||||
"./cmd/docgen"
|
||||
"./tests"
|
||||
];
|
||||
|
||||
passthru = { inherit tctl tctl-next; };
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/temporalio/cli/temporalcli.Version=${version}"
|
||||
];
|
||||
|
||||
meta = metaCommon // {
|
||||
# Tests fail with x86 on macOS Rosetta 2
|
||||
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd temporal \
|
||||
--bash <($out/bin/temporal completion bash) \
|
||||
--fish <($out/bin/temporal completion fish) \
|
||||
--zsh <($out/bin/temporal completion zsh)
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal";
|
||||
homepage = "https://docs.temporal.io/cli";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
mainProgram = "temporal";
|
||||
platforms = lib.unique (lib.concatMap (drv: drv.meta.platforms) paths);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trdl-client";
|
||||
version = "0.7.0";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "trdl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-umeoiEq+Cp/cKpiNxCnMDghubm3LPFPJA18ChuYmIVo=";
|
||||
hash = "sha256-7qhtn64nIcZLThXYLhrs/b5Z6k2mghJ77w6SyVcHmX4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/client";
|
||||
|
||||
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
|
||||
];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trealla";
|
||||
version = "2.63.11";
|
||||
version = "2.63.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trealla-prolog";
|
||||
repo = "trealla";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3Z8LML2BTHAaNEg65YqYg0HyLNG1HwHpztGfSY1VGyw=";
|
||||
hash = "sha256-4YQCfkAJTTS0n0hDUcc25ks0XtToqNL7eFVM1aPjE/w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -19,10 +19,10 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "tweepy";
|
||||
repo = "tweepy";
|
||||
rev = "v${version}";
|
||||
sha256 = "0k4bdlwjna6f1k19jki4xqgckrinkkw8b9wihzymr1l04rwd05nw";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3BbQeCaAhlz9h5GnhficNubJHu4kTpnCDM4oKzlti0w=";
|
||||
};
|
||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
|
||||
dependencies = oldAttrs.dependencies ++ [
|
||||
super.six
|
||||
super.requests.optional-dependencies.socks
|
||||
];
|
||||
@@ -36,13 +36,29 @@ with py.pkgs;
|
||||
buildPythonPackage rec {
|
||||
pname = "turses";
|
||||
version = "0.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6";
|
||||
hash = "sha256-RqYVQdGs0TOFYaGYswEQgbkfEYQVwIsRFETNskaFs5Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
pythonRelaxDeps = [
|
||||
"urwid"
|
||||
"future"
|
||||
"tweepy"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_config.py \
|
||||
--replace-fail "config.generate_config_file.assert_called_once()" "assert config.generate_config_file.call_count == 1"
|
||||
substituteInPlace tests/test_meta.py \
|
||||
--replace-fail "self.observer.update.assert_called_once()" "assert self.observer.update.call_count == 1"
|
||||
'';
|
||||
|
||||
build-system = with py.pkgs; [ setuptools ];
|
||||
|
||||
dependencies = with py.pkgs; [
|
||||
urwid
|
||||
tweepy
|
||||
future
|
||||
@@ -69,17 +85,6 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "urwid==1.3.0" "urwid" \
|
||||
--replace "future==0.14.3" "future" \
|
||||
--replace "tweepy==3.3.0" "tweepy"
|
||||
substituteInPlace tests/test_config.py \
|
||||
--replace "config.generate_config_file.assert_called_once()" "assert config.generate_config_file.call_count == 1"
|
||||
substituteInPlace tests/test_meta.py \
|
||||
--replace "self.observer.update.assert_called_once()" "assert self.observer.update.call_count == 1"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
TMP_TURSES=`echo turses-$RANDOM`
|
||||
mkdir $TMP_TURSES
|
||||
@@ -89,10 +94,11 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Twitter client for the console";
|
||||
mainProgram = "turses";
|
||||
homepage = "https://github.com/louipc/turses";
|
||||
changelog = "https://github.com/louipc/turses/blob/v${version}/HISTORY.rst";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
mainProgram = "turses";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,19 +14,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uutils-coreutils";
|
||||
version = "0.0.28";
|
||||
version = "0.0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "coreutils";
|
||||
tag = version;
|
||||
hash = "sha256-Gwks+xTkwK5dgV9AkSthIrhBNwq/WvM9SNr0wR/SBSM=";
|
||||
hash = "sha256-B6lz75uxROo7npiZNCdTt0NCxVvsaIgtWnuGOKevDQQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "uutils-coreutils-${version}";
|
||||
hash = "sha256-i7RvsgtmkH8og8lkRQURWLrzrhPkxans+KME2Ili0wM=";
|
||||
hash = "sha256-BSRYL9qsa+FUjfXTP/vx7VZwOyjhBM7DREvI6/X2tCA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -69,6 +69,7 @@ stdenv.mkDerivation rec {
|
||||
CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites.
|
||||
'';
|
||||
homepage = "https://github.com/uutils/coreutils";
|
||||
changelog = "https://github.com/uutils/coreutils/releases/tag/${version}";
|
||||
maintainers = with lib.maintainers; [ siraben ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -3,26 +3,32 @@
|
||||
fetchFromGitHub,
|
||||
flutter327,
|
||||
webkitgtk_4_1,
|
||||
pkg-config,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
runCommand,
|
||||
venera,
|
||||
yq,
|
||||
_experimental-update-script-combinators,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
flutter327.buildFlutterApplication rec {
|
||||
pname = "venera";
|
||||
version = "1.1.3";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "venera-app";
|
||||
repo = "venera";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zjlu+rdS+ctp8R1laeT9OF+HCLvTyQsAJIBA1fEiNMg=";
|
||||
hash = "sha256-RqrddFzd0+TePVupqVwTjlt/Jpwi++J3JCsltW6KORo=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes = {
|
||||
desktop_webview_window = "sha256-15tw3gLN9e886QjBFuYP34KLD1lN8AmQYXVza5Bvs40=";
|
||||
flutter_qjs = "sha256-SvOgcZquwZ1/HWVkPVnD8Eo+jD3jjfkKsVleJpNaiV0=";
|
||||
flutter_qjs = "sha256-nbXKfiCvG6JT570RNVq3gec+JFw3H7XG4g/QSNkDw18=";
|
||||
flutter_7zip = "sha256-KHDq4XG3l+dq1NPW84wOK5kKbXJ8qCK8voGeTnX/Krw=";
|
||||
lodepng_flutter = "sha256-bGc9uXD1EQ/19OIZmR7a/YL9w93fNWdQF5S19LSwxZw=";
|
||||
photo_view = "sha256-Z+9xgvk8YS+bgCbBW7BBY72tV6JUq2kCX5OwKFK4YPE=";
|
||||
scrollable_positioned_list = "sha256-6XmBlNxE7DEqY2LsEFtVrshn2Xt55XnmaiTq+tiPInA=";
|
||||
@@ -32,7 +38,6 @@ flutter327.buildFlutterApplication rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -57,15 +62,29 @@ flutter327.buildFlutterApplication rec {
|
||||
})
|
||||
];
|
||||
|
||||
extraWrapProgramArgs = ''
|
||||
--prefix LD_LIBRARY_PATH : $out/app/venera/lib
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0644 ./debian/gui/venera.png $out/share/pixmaps/venera.png
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
extraWrapProgramArgs = ''
|
||||
--prefix LD_LIBRARY_PATH : $out/app/venera/lib
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
pubspecSource =
|
||||
runCommand "pubspec.lock.json"
|
||||
{
|
||||
buildInputs = [ yq ];
|
||||
inherit (venera) src;
|
||||
}
|
||||
''
|
||||
cat $src/pubspec.lock | yq > $out
|
||||
'';
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(gitUpdater { rev-prefix = "v"; })
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "venera.pubspecSource" ./pubspec.lock.json)
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Comic reader that support reading local and network comics";
|
||||
|
||||
@@ -377,6 +377,17 @@
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"flutter_7zip": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "b33344797f1d2469339e0e1b75f5f954f1da224c",
|
||||
"resolved-ref": "b33344797f1d2469339e0e1b75f5f954f1da224c",
|
||||
"url": "https://github.com/wgh136/flutter_7zip"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "0.0.1"
|
||||
},
|
||||
"flutter_file_dialog": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -507,8 +518,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "1657f62fe7545ac43a339e0a5ee2b82bacd81e9f",
|
||||
"resolved-ref": "1657f62fe7545ac43a339e0a5ee2b82bacd81e9f",
|
||||
"ref": "9c99ac258a11f8e91761a5466a190efba3ca64af",
|
||||
"resolved-ref": "9c99ac258a11f8e91761a5466a190efba3ca64af",
|
||||
"url": "https://github.com/wgh136/flutter_qjs"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1080,15 +1091,15 @@
|
||||
"source": "hosted",
|
||||
"version": "5.0.2"
|
||||
},
|
||||
"shimmer": {
|
||||
"shimmer_animation": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "shimmer",
|
||||
"sha256": "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9",
|
||||
"name": "shimmer_animation",
|
||||
"sha256": "9357080b7dd892aae837d569e1fbbcbe7f9a02ca994e558561d90e35e92f1101",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.0"
|
||||
"version": "2.2.2"
|
||||
},
|
||||
"sky_engine": {
|
||||
"dependency": "transitive",
|
||||
@@ -1176,6 +1187,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"syntax_highlight": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "syntax_highlight",
|
||||
"sha256": "ee33b6aa82cc722bb9b40152a792181dee222353b486c0255fde666a3e3a4997",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.4.0"
|
||||
},
|
||||
"term_glyph": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1196,6 +1217,16 @@
|
||||
"source": "hosted",
|
||||
"version": "0.7.3"
|
||||
},
|
||||
"text_scroll": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "text_scroll",
|
||||
"sha256": "7869d86a6fdd725dee56bdd150216a99f0372b82fbfcac319214dbd5f36e1908",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.0"
|
||||
},
|
||||
"typed_data": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1401,11 +1432,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "zip_flutter",
|
||||
"sha256": "955b53d58709fcd9feefbed3d41b5522bc5273e677603e9fc67017a81e568d24",
|
||||
"sha256": "be21152c35fcb6d0ef4ce89fc3aed681f7adc0db5490ca3eb5893f23fd20e646",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.0.5"
|
||||
"version": "0.0.6"
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
|
||||
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/venera-app/venera/releases/latest | jq --raw-output .tag_name)
|
||||
latestVersion=$(echo "$latestTag" | sed 's/^v//')
|
||||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; venera.version or (lib.getVersion venera)" | tr -d '"')
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "package is up-to-date: $currentVersion"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
nix-update venera
|
||||
|
||||
curl https://raw.githubusercontent.com/venera-app/venera/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
|
||||
@@ -7,6 +7,7 @@
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
unstableGitUpdater,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
wayland-scanner,
|
||||
@@ -15,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-hdr-layer-kwin6";
|
||||
version = "0-unstable-2024-10-19";
|
||||
version = "0-unstable-2024-12-27";
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
@@ -39,11 +40,13 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zamundaaa";
|
||||
repo = "VK_hdr_layer";
|
||||
rev = "e173f2617262664901039e3c821929afce05d2c1";
|
||||
hash = "sha256-hBxRwbn29zFeHcRpfMF6I4piSASpN2AvZY0ci5Utj4U=";
|
||||
rev = "1534ef826bfecf525a6c3154f2e3b52d640a79cf";
|
||||
hash = "sha256-LaI7axY+O6MQ/7xdGlTO3ljydFAvqqdZpUI7A+B2Ilo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Vulkan Wayland HDR WSI Layer (Xaver Hugl's fork for KWin 6)";
|
||||
homepage = "https://github.com/Zamundaaa/VK_hdr_layer";
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "worker";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.boomerangsworld.de/cms/worker/downloads/worker-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Tff/1I9RZYo2oXGsnrGeSs69W9nPu7OFDwF1Bg6R01s=";
|
||||
hash = "sha256-PXBPnFwQKquxyel2NEQXXOviSEnSUdRrx+dyomzKL+k=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
git,
|
||||
gnused,
|
||||
nix,
|
||||
nixfmt-classic,
|
||||
majorVersion,
|
||||
}:
|
||||
|
||||
@@ -98,17 +97,13 @@ stdenv.mkDerivation rec {
|
||||
git
|
||||
gnused
|
||||
nix
|
||||
nixfmt-classic
|
||||
]
|
||||
}
|
||||
versionSelect='v${lib.versions.major version}.${lib.versions.minor version}.*'
|
||||
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
|
||||
latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
|
||||
if [ "$oldVersion" != "$latestTag" ]; then
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
default_nix="$nixpkgs/pkgs/development/compilers/scala/2.x.nix"
|
||||
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
@@ -20,7 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://invisible-island.net/archives/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz";
|
||||
urls = [
|
||||
"https://invisible-island.net/archives/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz"
|
||||
"https://ftp.gnu.org/gnu/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk=";
|
||||
};
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "albucore";
|
||||
version = "0.0.21";
|
||||
version = "0.0.23";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "albumentations-team";
|
||||
repo = "albucore";
|
||||
tag = version;
|
||||
hash = "sha256-bIsJ9o1gPCGJZXrzZbRXzS3ZQURcRaWmGBQZsAdX0eg=";
|
||||
hash = "sha256-jyNOrtQbQ62bQouu5WLYBWqVS5wUDZFsiqkMMb5p7Ek=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "opencv-python" ];
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "albumentations";
|
||||
version = "1.4.23";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "albumentations-team";
|
||||
repo = "albumentations";
|
||||
tag = version;
|
||||
hash = "sha256-d/5ZTSFcQqsiF2rDX92iXO2eHHS+GOBvWFw0MlSwyhE=";
|
||||
hash = "sha256-8WEOI2J2H4PNhyb9LoIUMofGKx9AHPiPddkQCSdh8/A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
51
pkgs/development/python-modules/copykitten/default.nix
Normal file
51
pkgs/development/python-modules/copykitten/default.nix
Normal file
@@ -0,0 +1,51 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
rustPlatform,
|
||||
lib,
|
||||
pillow,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "copykitten";
|
||||
version = "1.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Klavionik";
|
||||
repo = "copykitten";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-S4IPVhYk/o15LQK1AB8VpdrHwIwTZyvmI2+e27/vDLs=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
hash = "sha256-Qgg2S1nRwWs2O81huj1g4wq7v4G377T+V8/1rjhz1ZE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.maturinBuildHook
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
pillow
|
||||
];
|
||||
|
||||
# The tests get/set the contents of the clipboard by running subprocesses.
|
||||
# On Darwin, the tests try to use `pbcopy`/`pbpaste`, which aren't packaged in Nix.
|
||||
# On Linux, I tried adding `xclip` to `nativeCheckInputs`, but got errors about
|
||||
# displays being null and the clipboard never being initialized.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "copykitten" ];
|
||||
|
||||
meta = {
|
||||
description = "Robust, dependency-free way to use the system clipboard in Python";
|
||||
homepage = "https://github.com/Klavionik/copykitten";
|
||||
changelog = "https://github.com/Klavionik/copykitten/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.samasaur ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -15,12 +15,12 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "cypari2";
|
||||
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gXYGv2YbcdM+HQEkIZB6T4+wndgbfT464Xmzl4Agu/E=";
|
||||
hash = "sha256-qqAXpqKAWBkC9zz1zhaVcStlmKAyvhTPq4H5fEdfg7g=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -24,12 +24,15 @@ buildPythonPackage rec {
|
||||
--replace '"pytest-runner", ' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
dependencies = [
|
||||
setuptools
|
||||
wheel
|
||||
cython
|
||||
];
|
||||
|
||||
# workaround https://github.com/pytries/datrie/issues/101
|
||||
env.CFLAGS = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "debugpy";
|
||||
version = "1.8.11";
|
||||
version = "1.8.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "microsoft";
|
||||
repo = "debugpy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-C/cLUMQNmiLn3z93LOg++3WeDUihMR9O3XKouL4uPqw=";
|
||||
hash = "sha256-9hkHvanetjZ3Rww3DdTEcij47DgzhTRTk2rrtrJiQBU=";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
djangorestframework-simplejwt,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
pythonOlder,
|
||||
responses,
|
||||
setuptools,
|
||||
unittest-xml-reporting,
|
||||
@@ -15,23 +14,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dj-rest-auth";
|
||||
version = "6.0.0";
|
||||
version = "7.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iMerica";
|
||||
repo = "dj-rest-auth";
|
||||
tag = version;
|
||||
hash = "sha256-fNy1uN3oH54Wd9+EqYpiV0ot1MbSSC7TZoAARQeR81s=";
|
||||
hash = "sha256-bus7Sf5H4PA5YFrkX7hbALOq04koDz3KTO42hHFJPhw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "==" ">="
|
||||
substituteInPlace dj_rest_auth/tests/test_api.py \
|
||||
--replace-fail "assertEquals" "assertEqual"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -40,7 +35,9 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [ djangorestframework ];
|
||||
|
||||
optional-dependencies.with_social = [ django-allauth ];
|
||||
optional-dependencies.with_social = [
|
||||
django-allauth
|
||||
] ++ django-allauth.optional-dependencies.socialaccount;
|
||||
|
||||
nativeCheckInputs = [
|
||||
djangorestframework-simplejwt
|
||||
|
||||
@@ -12,19 +12,22 @@
|
||||
gettext,
|
||||
|
||||
# dependencies
|
||||
asgiref,
|
||||
django,
|
||||
|
||||
# optional-dependencies
|
||||
fido2,
|
||||
python3-openid,
|
||||
python3-saml,
|
||||
requests,
|
||||
requests-oauthlib,
|
||||
pyjwt,
|
||||
|
||||
# optional-dependencies
|
||||
python3-saml,
|
||||
qrcode,
|
||||
|
||||
# tests
|
||||
pillow,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-django,
|
||||
|
||||
# passthru tests
|
||||
@@ -33,36 +36,48 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-allauth";
|
||||
version = "0.61.1";
|
||||
version = "65.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pennersr";
|
||||
repo = "django-allauth";
|
||||
tag = version;
|
||||
hash = "sha256-C9SYlL1yMnSb+Zpi2opvDw1stxAHuI9/XKHyvkM36Cg=";
|
||||
hash = "sha256-IgadrtOQt3oY2U/+JWBs5v97aaWz5oinz5QUdGXBqO4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
asgiref
|
||||
django
|
||||
pyjwt
|
||||
python3-openid
|
||||
requests
|
||||
requests-oauthlib
|
||||
] ++ pyjwt.optional-dependencies.crypto;
|
||||
];
|
||||
|
||||
preBuild = "${python.interpreter} -m django compilemessages";
|
||||
preBuild = ''
|
||||
${python.interpreter} -m django compilemessages
|
||||
'';
|
||||
|
||||
optional-dependencies = {
|
||||
mfa = [
|
||||
fido2
|
||||
qrcode
|
||||
];
|
||||
openid = [ python3-openid ];
|
||||
saml = [ python3-saml ];
|
||||
mfa = [ qrcode ];
|
||||
socialaccount = [
|
||||
requests
|
||||
requests-oauthlib
|
||||
pyjwt
|
||||
] ++ pyjwt.optional-dependencies.crypto;
|
||||
steam = [ python3-openid ];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "allauth" ];
|
||||
@@ -70,6 +85,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pillow
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-django
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
@@ -42,6 +43,8 @@ buildPythonPackage rec {
|
||||
postgresqlTestHook
|
||||
];
|
||||
|
||||
doCheck = stdenv.hostPlatform.isLinux; # postgres fails to allocate shm on darwin
|
||||
|
||||
postgresqlTestUserOptions = "LOGIN SUPERUSER";
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@@ -34,12 +34,15 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
dependencies = [
|
||||
django-allauth
|
||||
django-gravatar2
|
||||
mailmanclient
|
||||
pytz
|
||||
];
|
||||
dependencies =
|
||||
[
|
||||
django-allauth
|
||||
django-gravatar2
|
||||
mailmanclient
|
||||
pytz
|
||||
]
|
||||
++ django-allauth.optional-dependencies.openid
|
||||
++ django-allauth.optional-dependencies.socialaccount;
|
||||
|
||||
nativeCheckInputs = [
|
||||
django
|
||||
@@ -62,5 +65,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://gitlab.com/mailman/django-mailman3";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
broken = lib.versionAtLeast django-allauth.version "65.0.0";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
let
|
||||
# 0.18.12 was yanked from PyPI, it refers to this issue:
|
||||
# https://github.com/deschler/django-modeltranslation/issues/701
|
||||
version = "0.19.11";
|
||||
version = "0.19.12";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "django-modeltranslation";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage {
|
||||
owner = "deschler";
|
||||
repo = "django-modeltranslation";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-J/D0rHhxJMpOSGu9LQ6tPKnjBZhqTX6I5YcSkx5+qXk=";
|
||||
hash = "sha256-j5IKAjGes1EUNX9XE1RAPkGJGviABa4VFl789Mj2dyc=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "djangorestframework-simplejwt";
|
||||
version = "5.3.1";
|
||||
version = "5.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "djangorestframework_simplejwt";
|
||||
inherit version;
|
||||
hash = "sha256-bEvTdTdEC8Q5Vk6/fWCF50xUEUhRlwc/UI69+jS8n64=";
|
||||
hash = "sha256-zM7M4aDhpKJA+ugNpz5fwjBVurq7i2feiPpHzTaCIyA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-spectacular";
|
||||
version = "0.27.2";
|
||||
version = "0.28.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = "tfranzel";
|
||||
repo = "drf-spectacular";
|
||||
tag = version;
|
||||
hash = "sha256-lOgFDkAY+PqSeyLSvWFT7KPVicSJZxd6yl17GAGHbRs=";
|
||||
hash = "sha256-+RXcCpsNAoGxK/taEf7+7QUDrHydvy5fIdBuEXi63DQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -52,6 +52,11 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/conftest.py \
|
||||
--replace-fail "'allauth.account'," "'allauth.account', 'allauth.socialaccount',"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -81,14 +86,22 @@ buildPythonPackage rec {
|
||||
psycopg2
|
||||
pytest-django
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ django-allauth.optional-dependencies.socialaccount;
|
||||
|
||||
disabledTests = [
|
||||
# Test requires django with gdal
|
||||
"test_rest_framework_gis"
|
||||
# Outdated test artifact
|
||||
"test_pydantic_decoration"
|
||||
"test_callbacks"
|
||||
# django-rest-knox is not packaged
|
||||
"test_knox_auth_token"
|
||||
# slightly different error messages which get asserted
|
||||
"test_model_choice_display_method_on_readonly"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Outdated test artifact
|
||||
"tests/contrib/test_pydantic.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "drf_spectacular" ];
|
||||
|
||||
@@ -24,11 +24,12 @@
|
||||
rich,
|
||||
tomlkit,
|
||||
gradio,
|
||||
safehttpx,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gradio-client";
|
||||
version = "1.4.0";
|
||||
version = "1.5.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -38,9 +39,9 @@ buildPythonPackage rec {
|
||||
owner = "gradio-app";
|
||||
repo = "gradio";
|
||||
# not to be confused with @gradio/client@${version}
|
||||
rev = "refs/tags/gradio_client@${version}";
|
||||
tag = "gradio_client@${version}";
|
||||
sparseCheckout = [ "client/python" ];
|
||||
hash = "sha256-pS7yrqBuq/Pe7sEfReAM6OL2qFQVA+vWra36UuhyDkk=";
|
||||
hash = "sha256-u4GQYtCeAMDqRRbZGtjfqIHwuHyxUpw6kRE75SJMALg=";
|
||||
};
|
||||
prePatch = ''
|
||||
cd client/python
|
||||
@@ -75,6 +76,7 @@ buildPythonPackage rec {
|
||||
pydub
|
||||
rich
|
||||
tomlkit
|
||||
safehttpx
|
||||
gradio.sans-reverse-dependencies
|
||||
];
|
||||
# ensuring we don't propagate this intermediate build
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pythonOlder,
|
||||
writeShellScriptBin,
|
||||
gradio,
|
||||
@@ -12,6 +14,11 @@
|
||||
hatch-requirements-txt,
|
||||
hatch-fancy-pypi-readme,
|
||||
|
||||
# web assets
|
||||
zip,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
|
||||
# runtime
|
||||
setuptools,
|
||||
aiofiles,
|
||||
@@ -35,6 +42,7 @@
|
||||
python-multipart,
|
||||
pydub,
|
||||
pyyaml,
|
||||
safehttpx,
|
||||
semantic-version,
|
||||
typing-extensions,
|
||||
uvicorn,
|
||||
@@ -64,23 +72,27 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gradio";
|
||||
version = "5.1.0";
|
||||
version = "5.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# We use the Pypi release, since it provides prebuilt webui assets
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0hU2aObeLfegG7M/AaB0/HcW7IY8QPRy2OQ5Q57x4VM=";
|
||||
# unfortunately no fetchPypi due to https://github.com/gradio-app/gradio/pull/9778
|
||||
src = fetchFromGitHub {
|
||||
owner = "gradio-app";
|
||||
repo = "gradio";
|
||||
tag = "gradio@${version}";
|
||||
hash = "sha256-HW0J7oSkCo4DIHpU4LUoBZ2jmmrv5Xd64floA4uyo5A=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version src;
|
||||
hash = "sha256-9fAkP2zV3OfyROdtvmS94ujpkGmlB0wGOaWS13LgJTM=";
|
||||
};
|
||||
|
||||
# fix packaging.ParserSyntaxError, which can't handle comments
|
||||
postPatch = ''
|
||||
sed -i -e "s/ #.*$//g" requirements*.txt
|
||||
|
||||
# they bundle deps?
|
||||
rm -rf venv/
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -96,6 +108,12 @@ buildPythonPackage rec {
|
||||
"ruff"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
zip
|
||||
nodejs
|
||||
pnpm_9.configHook
|
||||
];
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-requirements-txt
|
||||
@@ -125,6 +143,7 @@ buildPythonPackage rec {
|
||||
python-multipart
|
||||
pydub
|
||||
pyyaml
|
||||
safehttpx
|
||||
semantic-version
|
||||
typing-extensions
|
||||
uvicorn
|
||||
@@ -158,6 +177,16 @@ buildPythonPackage rec {
|
||||
(writeShellScriptBin "npm" "false")
|
||||
] ++ optional-dependencies.oauth ++ pydantic.optional-dependencies.email;
|
||||
|
||||
preBuild = ''
|
||||
pnpm build
|
||||
pnpm package
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
# SyntaxError: 'await' outside function
|
||||
zip -d dist/gradio-*.whl gradio/_frontend_code/lite/examples/transformers_basic/run.py
|
||||
'';
|
||||
|
||||
# Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail).
|
||||
# We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi.
|
||||
preCheck =
|
||||
@@ -193,12 +222,29 @@ buildPythonPackage rec {
|
||||
|
||||
# fails without network
|
||||
"test_download_if_url_correct_parse"
|
||||
"test_encode_url_to_base64_doesnt_encode_errors"
|
||||
|
||||
# flaky: OSError: Cannot find empty port in range: 7860-7959
|
||||
"test_docs_url"
|
||||
"test_orjson_serialization"
|
||||
"test_dataset_is_updated"
|
||||
"test_multimodal_api"
|
||||
"test_examples_keep_all_suffixes"
|
||||
"test_progress_bar"
|
||||
"test_progress_bar_track_tqdm"
|
||||
"test_info_and_warning_alerts"
|
||||
"test_info_isolation[True]"
|
||||
"test_info_isolation[False]"
|
||||
"test_examples_no_cache_optional_inputs"
|
||||
"test_start_server[127.0.0.1]"
|
||||
"test_start_server[[::1]]"
|
||||
"test_single_request"
|
||||
"test_all_status_messages"
|
||||
"test_default_concurrency_limits[not_set-statuses0]"
|
||||
"test_default_concurrency_limits[None-statuses1]"
|
||||
"test_default_concurrency_limits[1-statuses2]"
|
||||
"test_default_concurrency_limits[2-statuses3]"
|
||||
"test_concurrency_limits"
|
||||
|
||||
# tests if pip and other tools are installed
|
||||
"test_get_executable_path"
|
||||
@@ -256,6 +302,7 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# 100% touches network
|
||||
"test/test_networking.py"
|
||||
"client/python/test/test_client.py"
|
||||
# makes pytest freeze 50% of the time
|
||||
"test/test_interfaces.py"
|
||||
|
||||
@@ -289,6 +336,13 @@ buildPythonPackage rec {
|
||||
doInstallCheck = false;
|
||||
doCheck = false;
|
||||
preCheck = "";
|
||||
postInstall = ''
|
||||
shopt -s globstar
|
||||
for f in $out/**/*.py; do
|
||||
cp $f "$f"i
|
||||
done
|
||||
shopt -u globstar
|
||||
'';
|
||||
pythonImportsCheck = null;
|
||||
dontCheckRuntimeDeps = true;
|
||||
});
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "harlequin-postgres";
|
||||
version = "0.4.0";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "harlequin_postgres";
|
||||
inherit version;
|
||||
hash = "sha256-1y8S3z6ZTt+PZg75aB/bKnEPdAtqjZ2IqyBtUBk8IFA=";
|
||||
hash = "sha256-1/tALkY5wz9lOWc2QsZkEa/qx0DxjKIiVfXTfOu4wQE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -3,10 +3,13 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
exceptiongroup,
|
||||
aioquic,
|
||||
h11,
|
||||
h2,
|
||||
httpx,
|
||||
priority,
|
||||
trio,
|
||||
uvloop,
|
||||
wsproto,
|
||||
poetry-core,
|
||||
pytest-asyncio,
|
||||
@@ -16,16 +19,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hypercorn";
|
||||
version = "0.16.0";
|
||||
format = "pyproject";
|
||||
version = "0.17.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11"; # missing taskgroup dependency
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgjones";
|
||||
repo = "Hypercorn";
|
||||
rev = version;
|
||||
hash = "sha256-pIUZCQmC3c6FiV0iMMwJGs9TMi6B/YM+vaSx//sAmKE=";
|
||||
tag = version;
|
||||
hash = "sha256-AtSMURz1rOr6VTQ7L2EQ4XZeKVEGTPXTbs3u7IhnZo8";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -35,27 +38,31 @@ buildPythonPackage rec {
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
exceptiongroup
|
||||
h11
|
||||
h2
|
||||
priority
|
||||
wsproto
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
h3 = [ aioquic ];
|
||||
trio = [ trio ];
|
||||
uvloop = [ uvloop ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
httpx
|
||||
pytest-asyncio
|
||||
pytest-trio
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/pgjones/hypercorn/issues/217
|
||||
"test_startup_failure"
|
||||
];
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
pythonImportsCheck = [ "hypercorn" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/pgjones/hypercorn/blob/${src.tag}/CHANGELOG.rst";
|
||||
homepage = "https://github.com/pgjones/hypercorn";
|
||||
description = "ASGI web server inspired by Gunicorn";
|
||||
mainProgram = "hypercorn";
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hyrule";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hylang";
|
||||
repo = "hyrule";
|
||||
tag = version;
|
||||
hash = "sha256-w1Q2w/P1bDt/F1+zTkUFi5PxycXXE3p0qadfBcyWElg=";
|
||||
hash = "sha256-FJ7iu+ohbe4nhADka2OC+JHAmwZkkJgFVLyHD0Fms1E=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Utility library for the Hy programming language";
|
||||
homepage = "https://github.com/hylang/hyrule";
|
||||
changelog = "https://github.com/hylang/hylure/releases/tag/${version}";
|
||||
changelog = "https://github.com/hylang/hyrule/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@@ -50,6 +50,7 @@ buildPythonPackage rec {
|
||||
"test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57
|
||||
"test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests
|
||||
"test_nested_parallel_warnings" # tests is flaky under load
|
||||
"test_memory" # tests - and the module itself - assume strictatime mount for build directory
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin.
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kde-material-you-colors";
|
||||
version = "1.9.3";
|
||||
version = "1.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luisbocanegra";
|
||||
repo = "kde-material-you-colors";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hew+aWbfWmqTsxsNx/0Ow0WZAVl0e6OyzDxcKm+nlzQ=";
|
||||
hash = "sha256-qT2F3OtRzYagbBH/4kijuy4udD6Ak74WacIhfzaNWqo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "launchpadlib";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XUqQlekXc6dWXUwVlZSuMOynkv1fm4ne1FnXEUhKlss=";
|
||||
hash = "sha256-tMJYkLt1BQ1UwIEj0nMxVreKWaJVX1Rh9psORM2RJC8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-autorefs";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkdocstrings";
|
||||
repo = "autorefs";
|
||||
tag = version;
|
||||
hash = "sha256-C1ca7tx9s88U7Xp/bd3KhlWeb32a612RyCVBQz0vJ1g=";
|
||||
hash = "sha256-EfZcY5eZtRKjxWC4/sWF3F4N/uK2e3gFK2dBY/kTCM4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,8 +2,11 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
attrs,
|
||||
django,
|
||||
netaddr,
|
||||
netbox,
|
||||
setuptools,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-interface-synchronization";
|
||||
@@ -19,6 +22,12 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
attrs
|
||||
django
|
||||
netaddr
|
||||
];
|
||||
|
||||
# netbox is required for the pythonImportsCheck; plugin does not provide unit tests
|
||||
nativeCheckInputs = [ netbox ];
|
||||
|
||||
|
||||
@@ -7,19 +7,22 @@
|
||||
opencensus,
|
||||
psutil,
|
||||
requests,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opencensus-ext-azure";
|
||||
version = "1.1.13";
|
||||
format = "setuptools";
|
||||
version = "1.1.14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rsMEchdwBTebpWpwKgl9YYxfV1WOG7ZnbsdflIEwaSo=";
|
||||
hash = "sha256-ycbrrVQq62GBMyLmJ9WImlY+e4xOAkv1hGnQbbc6sUg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
azure-core
|
||||
azure-identity
|
||||
opencensus
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user