mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge master into haskell-updates
This commit is contained in:
commit
9ba6250a0d
@ -4661,6 +4661,12 @@
|
||||
githubId = 37017396;
|
||||
name = "gbtb";
|
||||
};
|
||||
gdinh = {
|
||||
email = "nix@contact.dinh.ai";
|
||||
github = "gdinh";
|
||||
githubId = 34658064;
|
||||
name = "Grace Dinh";
|
||||
};
|
||||
gebner = {
|
||||
email = "gebner@gebner.org";
|
||||
github = "gebner";
|
||||
@ -8160,6 +8166,15 @@
|
||||
githubId = 427866;
|
||||
name = "Matthias Beyer";
|
||||
};
|
||||
MatthieuBarthel = {
|
||||
email = "matthieu@imatt.ch";
|
||||
name = "Matthieu Barthel";
|
||||
github = "MatthieuBarthel";
|
||||
githubId = 435534;
|
||||
keys = [{
|
||||
fingerprint = "80EB 0F2B 484A BB80 7BEF 4145 BA23 F10E AADC 2E26";
|
||||
}];
|
||||
};
|
||||
matthuszagh = {
|
||||
email = "huszaghmatt@gmail.com";
|
||||
github = "matthuszagh";
|
||||
|
@ -354,6 +354,7 @@ in
|
||||
webdav = 322;
|
||||
pipewire = 323;
|
||||
rstudio-server = 324;
|
||||
localtimed = 325;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
|
||||
|
||||
@ -662,6 +663,7 @@ in
|
||||
webdav = 322;
|
||||
pipewire = 323;
|
||||
rstudio-server = 324;
|
||||
localtimed = 325;
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing
|
||||
# uid. Users and groups with the same name should have equal
|
||||
|
@ -1023,7 +1023,7 @@
|
||||
./services/system/cloud-init.nix
|
||||
./services/system/dbus.nix
|
||||
./services/system/earlyoom.nix
|
||||
./services/system/localtime.nix
|
||||
./services/system/localtimed.nix
|
||||
./services/system/kerberos/default.nix
|
||||
./services/system/nscd.nix
|
||||
./services/system/saslauthd.nix
|
||||
|
@ -1,37 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.localtimed;
|
||||
in {
|
||||
imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ];
|
||||
|
||||
options = {
|
||||
services.localtimed = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Enable `localtimed`, a simple daemon for keeping the
|
||||
system timezone up-to-date based on the current location. It uses
|
||||
geoclue2 to determine the current location.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.geoclue2.appConfig.localtimed = {
|
||||
isAllowed = true;
|
||||
isSystem = true;
|
||||
};
|
||||
|
||||
# Install the polkit rules.
|
||||
environment.systemPackages = [ pkgs.localtime ];
|
||||
# Install the systemd unit.
|
||||
systemd.packages = [ pkgs.localtime ];
|
||||
|
||||
systemd.services.localtime.wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
}
|
66
nixos/modules/services/system/localtimed.nix
Normal file
66
nixos/modules/services/system/localtimed.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.localtimed;
|
||||
in {
|
||||
imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ];
|
||||
|
||||
options = {
|
||||
services.localtimed = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Enable `localtimed`, a simple daemon for keeping the
|
||||
system timezone up-to-date based on the current location. It uses
|
||||
geoclue2 to determine the current location.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.geoclue2.appConfig.localtimed = {
|
||||
isAllowed = true;
|
||||
isSystem = true;
|
||||
users = [ (toString config.ids.uids.localtimed) ];
|
||||
};
|
||||
|
||||
# Install the polkit rules.
|
||||
environment.systemPackages = [ pkgs.localtime ];
|
||||
|
||||
systemd.services.localtimed = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
partOf = [ "localtimed-geoclue-agent.service" ];
|
||||
after = [ "localtimed-geoclue-agent.service" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.localtime}/bin/localtimed";
|
||||
Restart = "on-failure";
|
||||
Type = "exec";
|
||||
User = "localtimed";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.localtimed-geoclue-agent = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
partOf = [ "geoclue.service" ];
|
||||
after = [ "geoclue.service" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent";
|
||||
Restart = "on-failure";
|
||||
Type = "exec";
|
||||
User = "localtimed";
|
||||
};
|
||||
};
|
||||
|
||||
users = {
|
||||
users.localtimed = {
|
||||
uid = config.ids.uids.localtimed;
|
||||
group = "localtimed";
|
||||
};
|
||||
groups.localtimed.gid = config.ids.gids.localtimed;
|
||||
};
|
||||
};
|
||||
}
|
@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
''
|
||||
machine.wait_for_unit("isso.service")
|
||||
|
||||
machine.wait_for_open_port(port)
|
||||
machine.wait_for_open_port(${toString port})
|
||||
|
||||
machine.succeed("curl --fail http://localhost:${toString port}/?uri")
|
||||
machine.succeed("curl --fail http://localhost:${toString port}/js/embed.min.js")
|
||||
|
@ -4,16 +4,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "librespot";
|
||||
version = "0.3.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librespot-org";
|
||||
repo = "librespot";
|
||||
rev = "v${version}";
|
||||
sha256 = "1fv2sk89rf1vraq823bxddlxj6b4gqhfpc36xr7ibz2405zickfv";
|
||||
sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1sal85gsbnrabxi39298w9njdc08csnwl40akd6k9fsc0fmpn1b0";
|
||||
cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
@ -18,13 +18,13 @@ let
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "mt32emu-qt";
|
||||
version = "1.10.2";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munt";
|
||||
repo = "munt";
|
||||
rev = "${char2underscore "-" pname}_${char2underscore "." version}";
|
||||
sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9";
|
||||
sha256 = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -12,13 +12,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mt32emu-smf2wav";
|
||||
version = "1.8.2";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munt";
|
||||
repo = "munt";
|
||||
rev = "${char2underscore "-" pname}_${char2underscore "." version}";
|
||||
sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9";
|
||||
sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snd";
|
||||
version = "22.2";
|
||||
version = "22.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
|
||||
sha256 = "sha256-MZ8Vm/d+0r7YsXdySKcH5rqXBh4iFLyUe44LBOD58E0=";
|
||||
sha256 = "sha256-a/nYq6Cfbx93jfA6I8it+U0U36dOAFSpRis32spPks4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -80,5 +80,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/xou816/spot";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jtojnar tomfitzhenry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -34,13 +34,13 @@ stdenv.mkDerivation {
|
||||
pname = binName;
|
||||
# versions are specified in `squeezelite.h`
|
||||
# see https://github.com/ralph-irving/squeezelite/issues/29
|
||||
version = "1.9.9.1401";
|
||||
version = "1.9.9.1403";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ralph-irving";
|
||||
repo = "squeezelite";
|
||||
rev = "894df3ea80f66a27a9ae5fab918acf62a6798b8b";
|
||||
hash = "sha256-LIi+9vb0+56AGvVrLx4gQaUkUNjIi6PmqrLViLT1DSU=";
|
||||
rev = "bc72c0de3fff771540a2a45aaafafed539387b3c";
|
||||
hash = "sha256-205i61mbeQG2MzSE9NtPHSuNeyMbjZzbZVCFFzjqKqQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ flac libmad libvorbis mpg123 ]
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "termusic";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-n5Z6LnZ0x+V46Exa9vSMrndZHperJlcXl1unfeTuo9M=";
|
||||
sha256 = "sha256-4o36h/x4+h2H4xpgPfOgIza6zNANyhmSM3Cm1XwWb7w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eIM0/SWLZVyVsHyQ4GzKSjVTvK7oActAiBEv56+JqK4=";
|
||||
cargoHash = "sha256-WHxrMD6W7UyJg8HhjxWlm9KQ5SKsM6fLdvhDzBb16pI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ alsa-lib ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.45.0";
|
||||
version = "2.45.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-jw4ocBtyxhPhI2GnhL9tbduY4iIQK53vUHB64qSGXKI=";
|
||||
hash = "sha256-KUp7ZQZ+THjioOSe3A40Zj+5OteWxEv+dnSbTUM8qME=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0vwnx7fs46fkas75pnhjc81wy3hr24k2gs82i30ailaxw5r63j81";
|
||||
x86_64-darwin = "0bxc74vfkw9zhxfahzhcghlnybvj8k15jbni489lf636a45xrlcc";
|
||||
aarch64-linux = "10z6nv67yjd15ilxgfpjf07qbdp0cbd5761a5gcymiam4r22l6hq";
|
||||
aarch64-darwin = "133nccm0hcgcd2503psxwaaq4v4l16q7w7kbcz1y5lynlvwazjrx";
|
||||
armv7l-linux = "1sx3l42ls62v3apjap25ccg4mcbi71spfj5xh7y6rffzi65xwdrv";
|
||||
x86_64-linux = "1jvi34ym7d6j5zl9d7wg3rcy34f4ji907mixfmvs7g0z1vlra2sv";
|
||||
x86_64-darwin = "19nnkx2l4rvm23r8ii2a0jn8lvanmshwsjrsgmi7dcnf68143601";
|
||||
aarch64-linux = "17rx5v3kzwzkzhckly8s413370mrh7rcyhpnppmn39gkvy68ydhs";
|
||||
aarch64-darwin = "0ff0yn3kcb35s775w0k2l3szs137ph593qa7y3p2h4sbfsrgljxz";
|
||||
armv7l-linux = "0qhik2qhbwpjrbkpdc8cblvrh1hqld69il78zmayq1bbkqzhhmp5";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
@ -29,7 +29,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.70.0";
|
||||
version = "1.70.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "493";
|
||||
version = "495";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-sROmWFH3sDBDh1VSVLTM71Y9qD8CndvwW7PKzkavIuc=";
|
||||
sha256 = "sha256-MuSK19oSrRJZebATRpDW1CmUq4NKcpuoPmOuLyvL8A8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -52,6 +52,11 @@ stdenv.mkDerivation rec {
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $dev/lib/cmake/OpenImageIO/OpenImageIOTargets-*.cmake \
|
||||
--replace "\''${_IMPORT_PREFIX}/lib/lib" "$out/lib/lib"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.openimageio.org";
|
||||
description = "A library and tools for reading and writing images";
|
||||
|
@ -82,9 +82,9 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
in ''
|
||||
mkdir -p $out/etc/udev/rules.d/
|
||||
./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules || \
|
||||
cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
|
||||
mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d
|
||||
./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules
|
||||
./tools/sane-desc -m udev+hwdb -s doc/descriptions -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb
|
||||
# the created 49-libsane references /bin/sh
|
||||
substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
|
||||
--replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}"
|
||||
|
@ -14,10 +14,10 @@ let
|
||||
pname = "1password-cli";
|
||||
version = "2.6.1";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-2V3/F7/HEOvk2T1dv4rnS0xu6Z5EqGSV/9erED7ZS1w=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-z4pKZY5DQ2oDHHuet1S/p7GM+rXS8/8xmTrN+rqCUBo=" "zip";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-udKcojp7CUz5mXIFeLiXKJ7X1A/fejoeLUc+2zlnlKo=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-gJpwZrtgzC+fD8dqc2hgfsAiYmVkAY3xSmIQnsC5naw=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-X+VyoXg7HRq70b9qRhk2N/UvBlhIkvCWM6kadaGDhsU=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-YPidRXNzNNuDoM2Gd5dEsCDxwosBJFKSzjoP0SPkQZs=" "pkg";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-Z8MKp9fQBsvg1nQ0QSrnMV0Bxy6LmnwHb5WIrhGjxv8=" "pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
platforms = builtins.attrNames sources;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
let
|
||||
pname = "anytype";
|
||||
version = "0.26.1";
|
||||
version = "0.27.0";
|
||||
name = "Anytype-${version}";
|
||||
nameExecutable = pname;
|
||||
src = fetchurl {
|
||||
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
|
||||
name = "Anytype-${version}.AppImage";
|
||||
sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI=";
|
||||
sha256 = "sha256-AcnXhilnr5ay45S30eNSDuN+Ed1TDv/Rh523LsUf3iM=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
in
|
||||
|
70
pkgs/applications/misc/clipqr/default.nix
Normal file
70
pkgs/applications/misc/clipqr/default.nix
Normal file
@ -0,0 +1,70 @@
|
||||
{ buildGoModule
|
||||
, copyDesktopItems
|
||||
, fetchFromGitLab
|
||||
, lib
|
||||
, libGL
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, makeDesktopItem
|
||||
, mesa
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clipqr";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "imatt-foss";
|
||||
repo = "clipqr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E90nTJtx4GOacu8M7oQBznnSQVDIZatibgKMZEpTUaQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "5kAOSyVbvot4TX/XfRNe1/zZk6fa7pS1Dvn9nz11u3U=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libXrandr
|
||||
mesa
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 icon.svg $out/share/icons/hicolor/scalable/apps/clipqr.svg
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "ClipQR";
|
||||
desktopName = "ClipQR";
|
||||
exec = "clipqr";
|
||||
categories = [ "Utility" ];
|
||||
icon = "clipqr";
|
||||
comment = "Scan QR codes on screen and from camera";
|
||||
genericName = "ClipQR";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scan QR codes on screen and from camera, the result is in your clipboard";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ MatthieuBarthel ];
|
||||
homepage = "https://gitlab.com/imatt-foss/clipqr";
|
||||
};
|
||||
}
|
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crow-translate";
|
||||
version = "2.9.10";
|
||||
version = "2.9.12";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
|
||||
hash = "sha256-FIQuvayhk2XrkpbVxwfXRMyFnOxKv8bs1ayeboQHliY=";
|
||||
hash = "sha256-JkAykc5j5HMkK48qAm876A2zBD095CG/yR4TyXAdevM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -23,16 +23,16 @@
|
||||
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
|
||||
}) rec {
|
||||
pname = "dbeaver";
|
||||
version = "22.1.3"; # When updating also update mvnSha256
|
||||
version = "22.1.4"; # When updating also update mvnSha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-QrocrH/orgXvg0vNelm1hK4dHeDsxe3ZaVb3Q2FgYSo=";
|
||||
sha256 = "sha256-5s2SFquB0i5X2deBO0FStudReB4wGhQkhR39PHPBEAM=";
|
||||
};
|
||||
|
||||
mvnSha256 = "U+RqrXtwFrku4b5d47WrFLmrlfqBs8YVif/qGf5CXqQ=";
|
||||
mvnSha256 = "YIeKSL5scU8NxEIf+jK1g9cdFDOBVh14ruKMqUuz1Ts=";
|
||||
mvnParameters = "-P desktop,all-platforms";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpxsee";
|
||||
version = "11.1";
|
||||
version = "11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "sha256-0n1XPrJ+gssIP/7k9CI8AWXs9ddKOg3Lo3DfrXGUl84=";
|
||||
sha256 = "sha256-n8busir6IYyWyGOv9AzYjm8erR0fjMAduIzITH+EvVI=";
|
||||
};
|
||||
|
||||
patches = (substituteAll {
|
||||
|
@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
desktop-file-utils
|
||||
glib
|
||||
gtk3
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
@ -41,7 +42,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libhandy
|
||||
librsvg
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "system76-keyboard-configurator";
|
||||
version = "1.0.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "keyboard-configurator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CVCXNPmc/0T8vkxfU+i1nSbfusZGFVkLEveSoCePK0M=";
|
||||
sha256 = "sha256-N7faWyM2KExnKr6foO6KIxkFD/pGzw9RJDnADwK/fYU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
udev
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-/p2cVxOvWKkcVOYIR0N8tQSCniw+QhXhC+pus4NsQ8k=";
|
||||
cargoSha256 = "sha256-h5kqm3ZyqzJhTjBcuOvaHkwPvF1xerN2eEDFwZAah6g=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Keyboard configuration application for System76 keyboards and laptops";
|
||||
|
@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "103.0-3",
|
||||
"packageVersion": "103.0.2-1",
|
||||
"source": {
|
||||
"rev": "103.0-3",
|
||||
"sha256": "1d8qh0s5zjh10cyyawpvr7ywygg1ibh1r0rx0vnqv1qakj3y4jcq"
|
||||
"rev": "103.0.2-1",
|
||||
"sha256": "0cfhrxnvxlidipg0cpz0gapya8pvfqcmjkyqns4xz1jq5lkm1xg3"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "103.0",
|
||||
"sha512": "016c2f276fb94e5174626f7d8b1a821b2de0f5a07f8a10f00a7ea4d4285591b0c23dd3ef45306579de79b3dfa99ccc527224c33f3319f61cf088b1f4bd097f9e"
|
||||
"version": "103.0.2",
|
||||
"sha512": "f13984bb551039c80ef731931f08a284f070142ecb479b31a4caad026a6b535e3fc7ae506b629e933ba5f5a1676f14b6b36d031d22584170492676f8727c822a"
|
||||
}
|
||||
}
|
||||
|
@ -6,7 +6,7 @@
|
||||
offpunk,
|
||||
python3,
|
||||
stdenv,
|
||||
testVersion,
|
||||
testers,
|
||||
timg,
|
||||
xdg-utils,
|
||||
xsel,
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.version = testVersion { package = offpunk; };
|
||||
passthru.tests.version = testers.testVersion { package = offpunk; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "An Offline-First browser for the smolnet ";
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.30";
|
||||
version = "0.8.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-KTZ8UJ0aQmjreio7ancJnZ0KGANAQIPYNSQGXHHSqX4=";
|
||||
sha256 = "sha256-Yat9RIsbMCGVwu7xqC2xNUPZACpMG+ATsQN7d2n0eFU=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
@ -1,9 +1,9 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
||||
|
||||
let
|
||||
version = "0.31.5";
|
||||
sha256 = "0dv34y79229n63i5as0qxf3lmlsfyk8p277i09hrq1vn86wnjdm7";
|
||||
manifestsSha256 = "1p5f05lgbv2hhl5dbank2mmhmhlkxn1rfnh09x02j22ldrvk3zzl";
|
||||
version = "0.32.0";
|
||||
sha256 = "1gxfnf47i26kzgsaxbl2pf02hn5dwb290qs894hz196jc2021a7n";
|
||||
manifestsSha256 = "19jdmdipbshqv06xzkx5p4ym0x2jgrvnvsq38dg6b4y0iwzd9nmm";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bTvVf6fsrWLayOwwxBo2iOz5Di4dHEiV45uGkAyWrMU=";
|
||||
vendorSha256 = "sha256-pVK+VFfAk0jFp6u5mVB2p8CamPkD3/KRhYNy3zHUVCE=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
@ -46,7 +46,7 @@ in buildGoModule rec {
|
||||
$out/bin/flux --version | grep ${version} > /dev/null
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
for shell in bash fish zsh; do
|
||||
$out/bin/flux completion $shell > flux.$shell
|
||||
installShellCompletion flux.$shell
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.12.0";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LRCdKz7vaxxQTFveHbF2WrSinPtjWP96GhqtSMLIiDs=";
|
||||
hash = "sha256-0neq2EjlHddjLHyNlnqFjXCZpv8r7DGMeYNCzJUEFFg=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helmsman";
|
||||
version = "3.13.0";
|
||||
version = "3.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QyxluxAwhEZrgfMWlxB7sUZi6XGCFNGhhWRw3RmnhKM=";
|
||||
sha256 = "sha256-AfJf+o73iR0aHNFfB7f0S+cc5VeEOAjD0Ou44WHTTAg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gkzDecVvHZPFWDSi8nLw2mkR4HK0+pClpaHcdFFOnF8=";
|
||||
vendorSha256 = "sha256-Ijy9UxT746Bi6x+aXxKNRxzAo5yRTV/6nbVjk9i4ffk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k0sctl";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0sproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1SlVGQLU/7UmcvyKD/BaJSBCdOWACteQtR2Os4THPaU=";
|
||||
sha256 = "sha256-uKN+vH7BGz8lUDrmPeLp941KPkkTfOkK4Ib9GZR9D0M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vTcFJ7L8FW0IZBNarje/Oc3+jSRMga8+/nPLvqus2vY=";
|
||||
vendorSha256 = "sha256-CZ8DmgYXQcpd43qm6YsVHFePuUochHgJG7/ffEK8LL8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -16,15 +16,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
inherit pname ;
|
||||
version = "1.5.0";
|
||||
version = "1.7.1";
|
||||
tags = lib.optionals enableGateway ["gateway"];
|
||||
vendorSha256 = "sha256-ND1OTa37bxUNLDHceKdgiGE4LkEgBu9NmwuXtE4pZWk=";
|
||||
vendorSha256 = "sha256-0YmWmGuzyES7BoHKWxzF2K1rDW7PO2DRdNmY3eJkUAM=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kumahq";
|
||||
repo = "kuma";
|
||||
rev = version;
|
||||
sha256 = "sha256-CnL+OQfM1lamdCRHTLRmgpwfEfC7C9TX6UEF75bsOsQ=";
|
||||
sha256 = "sha256-U8fWDXJ0ztod6r0qz63jbgYA06ItxA76BjSliniYnIQ=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.30.5";
|
||||
version = "0.30.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K7vQ2Pz35/ye5AhUez/fN7PhW3KRv5/4duG4JpvO5vY=";
|
||||
sha256 = "sha256-i4i406Ys3MY77t4oN+kIeWopdjtfysm4xDFkTpuo+X0=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
@ -31,7 +31,7 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
$out/bin/velero completion bash > velero.bash
|
||||
$out/bin/velero completion zsh > velero.zsh
|
||||
installShellCompletion velero.{bash,zsh}
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.151";
|
||||
version = "1.2.153";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YgyR3BVkfQcluTamXlsCHHfqxbM1wqdmGsHPYDyMk8I=";
|
||||
sha256 = "sha256-BdGeafZvMgH6qRyYrFPQp0r2470me755J6gUK9XkIJQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XpSAFiweD2oUKleD6ztDp1+3PpfUWXfGaaE/9mzRrUQ=";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.17.0";
|
||||
version = "3.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eXm2oOHtNnDK4mikge8Ubjkg4b4mG7HMT17nL/CdU88=";
|
||||
sha256 = "sha256-G4FfKTlMuJ0YKsNQnMFjXq6ZBuLJjlCg7GqFPHcsHFM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-14SnK5CeMTmt0ZQ+CI14FACcMaNNbBWvAYfbQoJ2K/A=";
|
||||
vendorSha256 = "sha256-g2T3TmwkF1ft5XRimZLrTmm0Km5HcX/0aQtUjA5TZzw=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
@ -5,14 +5,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.3.22";
|
||||
version = "3.3.24";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VDMcOiuEOTzyogkdpVogikrme2Q6drpb40PqDgDtr7Q=";
|
||||
hash = "sha256-AjYX9f7v6lxMO6vTjAanDMluvGDAvTwcvcq/fwMzSfk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -7,7 +7,7 @@ let
|
||||
|
||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||
# source of the latter disappears much faster.
|
||||
version = "8.86.0.407";
|
||||
version = "8.87.0.403";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
@ -68,7 +68,7 @@ let
|
||||
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
];
|
||||
sha256 = "sha256-46M0JYP5QBCTCRqLtNyrQsEc6PsK6WRssb55IkG6pu0=";
|
||||
sha256 = "sha256-ibugr15eRQ2gbvX8wmk2lFioLPST9ljAuWcJHCoi9l8=";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
@ -73,7 +73,7 @@ let
|
||||
in
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.0.2";
|
||||
version = "4.1.0";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
@ -82,7 +82,7 @@ env.mkDerivation rec {
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "07fhm36394171w0rvay1x9x1br3z36z4dlpi57bkq23dvi331pxj";
|
||||
sha256 = "06va1b5dac7a2av6vc0xin27y1hfnf4xbafy10myv33am8l5222m";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tg_owt";
|
||||
version = "unstable-2022-05-08";
|
||||
version = "unstable-2022-08-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop-app";
|
||||
repo = "tg_owt";
|
||||
rev = "10d5f4bf77333ef6b43516f90d2ce13273255f41";
|
||||
sha256 = "02sky7sx73rj8xm1f70vy94zxaab6qiif742fv0vi4y6pfqrngn7";
|
||||
rev = "a5fbc9123e056e611e69acf0ceb4252ddd838adb";
|
||||
sha256 = "1hzck63spjjkqzkj0mlrxygrix4lw0n3i5cmc0vkxaphfzawz74n";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -1,4 +1,11 @@
|
||||
{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, libcommuni
|
||||
, qmake
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "communi";
|
||||
@ -15,12 +22,20 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ]
|
||||
++ lib.optional stdenv.isDarwin wrapQtAppsHook;
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ libcommuni qtbase ];
|
||||
buildInputs = [
|
||||
libcommuni
|
||||
qtbase
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
# libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin
|
||||
# Wrapper hook thinks it's a binary because it's in $out/Applications, wraps it with a shell script
|
||||
# So we manually call the wrapper script on just the binary
|
||||
dontWrapQtApps = stdenv.isDarwin;
|
||||
|
||||
preConfigure = ''
|
||||
export QMAKEFEATURES=${libcommuni}/features
|
||||
@ -32,20 +47,22 @@ stdenv.mkDerivation rec {
|
||||
"COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor"
|
||||
"COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications"
|
||||
"COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes"
|
||||
(if stdenv.isDarwin
|
||||
then [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/Applications" ]
|
||||
else [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin" ])
|
||||
"COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.isDarwin then "Applications" else "bin"}"
|
||||
];
|
||||
|
||||
postInstall = if stdenv.isDarwin then ''
|
||||
# Nix qmake does not add the bundle rpath by default.
|
||||
install_name_tool \
|
||||
-add_rpath @executable_path/../Frameworks \
|
||||
$out/Applications/Communi.app/Contents/MacOS/Communi
|
||||
'' else ''
|
||||
substituteInPlace "$out/share/applications/communi.desktop" \
|
||||
--replace "/usr/bin" "$out/bin"
|
||||
'';
|
||||
postInstall =
|
||||
if stdenv.isDarwin then ''
|
||||
# Nix qmake does not add the bundle rpath by default.
|
||||
install_name_tool \
|
||||
-add_rpath @executable_path/../Frameworks \
|
||||
$out/Applications/Communi.app/Contents/MacOS/Communi
|
||||
|
||||
# Do not remove until wrapQtAppsHook doesn't wrap dylibs in app bundles anymore
|
||||
wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi
|
||||
'' else ''
|
||||
substituteInPlace "$out/share/applications/communi.desktop" \
|
||||
--replace "/usr/bin" "$out/bin"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
rm -rf lib
|
||||
@ -56,6 +73,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/communi/communi-desktop";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ hrdinka ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
@ -6,19 +6,20 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "zeronet-conservancy";
|
||||
version = "0.7.6";
|
||||
version = "0.7.7";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeronet-conservancy";
|
||||
repo = "zeronet-conservancy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tWNU7UJVWB+aRLam6WKV/HaRRTIQvlEgxe4xJYKpXJY=";
|
||||
sha256 = "sha256-6qBdq6DoIKZUUGflz7kWu3S3pMJB4vkGUytpU5EatP0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client
|
||||
gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich
|
||||
gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich defusedxml
|
||||
pyaes
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
@ -5,14 +5,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waypipe";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "mstoeckl";
|
||||
repo = "waypipe";
|
||||
rev = "v${version}";
|
||||
sha256 = "02q8l1qaahmd41h6v3r46akh7xlqz7fpwwsy15qww4jdvypg6vg4";
|
||||
sha256 = "sha256-f1XEcDMy4skddtbZFFhCF4xg6zQahOLiGcYiJPy2SHs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "delly";
|
||||
version = "1.0.3";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dellytools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-37AEaTOFmJ2yYXLwjNa7UXBoH/NxOK8+vlXhUhj6CM4=";
|
||||
sha256 = "sha256-fGwSRYpvGYyYvRvP1ljs3mhXRpONzO5/QVegjqMsOdk=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib htslib bzip2 xz ncurses boost ];
|
||||
|
@ -1,26 +1,16 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, perlPackages, libminc }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, libminc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mni_autoreg";
|
||||
version = "unstable-2017-09-22";
|
||||
version = "unstable-2022-05-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BIC-MNI";
|
||||
repo = pname;
|
||||
rev = "ab99e29987dc029737785baebf24896ec37a2d76";
|
||||
sha256 = "0axl069nv57vmb2wvqq7s9v3bfxwspzmk37bxm4973ai1irgppjq";
|
||||
rev = "be7bd25bf7776974e0f2c1d90b6e7f8ccc0c8874";
|
||||
sha256 = "sGMZbCrdV6yAOgGiqvBFOUr6pGlTCqwy8yNrPxMoKco=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream workaround for -fno-common toolchains:
|
||||
# https://github.com/BIC-MNI/mni_autoreg/pull/28
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/BIC-MNI/mni_autoreg/commit/06adfacbd84369ea3bcc4376596ac1c0f2e49af9.patch";
|
||||
sha256 = "004sdrbx9kcj1qqwjly6p03svakl0x2sbv83salyg63fv67jynx8";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = [ libminc ];
|
||||
propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = pname;
|
||||
rev = "r${version}";
|
||||
sha256 = "sha256-BtUMpT1MKRFGRlIbCEGo4OBZ/r9es1VRmJdgmk1oZFQ=";
|
||||
sha256 = "sha256-U9VxpHzrAQPMqnSs0YcEnc9dlQUutTuZCJP5F1v7eaA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
|
||||
(if stdenv.isLinux then elfutils else libelf)
|
||||
];
|
||||
|
||||
# TODO: remove me on 1.7.0
|
||||
postPatch = ''
|
||||
sed -i "/vests22/d;/vhpi4/d" test/regress/testlist.txt
|
||||
# TODO: recheck me on next release
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
sed -i "/vhpi4/d" test/regress/testlist.txt
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "7.12.0";
|
||||
version = "7.12.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-URywo88EcQBYorwnKqgGOzunf2JunEWa36adhA1wha0=";
|
||||
hash = "sha256-QfSk6K/Vpj3+k+5w0thiP9O4CTvL8JDRwj4lDSt2NnU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghorg";
|
||||
version = "1.8.1";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrie30";
|
||||
repo = "ghorg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rnlSwqZ3Kigfmkt2ws5bmX/ipqxFUPZYDpdnkZZE59Y=";
|
||||
sha256 = "sha256-O5+OKY0o9vIO0uQGDlA0PMugfLAf45B/iHrrC2p0G+4=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-credential-1password";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "develerik";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F3XhBVTV8TgVNrOePm3F+uWspkllBlZ/yRyUxrCG0xw=";
|
||||
sha256 = "sha256-Bz/EW+K4XtDap3cu3/+9nJePcdxMXakj8HDPsbCx1FU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2CNGAuvO8IeNUhFnMEj8NjZ2Qm0y+i/0ktNCd3A8Ans=";
|
||||
vendorSha256 = "sha256-cPHA6rVUQg41sS79UBFf85OfLn53C8/OZVGT5xVdBdw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A git credential helper for 1Password";
|
||||
|
@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.11.4";
|
||||
version = "3.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nP7TOxTvf2twfS3rLYjiR6iRTS+lA6iJttqzlj4rGm0=";
|
||||
sha256 = "sha256-W2OYJO3UnBcZRoIyTRj3Wz7J91zDWrrYPH5OnYvXi24=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lefthook";
|
||||
version = "1.0.5";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
sha256 = "sha256-/y9UUVwJ/u1F9+hMxWqGENscTuf8GP4VZl7hTk3zyrM=";
|
||||
sha256 = "sha256-SIXenrdIprAFOvz68Kn9qwmxLtDNkMUHxkXYFIyKo0Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI=";
|
||||
vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -0,0 +1,66 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, cmake
|
||||
, installShellFiles
|
||||
, asciidoctor
|
||||
, DarwinTools
|
||||
, openssl
|
||||
, libusb1
|
||||
, AppKit
|
||||
, openssh
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "radicle-cli";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radicle-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LS6zYpMg0LanRL2M8ioGG8Ys07TPT/3hP7geEGehwxg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-o7ahnV7NnvzKxXb7HdNqKcxekshOtKanYKb0Sy15mhs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
installShellFiles
|
||||
asciidoctor
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
DarwinTools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libusb1
|
||||
AppKit
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for f in $(find . -name '*.adoc'); do
|
||||
mf=''${f%.*}
|
||||
asciidoctor --doctype manpage --backend manpage $f -o $mf
|
||||
installManPage $mf
|
||||
done
|
||||
'';
|
||||
|
||||
checkInputs = [ openssh ];
|
||||
preCheck = ''
|
||||
eval $(ssh-agent)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command-line tooling for Radicle, a decentralized code collaboration network";
|
||||
homepage = "https://radicle.xyz";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ amesgen ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "rad";
|
||||
};
|
||||
}
|
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "subgit";
|
||||
version = "3.3.13";
|
||||
version = "3.3.15";
|
||||
|
||||
meta = {
|
||||
description = "A tool for a smooth, stress-free SVN to Git migration";
|
||||
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://subgit.com/download/subgit-${version}.zip";
|
||||
sha256 = "sha256-+sG7yD2aVLV9i7iPZTMMsY1CQ1VuJ8w+jPguuTulR8c=";
|
||||
sha256 = "sha256-2/J/d4GrlLXR/7QBxgIMepzP+xxkeLvrCBwLl7Ke8wI=";
|
||||
};
|
||||
}
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetube";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
|
||||
sha256 = "sha256-OlWNln62VouUJzzk0CtED+OdSM+aBc4NOu1TSaKVWnk=";
|
||||
sha256 = "1n5r1h2khjwdsckiviv8f2pflxibk8rs68fs08jak0kbm0kkyj18";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
@ -18,10 +18,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# 'require' replaced with 'dofile' to work around
|
||||
# https://github.com/mpv-player/mpv/issues/7399 until fixed in mpvacious
|
||||
substituteInPlace subs2srs.lua \
|
||||
--replace "require('osd_styler')" "dofile('"$out/share/mpv/scripts/mpvacious/osd_styler.lua"')" \
|
||||
--replace "'curl'" "'${curl}/bin/curl'" \
|
||||
--replace "'wl-copy'" "'${wl-clipboard}/bin/wl-copy'" \
|
||||
--replace "xclip" "${xclip}/bin/xclip"
|
||||
@ -36,7 +33,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "mpvacious/subs2srs.lua";
|
||||
passthru.scriptName = "mpvacious";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Adds mpv keybindings to create Anki cards from movies and TV shows";
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
let
|
||||
version = "1.0.0";
|
||||
version = "1.1.1";
|
||||
|
||||
suffix = {
|
||||
x86_64-linux = "x86_64";
|
||||
@ -22,8 +22,8 @@ stdenv.mkDerivation {
|
||||
|
||||
sourceRoot = ".";
|
||||
src = dlbin {
|
||||
x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0=";
|
||||
aarch64-linux = "sha256-9ggRmijwXE9adVFv5XommgvdpeeWnWUFES+Ep2GrBVo=";
|
||||
x86_64-linux = "sha256-KRlOE4iDWMYzKZUZnuKIwIGooj5o8ARpROS7f2VIr1c=";
|
||||
aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
@ -4,16 +4,16 @@ buildGoModule rec {
|
||||
pname = "firectl";
|
||||
# The latest upstream 0.1.0 is incompatible with firecracker
|
||||
# v0.1.0. See issue: https://github.com/firecracker-microvm/firectl/issues/82
|
||||
version = "unstable-2022-03-01";
|
||||
version = "unstable-2022-07-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecracker-microvm";
|
||||
repo = pname;
|
||||
rev = "9f1b639a446e8d75f31787a00b9f273c1e68f12c";
|
||||
sha256 = "TjzzHY9VYPpWoPt6nHYUerKX94O03sm524wGM9lGzno=";
|
||||
rev = "ec72798240c0561dea8341d828e8c72bb0cc36c5";
|
||||
sha256 = "sha256-RAl1DaeMR7eYYwqVAvm6nib5gEGaM/t7TR8u1IpqOIM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "3SVEvvGNx6ienyJZg0EOofHNHCPSpJUGXwHxokdRG1c=";
|
||||
vendorSha256 = "sha256-dXAJOifRtzcTyGzUTFu9+daGAlL/5dQSwcjerkZDuKA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
42
pkgs/applications/virtualization/krunvm/default.nix
Normal file
42
pkgs/applications/virtualization/krunvm/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, asciidoctor
|
||||
, libkrun
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "krunvm";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rR762L8P+7ebE0u4MVCJoXc5mmqXlDFfSas+lFBMVFQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
hash = "sha256-3WiXm90XiQHpCbhlkigg/ZATQeDdUKTstN7hwcsKm4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform;[
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
rust.rustc
|
||||
asciidoctor
|
||||
];
|
||||
|
||||
buildInputs = [ libkrun ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI-based utility for creating microVMs from OCI images";
|
||||
homepage = "https://github.com/containers/krunvm";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "kvmtool";
|
||||
version = "unstable-2022-04-04";
|
||||
version = "unstable-2022-06-09";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git";
|
||||
rev = "5657dd3e48b41bc6db38fa657994bc0e030fd31f";
|
||||
sha256 = "1y1j44lk9957f2dmyrscbxl4zncp4ibvvcdj6bwylb8jsvmd5fs2";
|
||||
rev = "f44af23e3a62e46158341807b0d2d132249b96a8";
|
||||
sha256 = "sha256-M83dCCXU/fkh21x10vx6BLg9Wja1714qW7yxl5zY6z0=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "22.07.11";
|
||||
version = "22.08.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0wDSK1sBYEQ+3wr5BkZvvtFdG66uMzHYAtyvpaZZlTI=";
|
||||
sha256 = "sha256-nYRiAp8cHDyWGlb/s6ysiI2w2Oo7yj1HnKPo0EOqvhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "22.07.11";
|
||||
version = "22.08.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZLQYS9KQETgjSSdwWiA2tiQGS5hiEt4Gl0hUw5RI/S0=";
|
||||
sha256 = "sha256-AWDahl9DUAEYY7OW9E323LOdM37INcAbEXA19FYRObE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
@ -16,15 +16,16 @@
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, librsvg
|
||||
, pango
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-chess";
|
||||
version = "42.0";
|
||||
version = "42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Eq9Uk6YiBaxrt0VA8KhYQT2okolmo0boVDMLQdc7w5M=";
|
||||
sha256 = "ZikL9yhky8bufM6Mn0DegSTo5gl712hi8teqsMS9sCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
pango
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-terminal";
|
||||
version = "6.0.2";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "terminal";
|
||||
rev = version;
|
||||
sha256 = "sha256-glcY47E9bGVI6k9gakItN6srzMtmA4hCEz/JVD5UUmI=";
|
||||
sha256 = "sha256-qxjHrlpdJcfXEUan/JgU7HqBRdB36gxAb5xmd/ySsj0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -49,9 +49,6 @@ stdenv.mkDerivation rec {
|
||||
vte
|
||||
];
|
||||
|
||||
# See https://github.com/elementary/terminal/commit/914d4b0e2d0a137f12276d748ae07072b95eff80
|
||||
mesonFlags = [ "-Dubuntu-bionic-patched-vte=false" ];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
|
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mercury";
|
||||
version = "22.01.1";
|
||||
version = "22.01.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
|
||||
sha256 = "sha256-Cg0ixQtpmus6Q3fuc45OLheKCCTiTW3z1XJzxQ1OL6c=";
|
||||
sha256 = "sha256-1bS0t7OkpjoYcx2XA0tE8TG/WJttGxDo68S+zvAA0Eg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -85,9 +85,8 @@ let
|
||||
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "open-watcom-bin";
|
||||
pname = "${passthru.prettyName}-unwrapped";
|
||||
version = "1.9";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}";
|
||||
@ -113,8 +112,11 @@ stdenvNoCC.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.prettyName = "open-watcom-bin";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A C/C++ Compiler (binary distribution)";
|
||||
description = "A project to maintain and enhance the Watcom C, C++, and Fortran cross compilers and tools";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
homepage = "http://www.openwatcom.org/";
|
||||
license = licenses.watcom;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
|
@ -11,15 +11,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-watcom-v2";
|
||||
version = "unstable-2022-05-04";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
pname = "${passthru.prettyName}-unwrapped";
|
||||
version = "unstable-2022-08-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "01662ab4eb50c0757969fa53bd4270dbbba45dc5";
|
||||
sha256 = "Nl5mcPDCr08XkVMWqkbbgTP/YjpfwMOo2GVu43FQQ3Y=";
|
||||
rev = "4bdb73995b871982dd106838296903701ded29c2";
|
||||
sha256 = "sha256-Ay/f+gnj8EklN8T/uP0a+Zji6HEHAoPLdkrSTQaC9Rs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -82,8 +81,11 @@ stdenv.mkDerivation rec {
|
||||
# Stripping breaks many tools
|
||||
dontStrip = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
url = "https://github.com/open-watcom/open-watcom-v2.git";
|
||||
passthru = {
|
||||
prettyName = "open-watcom-v2";
|
||||
updateScript = unstableGitUpdater {
|
||||
url = "https://github.com/open-watcom/open-watcom-v2.git";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -29,7 +29,7 @@ let
|
||||
++ lib.optional isWindows "h/nt"
|
||||
++ lib.optional isLinux "lh";
|
||||
listToDirs = list: lib.strings.concatMapStringsSep ":" (dir: "${placeholder "out"}/${dir}") list;
|
||||
name = "${open-watcom.pname}-${open-watcom.version}";
|
||||
name = "${open-watcom.passthru.prettyName}-${open-watcom.version}";
|
||||
in
|
||||
symlinkJoin {
|
||||
inherit name;
|
||||
|
@ -1,46 +1,76 @@
|
||||
{ stdenv, clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr,
|
||||
openimageio, llvm, boost165, flex, bison, partio, pugixml,
|
||||
util-linux, python3
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, clang
|
||||
, libclang
|
||||
, zlib
|
||||
, openexr
|
||||
, openimageio2
|
||||
, llvm
|
||||
, boost
|
||||
, flex
|
||||
, bison
|
||||
, partio
|
||||
, pugixml
|
||||
, util-linux
|
||||
, python3
|
||||
}:
|
||||
|
||||
let boost_static = boost165.override { enableStatic = true; };
|
||||
in clangStdenv.mkDerivation rec {
|
||||
# In theory this could use GCC + Clang rather than just Clang,
|
||||
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
|
||||
let
|
||||
|
||||
boost_static = boost.override { enableStatic = true; };
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openshadinglanguage";
|
||||
version = "1.10.9";
|
||||
version = "1.11.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imageworks";
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "Release-1.10.9";
|
||||
sha256 = "1dwf10f2fpxc55pymwkapql20nc462mq61hv21c527994c2qp1ll";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2OOkLnHLz+vmSeEDQl12SrJBTuWwbnvoTatnvm8lpbA=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_BOOST_WAVE=ON"
|
||||
"-DENABLERTTI=ON"
|
||||
"-DENABLE_RTTI=ON"
|
||||
|
||||
# Build system implies llvm-config and llvm-as are in the same directory.
|
||||
# Override defaults.
|
||||
"-DLLVM_DIRECTORY=${llvm}"
|
||||
"-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
|
||||
|
||||
# Set C++11 to C++14 required for LLVM10+
|
||||
"-DCMAKE_CXX_STANDARD=14"
|
||||
];
|
||||
|
||||
preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash ";
|
||||
|
||||
nativeBuildInputs = [ cmake boost_static flex bison];
|
||||
buildInputs = [
|
||||
zlib openexr openimageio llvm
|
||||
partio pugixml
|
||||
util-linux # needed just for hexdump
|
||||
python3 # CMake doesn't check this?
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
clang
|
||||
cmake
|
||||
flex
|
||||
];
|
||||
# TODO: How important is partio? CMake doesn't seem to find it
|
||||
|
||||
buildInputs = [
|
||||
boost_static
|
||||
libclang
|
||||
llvm
|
||||
openexr
|
||||
openimageio2
|
||||
partio
|
||||
pugixml
|
||||
python3.pkgs.pybind11
|
||||
util-linux # needed just for hexdump
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "Advanced shading language for production GI renderers";
|
||||
homepage = "http://opensource.imageworks.com/?p=osl";
|
||||
homepage = "https://opensource.imageworks.com/osl.html";
|
||||
maintainers = with maintainers; [ hodapp ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
|
@ -27,14 +27,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "vyper";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ldNuADfWy1OWTPD7pTcpU5dX/mX2pV/QqSjJxkc5S28=";
|
||||
sha256 = "sha256-8jw92ttKhXubzDr0tt9/OoCsPEyB9yPRsueK+j4PO6Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -4,18 +4,18 @@ let
|
||||
|
||||
pkg = buildGoModule rec {
|
||||
pname = "arduino-cli";
|
||||
version = "0.21.1";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-IXzN6CnZCzrkcLVNmKc1WB0V+TTa56CBzASzK0FQO8c=";
|
||||
sha256 = "sha256-NuYPqJ/Fvt1P6KFXTIQaAvXYJgTwWrMspPags0Q06cE=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-VWoKHIRQfs4dbsOzV3AQpqWsCPDm/rVKGMsc4xZvbhU=";
|
||||
vendorSha256 = "sha256-u5YCwnciXlWgqQd9CXfXNipLLlNE3p8+bL6WaTvOkVA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "double-conversion";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "double-conversion";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Vvzjg+UOgegkH8x2vtNU1TS01k5O4ilRJjD7F+BmVmU=";
|
||||
sha256 = "sha256-vrh/dCuleE3fikryXX86XC/fdVV+j8HvIe4s/SRpNJw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdcm";
|
||||
version = "3.0.14";
|
||||
version = "3.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "malaterre";
|
||||
repo = "GDCM";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gXREvxgGpIBo5oVxxal+Xdwk0WFZufuJKGzABzhB7zM=";
|
||||
sha256 = "sha256-kyazfsm0lGgz26PWJUyFRmFxQFxmotDPXrwx3N/EVl0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
@ -16,13 +16,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "irrlichtmt";
|
||||
version = "1.9.0mt5";
|
||||
version = "1.9.0mt7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minetest";
|
||||
repo = "irrlicht";
|
||||
rev = version;
|
||||
sha256 = "sha256-ocsO4nKab2YxHY1qqZbF4OErpBKmG4V+psgC40APs8s=";
|
||||
sha256 = "sha256-Eu7zW3mXl7GPRmLnKjt/dPoZ64HPYulI7MO1dJfj+10=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -30,9 +30,11 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# https://github.com/minetest/minetest/pull/10729
|
||||
postPatch = lib.optionalString withTouchSupport ''
|
||||
substituteInPlace include/IrrCompileConfig.h \
|
||||
--replace '//#define _IRR_LINUX_X11_XINPUT2_' '#define _IRR_LINUX_X11_XINPUT2_'
|
||||
postPatch = lib.optionalString (!withTouchSupport) ''
|
||||
sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h
|
||||
|
||||
# HACK: Fix mistake in build script
|
||||
sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
|
@ -9,6 +9,21 @@
|
||||
, enableJpeg8 ? false # whether to build libjpeg with v8 compatibility
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
|
||||
# for passthru.tests
|
||||
, dvgrab
|
||||
, epeg
|
||||
, freeimage
|
||||
, gd
|
||||
, graphicsmagick
|
||||
, imagemagick
|
||||
, imlib2
|
||||
, jhead
|
||||
, libjxl
|
||||
, mjpegtools
|
||||
, opencv
|
||||
, python3
|
||||
, vips
|
||||
}:
|
||||
|
||||
assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both
|
||||
@ -61,6 +76,23 @@ stdenv.mkDerivation rec {
|
||||
doInstallCheck = true;
|
||||
installCheckTarget = "test";
|
||||
|
||||
passthru.tests = {
|
||||
inherit
|
||||
dvgrab
|
||||
epeg
|
||||
freeimage
|
||||
gd
|
||||
graphicsmagick
|
||||
imagemagick
|
||||
imlib2
|
||||
jhead
|
||||
libjxl
|
||||
mjpegtools
|
||||
opencv
|
||||
vips;
|
||||
inherit (python3.pkgs) pillow imread pyturbojpeg;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://libjpeg-turbo.org/";
|
||||
description = "A faster (using SIMD) libjpeg implementation";
|
||||
|
49
pkgs/development/libraries/libkrun/default.nix
Normal file
49
pkgs/development/libraries/libkrun/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, glibc
|
||||
, openssl
|
||||
, libkrunfw
|
||||
, sevVariant ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkrun";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qVyEqiqaQ8wfZhL5u+Bsaa1yXlgHUitSj5bo7FJ5Y8c=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
hash = "sha256-jxSzhj1iU8qY+sZEVCYTaUqpaA4egjJi9qxrapASQF0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform;[
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
rust.rustc
|
||||
] ++ lib.optional sevVariant pkg-config;
|
||||
|
||||
buildInputs = [
|
||||
glibc
|
||||
glibc.static
|
||||
(libkrunfw.override { inherit sevVariant; })
|
||||
] ++ lib.optional sevVariant openssl;
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ]
|
||||
++ lib.optional sevVariant "SEV=1";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A dynamic library providing Virtualization-based process isolation capabilities";
|
||||
homepage = "https://github.com/containers/libkrun";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
49
pkgs/development/libraries/libkrunfw/default.nix
Normal file
49
pkgs/development/libraries/libkrunfw/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, flex
|
||||
, bison
|
||||
, bc
|
||||
, elfutils
|
||||
, python3
|
||||
, sevVariant ? false
|
||||
}:
|
||||
|
||||
assert sevVariant -> stdenv.isx86_64;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkrunfw";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ay+E5AgJeA0i3T4JDosDawwtezDGquzAvYEWHGbPidg=";
|
||||
};
|
||||
|
||||
kernelSrc = fetchurl {
|
||||
url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.59.tar.xz";
|
||||
hash = "sha256-5t3GQgVzQNsGs7khwrMb/tLGETWejxRMPlz5w6wzvMs=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace Makefile --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ flex bison bc python3 python3.pkgs.pyelftools ];
|
||||
buildInputs = [ elfutils ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ]
|
||||
++ lib.optional sevVariant "SEV=1";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A dynamic library bundling the guest payload consumed by libkrun";
|
||||
homepage = "https://github.com/containers/libkrunfw";
|
||||
license = with licenses; [ lgpl2Only lgpl21Only ];
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
@ -2,15 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libminc";
|
||||
version = "unstable-2020-07-17";
|
||||
version = "2.4.05";
|
||||
|
||||
owner = "BIC-MNI";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = pname;
|
||||
rev = "ffb5fb234a852ea7e8da8bb2b3b49f67acbe56ca";
|
||||
sha256 = "0yr4ksghpvxh9zg0a4p7hvln3qirsi08plvjp5kxx2qiyj96zsdm";
|
||||
rev = "aa08255f0856e70fb001c5f9ee1f4e5a8c12d47d"; # new release, but no git tag
|
||||
sha256 = "XMTO6/HkyrrQ0s5DzJLCmmWheye2DGMnpDbcGdP6J+A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DLIBMINC_MINC1_SUPPORT=ON"
|
||||
"-DLIBMINC_BUILD_SHARED_LIBS=ON"
|
||||
"-DLIBMINC_USE_NIFTI=ON"
|
||||
"-DLIBMINC_USE_SYSTEM_NIFTI=ON"
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkPhase = ''
|
||||
ctest -j1 -E 'ezminc_rw_test' --output-on-failure
|
||||
# -j1: see https://github.com/BIC-MNI/libminc/issues/110
|
||||
# ezminc_rw_test: can't find libminc_io.so.5.2.0
|
||||
checkPhase = ''
|
||||
ctest -j1 --output-on-failure
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libzim";
|
||||
version = "7.2.2";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openzim";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs=";
|
||||
sha256 = "sha256-FSotc2hkWvkYEdZ3HI3JLzjtKFaWOc1Bx6r0WyeS/Kg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nanopb";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0cjfkwwzi018kc0b7lia7z2jdfgibqc99mf8rvj2xq2pfapp9kf1";
|
||||
sha256 = "sha256-B9J+GkgOBR4iZaP6/2ykcjbkifoyhkuukkjK/CLBZj0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ];
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ortp";
|
||||
version = "5.1.12";
|
||||
version = "5.1.55";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CD9xn1m6zpUEC+shmNeWfGAJxNto87UbznD+TLdeuEg=";
|
||||
sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw=";
|
||||
};
|
||||
|
||||
# Do not build static libraries
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libupnp";
|
||||
version = "1.14.12";
|
||||
version = "1.14.13";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "pupnp";
|
||||
repo = "pupnp";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-ZJ74x5+4dDb5sJ1cPtlin6iunGyu8boNSpfLFB1mCME=";
|
||||
sha256 = "sha256-3pvJDReyZilJ8pAHYw6d+6ammv4EliLgA+VOSBsvF20=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pyotherside";
|
||||
version = "1.5.9";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thp";
|
||||
repo = "pyotherside";
|
||||
rev = version;
|
||||
sha256 = "1k1fdsinysgx5gp6q62jiwcyiklakmjv6wbi1s2659am96vz3zj8";
|
||||
sha256 = "sha256-IIvL704snJIJbigAgJZ3WWg5a/mX/8qzgFN+dBEClG8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rdkafka";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edenhill";
|
||||
repo = "librdkafka";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r5H02HLqiixbShgXDEaYEe4OrQK2En5zuLtMOajEIBM=";
|
||||
sha256 = "sha256-G6rTvb2Z2O1Df5/6upEB9Eh049sx+LWhhDKvsZdDqsc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config python3 which ];
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocksdb";
|
||||
version = "7.4.4";
|
||||
version = "7.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-34pAAqUhHQiH0YuRl6a0zdn8p6hSAIJnZXIErm3SYFE=";
|
||||
sha256 = "sha256-m1ZHyHYFDGTYpP4uAg4T75sLKoLwhEDJstWg7EXHNc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, boost
|
||||
, libxmlxx
|
||||
, pkg-config
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ciftilib";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Washington-University";
|
||||
repo = "CiftiLib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xc2dpMse4SozYEV/w3rXCrh1LKpTThq5nHB2y5uAD0A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ boost libxmlxx zlib ];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'big|datatype-md5'" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Washington-University/CiftiLib";
|
||||
description = "Library for reading and writing CIFTI files";
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
}
|
@ -38,8 +38,11 @@ stdenv.mkDerivation rec {
|
||||
checkInputs = [ openssh ];
|
||||
buildInputs = [ blas lapack ];
|
||||
propagatedBuildInputs = [ mpi ];
|
||||
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
|
||||
|
||||
doCheck = true;
|
||||
# xslu and xsllt tests seem to time out on x86_64-darwin.
|
||||
# this line is left so those who force installation on x86_64-darwin can still build
|
||||
doCheck = !(stdenv.isx86_64 && stdenv.isDarwin);
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=(
|
||||
@ -73,7 +76,9 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.netlib.org/scalapack/";
|
||||
description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ costrouc markuskowa ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ costrouc markuskowa gdinh ];
|
||||
# xslu and xsllt tests fail on x86 darwin
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suitesparse-graphblas";
|
||||
version = "7.1.2";
|
||||
version = "7.2.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "DrTimothyAldenDavis";
|
||||
repo = "GraphBLAS";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fz8e2//bJB9SANEw29VrUeaqvmh/aSu6+ZnkMb6C40k=";
|
||||
sha256 = "sha256-N3TBuKWQRisXE5DQ0c+N2cv0darQ8mz4g2oe7pKst9E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
checkInputs = [ cppcheck gtest ];
|
||||
buildInputs = [ sqlite ];
|
||||
checkInputs = [ cppcheck ];
|
||||
buildInputs = [ sqlite gtest ];
|
||||
doCheck = true;
|
||||
|
||||
cmakeFlags = [
|
||||
|
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sundials";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
|
||||
outputs = [ "out" "examples" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
|
||||
hash = "sha256-GV1Vk3cvxIP2Pwh5TXnkurMMLsWObOSw+2vMDgxI8x0=";
|
||||
hash = "sha256-iaIr6oIP8lCqcjn2NKsH+jTv4dLc/eKcyNOvEUVboqc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -66,10 +66,10 @@ stdenv.mkDerivation rec {
|
||||
#
|
||||
# build error:
|
||||
#
|
||||
# /private/tmp/nix-build-sundials-6.2.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255].
|
||||
# /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255].
|
||||
# ldr x0, [x0, ___stack_chk_guard];momd
|
||||
# ^
|
||||
# /private/tmp/nix-build-sundials-6.2.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255].
|
||||
# /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255].
|
||||
# ldr x0, [x0, ___stack_chk_guard];momd
|
||||
#
|
||||
# See also a proposed solution: https://github.com/NixOS/nixpkgs/pull/151983
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "Vc";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VcDevel";
|
||||
repo = "Vc";
|
||||
rev = version;
|
||||
sha256 = "sha256-rh2vcn58xDsbxxABrxneCq6TKIyT51KxGB7sOtHpvYE=";
|
||||
sha256 = "sha256-fv0FHAl0xvAFybR/jwhX2LkozwEDy1TNcbVAmRRnLVU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -1,14 +1,5 @@
|
||||
import ./generic.nix {
|
||||
majorVersion = "9.0";
|
||||
minorVersion = "3";
|
||||
sourceSha256 = "vD65Ylsrjb/stgUqKrCR/JFAXeQzOw7GjzMjgVFU7Yo=";
|
||||
|
||||
patchesToFetch = [
|
||||
# Add missing header includes.
|
||||
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611
|
||||
{
|
||||
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/e066c3f4fbbfe7470c6207db0fc3f3952db633cb.patch";
|
||||
sha256 = "ggmDisS3qoMquOqrmIYlCIT7TLxP/DUtW29ktjaEnlM=";
|
||||
}
|
||||
];
|
||||
majorVersion = "9.1";
|
||||
minorVersion = "0";
|
||||
sourceSha256 = "sha256-j+1C9Pjx64CDEHto6qmtcdoHEQFhoxFq2Af0PlylzpY=";
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:
|
||||
{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff
|
||||
, fetchpatch
|
||||
, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools
|
||||
, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv
|
||||
, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
|
||||
# Darwin support
|
||||
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
|
||||
@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ libpng libtiff ]
|
||||
++ optionals enableQt [ qtbase qtx11extras qttools ]
|
||||
++ optionals enableQt (if lib.versionOlder majorVersion "9"
|
||||
then [ qtbase qtx11extras qttools ]
|
||||
else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ])
|
||||
++ optionals stdenv.isLinux [
|
||||
libGLU
|
||||
libGL
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "websocket++";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaphoyd";
|
||||
repo = "websocketpp";
|
||||
rev = version;
|
||||
sha256 = "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy";
|
||||
sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
|
||||
description = "C++/Boost Asio based websocket client/server library";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ revol-xut ];
|
||||
};
|
||||
}
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
checkInputs = [ wayland-scanner ];
|
||||
nativeBuildInputs = [ wayland-scanner ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace wlr-protocols.pc.in \
|
||||
@ -25,9 +25,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
make check
|
||||
'';
|
||||
checkTarget = "check";
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
|
||||
|
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "protobuf";
|
||||
|
||||
version = "3.21.4";
|
||||
sha256 = "sha256-vhfoUu63KhndfQTiITtTnaqFVF9OWMCaLf/9PUioKkQ=";
|
||||
version = "3.21.5";
|
||||
sha256 = "sha256-B8ytFyUJ8fLBwHmaKXxfOy0h6tRELjqc5IxUUl/YU5w=";
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiotractive";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhulik";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pcGUl8mq1O1QY5EPkNhWRLCKDn2FWAF9XymXkUXWEUk=";
|
||||
sha256 = "sha256-VCwIAeSAN4tMwB8TXN/ukrws0qYv/jHHeEu++m56AHA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "audioread";
|
||||
version = "2.1.9";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089";
|
||||
sha256 = "sha256-EhmVvSB+sf2j1Wa+uFHTU0J1klvDWk+22gyxHeD3JRo=";
|
||||
};
|
||||
|
||||
# No tests, need to disable or py3k breaks
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.13.14";
|
||||
version = "0.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-K2x0Up3H6kIWcYeWvVegd1CkTjq8RoM0AOm0SX5u6wQ=";
|
||||
hash = "sha256-MGLTFcsWVC/gTdgjny6LwyOO6QRc1QcLkVzy677Lqqw=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user