0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-10-19 00:02:21 +00:00 committed by GitHub
commit 4b9cf6ff6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
104 changed files with 1184 additions and 682 deletions

View file

@ -6332,6 +6332,16 @@
fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4";
}]; }];
}; };
gepbird = {
email = "gutyina.gergo.2@gmail.com";
github = "gepbird";
githubId = 29818440;
name = "Gutyina Gergő";
keys = [
{ fingerprint = "RoAfvqa6w1l8Vdm3W60TDXurYwJ6h03VEGD+wDNGEwc"; }
{ fingerprint = "MP2UpIRtJpbFFqyucP431H/FPCfn58UhEUTro4lXtRs"; }
];
};
gerg-l = { gerg-l = {
email = "gregleyda@proton.me"; email = "gregleyda@proton.me";
github = "Gerg-L"; github = "Gerg-L";
@ -8792,6 +8802,12 @@
githubId = 1189739; githubId = 1189739;
name = "Julio Borja Barra"; name = "Julio Borja Barra";
}; };
jue89 = {
email = "me@jue.yt";
github = "jue89";
githubId = 6105784;
name = "Juergen Fitschen";
};
jugendhacker = { jugendhacker = {
name = "j.r"; name = "j.r";
email = "j.r@jugendhacker.de"; email = "j.r@jugendhacker.de";
@ -10032,6 +10048,17 @@
githubId = 3696783; githubId = 3696783;
name = "Leroy Hopson"; name = "Leroy Hopson";
}; };
liketechnik = {
name = "Florian Warzecha";
email = "liketechnik@disroot.org";
github = "liketechnik";
githubId = 24209689;
keys = [{
fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C";
}];
};
lillycham = { lillycham = {
email = "lillycat332@gmail.com"; email = "lillycat332@gmail.com";
github = "lillycat332"; github = "lillycat332";
@ -15199,6 +15226,12 @@
githubId = 47790121; githubId = 47790121;
name = "Ryan Burns"; name = "Ryan Burns";
}; };
rtimush = {
email = "rtimush@gmail.com";
github = "rtimush";
githubId = 831307;
name = "Roman Timushev";
};
rtreffer = { rtreffer = {
email = "treffer+nixos@measite.de"; email = "treffer+nixos@measite.de";
github = "rtreffer"; github = "rtreffer";

View file

@ -76,6 +76,8 @@
- [stalwart-mail](https://stalw.art), an all-in-one email server (SMTP, IMAP, JMAP). Available as [services.stalwart-mail](#opt-services.stalwart-mail.enable). - [stalwart-mail](https://stalw.art), an all-in-one email server (SMTP, IMAP, JMAP). Available as [services.stalwart-mail](#opt-services.stalwart-mail.enable).
- [tang](https://github.com/latchset/tang), a server for binding data to network presence. Available as [services.tang](#opt-services.tang.enable).
- [Jool](https://nicmx.github.io/Jool/en/index.html), a kernelspace NAT64 and SIIT implementation, providing translation between IPv4 and IPv6. Available as [networking.jool.enable](#opt-networking.jool.enable). - [Jool](https://nicmx.github.io/Jool/en/index.html), a kernelspace NAT64 and SIIT implementation, providing translation between IPv4 and IPv6. Available as [networking.jool.enable](#opt-networking.jool.enable).
- [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services. - [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services.
@ -111,6 +113,8 @@
- [trunk-ng](https://github.com/ctron/trunk), A fork of `trunk`: Build, bundle & ship your Rust WASM application to the web - [trunk-ng](https://github.com/ctron/trunk), A fork of `trunk`: Build, bundle & ship your Rust WASM application to the web
- [virt-manager](https://virt-manager.org/), an UI for managing virtual machines in libvirt, is now available as `programs.virt-manager`.
## Backward Incompatibilities {#sec-release-23.11-incompatibilities} ## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
- `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`. - `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`.
@ -309,6 +313,8 @@
- `dagger` was removed because using a package called `dagger` and packaging it from source violates their trademark policy. - `dagger` was removed because using a package called `dagger` and packaging it from source violates their trademark policy.
- `win-virtio` package was renamed to `virtio-win` to be consistent with the upstream package name.
## Other Notable Changes {#sec-release-23.11-notable-changes} ## Other Notable Changes {#sec-release-23.11-notable-changes}
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

View file

@ -0,0 +1,16 @@
{ config, lib, pkgs, ... }:
let
cfg = config.programs.virt-manager;
in {
options.programs.virt-manager = {
enable = lib.mkEnableOption "virt-manager, an UI for managing virtual machines in libvirt";
package = lib.mkPackageOption pkgs "virt-manager" {};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
programs.dconf.enable = true;
};
}

View file

@ -644,7 +644,7 @@ in {
}; };
meta = { meta = {
maintainers = with lib.maintainers; [ lheckemann qyliss ma27 ]; maintainers = with lib.maintainers; [ lheckemann qyliss ];
doc = ./mailman.md; doc = ./mailman.md;
}; };

View file

@ -296,6 +296,6 @@ in {
]; ];
}; };
meta.maintainers = with maintainers; [ ma27 ]; meta.maintainers = with maintainers; [ ];
meta.doc = ./plausible.md; meta.doc = ./plausible.md;
} }

View file

@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker-registry"; name = "docker-registry";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ globin ma27 ironpinguin ]; maintainers = [ globin ironpinguin ];
}; };
nodes = { nodes = {

View file

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : { import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "documize"; name = "documize";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ]; maintainers = [ ];
}; };
nodes.machine = { pkgs, ... }: { nodes.machine = { pkgs, ... }: {

View file

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : { import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "gotify-server"; name = "gotify-server";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ ma27 ]; maintainers = [ ];
}; };
nodes.machine = { pkgs, ... }: { nodes.machine = { pkgs, ... }: {

View file

@ -17,7 +17,7 @@ let
makeHydraTest = with pkgs.lib; name: package: makeTest { makeHydraTest = with pkgs.lib; name: package: makeTest {
name = "hydra-${name}"; name = "hydra-${name}";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ lewo ma27 ]; maintainers = [ lewo ];
}; };
nodes.machine = { pkgs, lib, ... }: { nodes.machine = { pkgs, lib, ... }: {

View file

@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: { import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "plausible"; name = "plausible";
meta = with lib.maintainers; { meta = with lib.maintainers; {
maintainers = [ ma27 ]; maintainers = [ ];
}; };
nodes.machine = { pkgs, ... }: { nodes.machine = { pkgs, ... }: {

View file

@ -101,6 +101,7 @@ stdenv.mkDerivation {
description = "Lightweight headless squeezebox client emulator"; description = "Lightweight headless squeezebox client emulator";
homepage = "https://github.com/ralph-irving/squeezelite"; homepage = "https://github.com/ralph-irving/squeezelite";
license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2;
mainProgram = binName;
maintainers = with maintainers; [ adamcstephens ]; maintainers = with maintainers; [ adamcstephens ];
platforms = if (audioBackend == "pulse") then platforms.linux else platforms.linux ++ platforms.darwin; platforms = if (audioBackend == "pulse") then platforms.linux else platforms.linux ++ platforms.darwin;
}; };

View file

@ -49,14 +49,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tenacity"; pname = "tenacity";
version = "1.3.1"; version = "1.3.2";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "tenacityteam"; owner = "tenacityteam";
repo = pname; repo = pname;
fetchSubmodules = true;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-wesnay+UQiPSDaRuSo86MgHdElN4s0rPIvokZhKM7GI="; hash = "sha256-JgmAuCfXP345xgg5jac8Sa0cBSsWJbtoYmVV0DLcIkk=";
}; };
postPatch = '' postPatch = ''

View file

@ -8,13 +8,13 @@
buildGoModule rec { buildGoModule rec {
pname = "op-geth"; pname = "op-geth";
version = "1.101200.1"; version = "1.101301.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ethereum-optimism"; owner = "ethereum-optimism";
repo = "op-geth"; repo = "op-geth";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xF/KaN/O0Hn3W2a11ivdgLVr5gR14dW5807r1snQ9xw="; hash = "sha256-3W246cY2l0ZkeaCuDbq/TvKacTKqX7iPs5MMy1+7LxY=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -33,7 +33,7 @@ buildGoModule rec {
"cmd/utils" "cmd/utils"
]; ];
vendorHash = "sha256-5G0wPQaP2MofQQO1AiFa1BF8zarRnYyNYscbZ4Ku44o="; vendorHash = "sha256-CqmhIz03qrcEetiWjR5A+TCW0ACrxL1UzugcKzTVme0=";
# Fix for usb-related segmentation faults on darwin # Fix for usb-related segmentation faults on darwin
propagatedBuildInputs = propagatedBuildInputs =

View file

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
# released under a variant of the MIT license # released under a variant of the MIT license
# https://spdx.org/licenses/MIT-feh.html # https://spdx.org/licenses/MIT-feh.html
license = licenses.mit-feh; license = licenses.mit-feh;
maintainers = with maintainers; [ viric willibutz globin ma27 ]; maintainers = with maintainers; [ viric willibutz globin ];
platforms = platforms.unix; platforms = platforms.unix;
mainProgram = "feh"; mainProgram = "feh";
}; };

View file

@ -6,19 +6,23 @@
, qttools , qttools
, qtimageformats , qtimageformats
, qtsvg , qtsvg
, qtx11extras
, x11Support ? true
}: }:
mkDerivation rec { mkDerivation rec {
pname = "qview"; pname = "qview";
version = "5.0"; version = "6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jurplel"; owner = "jurplel";
repo = "qView"; repo = "qView";
rev = version; rev = version;
hash = "sha256-VQ0H9iPrrxO9e/kMo7yZ/zN5I2qDWBCAFacS9uGuZLI="; hash = "sha256-h1K1Smfy875NoHtgUrOvZZp0IgcQdbyuQhXU9ndM4bA=";
}; };
qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ buildInputs = [
@ -26,7 +30,7 @@ mkDerivation rec {
qttools qttools
qtimageformats qtimageformats
qtsvg qtsvg
]; ] ++ lib.optionals x11Support [ qtx11extras ];
meta = with lib; { meta = with lib; {
description = "Practical and minimal image viewer"; description = "Practical and minimal image viewer";

View file

@ -76,6 +76,6 @@ with python3.pkgs; buildPythonApplication rec {
homepage = "https://github.com/jarun/Buku"; homepage = "https://github.com/jarun/Buku";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ matthiasbeyer infinisil ma27 ]; maintainers = with maintainers; [ matthiasbeyer infinisil ];
}; };
} }

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "slippy"; pname = "slippy";
version = "0.1.0"; version = "0.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "axodotdev"; owner = "axodotdev";
repo = "slippy"; repo = "slippy";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-oxXmfvdnYmmKXvKHpJC23cvHaVdh5cpfQ1q5GPLskfY="; hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI=";
}; };
cargoHash = "sha256-4MMTWhyi2/n9ESX2KJFERsXQHyGZunvArbYQmKiV7Eg="; cargoHash = "sha256-6nB+rHBJU9qhA7azz2ynaBw1UJdwE+T7pgpoPzhD5Bk=";
# the dependency css-minify contains both README.md and Readme.md, # the dependency css-minify contains both README.md and Readme.md,
# which causes a hash mismatch on systems with a case-insensitive filesystem # which causes a hash mismatch on systems with a case-insensitive filesystem
@ -53,6 +53,11 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
]; ];
# Cargo.lock is outdated
postConfigure = ''
cargo metadata --offline
'';
meta = with lib; { meta = with lib; {
description = "Markdown slideshows in Rust"; description = "Markdown slideshows in Rust";
homepage = "https://github.com/axodotdev/slippy"; homepage = "https://github.com/axodotdev/slippy";

View file

@ -14,15 +14,15 @@
let let
package = buildGoModule rec { package = buildGoModule rec {
pname = "opentofu"; pname = "opentofu";
version = "1.6.0-alpha2"; version = "1.6.0-alpha3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opentofu"; owner = "opentofu";
repo = "opentofu"; repo = "opentofu";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-29vF5vWCPxJJHsQ1dkLcIaqEQVYxp2YjZ4LK5r4/dlo="; hash = "sha256-D95YzliadhhcOx8gW+lhECiYBtezsS8rj0Tz/29azlA=";
}; };
vendorHash = "sha256-qhnQ47K9N7HoTMUXhX2RlUuQaCgeAB/Sshh56A5rhpk="; vendorHash = "sha256-SbGdmPTJRSMDhqg0GEfdiQ+2Uw7xmz0Kcyrr1ANlKo4=";
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];
postConfigure = '' postConfigure = ''

View file

@ -2,11 +2,11 @@
let let
pname = "fluent-reader"; pname = "fluent-reader";
version = "1.1.3"; version = "1.1.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/yang991178/fluent-reader/releases/download/v${version}/Fluent.Reader.${version}.AppImage"; url = "https://github.com/yang991178/fluent-reader/releases/download/v${version}/Fluent.Reader.${version}.AppImage";
hash = "sha256-CzvhOaWfZ4rt2HmL/yv6P7IxEPLoyuBhftOxcjdMInU="; hash = "sha256-2oLV9SWBNt0j1WAS6j4dobsUEpptjTubpr8pdOcIOY4=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };

View file

@ -28,7 +28,7 @@ mkFranzDerivation' rec {
homepage = "https://getferdi.com/"; homepage = "https://getferdi.com/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ davidtwco ma27 ]; maintainers = with maintainers; [ davidtwco ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
hydraPlatforms = [ ]; hydraPlatforms = [ ];
knownVulnerabilities = [ knownVulnerabilities = [

View file

@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines # and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can # like this (rather than using {}) so that the updater script can
# find where to edit them. # find where to edit them.
versions.aarch64-darwin = "5.16.1.23158"; versions.aarch64-darwin = "5.16.2.23409";
versions.x86_64-darwin = "5.16.1.23158"; versions.x86_64-darwin = "5.16.2.23409";
versions.x86_64-linux = "5.16.1.8561"; versions.x86_64-linux = "5.16.2.8828";
srcs = { srcs = {
aarch64-darwin = fetchurl { aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg"; name = "zoomusInstallerFull.pkg";
hash = "sha256-D3eYHbnNSLLmOh7eIT2+J7PubhBZONqHThB6ibJLqGY="; hash = "sha256-MUkxEj4G6MCCXcqyFquCrHhnu+sVw5H4HSk+sP5H+gY=";
}; };
x86_64-darwin = fetchurl { x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-kvnaHwwWUiJmNsef6H5S/JHHtQgfFJd9rWwzTvi05g0="; hash = "sha256-niR/WbMq7T1PBCJMK1DdhbFc4eJDgub8LIv3X4i8S5c=";
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-zT0qGl8ODIcBISiRQ184aVr9hE8ZHnYatolqcsS6dpo="; hash = "sha256-eRvgNrMe/NyOnsMJ8L659C3Cl4xZ5Ij1u4qoHehj4y8=";
}; };
}; };

View file

@ -75,7 +75,6 @@ rec {
inherit (tor) geoip; inherit (tor) geoip;
}) })
]; ];
disable = !isPy3k;
propagatedBuildInputs = [ propagatedBuildInputs = [
colorama colorama
flask flask
@ -127,7 +126,6 @@ rec {
./fix-qrcode-gui.patch ./fix-qrcode-gui.patch
]; ];
disable = !isPy3k;
propagatedBuildInputs = [ propagatedBuildInputs = [
onionshare onionshare
pyqt5 pyqt5

View file

@ -0,0 +1,58 @@
{ lib
, cppzmq
, curl
, fetchFromGitHub
, glm
, gtkmm3
, libarchive
, libepoxy
, libgit2
, librsvg
, libuuid
, opencascade-occt
, pkg-config
, podofo
, sqlite
}:
# This base is used in horizon-eda and python3Packages.horizon-eda
rec {
pname = "horizon-eda";
version = "2.5.0";
src = fetchFromGitHub {
owner = "horizon-eda";
repo = "horizon";
rev = "v${version}";
hash = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
cppzmq
curl
glm
gtkmm3
libarchive
libepoxy
libgit2
librsvg
libuuid
opencascade-occt
podofo
sqlite
];
CASROOT = opencascade-occt;
meta = with lib; {
description = "A free EDA software to develop printed circuit boards";
homepage = "https://horizon-eda.org";
maintainers = with maintainers; [ guserav jue89 ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

View file

@ -1,62 +1,33 @@
{ stdenv { stdenv
, boost , boost
, callPackage
, coreutils , coreutils
, cppzmq
, curl
, libepoxy
, fetchFromGitHub
, glm
, gtkmm3
, lib
, libarchive
, libgit2
, librsvg
, libspnav , libspnav
, libuuid
, opencascade-occt
, pkg-config
, podofo
, python3 , python3
, sqlite
, wrapGAppsHook , wrapGAppsHook
}: }:
let
base = callPackage ./base.nix { };
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "horizon-eda"; inherit (base) pname version src meta CASROOT;
version = "2.5.0";
src = fetchFromGitHub { # provide base for python module
owner = "horizon-eda"; passthru = {
repo = "horizon"; inherit base;
rev = "v${version}";
sha256 = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8=";
}; };
buildInputs = [ buildInputs = base.buildInputs ++ [
cppzmq
curl
libepoxy
glm
gtkmm3
libarchive
libgit2
librsvg
libspnav libspnav
libuuid
opencascade-occt
podofo
python3
sqlite
]; ];
nativeBuildInputs = [ nativeBuildInputs = base.nativeBuildInputs ++ [
boost.dev boost.dev
pkg-config
wrapGAppsHook wrapGAppsHook
python3
]; ];
CASROOT = opencascade-occt;
installFlags = [ installFlags = [
"INSTALL=${coreutils}/bin/install" "INSTALL=${coreutils}/bin/install"
"DESTDIR=$(out)" "DESTDIR=$(out)"
@ -64,12 +35,4 @@ stdenv.mkDerivation rec {
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; {
description = "A free EDA software to develop printed circuit boards";
homepage = "https://horizon-eda.org";
maintainers = with maintainers; [ guserav ];
license = licenses.gpl3;
platforms = platforms.linux;
};
} }

View file

@ -6,7 +6,7 @@
let let
pname = "losslesscut"; pname = "losslesscut";
version = "3.55.2"; version = "3.58.0";
metaCommon = with lib; { metaCommon = with lib; {
description = "The swiss army knife of lossless video/audio editing"; description = "The swiss army knife of lossless video/audio editing";
homepage = "https://mifi.no/losslesscut/"; homepage = "https://mifi.no/losslesscut/";
@ -15,22 +15,22 @@ let
}; };
x86_64-appimage = callPackage ./build-from-appimage.nix { x86_64-appimage = callPackage ./build-from-appimage.nix {
inherit pname version metaCommon; inherit pname version metaCommon;
hash = "sha256-oQYDK/BHxC/zJuocDH+HcItcPQIsxAaKoD+49TAA+ds="; hash = "sha256-wmOdW5LdGLs6Wrt/VBlbC1ScFZBmd5gVQaj/cYADnWc=";
inherit (buildPackages) makeWrapper; inherit (buildPackages) makeWrapper;
}; };
x86_64-dmg = callPackage ./build-from-dmg.nix { x86_64-dmg = callPackage ./build-from-dmg.nix {
inherit pname version metaCommon; inherit pname version metaCommon;
hash = "sha256-dmtnGv5XQn2ANpYyFu9jtTGr1b7GdDrV3Oajd5bMr0k="; hash = "sha256-ZNUkzxpFTmsFcdC4oJWDxvqunpaBKz7Fnmrsa4W12Bg=";
isAarch64 = false; isAarch64 = false;
}; };
aarch64-dmg = callPackage ./build-from-dmg.nix { aarch64-dmg = callPackage ./build-from-dmg.nix {
inherit pname version metaCommon; inherit pname version metaCommon;
hash = "sha256-uU48Clhk4FllM7osHRR4D7xGZCmcvylqlUt6JqCrm/8="; hash = "sha256-PpQF31qsn9TOIRVzOdDoLUqti+m1uRpBQrrqKtxFleE=";
isAarch64 = true; isAarch64 = true;
}; };
x86_64-windows = callPackage ./build-from-windows.nix { x86_64-windows = callPackage ./build-from-windows.nix {
inherit pname version metaCommon; inherit pname version metaCommon;
hash = "sha256-YkPF6sgL/oGXSXCdQt+7iW2n5f9Tk2ItchwRAwq7IPY="; hash = "sha256-AgWvLU9m2q7fxZYXgHGMgEj1WLP5XzERq7tWcin2/30=";
}; };
in in
( (

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, p7zip, win-virtio }: { lib, stdenv, fetchurl, p7zip, virtio-win }:
let let
version_usbdk = "1.0.22"; version_usbdk = "1.0.22";
@ -58,9 +58,9 @@ stdenv.mkDerivation {
copy_usbdk = arch: "mkdir -p $out/${arch}/usbdk; cp usbdk/${arch}/* $out/${arch}/usbdk/. \n"; copy_usbdk = arch: "mkdir -p $out/${arch}/usbdk; cp usbdk/${arch}/* $out/${arch}/usbdk/. \n";
copy_vdagent = arch: "mkdir -p $out/${arch}/vdagent; cp vdagent/${arch}/* $out/${arch}/vdagent/. \n"; copy_vdagent = arch: "mkdir -p $out/${arch}/vdagent; cp vdagent/${arch}/* $out/${arch}/vdagent/. \n";
# SPICE needs vioserial # SPICE needs vioserial
# TODO: Link windows version in win-spice (here) to version used in win-virtio. # TODO: Link windows version in win-spice (here) to version used in virtio-win.
# That way it would never matter whether vioserial is installed from win-virtio or win-spice. # That way it would never matter whether vioserial is installed from virtio-win or win-spice.
copy_vioserial = arch: version: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/vioserial/${version}/${arch}/* $out/${arch}/vioserial/. \n"; copy_vioserial = arch: version: "mkdir -p $out/${arch}/vioserial; cp ${virtio-win}/vioserial/${version}/${arch}/* $out/${arch}/vioserial/. \n";
copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch version); copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch version);
in '' in ''
runHook preInstall runHook preInstall

View file

@ -1,4 +1,4 @@
{ picom, lib, fetchFromGitHub }: { picom, lib, fetchFromGitHub, installShellFiles }:
picom.overrideAttrs (oldAttrs: rec { picom.overrideAttrs (oldAttrs: rec {
pname = "picom-allusive"; pname = "picom-allusive";
@ -11,11 +11,14 @@ picom.overrideAttrs (oldAttrs: rec {
hash = "sha256-1zWntz2QKp/O9ZuOUZy9NkCNXFsBqRRvcd0SAr+7G/o="; hash = "sha256-1zWntz2QKp/O9ZuOUZy9NkCNXFsBqRRvcd0SAr+7G/o=";
}; };
nativeBuildInputs = [ installShellFiles ] ++ oldAttrs.nativeBuildInputs;
postInstall = '' postInstall = ''
chmod +x $out/bin/picom-trans chmod +x $out/bin/picom-trans
installManPage $src/man/picom.1.gz
'' + (lib.optionalString (oldAttrs ? postInstall) oldAttrs.postInstall); '' + (lib.optionalString (oldAttrs ? postInstall) oldAttrs.postInstall);
meta = { meta = (builtins.removeAttrs oldAttrs.meta [ "longDescription" ]) // {
description = "A fork of picom featuring improved animations and other features"; description = "A fork of picom featuring improved animations and other features";
homepage = "https://github.com/allusive-dev/picom-allusive"; homepage = "https://github.com/allusive-dev/picom-allusive";
license = with lib.licenses; [ mit mpl20 ]; license = with lib.licenses; [ mit mpl20 ];

View file

@ -0,0 +1,32 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
}:
stdenvNoCC.mkDerivation rec {
pname = "bemoji";
version = "0.3.0";
src = fetchFromGitHub {
owner = "marty-oehme";
repo = "bemoji";
rev = version;
hash = "sha256-XXNrUaS06UHF3cVfIfWjGF1sdPE709W2tFhfwTitzNs=";
};
strictDeps = true;
dontBuild = true;
postInstall = ''
install -Dm555 bemoji -t $out/bin
'';
meta = with lib; {
homepage = "https://github.com/marty-oehme/bemoji/";
description = "Emoji picker with support for bemenu/wofi/rofi/dmenu and wayland/X11";
license = licenses.mit;
mainProgram = "bemoji";
platforms = platforms.all;
maintainers = with maintainers; [ laurent-f1z1 ];
};
}

View file

@ -28,6 +28,6 @@ buildNpmPackage rec {
homepage = "https://github.com/facebook/create-react-app"; homepage = "https://github.com/facebook/create-react-app";
license = lib.licenses.mit; license = lib.licenses.mit;
mainProgram = "create-react-app"; mainProgram = "create-react-app";
maintainers = with lib.maintainers; [ ma27 ]; maintainers = with lib.maintainers; [ ];
}; };
} }

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
name = "headphones-toolbox"; name = "headphones-toolbox";
version = "0.0.4"; version = "0.0.5";
src = fetchurl { src = fetchurl {
url = "https://github.com/george-norton/headphones-toolbox/releases/download/headphones-toolbox-beta-v5/ploopy-headphones-toolbox_${finalAttrs.version}_amd64.deb"; url = "https://github.com/ploopyco/headphones-toolbox/releases/download/app-v${finalAttrs.version}/ploopy-headphones-toolbox_${finalAttrs.version}_amd64.deb";
hash = "sha256-47F/bTi7ctIbfRnYVbksYUsHmL+3KYWccNg5dKPGR/U="; hash = "sha256-lWjmpybGcL3sbBng8zCTUtwYhlrQ6cCrKkhiu+g9MsE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; { meta = with lib; {
description = "A UI for configuring Ploopy Headphones"; description = "A UI for configuring Ploopy Headphones";
homepage = "https://github.com/george-norton/headphones-toolbox"; homepage = "https://github.com/ploopyco/headphones-toolbox/";
maintainers = with maintainers; [ knarkzel nyanbinary ]; maintainers = with maintainers; [ knarkzel nyanbinary ];
license = licenses.gpl3Only; license = licenses.gpl3Only;
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ];

View file

@ -0,0 +1,28 @@
{ lib, fetchzip, stdenvNoCC }:
stdenvNoCC.mkDerivation {
pname = "minecraftia";
version = "1.0";
src = fetchzip {
url = "https://fontlibrary.org/assets/downloads/minecraftia/71962a7e3d4a70435c030466a12f1d63/minecraftia.zip";
hash = "sha256-AZFSts0GpBttbhl1LHMORiqqc9o7ZWhh5hbjhSnxAlA=";
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/Minecraftia.ttf
runHook postInstall
'';
meta = with lib; {
homepage = "https://fontlibrary.org/en/font/minecraftia";
description = "Cool Minecraft font";
license = licenses.cc-by-sa-30;
platforms = platforms.all;
maintainers = with lib.maintainers; [ gepbird ];
};
}

View file

@ -0,0 +1,47 @@
{ lib, stdenv, coursier, buildGraalvmNativeImage }:
let
baseName = "scala-update";
version = "0.2.2";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
export COURSIER_CACHE=$(pwd)
${coursier}/bin/cs fetch io.github.kitlangton:scala-update_2.13:${version} > deps
mkdir -p $out/share/java
cp $(< deps) $out/share/java/
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "kNnFzzHn+rFq4taqRYjBYaDax0MHW+vIoSFVN3wxA8M=";
};
in buildGraalvmNativeImage {
pname = baseName;
inherit version;
buildInputs = [ deps ];
src = "${deps}/share/java/${baseName}_2.13-${version}.jar";
extraNativeImageBuildArgs =
[ "--no-fallback" "--enable-url-protocols=https" "update.Main" ];
buildPhase = ''
runHook preBuild
native-image ''${nativeImageBuildArgs[@]} -cp $(JARS=("${deps}/share/java"/*.jar); IFS=:; echo "''${JARS[*]}")
runHook postBuild
'';
installCheckPhase = ''
$out/bin/${baseName} --version | grep -q "${version}"
'';
meta = with lib; {
description = "Update your Scala dependencies interactively";
homepage = "https://github.com/kitlangton/scala-update";
license = licenses.asl20;
maintainers = [ maintainers.rtimush ];
};
}

View file

@ -0,0 +1,23 @@
{ lib, stdenvNoCC, uiua }:
stdenvNoCC.mkDerivation {
pname = "uiua386";
inherit (uiua) src version;
installPhase = ''
runHook preInstall
install -Dm444 -t $out/share/fonts/truetype ./site/Uiua386.ttf
runHook postInstall
'';
meta = {
description = "An Uiua font";
homepage = "https://uiua.org/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ skykanin ];
platforms = lib.platforms.all;
};
}

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, libarchive }: { lib, stdenv, fetchurl, libarchive }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "win-virtio"; pname = "virtio-win";
version = "0.1.240-1"; version = "0.1.240-1";
src = fetchurl { src = fetchurl {

View file

@ -9,4 +9,4 @@ version="$(curl -Ls https://fedorapeople.org/groups/virt/virtio-win/repo/latest/
sort -Vu | \ sort -Vu | \
tail -n1)" tail -n1)"
update-source-version win-virtio "$version" update-source-version virtio-win "$version"

View file

@ -0,0 +1,33 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, libusb1
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wb32-dfu-updater";
version = "1.0.0";
src = fetchFromGitHub {
owner = "WestberryTech";
repo = finalAttrs.pname;
rev = finalAttrs.version;
hash = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libusb1 ];
meta = with lib; {
description = "USB programmer for downloading and uploading firmware to/from USB devices.";
longDescription = ''
wb32-dfu-updater is a host tool used to download and upload firmware to/from WB32 MCU via USB. (wb32-dfu-updater_cli is the command line version).
'';
homepage = "https://github.com/WestberryTech/wb32-dfu-updater";
license = licenses.asl20;
maintainers = [ maintainers.liketechnik ];
mainProgram = "wb32-dfu-updater_cli";
platforms = platforms.all;
};
})

View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "deepin-compressor"; pname = "deepin-compressor";
version = "5.12.18"; version = "5.12.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-oHJOqfvrIQTspsTTnVyruiIAdh0kX12LzgGgSCYXfLE="; hash = "sha256-oOxto0X/GBAA9q691uwC0PtCdHDTMBqi80ov4xCXPn0=";
}; };
postPatch = '' postPatch = ''

View file

@ -6,6 +6,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, removeReferencesTo
, makeWrapper , makeWrapper
, which , which
, writeTextFile , writeTextFile
@ -20,7 +21,8 @@
, installShellFiles , installShellFiles
, git , git
, unzip , unzip
, dmd_bin ? "${callPackage ./bootstrap.nix { }}/bin" , dmdBootstrap ? callPackage ./bootstrap.nix { }
, dmd_bin ? "${dmdBootstrap}/bin"
}: }:
let let
@ -210,6 +212,12 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
preFixup = ''
find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${dmd_bin}/dmd '{}' +
'';
disallowedReferences = [ dmdBootstrap ];
meta = with lib; { meta = with lib; {
description = "Official reference compiler for the D language"; description = "Official reference compiler for the D language";
homepage = "https://dlang.org/"; homepage = "https://dlang.org/";

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "A general purpose cross-platform C++ machine learning library"; description = "A general purpose cross-platform C++ machine learning library";
homepage = "http://www.dlib.net"; homepage = "http://www.dlib.net";
license = licenses.boost; license = licenses.boost;
maintainers = with maintainers; [ christopherpoole ma27 ]; maintainers = with maintainers; [ christopherpoole ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -165,7 +165,7 @@ qtModule {
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
'' ''
+ lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.isDarwin ''
substituteInPlace configure.cmake \ substituteInPlace configure.cmake src/gn/CMakeLists.txt \
--replace "AppleClang" "Clang" --replace "AppleClang" "Clang"
substituteInPlace cmake/Functions.cmake \ substituteInPlace cmake/Functions.cmake \
--replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"

View file

@ -1,9 +1,11 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, bash
, cmake , cmake
, cfitsio , cfitsio
, libusb1 , libusb1
, kmod
, zlib , zlib
, boost , boost
, libev , libev
@ -58,6 +60,15 @@ stdenv.mkDerivation rec {
# Socket address collisions between tests # Socket address collisions between tests
enableParallelChecking = false; enableParallelChecking = false;
postFixup = lib.optionalString stdenv.isLinux ''
for f in $out/lib/udev/rules.d/*.rules
do
substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh" \
--replace "/sbin/modprobe" "${kmod}/sbin/modprobe"
done
'';
meta = with lib; { meta = with lib; {
homepage = "https://www.indilib.org/"; homepage = "https://www.indilib.org/";
description = "Implementation of the INDI protocol for POSIX operating systems"; description = "Implementation of the INDI protocol for POSIX operating systems";

View file

@ -1,6 +1,8 @@
{ stdenv { stdenv
, lib , lib
, bash
, cmake , cmake
, coreutils
, cfitsio , cfitsio
, libusb1 , libusb1
, zlib , zlib
@ -24,6 +26,10 @@
, firmware ? null , firmware ? null
}: }:
let
libusb-with-fxload = libusb1.override { withExamples = true;};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "indi-3rdparty"; pname = "indi-3rdparty";
@ -68,6 +74,19 @@ stdenv.mkDerivation rec {
"-DWITH_SBIG=off" "-DWITH_SBIG=off"
]; ];
postFixup = lib.optionalString stdenv.isLinux ''
for f in $out/lib/udev/rules.d/*.rules
do
substituteInPlace $f --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \
--replace "/lib/firmware/" "$out/lib/firmware/" \
--replace "/bin/sleep" "${coreutils}/bin/sleep" \
--replace "/bin/cat" "${coreutils}/bin/cat" \
--replace "/bin/echo" "${coreutils}/bin/echo" \
--replace "/bin/sh" "${bash}/bin/sh"
done
'';
meta = with lib; { meta = with lib; {
homepage = "https://www.indilib.org/"; homepage = "https://www.indilib.org/";
description = "Third party drivers for the INDI astronomical software suite"; description = "Third party drivers for the INDI astronomical software suite";

View file

@ -1,7 +1,9 @@
{ stdenv { stdenv
, lib , lib
, bash
, cmake , cmake
, cfitsio , cfitsio
, coreutils
, libusb1 , libusb1
, zlib , zlib
, boost , boost
@ -21,7 +23,9 @@
, src , src
, autoPatchelfHook , autoPatchelfHook
}: }:
let
libusb-with-fxload = libusb1.override { withExamples = true;};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "indi-firmware"; pname = "indi-firmware";
@ -39,7 +43,8 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_LIBDIR=lib"
"-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
"-DRULES_INSTALL_DIR=lib/udev/rules.d" "-DRULES_INSTALL_DIR=lib/udev/rules.d"
"-DFIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware" "-DFIRMWARE_INSTALL_DIR=lib/firmware"
"-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy"
"-DCONF_DIR=etc" "-DCONF_DIR=etc"
"-DBUILD_LIBS=1" "-DBUILD_LIBS=1"
"-DWITH_PENTAX=off" "-DWITH_PENTAX=off"
@ -52,8 +57,17 @@ stdenv.mkDerivation rec {
done done
''; '';
postFixup = '' postFixup = lib.optionalString stdenv.isLinux ''
rm $out/lib/udev/rules.d/99-fli.rules for f in $out/lib/udev/rules.d/*.rules
do
substituteInPlace "$f" --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \
--replace "/bin/sleep" "${coreutils}/bin/sleep" \
--replace "/bin/cat" "${coreutils}/bin/cat" \
--replace "/bin/echo" "${coreutils}/bin/echo" \
--replace "/bin/sh" "${bash}/bin/sh" \
--replace "/lib/firmware/" "$out/lib/firmware/"
sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i "$f"
done
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,4 +1,4 @@
{ buildEnv, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }: { buildEnv, makeBinaryWrapper, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }:
buildEnv { buildEnv {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -6,5 +6,13 @@ buildEnv {
indilib indilib
] ]
++ extraDrivers; ++ extraDrivers;
nativeBuildInputs = [ makeBinaryWrapper ];
postBuild = ''
makeBinaryWrapper ${indilib}/bin/indiserver $out/bin/indiserver --set-default INDIPREFIX $out
'';
inherit (indilib) meta; inherit (indilib) meta;
} }

View file

@ -12,7 +12,7 @@ buildPythonPackage rec {
version = "1.0.0"; version = "1.0.0";
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romis2012"; owner = "romis2012";

View file

@ -19,7 +19,7 @@ buildPythonPackage rec {
version = "unstable-2023-03-14"; version = "unstable-2023-03-14";
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "claws"; owner = "claws";

View file

@ -4,21 +4,28 @@
, jax , jax
, jaxlib , jaxlib
, lib , lib
, pythonOlder
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "augmax"; pname = "augmax";
version = "unstable-2022-02-19"; version = "0.3.1";
format = "setuptools"; pyproject = true;
disbaled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "khdlr"; owner = "khdlr";
repo = pname; repo = "augmax";
# augmax does not have releases tagged. See https://github.com/khdlr/augmax/issues/5. rev = "refs/tags/v${version}";
rev = "3e5d85d6921a1e519987d33f226bc13f61e04d04"; hash = "sha256-hDNNoE7KVaH3jrXZA4A8f0UoQJPl6KHA3XwMc3Ccohk=";
sha256 = "046n43v7161w7najzlbi0443q60436xv24nh1mv23yw6psqqhx5i";
}; };
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ einops jax ]; propagatedBuildInputs = [ einops jax ];
# augmax does not have any tests at the time of writing (2022-02-19), but # augmax does not have any tests at the time of writing (2022-02-19), but
@ -30,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Efficiently Composable Data Augmentation on the GPU with Jax"; description = "Efficiently Composable Data Augmentation on the GPU with Jax";
homepage = "https://github.com/khdlr/augmax"; homepage = "https://github.com/khdlr/augmax";
changelog = "https://github.com/khdlr/augmax/blob/${src.rev}/CHANGELOG.md";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ samuela ]; maintainers = with maintainers; [ samuela ];
}; };

View file

@ -12,7 +12,7 @@ buildPythonPackage rec {
version = "2.3.0"; version = "2.3.0";
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kuzmoyev"; owner = "kuzmoyev";

View file

@ -10,7 +10,7 @@ buildPythonPackage rec {
version = "1.2.0"; version = "1.2.0";
pyproject = true; pyproject = true;
disable = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "to-mc"; owner = "to-mc";

View file

@ -26,7 +26,7 @@ buildPythonPackage rec {
version = "0.0.18"; version = "0.0.18";
pyproject = true; pyproject = true;
disable = pythonOlder "3.8"; disabled = pythonOlder "3.8";
# using PyPI as github repo does not contain tags or release branches # using PyPI as github repo does not contain tags or release branches
src = fetchPypi { src = fetchPypi {

View file

@ -16,7 +16,7 @@ buildPythonPackage rec {
version = "1.3.0"; version = "1.3.0";
format = "pyproject"; format = "pyproject";
disable = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DynamicTimeWarping"; owner = "DynamicTimeWarping";

View file

@ -9,7 +9,6 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "flask-openid"; pname = "flask-openid";
version = "1.3.0"; version = "1.3.0";
disable = !isPy3k;
src = fetchPypi { src = fetchPypi {
pname = "Flask-OpenID"; pname = "Flask-OpenID";

View file

@ -13,7 +13,7 @@ buildPythonPackage rec {
version = "2023.7.26"; version = "2023.7.26";
format = "wheel"; format = "wheel";
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version format; inherit pname version format;

View file

@ -16,7 +16,7 @@ buildPythonPackage rec {
pname = "gcsa"; pname = "gcsa";
version = "2.1.0"; version = "2.1.0";
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kuzmoyev"; owner = "kuzmoyev";

View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "graphql-server-core"; pname = "graphql-server-core";
version = "2.0.0"; version = "2.0.0";
disable = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "graphql-python"; owner = "graphql-python";

View file

@ -22,7 +22,7 @@ buildPythonPackage rec {
version = "2.0.1"; version = "2.0.1";
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GreyNoise-Intelligence"; owner = "GreyNoise-Intelligence";

View file

@ -0,0 +1,46 @@
{ lib
, stdenv
, buildPythonPackage
, callPackage
, horizon-eda
, mesa
, pycairo
, python
, pythonOlder
}:
let
base = horizon-eda.passthru.base;
in
buildPythonPackage {
inherit (base) pname version src meta CASROOT;
pyproject = false;
disabled = pythonOlder "3.9";
buildInputs = base.buildInputs ++ [
mesa
mesa.osmesa
python
];
propagatedBuildInputs = [
pycairo
];
nativeBuildInputs = base.nativeBuildInputs;
buildFlags = ["pymodule"];
installPhase = ''
runHook preInstall
mkdir -p $out/${python.sitePackages}
cp build/horizon.so $out/${python.sitePackages}
runHook postInstall
'';
enableParallelBuilding = true;
}

View file

@ -14,7 +14,7 @@ buildPythonPackage rec {
version = "0.3.3"; version = "0.3.3";
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "datavaluepeople"; owner = "datavaluepeople";

View file

@ -15,7 +15,7 @@ buildPythonPackage rec {
version = "0.0.11"; version = "0.0.11";
pyproject = true; pyproject = true;
disable = pythonOlder "3.8"; disabled = pythonOlder "3.8";
# using PyPI as git repository does not have release tags or branches # using PyPI as git repository does not have release tags or branches
src = fetchPypi { src = fetchPypi {

View file

@ -14,7 +14,7 @@ buildPythonPackage rec {
version = "0.0.6"; version = "0.0.6";
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

View file

@ -28,7 +28,7 @@
}: }:
let let
version = "2.7.0"; version = "2.7.1";
in in
buildPythonPackage { buildPythonPackage {
pname = "paddleocr"; pname = "paddleocr";
@ -39,7 +39,7 @@ buildPythonPackage {
owner = "PaddlePaddle"; owner = "PaddlePaddle";
repo = "PaddleOCR"; repo = "PaddleOCR";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-r7Y666KpY855NCSinCBBUz9PXHfZ56+oZW1/0ISpWe4="; hash = "sha256-5Dt4UL+7dwJNjcNnCVi3o8bLCt7/m/M6oh1vPu9rza8=";
}; };
patches = [ patches = [

View file

@ -19,7 +19,7 @@ buildPythonPackage rec {
version = "2.0.3"; version = "2.0.3";
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alkaline-ml"; owner = "alkaline-ml";

View file

@ -12,7 +12,7 @@ buildPythonPackage rec {
version = "0.3.8"; version = "0.3.8";
pyproject = true; pyproject = true;
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "getmoto"; owner = "getmoto";

View file

@ -14,7 +14,7 @@ buildPythonPackage {
inherit pname version; inherit pname version;
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

View file

@ -12,7 +12,7 @@ buildPythonPackage rec {
version = "1.7.0"; version = "1.7.0";
format = "pyproject"; format = "pyproject";
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "adamchainz"; owner = "adamchainz";

View file

@ -18,7 +18,7 @@ buildPythonPackage rec {
pname = "schemainspect"; pname = "schemainspect";
version = "3.1.1663587362"; version = "3.1.1663587362";
format = "pyproject"; format = "pyproject";
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "djrobstep"; owner = "djrobstep";

View file

@ -15,7 +15,7 @@ buildPythonPackage rec {
version = "0.3.1"; version = "0.3.1";
pyproject = true; pyproject = true;
disable = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "welch"; owner = "welch";

View file

@ -21,7 +21,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "softlayer"; pname = "softlayer";
version = "6.1.9"; version = "6.1.10";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = "softlayer-python"; repo = "softlayer-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-mYezVJSBtZuNT6mG544dJhRFh26M4nN4nE3tUVB3cZQ="; hash = "sha256-0NLa+kEArKqfqytnxbzXnX/OVhYFBKZO9odXGR0AoSA=";
}; };
postPatch = '' postPatch = ''
@ -78,7 +78,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python libraries that assist in calling the SoftLayer API"; description = "Python libraries that assist in calling the SoftLayer API";
homepage = "https://github.com/softlayer/softlayer-python"; homepage = "https://github.com/softlayer/softlayer-python";
changelog = "https://github.com/softlayer/softlayer-python/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/softlayer/softlayer-python/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ onny ]; maintainers = with maintainers; [ onny ];
}; };

View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sphinx-basic-ng"; pname = "sphinx-basic-ng";
version = "1.0.0.beta2"; version = "1.0.0.beta2";
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pradyunsg"; owner = "pradyunsg";

View file

@ -29,7 +29,7 @@ buildPythonPackage rec {
version = "0.20.1"; version = "0.20.1";
pyproject = true; pyproject = true;
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "blue-yonder"; owner = "blue-yonder";

View file

@ -99,7 +99,7 @@ buildPythonPackage {
inherit version; inherit version;
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neuml"; owner = "neuml";

View file

@ -27,7 +27,7 @@ buildPythonPackage rec {
version = "0.0.15"; version = "0.0.15";
format = "pyproject"; format = "pyproject";
disable = pythonOlder "3.8"; disabled = pythonOlder "3.8";
# using PyPI because the repo does not have tags or release branches # using PyPI because the repo does not have tags or release branches
src = fetchPypi { src = fetchPypi {

View file

@ -9,12 +9,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "uhi"; pname = "uhi";
version = "0.3.3"; version = "0.4.0";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "800caf3a5f1273b08bcc3bb4b49228fe003942e23423812b0110546aad9a24be"; sha256 = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo=";
}; };
buildInputs = [ buildInputs = [

View file

@ -34,7 +34,7 @@ buildPythonPackage {
inherit version; inherit version;
format = "setuptools"; format = "setuptools";
disable = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebookresearch"; owner = "facebookresearch";

View file

@ -1032,6 +1032,7 @@ let
}); });
quarto = old.quarto.overrideAttrs (attrs: { quarto = old.quarto.overrideAttrs (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.quarto ];
postPatch = '' postPatch = ''
substituteInPlace "R/quarto.R" \ substituteInPlace "R/quarto.R" \
--replace "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = NA)" "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = '${lib.getBin pkgs.quarto}/bin/quarto')" --replace "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = NA)" "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = '${lib.getBin pkgs.quarto}/bin/quarto')"

View file

@ -1,21 +1,34 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts { lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts
, coreutils, git, gnused, nix, nixfmt }: , coreutils, git, gnused, nix, zlib }:
let
libPath = lib.makeLibraryPath [
zlib # libz.so.1
];
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "coursier"; pname = "coursier";
version = "2.1.7"; version = "2.1.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
sha256 = "aih4gkfSFTyZtw61NfB2JcNjfmxYWi1kWNGooI+110E="; hash = "sha256-aih4gkfSFTyZtw61NfB2JcNjfmxYWi1kWNGooI+110E=";
}; };
dontUnpack = true;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildCommand = '' installPhase = ''
runHook preInstall
install -Dm555 $src $out/bin/cs install -Dm555 $src $out/bin/cs
patchShebangs $out/bin/cs patchShebangs $out/bin/cs
wrapProgram $out/bin/cs --prefix PATH ":" ${jre}/bin wrapProgram $out/bin/cs \
--prefix PATH ":" ${lib.makeBinPath [ jre ]} \
--prefix LD_LIBRARY_PATH ":" ${libPath}
runHook postInstall
''; '';
passthru.updateScript = writeScript "update.sh" '' passthru.updateScript = writeScript "update.sh" ''
@ -38,5 +51,6 @@ stdenv.mkDerivation rec {
description = "Scala library to fetch dependencies from Maven / Ivy repositories"; description = "Scala library to fetch dependencies from Maven / Ivy repositories";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ adelbertc nequissimus ]; maintainers = with maintainers; [ adelbertc nequissimus ];
platforms = platforms.all;
}; };
} }

View file

@ -1,15 +1,15 @@
{ lib, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: { lib, buildGoModule, fetchgit, qemu, podman, makeWrapper }:
buildGoModule rec { buildGoModule rec {
pname = "out-of-tree"; pname = "out-of-tree";
version = "2.0.4"; version = "2.1.1";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
src = fetchgit { src = fetchgit {
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
url = "https://code.dumpstack.io/tools/${pname}.git"; url = "https://code.dumpstack.io/tools/${pname}.git";
sha256 = "sha256-D2LiSDnF7g1h0XTulctCnZ+I6FZSLA0XRd9LQLOMP9c="; sha256 = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo=";
}; };
vendorHash = "sha256-p1dqzng3ak9lrnzrEABhE1TP1lM2Ikc8bmvp5L3nUp0="; vendorHash = "sha256-p1dqzng3ak9lrnzrEABhE1TP1lM2Ikc8bmvp5L3nUp0=";
@ -18,7 +18,7 @@ buildGoModule rec {
postFixup = '' postFixup = ''
wrapProgram $out/bin/out-of-tree \ wrapProgram $out/bin/out-of-tree \
--prefix PATH : "${lib.makeBinPath [ qemu ]}" --prefix PATH : "${lib.makeBinPath [ qemu podman ]}"
''; '';
meta = with lib; { meta = with lib; {

View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-tally"; pname = "cargo-tally";
version = "1.0.30"; version = "1.0.31";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-5k4nx4VSYN4jscCwj5NVYnV5/GS0PRCA23xR6STHr88="; hash = "sha256-2V2JXSlFzYoSidByWGFTGwNHM9c5Go1cdHLp0b7N+hI=";
}; };
cargoHash = "sha256-eyGDizffuIPpa797YplD6763/JlVtoMAxybK9KsgmLE="; cargoHash = "sha256-mcYAqzfZO0M/UQTeYp4eCD7VVIWhtHi7VxBZtrr/aCk=";
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
DiskArbitration DiskArbitration

View file

@ -4,28 +4,26 @@
buildGo121Module, buildGo121Module,
fetchFromGitHub, fetchFromGitHub,
installShellFiles, installShellFiles,
nix-update-script,
}: }:
buildGo121Module rec { buildGo121Module rec {
pname = "turso-cli"; pname = "turso-cli";
version = "0.85.3"; version = "0.86.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tursodatabase"; owner = "tursodatabase";
repo = "turso-cli"; repo = "turso-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dJpHrqPyikkUnE4Un1fGOEJL49U5IiInYeSWmI04r18="; hash = "sha256-hTqjNQSScQzCUBs4pYgxRnRvUSoQXXeZIceSZAR1Oa0=";
}; };
vendorHash = "sha256-Hv4CacBrRX2YT3AkbNzyWrA9Ex6YMDPrPvezukwMkTE="; vendorHash = "sha256-EqND/W+NNatoBUMXWrsjNPfxAtX0oUASUxN6Rmhp7SQ=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
# Build with production code ldflags = [
tags = ["prod"]; "-X github.com/tursodatabase/turso-cli/internal/cmd.version=v${version}"
# Include version for `turso --version` reporting ];
preBuild = ''
echo "v${version}" > internal/cmd/version.txt
'';
preCheck = '' preCheck = ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
@ -38,6 +36,8 @@ buildGo121Module rec {
--zsh <($out/bin/turso completion zsh) --zsh <($out/bin/turso completion zsh)
''; '';
passthru.updateScript = nix-update-script { };
meta = with lib; { meta = with lib; {
description = "This is the command line interface (CLI) to Turso."; description = "This is the command line interface (CLI) to Turso.";
homepage = "https://turso.tech"; homepage = "https://turso.tech";

View file

@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "utm"; pname = "utm";
version = "4.3.5"; version = "4.4.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
hash = "sha256-aDIjf4TqhSIgYaJulI5FgXxlNiZ1qcNY+Typ7+S5Hc8="; hash = "sha256-U1HB8uP8OzHX8LzBE8u7YSDI4vlY9vlMRE+JI+x9rvk=";
}; };
nativeBuildInputs = [ undmg makeWrapper ]; nativeBuildInputs = [ undmg makeWrapper ];

View file

@ -52,6 +52,6 @@ optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated
homepage = "https://www.atlassian.com/software/confluence"; homepage = "https://www.atlassian.com/software/confluence";
sourceProvenance = with sourceTypes; [ binaryBytecode ]; sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ globin willibutz ciil techknowlogick ma27 ]; maintainers = with maintainers; [ globin willibutz ciil techknowlogick ];
}; };
}) })

View file

@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
description = "Proprietary issue tracking product, also providing project management functions"; description = "Proprietary issue tracking product, also providing project management functions";
homepage = "https://www.atlassian.com/software/jira"; homepage = "https://www.atlassian.com/software/jira";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ globin ciil megheaiulian techknowlogick ma27 ]; maintainers = with maintainers; [ globin ciil megheaiulian techknowlogick ];
}; };
} }

View file

@ -78,6 +78,6 @@ buildPythonPackage rec {
homepage = "https://www.gnu.org/software/mailman/"; homepage = "https://www.gnu.org/software/mailman/";
description = "Free software for managing electronic mail discussion and newsletter lists"; description = "Free software for managing electronic mail discussion and newsletter lists";
license = lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ qyliss ma27 ]; maintainers = with lib.maintainers; [ qyliss ];
}; };
} }

View file

@ -14,16 +14,16 @@
buildGoModule rec { buildGoModule rec {
pname = "grafana-agent"; pname = "grafana-agent";
version = "0.37.1"; version = "0.37.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grafana"; owner = "grafana";
repo = "agent"; repo = "agent";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0agQAz/oR6hrokAAjCLMcDrR6/f4r0BJgQHWZvGqWAE="; hash = "sha256-LeXJ//WbvlOtlomzws3Aa2FE9D4D4KF5iCjPyFyExig=";
}; };
vendorHash = "sha256-GfIzZ0fuRrlYLbGbYVE1HzMZfszokfixG+YVqkTyaQE="; vendorHash = "sha256-DKFXJ+1EE/92BOoGVit7ZK6U2HL8JyG9HqcA8ww3mtA=";
proxyVendor = true; # darwin/linux hash mismatch proxyVendor = true; # darwin/linux hash mismatch
frontendYarnOfflineCache = fetchYarnDeps { frontendYarnOfflineCache = fetchYarnDeps {

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ipmi_exporter"; pname = "ipmi_exporter";
version = "1.6.1"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prometheus-community"; owner = "prometheus-community";
repo = "ipmi_exporter"; repo = "ipmi_exporter";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hifG1lpFUVLoy7Ol3N6h+s+hZjnQxja5svpY4lFFsxw="; hash = "sha256-yVFpYedWELqDNzmHQfMJa95iKQsn1N/wa82sQEQh1Uw=";
}; };
vendorHash = "sha256-UuPZmxoKVj7FusOS6H1gn6SAzQIZAKyX+m+QS657yXw="; vendorHash = "sha256-1ntFcOmVN4I1aa/5gWnzkYNYxxFT9ZM1usNnE23KfR0=";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
popd popd
''; '';
outputs = [ "out" "dev" "lib" ];
nativeBuildInputs = [ cmake docbook_xsl libxslt ]; nativeBuildInputs = [ cmake docbook_xsl libxslt ];
buildInputs = [ buildInputs = [

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "outline"; pname = "outline";
version = "0.71.0"; version = "0.72.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "outline"; owner = "outline";
repo = "outline"; repo = "outline";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-vwYq5b+cMYf/gnpCwLEpErYKqYw/RwcvyBjhp+5+bTY="; hash = "sha256-y54EYWI1DbxosUflp5z+b4i1vO1qDju8LxEK0nt4S/g=";
}; };
nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps { yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${src}/yarn.lock";
hash = "sha256-j9iaxXfMlG9dT6fvYgPQg6Y0QvCRiBU1peO0YgsGHOY="; hash = "sha256-uXWBYZAjMA88NtADA4s2kB4Ubb2atrW6F4kAzDGA1WI=";
}; };
configurePhase = '' configurePhase = ''
@ -63,7 +63,8 @@ stdenv.mkDerivation rec {
makeWrapper ${nodejs}/bin/node $out/bin/outline-server \ makeWrapper ${nodejs}/bin/node $out/bin/outline-server \
--add-flags $build/server/index.js \ --add-flags $build/server/index.js \
--set NODE_ENV production \ --set NODE_ENV production \
--set NODE_PATH $node_modules --set NODE_PATH $node_modules \
--prefix PATH : ${lib.makeBinPath [ nodejs ]} # required to run migrations
runHook postInstall runHook postInstall
''; '';

File diff suppressed because it is too large Load diff

View file

@ -24,13 +24,13 @@
let let
pname = "windmill"; pname = "windmill";
version = "1.160.0"; version = "1.184.0";
fullSrc = fetchFromGitHub { fullSrc = fetchFromGitHub {
owner = "windmill-labs"; owner = "windmill-labs";
repo = "windmill"; repo = "windmill";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-WsIYGqBBcLq5CE/zcgqPVCYtxM3GfSxSqF2JeW6C0ss="; hash = "sha256-K7nF2B52dEzvdZxj21i89uJveh3/cM7uq7y/EE45ooY";
}; };
pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]);
@ -43,7 +43,11 @@ let
sourceRoot = "${fullSrc.name}/frontend"; sourceRoot = "${fullSrc.name}/frontend";
npmDepsHash = "sha256-GUrOfN3SyxkvQllgHXDao8JFl5zY4DBxftelsX0Rkqo="; npmDepsHash = "sha256-pGTJfVXo7nPIzwVIVxOm1pTd+7CbnKCnaQMYC+GkSAI=";
# without these you get a
# FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory
env.NODE_OPTIONS="--max-old-space-size=8192";
preBuild = '' preBuild = ''
npm run generate-backend-client npm run generate-backend-client
@ -101,7 +105,7 @@ rustPlatform.buildRustPackage {
]; ];
postPatch = '' postPatch = ''
substituteInPlace windmill-worker/src/worker.rs \ substituteInPlace windmill-worker/src/bash_executor.rs \
--replace '"/bin/bash"' '"${bash}/bin/bash"' --replace '"/bin/bash"' '"${bash}/bin/bash"'
substituteInPlace windmill-api/src/lib.rs \ substituteInPlace windmill-api/src/lib.rs \
@ -154,7 +158,7 @@ rustPlatform.buildRustPackage {
description = "Open-source developer platform to turn scripts into workflows and UIs"; description = "Open-source developer platform to turn scripts into workflows and UIs";
homepage = "https://windmill.dev"; homepage = "https://windmill.dev";
license = lib.licenses.agpl3Only; license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ dit7ya ]; maintainers = with lib.maintainers; [ dit7ya happysalada ];
mainProgram = "windmill"; mainProgram = "windmill";
# limited by librusty_v8 # limited by librusty_v8
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "carapace"; pname = "carapace";
version = "0.27.0"; version = "0.28.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rsteube"; owner = "rsteube";
repo = "${pname}-bin"; repo = "${pname}-bin";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-UcJbWOYkNUJEilJL/LG5o+I1ugqEOEGfs+uvKUMnTMU="; hash = "sha256-0ubZt4KsjsoIcglo/lh9JDAZjuACBNdVLJazH0Csxl0=";
}; };
vendorHash = "sha256-PN8ARsJQqRj333ervoy24PZoWkrCIYiGxOovzEhPNZQ="; vendorHash = "sha256-35Gmye5NPOtUaW8zNkjK0cQ3FRB1fK7UyqT5c17rls4=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/wyntau/fzf-zsh"; homepage = "https://github.com/wyntau/fzf-zsh";
description = "wrap fzf to use in oh-my-zsh"; description = "wrap fzf to use in oh-my-zsh";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ma27 ]; maintainers = with maintainers; [ ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -21,6 +21,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; homepage = "https://github.com/halfo/lambda-mod-zsh-theme/";
license = licenses.mit; license = licenses.mit;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ ma27 ]; maintainers = with maintainers; [ ];
}; };
} }

View file

@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; homepage = "https://github.com/MichaelAquilina/zsh-you-should-use";
license = licenses.gpl3; license = licenses.gpl3;
description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed";
maintainers = with maintainers; [ ma27 ]; maintainers = with maintainers; [ ];
}; };
} }

View file

@ -5,18 +5,18 @@
buildGoModule rec { buildGoModule rec {
pname = "google-cloud-sql-proxy"; pname = "google-cloud-sql-proxy";
version = "2.7.0"; version = "2.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoogleCloudPlatform"; owner = "GoogleCloudPlatform";
repo = "cloud-sql-proxy"; repo = "cloud-sql-proxy";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-4PB9Eaqb8teF+gmiHD2VAIFnxqiK2Nb0u+xSNAM8iMs="; hash = "sha256-8UoAN5z84gGV869AgOWGrC92NdEnkw5b6QME4QKQ/mM=";
}; };
subPackages = [ "." ]; subPackages = [ "." ];
vendorHash = "sha256-LaI7IdSyB7ETTjqIcIPDf3noEbvwlN3+KqrkSm8B6m8="; vendorHash = "sha256-S2bt015AD25K6yrVGK3qv8Gq2fVifVV0AVBSt/8V9So=";
preCheck = '' preCheck = ''
buildFlagsArray+="-short" buildFlagsArray+="-short"

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, Security, SystemConfiguration }: { stdenv, lib, fetchFromGitHub, rustPlatform, CoreServices, Security, SystemConfiguration }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "kak-lsp"; pname = "kak-lsp";
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-g63Kfi4xJZO/+fq6eK2iB1dUGoSGWIIRaJr8BWO/txM="; cargoSha256 = "sha256-g63Kfi4xJZO/+fq6eK2iB1dUGoSGWIIRaJr8BWO/txM=";
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
meta = with lib; { meta = with lib; {
description = "Kakoune Language Server Protocol Client"; description = "Kakoune Language Server Protocol Client";

View file

@ -5,6 +5,7 @@
, avrdude , avrdude
, dfu-programmer , dfu-programmer
, dfu-util , dfu-util
, wb32-dfu-updater
, gcc-arm-embedded , gcc-arm-embedded
, gnumake , gnumake
, teensy-loader-cli , teensy-loader-cli
@ -38,6 +39,7 @@ python3.pkgs.buildPythonApplication rec {
avrdude avrdude
dfu-programmer dfu-programmer
dfu-util dfu-util
wb32-dfu-updater
teensy-loader-cli teensy-loader-cli
gcc-arm-embedded gcc-arm-embedded
gnumake gnumake

View file

@ -42,6 +42,6 @@ buildPythonApplication rec {
description = description =
"vpnc-script replacement for easy and secure split-tunnel VPN setup"; "vpnc-script replacement for easy and secure split-tunnel VPN setup";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ jdbaldry ]; maintainers = with maintainers; [ liketechnik ];
}; };
} }

View file

@ -17,11 +17,11 @@ let
# onlykey requires a patched version of libagent # onlykey requires a patched version of libagent
lib-agent = with python3Packages; libagent.overridePythonAttrs (oa: rec{ lib-agent = with python3Packages; libagent.overridePythonAttrs (oa: rec{
version = "1.0.4"; version = "1.0.6";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "lib-agent"; pname = "lib-agent";
sha256 = "sha256-MwtufyJVPWuK7bbX+9Kv6wEi/zq4ftXrfjrMOYpcIfc="; sha256 = "sha256-IrJizIHDIPHo4tVduUat7u31zHo3Nt8gcMOyUUqkNu0=";
}; };
propagatedBuildInputs = oa.propagatedBuildInputs or [ ] ++ [ propagatedBuildInputs = oa.propagatedBuildInputs or [ ] ++ [
bech32 bech32
@ -45,11 +45,11 @@ let
in in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "onlykey-agent"; pname = "onlykey-agent";
version = "1.1.13"; version = "1.1.15";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-GAb6crtW6rLAbFtdi6fAGCPjXpKFhravguoGjuNcIxc="; sha256 = "sha256-SbGb7CjcD7cFPvASZtip56B4uxRiFKZBvbsf6sb8fds=";
}; };
propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli ]; propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli ];

View file

@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "onlykey-cli"; pname = "onlykey-cli";
version = "1.2.9"; version = "1.2.10";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "onlykey"; pname = "onlykey";
sha256 = "sha256-92CzDZgtmww0eABtjeBo6HNQ00sijWakjXLPJiOXY/A="; sha256 = "sha256-ZmQnyZx9YlIIxMMdZ0U2zb+QANfcwrtG7iR1LpgzmBQ=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
# Requires having the physical onlykey (a usb security key) # Requires having the physical onlykey (a usb security key)
doCheck = false; doCheck = false;
pythonImportsCheck = [ "onlykey.cli" ]; pythonImportsCheck = [ "onlykey.client" ];
meta = with lib; { meta = with lib; {
description = "OnlyKey client and command-line tool"; description = "OnlyKey client and command-line tool";

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "vgrep"; pname = "vgrep";
version = "2.6.1"; version = "2.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vrothberg"; owner = "vrothberg";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8xLyk1iid3xDCAuZwz1oXsEyboLaxvzm1BEyA2snQt4="; hash = "sha256-+KZNNkTuZyF02YDZX3u1KdhOcZ3+Ud6aDGL/sGUN1hI=";
}; };
vendorHash = null; vendorHash = null;

Some files were not shown because too many files have changed in this diff Show more