Project import generated by Copybara.
GitOrigin-RevId: 7f9b6e2babf232412682c09e57ed666d8f84ac2d
This commit is contained in:
Default email
parent
4cef54442e
commit
871149a62e
200 changed files with 3752 additions and 4374 deletions
|
|
@ -601,6 +601,12 @@
|
|||
githubId = 15623522;
|
||||
name = "Amar Paul";
|
||||
};
|
||||
amarshall = {
|
||||
email = "andrew@johnandrewmarshall.com";
|
||||
github = "amarshall";
|
||||
githubId = 153175;
|
||||
name = "Andrew Marshall";
|
||||
};
|
||||
ambroisie = {
|
||||
email = "bruno.nixpkgs@belanyi.fr";
|
||||
github = "ambroisie";
|
||||
|
|
@ -2897,6 +2903,12 @@
|
|||
githubId = 19733;
|
||||
name = "Moritz Heidkamp";
|
||||
};
|
||||
DerickEddington = {
|
||||
email = "derick.eddington@pm.me";
|
||||
github = "DerickEddington";
|
||||
githubId = 4731128;
|
||||
name = "Derick Eddington";
|
||||
};
|
||||
dermetfan = {
|
||||
email = "serverkorken@gmail.com";
|
||||
github = "dermetfan";
|
||||
|
|
@ -6030,6 +6042,12 @@
|
|||
githubId = 4611077;
|
||||
name = "Raymond Gauthier";
|
||||
};
|
||||
jrpotter = {
|
||||
email = "jrpotter2112@gmail.com";
|
||||
github = "jrpotter";
|
||||
githubId = 3267697;
|
||||
name = "Joshua Potter";
|
||||
};
|
||||
jschievink = {
|
||||
email = "jonasschievink@gmail.com";
|
||||
matrix = "@jschievink:matrix.org";
|
||||
|
|
@ -7060,12 +7078,6 @@
|
|||
githubId = 36448130;
|
||||
name = "Michael Brantley";
|
||||
};
|
||||
linarcx = {
|
||||
email = "linarcx@gmail.com";
|
||||
github = "linarcx";
|
||||
githubId = 10884422;
|
||||
name = "Kaveh Ahangar";
|
||||
};
|
||||
linc01n = {
|
||||
email = "git@lincoln.hk";
|
||||
github = "linc01n";
|
||||
|
|
@ -9880,6 +9892,12 @@
|
|||
githubId = 20524473;
|
||||
name = "Psyanticy";
|
||||
};
|
||||
psydvl = {
|
||||
email = "psydvl@fea.st";
|
||||
github = "psydvl";
|
||||
githubId = 43755002;
|
||||
name = "Dmitriy P";
|
||||
};
|
||||
ptival = {
|
||||
email = "valentin.robert.42@gmail.com";
|
||||
github = "Ptival";
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ After building/downloading all required dependencies, this will perform
|
|||
a build that starts a QEMU/KVM virtual machine containing a NixOS
|
||||
system. The virtual machine mounts the Nix store of the host; this makes
|
||||
VM creation very fast, as no disk image needs to be created. Afterwards,
|
||||
you can view a pretty-printed log of the test:
|
||||
you can view a log of the test:
|
||||
|
||||
```ShellSession
|
||||
$ firefox result/log.html
|
||||
$ nix-store --read-log result
|
||||
```
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ machine: QEMU running (pid 8841)
|
|||
perform a build that starts a QEMU/KVM virtual machine containing a
|
||||
NixOS system. The virtual machine mounts the Nix store of the host;
|
||||
this makes VM creation very fast, as no disk image needs to be
|
||||
created. Afterwards, you can view a pretty-printed log of the test:
|
||||
created. Afterwards, you can view a log of the test:
|
||||
</para>
|
||||
<programlisting>
|
||||
$ firefox result/log.html
|
||||
$ nix-store --read-log result
|
||||
</programlisting>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ with lib;
|
|||
isoImage.edition = "gnome";
|
||||
|
||||
services.xserver.desktopManager.gnome = {
|
||||
# Add firefox to favorite-apps
|
||||
# Add Firefox and other tools useful for installation to the launcher
|
||||
favoriteAppsOverride = ''
|
||||
[org.gnome.shell]
|
||||
favorite-apps=[ 'firefox.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ]
|
||||
favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop' ]
|
||||
'';
|
||||
enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,4 +25,7 @@ pkgs.runCommand "nixos-build-vms" { nativeBuildInputs = [ pkgs.makeWrapper ]; }
|
|||
ln -s ${interactiveDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
|
||||
wrapProgram $out/bin/nixos-test-driver \
|
||||
--add-flags "--interactive"
|
||||
wrapProgram $out/bin/nixos-run-vms \
|
||||
--set testScript "${pkgs.writeText "start-all" "start_all(); join_all();"}" \
|
||||
--add-flags "--no-interactive"
|
||||
''
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ in
|
|||
location ~* \.php$ {
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
fastcgi_pass unix:${fpm.socket};
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
include ${pkgs.nginx}/conf/fastcgi.conf;
|
||||
}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ in
|
|||
location ~* \.php$ {
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
fastcgi_pass unix:${fpm.socket};
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
include ${pkgs.nginx}/conf/fastcgi.conf;
|
||||
}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -762,7 +762,7 @@ in
|
|||
nix.settings = mkMerge [
|
||||
{
|
||||
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
|
||||
substituters = [ "https://cache.nixos.org/" ];
|
||||
substituters = mkAfter [ "https://cache.nixos.org/" ];
|
||||
|
||||
system-features = mkDefault (
|
||||
[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ in
|
|||
fastcgi_param PATH_INFO $uri;
|
||||
fastcgi_param GIT_PROJECT_ROOT $document_root;
|
||||
fastcgi_read_timeout 500s;
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
gzip off;
|
||||
}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ let
|
|||
|
||||
certtool = "${pkgs.gnutls.bin}/bin/certtool";
|
||||
|
||||
nixos-taskserver = pkgs.pythonPackages.buildPythonApplication {
|
||||
nixos-taskserver = with pkgs.python2.pkgs; buildPythonApplication {
|
||||
name = "nixos-taskserver";
|
||||
|
||||
src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } ''
|
||||
|
|
@ -129,7 +129,7 @@ let
|
|||
EOF
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ pkgs.pythonPackages.click ];
|
||||
propagatedBuildInputs = [ click ];
|
||||
};
|
||||
|
||||
in {
|
||||
|
|
@ -138,12 +138,13 @@ in {
|
|||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
description = let
|
||||
url = "https://nixos.org/manual/nixos/stable/index.html#module-services-taskserver";
|
||||
in ''
|
||||
Whether to enable the Taskwarrior server.
|
||||
|
||||
More instructions about NixOS in conjuction with Taskserver can be
|
||||
found in the NixOS manual at
|
||||
<olink targetdoc="manual" targetptr="module-taskserver"/>.
|
||||
found <link xlink:href="${url}">in the NixOS manual</link>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<chapter xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
version="5.0"
|
||||
xml:id="module-taskserver">
|
||||
xml:id="module-services-taskserver">
|
||||
<title>Taskserver</title>
|
||||
<para>
|
||||
Taskserver is the server component of
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ in {
|
|||
location /cgi-bin {
|
||||
gzip off;
|
||||
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME ${pkg}/libexec/zoneminder/${zms};
|
||||
fastcgi_param HTTP_PROXY "";
|
||||
fastcgi_intercept_errors on;
|
||||
|
|
@ -270,7 +270,7 @@ in {
|
|||
try_files $uri =404;
|
||||
fastcgi_index index.php;
|
||||
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME $request_filename;
|
||||
fastcgi_param HTTP_PROXY "";
|
||||
|
||||
|
|
|
|||
|
|
@ -90,6 +90,6 @@ in
|
|||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ pingiun ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@ in
|
|||
"~ \\.php$" = {
|
||||
extraConfig = ''
|
||||
try_files $uri $uri/ /doku.php;
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param REDIRECT_STATUS 200;
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket};
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ in
|
|||
'';
|
||||
locations = {
|
||||
"~ \\.php$".extraConfig = ''
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
fastcgi_index index.php;
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.jirafeau.socket};
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ in
|
|||
locations."~ \\.php$" = {
|
||||
tryFiles = "$uri =404";
|
||||
extraConfig = ''
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_pass unix:${fpm.socket};
|
||||
fastcgi_index index.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ in
|
|||
|
||||
locations."~ ^/index.php(/|$)" = {
|
||||
extraConfig = ''
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ in
|
|||
};
|
||||
locations."${cfg.location}/" = {
|
||||
extraConfig = ''
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile};
|
||||
fastcgi_pass unix:/run/gitweb/gitweb.sock;
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ import ./make-test-python.nix (
|
|||
auth_basic_user_file /etc/gitolite/htpasswd;
|
||||
|
||||
# common FastCGI parameters are required
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
|
||||
# strip the CGI program prefix
|
||||
fastcgi_split_path_info ^(/git)(.*)$;
|
||||
|
|
|
|||
2
third_party/nixpkgs/nixos/tests/php/fpm.nix
vendored
2
third_party/nixpkgs/nixos/tests/php/fpm.nix
vendored
|
|
@ -17,7 +17,7 @@ import ../make-test-python.nix ({ pkgs, lib, php, ... }: {
|
|||
locations."~ \\.php$".extraConfig = ''
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket};
|
||||
fastcgi_index index.php;
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
include ${pkgs.nginx}/conf/fastcgi.conf;
|
||||
'';
|
||||
locations."/" = {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
pname = "plexamp";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||
name="${pname}-${version}.AppImage";
|
||||
sha512 = "C6fR3HyXZ5dXvKqtADjCm9WwsnI/wKhlR0K4+zkEW4JNmozmZvdB9eDIoS32wgTe23phtwazbXwroK/Xb0kZmQ==";
|
||||
sha512 = "pZy2afj7g6wnOIHH3ecCYUX7/NX5op4aLSHe4/GbI5L9NUuFGoJIWWuVbv2kngcTo+XUqP0yoe0Ns+I4WulDVA==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
|
|||
meta = with lib; {
|
||||
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
|
||||
homepage = "https://plexamp.com/";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/38";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/39";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ killercup synthetica ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "tiled";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjorn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JmnJUpbOPAkURTgRDLuTf1Mqh+simog1BE6s5+mA20Q=";
|
||||
sha256 = "sha256-5yh0+Z6SbHEFKvCJjQY9BS8vUihBspGhFjfhrUOfiIo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ stdenv.mkDerivation {
|
|||
preferLocalBuild = true;
|
||||
|
||||
meta = with retroarch.meta; {
|
||||
inherit changelog license homepage platforms maintainers;
|
||||
description = description
|
||||
+ " (with cores: "
|
||||
inherit changelog description homepage license maintainers platforms;
|
||||
longDescription =
|
||||
"RetroArch is the reference frontend for the libretro API. The following cores are included: "
|
||||
+ lib.concatStringsSep ", " (map (x: "${x.name}") cores)
|
||||
+ ")";
|
||||
+ ".";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ stdenv, lib, pkgArches, callPackage,
|
||||
{ stdenv, lib, pkgArches, callPackage, makeSetupHook,
|
||||
name, version, src, mingwGccs, monos, geckos, platforms,
|
||||
bison, flex, fontforge, makeWrapper, pkg-config,
|
||||
autoconf, hexdump, perl, nixosTests,
|
||||
supportFlags,
|
||||
patches,
|
||||
vkd3dArches,
|
||||
moltenvk,
|
||||
buildScript ? null, configureFlags ? []
|
||||
}:
|
||||
|
||||
|
|
@ -15,9 +16,31 @@ let
|
|||
prevName = name;
|
||||
prevPlatforms = platforms;
|
||||
prevConfigFlags = configureFlags;
|
||||
setupHookDarwin = makeSetupHook {
|
||||
name = "darwin-mingw-hook";
|
||||
substitutions = {
|
||||
darwinSuffixSalt = stdenv.cc.suffixSalt;
|
||||
mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs;
|
||||
};
|
||||
} ./setup-hook-darwin.sh;
|
||||
in
|
||||
stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||
builder = buildScript;
|
||||
}) // (lib.optionalAttrs stdenv.isDarwin {
|
||||
postConfigure = ''
|
||||
# dynamic fallback, so this shouldn’t cause problems for older versions of macOS and will
|
||||
# provide additional functionality on newer ones. This can be removed once the x86_64-darwin
|
||||
# SDK is updated.
|
||||
sed 's|/\* #undef HAVE_MTLDEVICE_REGISTRYID \*/|#define HAVE_MTLDEVICE_REGISTRYID 1|' \
|
||||
-i include/config.h
|
||||
'';
|
||||
postBuild = ''
|
||||
# The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link
|
||||
# to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and
|
||||
# rebuild it with empty NIX_LDFLAGS.
|
||||
rm loader/wine64-preloader
|
||||
make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}=""
|
||||
'';
|
||||
}) // rec {
|
||||
inherit src;
|
||||
|
||||
|
|
@ -38,11 +61,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
|||
hexdump
|
||||
perl
|
||||
]
|
||||
++ lib.optionals supportFlags.mingwSupport mingwGccs;
|
||||
++ lib.optionals supportFlags.mingwSupport (mingwGccs
|
||||
++ lib.optional stdenv.isDarwin setupHookDarwin);
|
||||
|
||||
buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:
|
||||
[ pkgs.freetype pkgs.perl ]
|
||||
[ pkgs.freetype pkgs.perl pkgs.libunwind ]
|
||||
++ lib.optional stdenv.isLinux pkgs.libcap
|
||||
++ lib.optional stdenv.isDarwin pkgs.libinotify-kqueue
|
||||
++ lib.optional cupsSupport pkgs.cups
|
||||
++ lib.optional gettextSupport pkgs.gettext
|
||||
++ lib.optional dbusSupport pkgs.dbus
|
||||
|
|
@ -56,14 +81,16 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
|||
++ lib.optional v4lSupport pkgs.libv4l
|
||||
++ lib.optional saneSupport pkgs.sane-backends
|
||||
++ lib.optional gphoto2Support pkgs.libgphoto2
|
||||
++ lib.optional krb5Support pkgs.libkrb5
|
||||
++ lib.optional ldapSupport pkgs.openldap
|
||||
++ lib.optional fontconfigSupport pkgs.fontconfig
|
||||
++ lib.optional alsaSupport pkgs.alsa-lib
|
||||
++ lib.optional pulseaudioSupport pkgs.libpulseaudio
|
||||
++ lib.optional (xineramaSupport && !waylandSupport) pkgs.xorg.libXinerama
|
||||
++ lib.optional udevSupport pkgs.udev
|
||||
++ lib.optional vulkanSupport pkgs.vulkan-loader
|
||||
++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader)
|
||||
++ lib.optional sdlSupport pkgs.SDL2
|
||||
++ lib.optional usbSupport pkgs.libusb1
|
||||
++ vkd3dArches
|
||||
++ lib.optionals gstreamerSupport (with pkgs.gst_all_1;
|
||||
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
|
||||
|
|
@ -83,12 +110,17 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
|||
wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
|
||||
])));
|
||||
|
||||
patches = [ ] ++ patches';
|
||||
patches = [ ]
|
||||
# Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available
|
||||
# in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax.
|
||||
++ lib.optional stdenv.isDarwin ./darwin-metal-compat.patch
|
||||
++ patches';
|
||||
|
||||
configureFlags = prevConfigFlags
|
||||
++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ]
|
||||
++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ]
|
||||
++ lib.optionals supportFlags.vkd3dSupport [ "--with-vkd3d" ];
|
||||
++ lib.optionals supportFlags.vkd3dSupport [ "--with-vkd3d" ]
|
||||
++ lib.optionals (stdenv.isDarwin && !supportFlags.xineramaSupport) [ "--without-x" ];
|
||||
|
||||
# Wine locates a lot of libraries dynamically through dlopen(). Add
|
||||
# them to the RPATH so that the user doesn't have to set them in
|
||||
|
|
|
|||
31
third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch
vendored
Normal file
31
third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch
vendored
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
|
||||
index f64a6c0f6ad..6da0391e3fa 100644
|
||||
--- a/dlls/winemac.drv/cocoa_display.m
|
||||
+++ b/dlls/winemac.drv/cocoa_display.m
|
||||
@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
|
||||
* the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps
|
||||
* using the integrated GPU. This is the behavior of Windows on a Mac. */
|
||||
primary_device = [MTLCreateSystemDefaultDevice() autorelease];
|
||||
- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID))
|
||||
+ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, (uint64_t)[primary_device registryID]))
|
||||
goto done;
|
||||
|
||||
/* Hide the integrated GPU if the system default device is a dedicated GPU */
|
||||
@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
|
||||
|
||||
for (i = 0; i < devices.count; i++)
|
||||
{
|
||||
- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID))
|
||||
+ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], (uint64_t)[devices[i] registryID]))
|
||||
goto done;
|
||||
|
||||
if (hide_integrated && devices[i].isLowPower)
|
||||
@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp
|
||||
|
||||
device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease];
|
||||
if (device && [device respondsToSelector:@selector(registryID)])
|
||||
- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID);
|
||||
+ ret = macdrv_get_gpu_info_from_registry_id(gpu, (uint64_t)[device registryID]);
|
||||
|
||||
done:
|
||||
[pool release];
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
# };
|
||||
# Make additional configurations on demand:
|
||||
# wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
|
||||
{ lib, stdenv, callPackage,
|
||||
{ lib, stdenv, callPackage, darwin,
|
||||
wineRelease ? "stable",
|
||||
wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32",
|
||||
gettextSupport ? false,
|
||||
|
|
@ -29,6 +29,7 @@
|
|||
v4lSupport ? false,
|
||||
saneSupport ? false,
|
||||
gphoto2Support ? false,
|
||||
krb5Support ? false,
|
||||
ldapSupport ? false,
|
||||
pulseaudioSupport ? false,
|
||||
udevSupport ? false,
|
||||
|
|
@ -36,9 +37,11 @@
|
|||
vulkanSupport ? false,
|
||||
sdlSupport ? false,
|
||||
vkd3dSupport ? false,
|
||||
usbSupport ? false,
|
||||
mingwSupport ? wineRelease != "stable",
|
||||
waylandSupport ? wineRelease == "wayland",
|
||||
embedInstallers ? false # The Mono and Gecko MSI installers
|
||||
embedInstallers ? false, # The Mono and Gecko MSI installers
|
||||
moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily
|
||||
}:
|
||||
|
||||
let wine-build = build: release:
|
||||
|
|
@ -48,11 +51,12 @@ let wine-build = build: release:
|
|||
inherit
|
||||
cupsSupport gettextSupport dbusSupport openalSupport cairoSupport
|
||||
odbcSupport netapiSupport cursesSupport vaSupport pcapSupport
|
||||
v4lSupport saneSupport gphoto2Support ldapSupport fontconfigSupport
|
||||
v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport
|
||||
alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport
|
||||
tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport
|
||||
sdlSupport vkd3dSupport mingwSupport waylandSupport embedInstallers;
|
||||
sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers;
|
||||
};
|
||||
inherit moltenvk;
|
||||
});
|
||||
|
||||
in if wineRelease == "staging" then
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage,
|
||||
{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, moltenvk,
|
||||
wineRelease ? "stable",
|
||||
supportFlags
|
||||
}:
|
||||
|
||||
let
|
||||
src = lib.getAttr wineRelease (callPackage ./sources.nix {});
|
||||
vkd3d = pkgs.callPackage ./vkd3d.nix {};
|
||||
vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix {};
|
||||
vkd3d = pkgs.callPackage ./vkd3d.nix { inherit moltenvk; };
|
||||
vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; };
|
||||
in with src; {
|
||||
wine32 = pkgsi686Linux.callPackage ./base.nix {
|
||||
name = "wine-${version}";
|
||||
inherit src version supportFlags patches;
|
||||
inherit src version supportFlags patches moltenvk;
|
||||
pkgArches = [ pkgsi686Linux ];
|
||||
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ];
|
||||
geckos = [ gecko32 ];
|
||||
|
|
@ -20,7 +20,7 @@ in with src; {
|
|||
};
|
||||
wine64 = callPackage ./base.nix {
|
||||
name = "wine64-${version}";
|
||||
inherit src version supportFlags patches;
|
||||
inherit src version supportFlags patches moltenvk;
|
||||
pkgArches = [ pkgs ];
|
||||
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ];
|
||||
mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ];
|
||||
|
|
@ -31,7 +31,7 @@ in with src; {
|
|||
};
|
||||
wineWow = callPackage ./base.nix {
|
||||
name = "wine-wow-${version}";
|
||||
inherit src version supportFlags patches;
|
||||
inherit src version supportFlags patches moltenvk;
|
||||
stdenv = stdenv_32bit;
|
||||
pkgArches = [ pkgs pkgsi686Linux ];
|
||||
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ];
|
||||
|
|
|
|||
37
third_party/nixpkgs/pkgs/applications/emulators/wine/setup-hook-darwin.sh
vendored
Normal file
37
third_party/nixpkgs/pkgs/applications/emulators/wine/setup-hook-darwin.sh
vendored
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
|
||||
fixupCFlagsForDarwin() {
|
||||
# Because it’s getting called from a Darwin stdenv, MinGW will pick up on Darwin-specific
|
||||
# flags, and the ./configure tests will fail to consider it a working cross-compiler.
|
||||
# Strip them out, so Wine can use MinGW to build its DLLs instead of trying to use Clang.
|
||||
# Ideally, it would be possible to build the DLLs on Windows (i.e., as part of `pkgsCross``),
|
||||
# but that is not the case currently with Wine’s build system.
|
||||
cflagsFilter='s|-F[^ ]*||g;s|-iframework [^ ]*||g;s|-isystem [^ ]*||g;s| *| |g'
|
||||
|
||||
# libiconv and libintl aren’t needed by Wine, and having them causes linking to fail.
|
||||
# The `CoreFoundation` reference is added by `linkSystemCoreFoundationFramework` in the
|
||||
# Apple SDK’s setup hook. Remove that because MingW will fail due to file not found.
|
||||
ldFlagsFilter='s|-lintl||g;s|-liconv||g;s|/nix/store/[^-]*-apple-framework-CoreFoundation[^ ]*||g'
|
||||
|
||||
# `cc-wrapper.sh`` supports getting flags from a system-specific salt. While it is currently a
|
||||
# tuple, that’s not considered a stable interface, so the Wine derivation will provide them:
|
||||
# - for Darwin: The source is `stdenv.cc.suffixSalt`; and
|
||||
# - for MinGW: The source is the `suffixSalt`` attribute of each of the `mingwGccs`.
|
||||
export NIX_CFLAGS_COMPILE_@darwinSuffixSalt@=${NIX_CFLAGS_COMPILE-}
|
||||
export NIX_LDFLAGS_@darwinSuffixSalt@=${NIX_LDFLAGS-}
|
||||
for mingwSalt in @mingwGccsSuffixSalts@; do
|
||||
echo removing @darwinSuffixSalt@-specific flags from NIX_CFLAGS_COMPILE for $mingwSalt
|
||||
export NIX_CFLAGS_COMPILE_$mingwSalt+="$(sed "$cflagsFilter" <<< "$NIX_CFLAGS_COMPILE")"
|
||||
echo removing @darwinSuffixSalt@-specific flags from NIX_LDFLAGS for $mingwSalt
|
||||
export NIX_LDFLAGS_$mingwSalt+="$(sed "$ldFlagsFilter;$cflagsFilter" <<< "$NIX_LDFLAGS")"
|
||||
done
|
||||
|
||||
# Make sure the global flags aren’t accidentally influencing the platform-specific flags.
|
||||
export NIX_CFLAGS_COMPILE=""
|
||||
export NIX_LDFLAGS=""
|
||||
}
|
||||
|
||||
# This is pretty hacky, but this hook _must_ run after `linkSystemCoreFoundationFramework`.
|
||||
function runFixupCFlagsForDarwinLast() {
|
||||
preConfigureHooks+=(fixupCFlagsForDarwin)
|
||||
}
|
||||
postUnpackHooks+=(runFixupCFlagsForDarwinLast)
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }:
|
||||
{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader }:
|
||||
|
||||
#TODO: MoltenVK
|
||||
#TODO: unstable
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -12,7 +11,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0szr1lw3xbgi9qjm13d1q4gyzzwv8i5wfxiwjg6dmwphrc7h6jxh";
|
||||
};
|
||||
|
||||
buildInputs = [ vulkan-headers spirv-headers vulkan-loader ];
|
||||
buildInputs = [ vulkan-headers spirv-headers ]
|
||||
++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A 3d library build on top on Vulkan with a similar api to DirectX 12";
|
||||
homepage = "https://source.winehq.org/git/vkd3d.git";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.marius851000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@ assert x11Support -> xorg != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bemenu";
|
||||
version = "0.6.4";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "5xRM3NQfomG0vJheNEBLy3OaS6UEwabNKYa96u2md6M=";
|
||||
sha256 = "sha256-687/v3YvRXbop5EouXS5/aI5P+o0QgpWlUCVzDG8jzM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config pcre ];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A bidirectional console";
|
||||
homepage = "https://github.com/behdad/bicon";
|
||||
license = [ licenses.lgpl21 licenses.psfl licenses.bsd0 ];
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,20 +2,32 @@
|
|||
, meson, ninja, pkg-config, wrapGAppsHook
|
||||
, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk
|
||||
, python3Packages, gettext
|
||||
, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gnome
|
||||
, steam-run, xdg-utils, pciutils, cabextract, wineWowPackages
|
||||
, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gtksourceview4, gnome
|
||||
, steam, xdg-utils, pciutils, cabextract, wineWowPackages
|
||||
, freetype, p7zip, gamemode
|
||||
, bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs
|
||||
, bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs
|
||||
}:
|
||||
|
||||
let
|
||||
steam-run = (steam.override {
|
||||
# required by wine runner `caffe`
|
||||
extraLibraries = pkgs: with pkgs; [ libunwind libusb1 ]
|
||||
++ bottlesExtraLibraries pkgs;
|
||||
extraPkgs = pkgs: [ ]
|
||||
++ bottlesExtraPkgs pkgs;
|
||||
}).run;
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bottles";
|
||||
version = "2021.12.28-treviso";
|
||||
version = "2022.2.14-trento";
|
||||
sha256 = "GtVC3JfVoooJ+MuF9r1W3J8RfXNKalaIgecv1ner7GA=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bottlesdevs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "lZbSLLBg7XM6PuOmu5rJ15dg+QHHRcjijRYE6u3WT9Y=";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -40,6 +52,7 @@ python3Packages.buildPythonApplication rec {
|
|||
gsettings-desktop-schemas
|
||||
gspell
|
||||
gtk3
|
||||
gtksourceview4
|
||||
libhandy
|
||||
libnotify
|
||||
webkitgtk
|
||||
|
|
@ -75,8 +88,8 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
preConfigure = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
substituteInPlace src/backend/runner.py \
|
||||
--replace "{Paths.runners}" "${steam-run}/bin/steam-run {Paths.runners}"
|
||||
substituteInPlace src/backend/wine/winecommand.py \
|
||||
--replace '= f"{Paths.runners}' '= f"${steam-run}/bin/steam-run {Paths.runners}'
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
@ -87,7 +100,7 @@ python3Packages.buildPythonApplication rec {
|
|||
description = "An easy-to-use wineprefix manager";
|
||||
homepage = "https://usebottles.com/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ bloomvdomino shamilton ];
|
||||
maintainers = with maintainers; [ bloomvdomino psydvl shamilton ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,15 @@
|
|||
, dbus
|
||||
}:
|
||||
|
||||
let
|
||||
themes = fetchFromGitLab {
|
||||
domain = "source.puri.sm";
|
||||
owner = "Librem5";
|
||||
repo = "feedbackd-device-themes";
|
||||
rev = "v0.0.20210909";
|
||||
sha256 = "1d041wnq39sa0sl08xya4yp3n7j6aw560i38chl10vgpmwk9mmhr";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "feedbackd";
|
||||
# Not an actual upstream project release,
|
||||
|
|
@ -63,6 +72,7 @@ stdenv.mkDerivation rec {
|
|||
postInstall = ''
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules
|
||||
cp ${themes}/data/* $out/share/feedbackd/themes/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "girara";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-GPECj0CVxKh+gTfAkkvs13tdiy93il97iqbSTxLQSiM=";
|
||||
sha256 = "sha256-QTQiE/jnRSWPHbKMu2zMJ6YwCaXgAb95G74BzkNtTbc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ];
|
||||
|
|
|
|||
33
third_party/nixpkgs/pkgs/applications/misc/gremlin-server/default.nix
vendored
Normal file
33
third_party/nixpkgs/pkgs/applications/misc/gremlin-server/default.nix
vendored
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ fetchzip, lib, stdenv, makeWrapper, openjdk }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gremlin-server";
|
||||
version = "3.5.2";
|
||||
src = fetchzip {
|
||||
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-server-${version}-bin.zip";
|
||||
sha256 = "sha256-XFI2PQnvIPYjkJhm73TPSpMqH4+/Qv5RxS5iWkfuBg0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# Note you'll want to prefix any commands with LOG_DIR, PID_DIR, and RUN_DIR
|
||||
# environment variables set to a writable director(y/ies).
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/opt
|
||||
cp -r conf ext lib scripts $out/opt/
|
||||
install -D bin/gremlin-server.sh $out/opt/bin/gremlin-server
|
||||
makeWrapper $out/opt/bin/gremlin-server $out/bin/gremlin-server \
|
||||
--prefix PATH ":" "${openjdk}/bin/" \
|
||||
--set CLASSPATH "$out/opt/lib/"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tinkerpop.apache.org/";
|
||||
description = "Server of the Apache TinkerPop graph computing framework";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.jrpotter ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,26 +1,20 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "jrnl";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrnl-org";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+kPr7ndY6u1HMw6m0UZJ5jxVIPNjlTfQt7OYEdZkHBE=";
|
||||
sha256 = "sha256-Edu+GW/D+R5r0R750Z1f8YUVPMYbm9PK4D73sTDzDEc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
|
@ -45,14 +39,10 @@ python3.pkgs.buildPythonApplication rec {
|
|||
toml
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/jrnl-org/jrnl/pull/1359
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/jrnl-org/jrnl/commit/a55a240eff7a167af5974a03e9de6f7b818eafd9.patch";
|
||||
sha256 = "1w3gb4vasvh51nggf89fsqsm4862m0g7hr36qz22n4vg9dds175m";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "scli";
|
||||
version = "0.6.6";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isamert";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "16hfp8dn270amrilvv3sjqhq2x295kw0cxszf63jh405z3ql834g";
|
||||
sha256 = "sha256-DUDf5FlcNZzZASa8vTc72Z1/Dk+iAhtcgVJtjDUwyEo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yate";
|
||||
version = "6.1.0-1";
|
||||
version = "6.4.0-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d";
|
||||
hash = "sha256-jCPca/+/jUeNs6hZZLUBl3HI9sms9SIPNGVRanSKA7A=";
|
||||
};
|
||||
|
||||
# TODO zaptel ? postgres ?
|
||||
|
|
@ -14,12 +14,14 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ qt4 openssl ];
|
||||
|
||||
# /dev/null is used when linking which is a impure path for the wrapper
|
||||
preConfigure =
|
||||
postPatch =
|
||||
''
|
||||
sed -i 's@,/dev/null@@' configure
|
||||
patchShebangs configure
|
||||
substituteInPlace configure --replace ",/dev/null" ""
|
||||
'';
|
||||
|
||||
enableParallelBuilding = false; # fails to build if true
|
||||
|
||||
# --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
|
||||
preBuild =
|
||||
''
|
||||
|
|
@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://yate.null.ro/";
|
||||
# Yate's license is GPL with an exception for linking with
|
||||
# OpenH323 and PWlib (licensed under MPL).
|
||||
license = ["GPL" "MPL"];
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.10.5";
|
||||
version = "1.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n6viI9yEqb73691s499vRB48LCOV0LdTbMR81P+Q5pM=";
|
||||
sha256 = "sha256-N4NB4lfWIN+jreAuaaGKRdpgwHy2CKrPrGxu1iSCZyU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@
|
|||
"owner": "aiven",
|
||||
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v2.6.0",
|
||||
"sha256": "1vbphaxw6qskn7g4jah00cpw2w960x50rpvx5kq143d8b2vbiix4",
|
||||
"vendorSha256": "1zxs0p2xwxgvxdx65h0yfvzl7qmqlw41ipw0gsf25g0mvs4jckwb",
|
||||
"version": "2.6.0"
|
||||
"rev": "v2.7.0",
|
||||
"sha256": "12n97z3r5bz7hwgcz193x90n7ibk4fdph7pqxwwinrvlc6zb7hz6",
|
||||
"vendorSha256": "12lj7p74mhiy30fhc12ihbf827axlbxhbfzr10iwwhb0nydsfiyl",
|
||||
"version": "2.7.0"
|
||||
},
|
||||
"akamai": {
|
||||
"owner": "akamai",
|
||||
|
|
@ -40,10 +40,10 @@
|
|||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.155.0",
|
||||
"sha256": "0gzgh9w564c29hkx2sbrfrw04qbgdswc3ppvaa6xsz1s7g0p902a",
|
||||
"rev": "v1.157.0",
|
||||
"sha256": "02zsp7kxvg6i7wzrx6qigjsvxmmz4rhpjb36qz1jwn3dzpx6dyv1",
|
||||
"vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg",
|
||||
"version": "1.155.0"
|
||||
"version": "1.157.0"
|
||||
},
|
||||
"ansible": {
|
||||
"owner": "nbering",
|
||||
|
|
@ -94,10 +94,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.0.0",
|
||||
"sha256": "03lsdkjahq9prqrnw3v9073bi9378cqyl0g16qaqns7wrhxcxzm2",
|
||||
"vendorSha256": "1mzacd4bmr3743kvxcp1nyc0gkr2gh8gm0rhq887z62lafpnbhy1",
|
||||
"version": "4.0.0"
|
||||
"rev": "v4.2.0",
|
||||
"sha256": "1ijspv7bf6qi4s3k58vbaz4gbk6y60h7jrml2wjn6mas6pchiy0f",
|
||||
"vendorSha256": "09p029a5qqhf28afhcs5pk2px18x2q6kc16xzjzmzpisvnfl4hfb",
|
||||
"version": "4.2.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -112,10 +112,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v2.96.0",
|
||||
"sha256": "18c164acz8l1s2d06af9v8rg09a5b1s0360974fpca8rfiw425lf",
|
||||
"rev": "v2.97.0",
|
||||
"sha256": "0a95xq2bk6a1yas2kxfq30s41s2jgv2rjvz4y7m34wlldd9qxfhg",
|
||||
"vendorSha256": null,
|
||||
"version": "2.96.0"
|
||||
"version": "2.97.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -157,10 +157,10 @@
|
|||
"owner": "brightbox",
|
||||
"provider-source-address": "registry.terraform.io/brightbox/brightbox",
|
||||
"repo": "terraform-provider-brightbox",
|
||||
"rev": "v2.0.7",
|
||||
"sha256": "0p2gg24yvzghhsa5g1dqd27vkj6p2wyr3wxd964r5kz0sl80xh1y",
|
||||
"vendorSha256": "05min7zgl9q4qw8v5ivf352pg4i5jnv449jl129vdsqz7p2wrc6d",
|
||||
"version": "2.0.7"
|
||||
"rev": "v2.1.1",
|
||||
"sha256": "0gscxy921h8wkr40pi86dfx62z2jl0kkvnkfw7ab7xswz63h1ilm",
|
||||
"vendorSha256": "1ij21y7lx6599b87vlz31mwykj0qam62w7776d6ar99pc0zl8r8k",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"checkly": {
|
||||
"owner": "checkly",
|
||||
|
|
@ -194,10 +194,10 @@
|
|||
"owner": "cloudflare",
|
||||
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v3.8.0",
|
||||
"sha256": "1splgbfjwfjx9qv5f526jk7yzfh24crw0xasx42jfia639m6s49c",
|
||||
"vendorSha256": "0cf96s4xgx2idx7g40qhk16fwhdfnk1pcl6dy3cl2zr4afz5sky1",
|
||||
"version": "3.8.0"
|
||||
"rev": "v3.9.1",
|
||||
"sha256": "02kyjf2mizvxv1a2fkw2wsk0gmilj83sj3qv1d7g0wxxkxx00nd2",
|
||||
"vendorSha256": "167jafxr4g43y9gvqjq5z7vd9cyf15d69wbrdvqsfzj8sszqfq5l",
|
||||
"version": "3.9.1"
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"owner": "cloudfoundry-community",
|
||||
|
|
@ -248,10 +248,10 @@
|
|||
"owner": "poseidon",
|
||||
"provider-source-address": "registry.terraform.io/poseidon/ct",
|
||||
"repo": "terraform-provider-ct",
|
||||
"rev": "v0.9.1",
|
||||
"sha256": "1d8q6ffh64v46r80vmbpsgmjw1vg6y26hpq3nz2h5mvqm0fqya9r",
|
||||
"vendorSha256": "0zi64rki932x343iavwb7w5h5ripca3c2534mb91liym37vgkykv",
|
||||
"version": "0.9.1"
|
||||
"rev": "v0.9.2",
|
||||
"sha256": "104j34b1m110fdya21k4rz03j1yba4a9cpm7hq13i8hc2diqjqnc",
|
||||
"vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk",
|
||||
"version": "0.9.2"
|
||||
},
|
||||
"datadog": {
|
||||
"owner": "DataDog",
|
||||
|
|
@ -302,10 +302,10 @@
|
|||
"owner": "dnsimple",
|
||||
"provider-source-address": "registry.terraform.io/dnsimple/dnsimple",
|
||||
"repo": "terraform-provider-dnsimple",
|
||||
"rev": "v0.11.0",
|
||||
"sha256": "0w5lz9lz5jfvpn87d7xzpjimvh6wnwqfwk6masrhiw88h10pgd7n",
|
||||
"rev": "v0.11.1",
|
||||
"sha256": "0jzw1kjykbka59kx30xm3qicjb6fdmm5l4f2dr8g7nxdaqnxri0s",
|
||||
"vendorSha256": "06wggchs5khzyg6fd9s0qj76awnw28s7l278awanqimqgqajijkj",
|
||||
"version": "0.11.0"
|
||||
"version": "0.11.1"
|
||||
},
|
||||
"docker": {
|
||||
"owner": "kreuzwerker",
|
||||
|
|
@ -411,20 +411,20 @@
|
|||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.10.0",
|
||||
"sha256": "19hxlvahjk0pfixykb4vfg2gyf85p6zrj0z6wfm1q3ddk35rka4z",
|
||||
"vendorSha256": "0l6f0zi3abkz4hn23bbp009bp43mpwsz9sqk3d75jpxgxi7c7f33",
|
||||
"version": "4.10.0"
|
||||
"rev": "v4.11.0",
|
||||
"sha256": "1n3d4qxy2x69ryphqwyih7iz6slx5z1plyyzdcd7pxlaw8x8hpgm",
|
||||
"vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7",
|
||||
"version": "4.11.0"
|
||||
},
|
||||
"google-beta": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.10.0",
|
||||
"sha256": "01w0p1b4q2h7rmyq7fmh1zr8h22gwlws8w58ggbnah2xvn3jzvk3",
|
||||
"vendorSha256": "0l6f0zi3abkz4hn23bbp009bp43mpwsz9sqk3d75jpxgxi7c7f33",
|
||||
"version": "4.10.0"
|
||||
"rev": "v4.11.0",
|
||||
"sha256": "0ylfx8ks5azicnckkx3lrawf1gpsq95qsng550p51gr1wna1aqmy",
|
||||
"vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7",
|
||||
"version": "4.11.0"
|
||||
},
|
||||
"grafana": {
|
||||
"owner": "grafana",
|
||||
|
|
@ -466,10 +466,10 @@
|
|||
"owner": "heroku",
|
||||
"provider-source-address": "registry.terraform.io/heroku/heroku",
|
||||
"repo": "terraform-provider-heroku",
|
||||
"rev": "v5.0.0-beta.1",
|
||||
"rev": "v5.0.0",
|
||||
"sha256": "1dskbwa10dmj5fdw0wplby6hhcvxri68jlg34966mqx8pas3zsxy",
|
||||
"vendorSha256": "13f7841i14b5n5iabqky7694mbqg95f0cvaygapczki5lf2j7fqy",
|
||||
"version": "5.0.0-beta.1"
|
||||
"version": "5.0.0"
|
||||
},
|
||||
"http": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -511,10 +511,10 @@
|
|||
"owner": "IBM-Cloud",
|
||||
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.38.2",
|
||||
"sha256": "1c6mm57apk93s18747h8ywvq5463qwapinr735ci2pmb2655cs85",
|
||||
"vendorSha256": "034k4sjbd5b64v4xvxgrhg3n8dchv41fk5vbcmk29rppi6pjc0yg",
|
||||
"version": "1.38.2"
|
||||
"rev": "v1.39.0-beta0",
|
||||
"sha256": "1ms6jr2f112qxslv2lapvngkmg2mlf0jfjnpx6rxqzclq0xcjqn1",
|
||||
"vendorSha256": "0g6bm2pvdvj24yw26d2w8d7nr9izzqwrwzdz4y9dbr426xycrgy5",
|
||||
"version": "1.39.0-beta0"
|
||||
},
|
||||
"icinga2": {
|
||||
"owner": "Icinga",
|
||||
|
|
@ -674,10 +674,10 @@
|
|||
"owner": "equinix",
|
||||
"provider-source-address": "registry.terraform.io/equinix/metal",
|
||||
"repo": "terraform-provider-metal",
|
||||
"rev": "v3.2.1",
|
||||
"sha256": "0j07rras4m6i668lkvvn3rq5l67qfzk9bmpijsfk3my0zsgv8nvw",
|
||||
"rev": "v3.2.2",
|
||||
"sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi",
|
||||
"vendorSha256": null,
|
||||
"version": "3.2.1"
|
||||
"version": "3.2.2"
|
||||
},
|
||||
"minio": {
|
||||
"owner": "aminueza",
|
||||
|
|
@ -701,10 +701,10 @@
|
|||
"owner": "NaverCloudPlatform",
|
||||
"provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud",
|
||||
"repo": "terraform-provider-ncloud",
|
||||
"rev": "v2.2.2",
|
||||
"sha256": "0f2q0k04bkkqw6qsjfpbmrqgxn504ys0ffg2ids82vzxjsmfpi1n",
|
||||
"vendorSha256": "1799i4d32y22v6ywwklm3ncmzir5hg8cw23jzb8d28xiw8vswhs4",
|
||||
"version": "2.2.2"
|
||||
"rev": "v2.2.5",
|
||||
"sha256": "0hspr6iv69izg1y8s1sj24kgy562jggn9nwqgprn4zca7vsrl29r",
|
||||
"vendorSha256": "1hiz0pphl4jxfglxj28rm58ih7c5dabhd2gaig23hcqvczhf1wd2",
|
||||
"version": "2.2.5"
|
||||
},
|
||||
"netlify": {
|
||||
"owner": "AegirHealth",
|
||||
|
|
@ -719,10 +719,10 @@
|
|||
"owner": "newrelic",
|
||||
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v2.36.2",
|
||||
"sha256": "0gz6yynpmzv2hs85y6a6kfsci1hx25gikbmq35w9kvv91gn7vd22",
|
||||
"vendorSha256": "1i7zgdh63q8m6267k51xn711vhjx5zyq2xgnfr7i38xczrw6rcsq",
|
||||
"version": "2.36.2"
|
||||
"rev": "v2.37.0",
|
||||
"sha256": "1gx2sxm39ap84anaiffdacqqrgagymgxywxc0rnc7zkwvziazhw9",
|
||||
"vendorSha256": "130ddc9qs6i8l2ka76n9rxwsz71h0wywbnjd3p2xbkkpqsg66lbz",
|
||||
"version": "2.37.0"
|
||||
},
|
||||
"nomad": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -765,19 +765,19 @@
|
|||
"owner": "nutanix",
|
||||
"provider-source-address": "registry.terraform.io/nutanix/nutanix",
|
||||
"repo": "terraform-provider-nutanix",
|
||||
"rev": "v1.2.2",
|
||||
"sha256": "08y5hxp28z5mhrbfs0mdwdj694k26gwl0qb80dggmmdil704ajwk",
|
||||
"vendorSha256": "0s7yi00zskc4j7vnqjfd64pxk2bpk1cqmqgiyxfh7aqqzg22yqkz",
|
||||
"version": "1.2.2"
|
||||
"rev": "v1.3.0",
|
||||
"sha256": "1q38f6a8d607sdhrr6xcqmdsvm625v7y36xma137bqv09g3xga0s",
|
||||
"vendorSha256": "0qkd9pnidf4rhbk7p4jkpcdq36g8lp8pwpsf3hydy6xh072iy4id",
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"oci": {
|
||||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.63.0",
|
||||
"sha256": "03hdq6024ch3rx20vgqh3xix6dn0chwgiz1z68f22h4gqzj5p955",
|
||||
"rev": "v4.64.0",
|
||||
"sha256": "1x8lhyr356j2gihgfy8563n75aqb2prwvdlnkxmvlbqcp10rnggd",
|
||||
"vendorSha256": null,
|
||||
"version": "4.63.0"
|
||||
"version": "4.64.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
|
|
@ -811,10 +811,10 @@
|
|||
"owner": "OpenNebula",
|
||||
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
||||
"repo": "terraform-provider-opennebula",
|
||||
"rev": "v0.4.0",
|
||||
"sha256": "1r6v1ksis0h9mairvn9mwk49dkn6s6ixi8j0jaz9w173lx5si917",
|
||||
"rev": "v0.4.1",
|
||||
"sha256": "13z14p8zkrmffai5pdiwi33xsznan015nl9b9cfyxi1is4m5i41m",
|
||||
"vendorSha256": "0qyzavig8wnnjzm63pny5azywqyrnjm978yg5y0sr6zw8wghjd15",
|
||||
"version": "0.4.0"
|
||||
"version": "0.4.1"
|
||||
},
|
||||
"openstack": {
|
||||
"owner": "terraform-provider-openstack",
|
||||
|
|
@ -829,19 +829,19 @@
|
|||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.27.5-alpha.1",
|
||||
"sha256": "17ws855280bi1ps6q0rdcylsbjmb1m4wvv7m9gxxlryq0gkjdsw2",
|
||||
"vendorSha256": "1qxh3nf6c0ii6wm8vch1bks3gqi2gfzi97szspbcn0z8kdhic07s",
|
||||
"version": "1.27.5-alpha.1"
|
||||
"rev": "v1.27.5",
|
||||
"sha256": "04kr3319xpzabajzav3hl2ibws2lj7x2naqfc9gpdy7j06rhhkaa",
|
||||
"vendorSha256": "1lyz6lb4ciddr3d2zh5hfdfvhdacs13xynkpsjcjyqqfhayxqavg",
|
||||
"version": "1.27.5"
|
||||
},
|
||||
"opsgenie": {
|
||||
"owner": "opsgenie",
|
||||
"provider-source-address": "registry.terraform.io/opsgenie/opsgenie",
|
||||
"repo": "terraform-provider-opsgenie",
|
||||
"rev": "v0.6.9",
|
||||
"sha256": "1wi0wdz0xh8p1znbb545xyzhg191d0xb1pwqqrxl5gz5w009dcz6",
|
||||
"rev": "v0.6.10",
|
||||
"sha256": "1kxq66skal10nx5mgk8qj15chk01fi1pjamgakr1j56m1dgw03cw",
|
||||
"vendorSha256": null,
|
||||
"version": "0.6.9"
|
||||
"version": "0.6.10"
|
||||
},
|
||||
"oraclepaas": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -1018,10 +1018,10 @@
|
|||
"owner": "spotinst",
|
||||
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.66.0",
|
||||
"sha256": "0rkh9vf2k9iynvpkzavca23jxi96dz7b7yc0h9hlhi5bmp5b337a",
|
||||
"vendorSha256": "19zhyib256sp1b6zv281lw5mry8g865n4nrxc6x9gkpwg1m0z87z",
|
||||
"version": "1.66.0"
|
||||
"rev": "v1.68.0",
|
||||
"sha256": "0llyy4rskspw4cy8jdbk175rli9s53mabj4b9yarm7apg17ai399",
|
||||
"vendorSha256": "0j0airkc1p0y9w1w40fbwxmymf8rbal2ycrkp31x1c06f8s4lhzm",
|
||||
"version": "1.68.0"
|
||||
},
|
||||
"stackpath": {
|
||||
"owner": "stackpath",
|
||||
|
|
@ -1063,10 +1063,10 @@
|
|||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.61.6",
|
||||
"sha256": "10zx8gcvcadc184d3lfmx4ipi54z3a1xa48dki3wibwmvg5nw1mf",
|
||||
"rev": "v1.61.8",
|
||||
"sha256": "1a8p141m3kcr1irl9z3vpjs6zkgqp003z7m52yskapv4df8d6skz",
|
||||
"vendorSha256": null,
|
||||
"version": "1.61.6"
|
||||
"version": "1.61.8"
|
||||
},
|
||||
"tfe": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -1136,10 +1136,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/vault",
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v3.2.1",
|
||||
"sha256": "0y8vvc5mckzjs24x36rihl1vdvh9k2kazn5lsqvq6apv36kg5vw4",
|
||||
"vendorSha256": "0j5kz5jvyds701gq89v8dcsvm67kbfxxgzjvmn74ms3nrkx8hr84",
|
||||
"version": "3.2.1"
|
||||
"rev": "v3.3.0",
|
||||
"sha256": "1b36c2f06fglf6bs6s4ly73vk1cm7zd1ci13df5wp0f2xxib3szk",
|
||||
"vendorSha256": "0x9cyxnaqkfpzx9ml7qqhl98jslpy1v965kd11kgcvqpr9lmc77x",
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"vcd": {
|
||||
"owner": "vmware",
|
||||
|
|
|
|||
|
|
@ -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.25.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OWLyjXsV2MX1WfSjRD1/0oAeZxQpeWz5xIyYTLnn+eA=";
|
||||
sha256 = "sha256-dvY5kiLJ3psoQxG12E4qOjgF9GdXpjRKU3HlbPvwWBU=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.67";
|
||||
version = "1.2.69";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SCSj+spANhbrdhj204fsvshkDi0fKmt8jbc11UHJARw=";
|
||||
sha256 = "sha256-rmDP8qPOPhUrygt5gAF2MOVNCHqh+1Gc50mnVFXpev4=";
|
||||
};
|
||||
vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0=";
|
||||
proxyVendor = true;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"emoji-js-clean": "^4.0.0",
|
||||
"emoji-mart": "^3.0.0",
|
||||
"emoji-regex": "^9.2.2",
|
||||
"error-stack-parser": "^2.0.6",
|
||||
"error-stack-parser": "2.0.6",
|
||||
"filesize": "^8.0.6",
|
||||
"mapbox-gl": "^1.12.0",
|
||||
"mime-types": "^2.1.31",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.10.1",
|
||||
"version": "1.10.4",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "1.10.1",
|
||||
"desktopSrcHash": "cA+yXVkfizVRbbykFRhNIbdaGLuEk2IuKFO8YJt78Q4=",
|
||||
"desktopYarnHash": "0kz6vkfxxk4sbr9zpaig1lhsbwj4f57v4f4pr373xxsnk1wagkfn",
|
||||
"webHash": "1g5hw39fr7adazmafpxivfxv28nzcv99r8sihga1j91avf6lxkim"
|
||||
"version": "1.10.4",
|
||||
"desktopSrcHash": "cuMo0wRMC6+un3BQK0+Ecnjvs6HugNk71yElNJarlyc=",
|
||||
"desktopYarnHash": "0llnqwgiqggfcgjyaar2h2r1pyw8m14icfb1pcdphqxrah9gpsar",
|
||||
"webHash": "0vf8npddbx4dmq9c1ghak97jn28b18ssblbrq5smdhlzsnxlpm3l"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "052k6kiw6yglgcbs1liynh4hf5ac56ychpivrbw85jh3dpq9fig8";
|
||||
sha256 = "1ddbhwsycfpf430k52l5gggywd09h10hwcwzpydam43c5ga30vdp";
|
||||
};
|
||||
|
||||
patches = optional smimeSupport (fetchpatch {
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tribler";
|
||||
version = "7.10.0";
|
||||
version = "7.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
|
||||
hash = "sha256-CVZOVOWS0fvfg1yDiWFRa4v4Tpzl8RMVBQ6z0Ib4hfQ=";
|
||||
sha256 = "0ffh8chb47iaar8872gvalgm84fjzyxph16nixsxknnprqdxyrkx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -62,6 +62,8 @@ stdenv.mkDerivation rec {
|
|||
service-identity
|
||||
twisted
|
||||
yappi
|
||||
pydantic
|
||||
anyio
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -71,6 +73,7 @@ stdenv.mkDerivation rec {
|
|||
cp -prvd ./* $out/
|
||||
makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \
|
||||
--set QT_PLUGIN_PATH "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" \
|
||||
--set _TRIBLERPATH $out/src \
|
||||
--set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \
|
||||
--set NO_AT_BRIDGE 1 \
|
||||
|
|
@ -78,10 +81,17 @@ stdenv.mkDerivation rec {
|
|||
--add-flags "-O $out/src/run_tribler.py"
|
||||
|
||||
mkdir -p $out/share/applications $out/share/icons
|
||||
cp $out/build/debian/tribler/usr/share/applications/tribler.desktop $out/share/applications/tribler.desktop
|
||||
cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/
|
||||
cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm
|
||||
'';
|
||||
|
||||
shellHook = ''
|
||||
wrapPythonPrograms || true
|
||||
export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms)
|
||||
export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH
|
||||
export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Decentralised P2P filesharing client based on the Bittorrent protocol";
|
||||
homepage = "https://www.tribler.org/";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "remmina";
|
||||
version = "1.4.23";
|
||||
version = "1.4.24";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MyemiSAMZEa9Ng6WHEyHgrze8YtIbzMCR8CTb86PDsg=";
|
||||
sha256 = "sha256-rcxgr3HVOWA3mTfX8tka9bPGDRDtKhBRsfQ3hv9XHf0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ assert builtins.elem variant [ "fresh" "still" ];
|
|||
|
||||
let
|
||||
jre' = jre_minimal.override {
|
||||
modules = [ "java.base" "java.desktop" ];
|
||||
modules = [ "java.base" "java.desktop" "java.logging" ];
|
||||
};
|
||||
|
||||
importVariant = f: import (./. + "/src-${variant}/${f}");
|
||||
|
|
|
|||
|
|
@ -7,6 +7,13 @@
|
|||
let allVersions = with lib; flip map
|
||||
# N.B. Versions in this list should be ordered from newest to oldest.
|
||||
[
|
||||
{
|
||||
version = "13.0.1";
|
||||
lang = "en";
|
||||
language = "English";
|
||||
sha256 = "3672a920c1b4af1afd480733f6d67665baf8258757dfe59a6ed6d7440cf26dba";
|
||||
installer = "Mathematica_13.0.1_BNDL_LINUX.sh";
|
||||
}
|
||||
{
|
||||
version = "13.0.0";
|
||||
lang = "en";
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cwltool";
|
||||
version = "3.1.20220217190813";
|
||||
version = "3.1.20220217222804";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-workflow-language";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2Zd1Z/Tv8wAiqlaYkZRflsUVl8OAOXdufq9k4j4L7f0=";
|
||||
sha256 = "sha256-7zID/lChliEJxu6Dawz9DNP2YvSwtMo8G+ooXNh2Phc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace src/droidcam.c \
|
||||
--replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png"
|
||||
--replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/96x96/apps/droidcam.png"
|
||||
substituteInPlace droidcam.desktop \
|
||||
--replace "/opt/droidcam-icon.png" "droidcam" \
|
||||
--replace "/usr/local/bin/droidcam" "droidcam"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -42,7 +45,8 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
|
||||
install -Dt $out/bin droidcam droidcam-cli
|
||||
install -D icon2.png $out/share/icons/hicolor/droidcam.png
|
||||
install -D icon2.png $out/share/icons/hicolor/96x96/apps/droidcam.png
|
||||
install -D droidcam.desktop $out/share/applications/droidcam.desktop
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.22.5";
|
||||
version = "1.22.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "20250fc28ce04636580577b2864e54e6bea9daf68e2d8afaeb78e131b182cd28";
|
||||
sha256 = "sha256-aPPRzNotm3ATL0lEq+49lrlrHoNp+Dm1Im5jYF4E1vY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
|
|
|||
39
third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix
vendored
Normal file
39
third_party/nixpkgs/pkgs/applications/virtualization/libgovirt/default.nix
vendored
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, glib
|
||||
, librest
|
||||
, libsoup
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgovirt";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gnome.org/sources/libgovirt/0.3/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
librest
|
||||
libsoup
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.gnome.org/GNOME/libgovirt";
|
||||
description = "GObject wrapper for the oVirt REST API";
|
||||
maintainers = [ maintainers.amarshall ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
}
|
||||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kz+gyl7BuC0G97Lj3T1a859TYhwfAGB1hTiYXq66wwY=";
|
||||
sha256 = "sha256-hzoc5zbdnHHTY04aGn+77lHvPh+KNOPoZmW19YIZHv8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-x0VmidGV9TsGOyL+OTUHXOxJ2cgvIqph56MrwfR2SP4=";
|
||||
vendorSha256 = "sha256-eJnwXXYWMaIfM8SW4MtmG4wsPA/9sx4j2AkOd6GpnsY=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,86 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, intltool, shared-mime-info, wrapGAppsHook
|
||||
, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte
|
||||
{ lib
|
||||
, stdenv
|
||||
, bash-completion
|
||||
, fetchurl
|
||||
, gdbm ? null
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, gtk-vnc
|
||||
, gtk3
|
||||
, intltool
|
||||
, libcap ? null
|
||||
, libgovirt
|
||||
, libvirt
|
||||
, libvirt-glib
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, shared-mime-info
|
||||
, spice-gtk ? null
|
||||
, spice-protocol ? null
|
||||
, spiceSupport ? true
|
||||
, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
|
||||
, vte
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
assert spiceSupport ->
|
||||
spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null;
|
||||
assert spiceSupport -> (
|
||||
gdbm != null
|
||||
&& libcap != null
|
||||
&& spice-gtk != null
|
||||
&& spice-protocol != null
|
||||
);
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
baseName = "virt-viewer";
|
||||
version = "9.0";
|
||||
version = "11.0";
|
||||
name = "${baseName}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
|
||||
sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i";
|
||||
url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.xz";
|
||||
sha256 = "sha256-pD+iMlxMHHelyMmAZaww7wURohrJjlkPIjQIabrZq9A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool shared-mime-info wrapGAppsHook glib ];
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
intltool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
shared-mime-info
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte
|
||||
bash-completion
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
gtk-vnc
|
||||
gtk3
|
||||
libgovirt
|
||||
libvirt
|
||||
libvirt-glib
|
||||
libxml2
|
||||
vte
|
||||
] ++ optionals spiceSupport [
|
||||
spice-gtk spice-protocol libcap gdbm
|
||||
gdbm
|
||||
libcap
|
||||
spice-gtk
|
||||
spice-protocol
|
||||
];
|
||||
|
||||
# Required for USB redirection PolicyKit rules file
|
||||
propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/post_install.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A viewer for remote virtual machines";
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ in fetchFromGitHub {
|
|||
description = "A Persian/Arabic Open Source Font";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ in fetchFromGitHub {
|
|||
description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ in fetchFromGitHub {
|
|||
# License information is unavailable.
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ in fetchFromGitHub {
|
|||
description = "A multi-script display typeface for popular culture";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ in fetchFromGitHub {
|
|||
description = "A Persian (Farsi) Font - قلم (فونت) فارسی ناهید";
|
||||
license = licenses.free;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ in fetchzip {
|
|||
homepage = "https://github.com/naver/nanumfont";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ linarcx ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ in fetchFromGitHub {
|
|||
description = "Persian/Arabic Open Source Font";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ in fetchFromGitHub {
|
|||
description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ in fetchFromGitHub {
|
|||
description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ in fetchFromGitHub {
|
|||
description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ in fetchFromGitHub {
|
|||
description = "A Persian (Farsi) Font - فونت (قلم) فارسی شبنم";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ in fetchFromGitHub {
|
|||
description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
125
third_party/nixpkgs/pkgs/data/icons/comixcursors/default.nix
vendored
Normal file
125
third_party/nixpkgs/pkgs/data/icons/comixcursors/default.nix
vendored
Normal file
|
|
@ -0,0 +1,125 @@
|
|||
{ lib, stdenv, fetchFromGitLab, bc, librsvg, xcursorgen }:
|
||||
|
||||
let
|
||||
dimensions = {
|
||||
color = [ "Black" "Blue" "Green" "Orange" "Red" "White" ];
|
||||
opacity = [ "" "Opaque_" ]; # Translucent or opaque.
|
||||
thickness = [ "" "Slim_" ]; # Thick or slim edges.
|
||||
handedness = [ "" "LH_" ]; # Right- or left-handed.
|
||||
};
|
||||
product = lib.cartesianProductOfSets dimensions;
|
||||
variantName =
|
||||
{ color, opacity, thickness, handedness }:
|
||||
"${handedness}${opacity}${thickness}${color}";
|
||||
variants =
|
||||
# (The order of this list is already good looking enough to show in the
|
||||
# meta.longDescription.)
|
||||
map variantName product;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "comixcursors";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "limitland";
|
||||
repo = "comixcursors";
|
||||
# https://gitlab.com/limitland/comixcursors/-/issues/3
|
||||
rev = "8c327c8514ab3a352583605c1ddcb7eb3d1d302b";
|
||||
sha256 = "0bpxqw4izj7m0zb9lnxnmsjicfw60ppkdyv5nwrrz4x865wb296a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bc librsvg xcursorgen ];
|
||||
|
||||
patches = [ ./makefile-shell-var.patch ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./install-all ./bin/
|
||||
'';
|
||||
|
||||
# install-all is used instead of the directions in upstream's INSTALL file,
|
||||
# because using its Makefile directly is broken. Upstream itself seems to use
|
||||
# its build-distribution script instead, which also uses install-all, but we
|
||||
# do not use it because it does extra things for other distros.
|
||||
#
|
||||
# When not all of the variants, i.e. only a smaller subset of them, are
|
||||
# desired (i.e. when a subset of outputs are chosen), install-all will still
|
||||
# build all of them. While upstream appears to provide old functionality for
|
||||
# building only a subset, it is broken and we do not use it. With prebuilt
|
||||
# substitutions, installers of this package will get only the outputs they
|
||||
# chose.
|
||||
buildPhase = ''
|
||||
ICONSDIR=$TMP/staged ./install-all
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
for outputName in $outputs ; do
|
||||
if [ $outputName != out ]; then
|
||||
local outputDir=''${!outputName};
|
||||
local iconsDir=$outputDir/share/icons
|
||||
local cursorName=$(tr _ - <<<"$outputName")
|
||||
|
||||
mkdir -p $iconsDir
|
||||
cp -r -d $TMP/staged/ComixCursors-$cursorName $iconsDir
|
||||
|
||||
unset outputDir iconsDir cursorName
|
||||
fi
|
||||
done
|
||||
|
||||
# Need this directory (empty) to prevent the builder scripts from breaking.
|
||||
mkdir -p $out
|
||||
'';
|
||||
|
||||
outputs = let
|
||||
default = "Opaque_Black";
|
||||
in
|
||||
# Have the most-traditional variant be the default output (as the first).
|
||||
# Even with outputsToInstall=[], the default/first still has an effect on
|
||||
# some Nix tools (e.g. nix-build).
|
||||
[ default ] ++ (lib.remove default variants)
|
||||
# Need a dummy "out" output to prevent the builder scripts from breaking.
|
||||
++ [ "out" ];
|
||||
|
||||
# No default output (to the extent possible). Instead, the outputs'
|
||||
# attributes are used to choose which variant(s) to have.
|
||||
outputsToInstall = [];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Comix Cursors mouse themes";
|
||||
longDescription = ''
|
||||
There are many (${toString ((length outputs) - 1)}) variants of color,
|
||||
opacity, edge thickness, and right- or left-handedness, for this cursor
|
||||
theme. This package's derivation has an output for each of these
|
||||
variants, named following the upstream convention, and the attribute for
|
||||
an output must be used to install a variant. E.g.:
|
||||
<programlisting language="nix">
|
||||
environment.systemPackages = [
|
||||
comixcursors.Blue
|
||||
comixcursors.Opaque_Orange
|
||||
comixcursors.Slim_Red
|
||||
comixcursors.Opaque_Slim_White
|
||||
comixcursors.LH_Green
|
||||
comixcursors.LH_Opaque_Black
|
||||
comixcursors.LH_Slim_Orange
|
||||
comixcursors.LH_Opaque_Slim_Blue
|
||||
];
|
||||
</programlisting>
|
||||
|
||||
Attempting to use just <literal>comixcursors</literal>, i.e. without an
|
||||
output attribute, will not install any variants. To install all the
|
||||
variants, use <literal>comixcursors.all</literal> (which is a list), e.g.:
|
||||
<programlisting language="nix">
|
||||
environment.systemPackages = comixcursors.all ++ [...];
|
||||
</programlisting>
|
||||
|
||||
The complete list of output attributes is:
|
||||
<programlisting>
|
||||
${concatStringsSep "\n" variants}
|
||||
</programlisting>
|
||||
'';
|
||||
homepage = "https://gitlab.com/limitland/comixcursors";
|
||||
changelog = "https://gitlab.com/limitland/comixcursors/-/blob/HEAD/NEWS";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.DerickEddington ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
11
third_party/nixpkgs/pkgs/data/icons/comixcursors/makefile-shell-var.patch
vendored
Normal file
11
third_party/nixpkgs/pkgs/data/icons/comixcursors/makefile-shell-var.patch
vendored
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -22,8 +22,6 @@
|
||||
|
||||
# Makefile for ComixCursors project.
|
||||
|
||||
-SHELL = /bin/bash
|
||||
-
|
||||
CURSORSNAME = ComixCursors
|
||||
PACKAGENAME ?= ${CURSORSNAME}
|
||||
SUMMARY ?= The original Comix Cursors
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xapps";
|
||||
version = "2.2.5";
|
||||
version = "2.2.8";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Ev+gTl9jY1HLbXKnCsVVSsY8ZrHyzsIkp+JTaXOTm6I=";
|
||||
hash = "sha256-70troRGklu5xGjBIrGvshcOX/UT96hIEFXyo4yj2GT4=";
|
||||
};
|
||||
|
||||
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xviewer";
|
||||
version = "3.2.2";
|
||||
version = "3.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FFRms4yh7TQ/O3ee7igeIslimSWLhue3BE1xCrJ3NQ4=";
|
||||
sha256 = "sha256-OyHSBXtJ/TExl06NLUAaIZq4u0+fI3YGQ37HRZeNP+0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en";
|
||||
description = "Application that let you manage Bluetooth in the GNOME destkop";
|
||||
description = "Application that lets you manage Bluetooth in the GNOME desktop";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-notifyd";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
sha256 = "sha256-Gomehef68+mOgGFDaH48jG51nbaV4ruN925h71w7FuE=";
|
||||
sha256 = "sha256-JcHxqKLl4F4FQv7lE64gWUorCvl5g5mSD+jEmj1ORfY=";
|
||||
|
||||
buildInputs = [ gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||
|
||||
|
|
|
|||
21
third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix
vendored
Normal file
21
third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ lib, mkCoqDerivation, coq, version ? null }:
|
||||
|
||||
with lib;
|
||||
mkCoqDerivation {
|
||||
pname = "LibHyps";
|
||||
owner = "Matafou";
|
||||
inherit version;
|
||||
defaultVersion = if (versions.range "8.11" "8.15") coq.version then "2.0.4.1" else null;
|
||||
release = {
|
||||
"2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h";
|
||||
};
|
||||
|
||||
configureScript = "./configure.sh";
|
||||
|
||||
releaseRev = (v: "libhyps-${v}");
|
||||
|
||||
meta = {
|
||||
description = "Hypotheses manipulation library";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -8,11 +8,12 @@ mkCoqDerivation {
|
|||
|
||||
release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
|
||||
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
|
||||
release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j";
|
||||
releaseRev = (v: "v${v}");
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.13" "8.14"; out = "0.5"; }
|
||||
{ case = range "8.13" "8.15"; out = "0.6"; }
|
||||
{ case = range "8.11" "8.12"; out = "0.4"; }
|
||||
] null;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec {
|
|||
repo = "hydra-battles";
|
||||
|
||||
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
|
||||
release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j";
|
||||
releaseRev = (v: "v${v}");
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [
|
||||
{ cases = [ (range "8.14" "8.15") (isGe "1.12.0") ]; out = "0.6"; }
|
||||
{ cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; }
|
||||
] null;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
{ lib, mkCoqDerivation, coq, equations, version ? null }:
|
||||
{ lib, mkCoqDerivation, coq, equations, LibHyps, version ? null }:
|
||||
with lib;
|
||||
|
||||
mkCoqDerivation {
|
||||
(mkCoqDerivation {
|
||||
pname = "hydra-battles";
|
||||
owner = "coq-community";
|
||||
|
||||
release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
|
||||
release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk";
|
||||
release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j";
|
||||
releaseRev = (v: "v${v}");
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.13" "8.14"; out = "0.5"; }
|
||||
{ case = range "8.13" "8.15"; out = "0.6"; }
|
||||
{ case = range "8.11" "8.12"; out = "0.4"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ equations ];
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
meta = {
|
||||
|
|
@ -32,4 +31,7 @@ mkCoqDerivation {
|
|||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
}).overrideAttrs(o:
|
||||
let inherit (o) version; in {
|
||||
propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version) LibHyps;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -92,6 +92,12 @@ self: super: {
|
|||
rm -r $out/doc/?ndroid*
|
||||
'';
|
||||
};
|
||||
|
||||
# Git annex provides a restricted login shell. Setting
|
||||
# passthru.shellPath here allows a user's login shell to be set to
|
||||
# `git-annex-shell` by making `shell = haskellPackages.git-annex`.
|
||||
# https://git-annex.branchable.com/git-annex-shell/
|
||||
passthru.shellPath = "/bin/git-annex-shell";
|
||||
}) super.git-annex;
|
||||
|
||||
# Fix test trying to access /home directory
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "7.4.27";
|
||||
sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563";
|
||||
version = "7.4.28";
|
||||
sha256 = "sha256-IIUIaoY0RLDjlUfeGklp/RxAoMGI61j6spOLZJsMS1g=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.0.14";
|
||||
sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v";
|
||||
version = "8.0.16";
|
||||
sha256 = "sha256-9J+Bge4pRjoNI6DGWWnpLVj+6KxWTfkXz/WOSNZeGEk=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.2";
|
||||
sha256 = "1aakbfgjffha4v7fl6229wwzavw59s1qkb547sipyhl88gfwfgci";
|
||||
version = "8.1.3";
|
||||
sha256 = "sha256-NUxOLFBgRuyoEtH8JSaISi9UtePSDvDt6RmmnrIy0L4=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system";
|
||||
homepage = "http://nongnu.org/jcal/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.linarcx ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
, at-spi2-core
|
||||
, cups
|
||||
, libxshmfence
|
||||
, obs-studio
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -59,27 +60,27 @@ let
|
|||
"aarch64-linux" = {
|
||||
platformStr = "linuxarm64";
|
||||
projectArch = "arm64";
|
||||
sha256 = "01ny1k10dklsqrrqmxqd9433413wmpk4ddsmkjp9dzv52dvpcl08";
|
||||
};
|
||||
"i686-linux" = {
|
||||
platformStr = "linux32";
|
||||
projectArch = "x86";
|
||||
sha256 = "000j6pc336c43xczl1rs5zf8nsf17y76f1kpy14gqgpwyzl8my0w";
|
||||
};
|
||||
"x86_64-linux" = {
|
||||
platformStr = "linux64";
|
||||
projectArch = "x86_64";
|
||||
sha256 = "1ydjckld89dkpy5zrvk7jjpz70mnlmbm8yinkfpzgcwbkcakk6k7";
|
||||
};
|
||||
};
|
||||
platforms."aarch64-linux".sha256 = "0m12adzcs6xsmgnqsdc5g0xs6xmjbj560x4d9rnv9fpf1p7jv2fa";
|
||||
platforms."i686-linux".sha256 = "00cy5kxx8hpifkwhn9qbfch7ng3crx0zb6ypllzip6qms956mama";
|
||||
platforms."x86_64-linux".sha256 = "1f1hxx4xl0wljyrgj0m3zq47yz2cyqd52qigrkpcvavr1d2sx6m3";
|
||||
|
||||
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cef-binary";
|
||||
version = "96.0.18";
|
||||
gitRevision = "fe551e4";
|
||||
chromiumVersion = "96.0.4664.110";
|
||||
version = "98.1.21";
|
||||
gitRevision = "9782362";
|
||||
chromiumVersion = "98.0.4758.102";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
|
||||
|
|
@ -102,6 +103,11 @@ stdenv.mkDerivation rec {
|
|||
cp -r ../include $out/
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit obs-studio; # frequently breaks on CEF updates
|
||||
};
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple framework for embedding Chromium-based browsers in other applications";
|
||||
homepage = "https://cef-builds.spotifycdn.com/index.html";
|
||||
|
|
|
|||
27
third_party/nixpkgs/pkgs/development/libraries/libcef/update.sh
vendored
Executable file
27
third_party/nixpkgs/pkgs/development/libraries/libcef/update.sh
vendored
Executable file
|
|
@ -0,0 +1,27 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused jq
|
||||
|
||||
set -x -eu -o pipefail
|
||||
|
||||
cd $(dirname "${BASH_SOURCE[0]}")
|
||||
|
||||
VERSION_JSON=$(curl --silent https://cef-builds.spotifycdn.com/index.json | jq '[.linux64.versions[] | select (.channel == "stable")][0]')
|
||||
|
||||
CEF_VERSION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f1)
|
||||
GIT_REVISION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f2 | cut -c 2-)
|
||||
CHROMIUM_VERSION=$(echo ${VERSION_JSON} | jq -r '.chromium_version')
|
||||
|
||||
SHA256_LINUX64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux64_minimal.tar.bz2)
|
||||
SHA256_LINUX32=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux32_minimal.tar.bz2)
|
||||
SHA256_LINUXARM64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linuxarm64_minimal.tar.bz2)
|
||||
|
||||
setKV () {
|
||||
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
|
||||
}
|
||||
|
||||
setKV version ${CEF_VERSION}
|
||||
setKV gitRevision ${GIT_REVISION}
|
||||
setKV chromiumVersion ${CHROMIUM_VERSION}
|
||||
setKV 'platforms."aarch64-linux".sha256' ${SHA256_LINUXARM64}
|
||||
setKV 'platforms."i686-linux".sha256' ${SHA256_LINUX32}
|
||||
setKV 'platforms."x86_64-linux".sha256' ${SHA256_LINUX64}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, makeWrapper
|
||||
, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
|
||||
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
|
||||
, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre2, augeas, libxml2
|
||||
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db
|
||||
, gmp, readline, file, numactl, libapparmor, jansson
|
||||
, getopt, perlPackages, ocamlPackages
|
||||
|
|
@ -12,11 +12,11 @@ assert javaSupport -> jdk != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libguestfs";
|
||||
version = "1.44.1";
|
||||
version = "1.46.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
|
||||
sha256 = "09dhmlbfdwirlmkasa28x69vqs5xndq0lnng6b4if76s6bfxrdvj";
|
||||
sha256 = "0sq092irlj2jf64m7hjx23hn5k4iypqxmlyn9g2z0q0xab56ksp6";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
++ (with ocamlPackages; [ ocaml findlib ]);
|
||||
buildInputs = [
|
||||
ncurses jansson
|
||||
pcre augeas libxml2 acl libcap libcap_ng libconfig
|
||||
pcre2 augeas libxml2 acl libcap libcap_ng libconfig
|
||||
systemd fuse yajl libvirt gmp readline file hivex db
|
||||
numactl libapparmor perlPackages.ModuleBuild
|
||||
libtirpc
|
||||
|
|
@ -53,13 +53,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals (!javaSupport) [ "--without-java" ];
|
||||
patches = [
|
||||
./libguestfs-syms.patch
|
||||
# Set HAVE_RPM, HAVE_DPKG, HAVE_PACMAN
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libguestfs/libguestfs/commit/210959cc344d6a4a1e3afa26d276b130651def74.patch";
|
||||
sha256 = "121l58mk2mwhhqc3rcisdw3di7y729b30hyffc8a50mq5k7fvsdb";
|
||||
})
|
||||
];
|
||||
NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
|
||||
installFlags = [ "REALLY_INSTALL=yes" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitLab
|
||||
, meson, pkg-config, ninja
|
||||
, libdrm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libliftoff";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1s53jsll3c7272bhmh4jr6k5m1nvn8i1ld704qmzsm852ilmgrla";
|
||||
sha256 = "1ysxm7kg1gwrsn29lw8kngvkxp46g4m2pvbwcvscgvr54ikirn4q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qpdf";
|
||||
version = "10.4.0";
|
||||
version = "10.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qpdf";
|
||||
repo = "qpdf";
|
||||
rev = "release-qpdf-${version}";
|
||||
sha256 = "sha256-IYXH1Pcd0eRzlbRouAB17wsCUGNuIlJfwJLbXiaC5dk=";
|
||||
hash = "sha256-+8bH7fKJ5uZRxKX/4nMkoZGFTxm2uJEXkb1wq5FrLWs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "readline";
|
||||
version = "5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/readline/readline-${version}.tar.gz";
|
||||
sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ncurses];
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./shobj-darwin.patch;
|
||||
|
||||
meta = with lib; {
|
||||
branch = "5";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
{ fetchurl, lib, stdenv, ncurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "readline";
|
||||
version = "6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/readline/readline-${version}.tar.gz";
|
||||
sha256 = "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ncurses];
|
||||
|
||||
patchFlags = [ "-p0" ];
|
||||
patches =
|
||||
[ ./link-against-ncurses.patch
|
||||
./no-arch_only.patch
|
||||
./clang.patch
|
||||
]
|
||||
++
|
||||
(let
|
||||
patch = nr: sha256:
|
||||
fetchurl {
|
||||
url = "mirror://gnu/readline/readline-${version}-patches/readline62-${nr}";
|
||||
inherit sha256;
|
||||
};
|
||||
in
|
||||
import ./readline-6.2-patches.nix patch);
|
||||
|
||||
meta = {
|
||||
description = "Library for interactive line editing";
|
||||
|
||||
longDescription = ''
|
||||
The GNU Readline library provides a set of functions for use by
|
||||
applications that allow users to edit command lines as they are
|
||||
typed in. Both Emacs and vi editing modes are available. The
|
||||
Readline library includes additional functions to maintain a
|
||||
list of previously-entered command lines, to recall and perhaps
|
||||
reedit those lines, and perform csh-like history expansion on
|
||||
previous commands.
|
||||
|
||||
The history facilities are also placed into a separate library,
|
||||
the History library, as part of the build process. The History
|
||||
library may be used without Readline in applications which
|
||||
desire its capabilities.
|
||||
'';
|
||||
|
||||
homepage = "https://savannah.gnu.org/projects/readline/";
|
||||
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
branch = "6.2";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
# Don't run the native `strip' when cross-compiling.
|
||||
(if stdenv.hostPlatform != stdenv.buildPlatform
|
||||
then { dontStrip = true; }
|
||||
else { }))
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/support/shobj-conf b/support/shobj-conf
|
||||
index 5a63e80..4b2a741 100644
|
||||
--- support/shobj-conf
|
||||
+++ support/shobj-conf
|
||||
@@ -189,7 +189,7 @@ darwin*|macosx*)
|
||||
darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
|
||||
SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
|
||||
;;
|
||||
- *) SHOBJ_LDFLAGS='-dynamic'
|
||||
+ *) SHOBJ_LDFLAGS='-dynamiclib'
|
||||
SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff -ru -x '*~' readline-6.2-orig/support/shobj-conf readline-6.2/support/shobj-conf
|
||||
--- support/shobj-conf 2009-10-28 14:20:21.000000000 +0100
|
||||
+++ support/shobj-conf 2014-07-01 13:03:28.000000000 +0200
|
||||
@@ -168,8 +168,8 @@
|
||||
SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
|
||||
SHLIB_LIBSUFF='dylib'
|
||||
|
||||
- SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
|
||||
- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
|
||||
+ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
|
||||
+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
|
||||
|
||||
SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
|
||||
;;
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
# Automatically generated by `update-patch-set.sh'; do not edit.
|
||||
|
||||
patch: [
|
||||
(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q")
|
||||
(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy")
|
||||
(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb")
|
||||
(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89")
|
||||
(patch "005" "1x61bjl3wgs1gwla9b3y1hh12m1j5qlbis22258mljjl9mg900pg")
|
||||
]
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/support/shobj-conf.orig 2006-04-11 06:15:43.000000000 -0700
|
||||
+++ b/support/shobj-conf 2007-11-08 01:15:43.000000000 -0800
|
||||
@@ -171,7 +171,7 @@
|
||||
SHLIB_LIBSUFF='dylib'
|
||||
|
||||
case "${host_os}" in
|
||||
- darwin[78]*) SHOBJ_LDFLAGS=''
|
||||
+ darwin[789]*) SHOBJ_LDFLAGS=''
|
||||
SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
|
||||
;;
|
||||
*) SHOBJ_LDFLAGS='-dynamic'
|
||||
|
|
@ -1,8 +1,22 @@
|
|||
{ fetchFromGitHub }:
|
||||
{ lib, buildNimPackage, fetchFromGitHub, astpatternmatching }:
|
||||
|
||||
fetchFromGitHub {
|
||||
buildNimPackage rec {
|
||||
pname = "jsonschema";
|
||||
version = "unstable-2019-09-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PMunch";
|
||||
repo = "jsonschema";
|
||||
rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf";
|
||||
sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ astpatternmatching ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/PMunch/jsonschema";
|
||||
description = "Schema validation of JSON for Nim";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
5599
third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
generated
vendored
5599
third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
generated
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "advantage-air";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "advantage_air";
|
||||
inherit version;
|
||||
hash = "sha256-K+UhvWwV2Icpx53l3zFhD7LTwn0otsHpbUfJ4Vu0Et0=";
|
||||
hash = "sha256-C+cB6oHmbr9mHZKnbls42yenQy3+L8huLk9wKazIWfU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-gdacs";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-gdacs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CIQoQRk5KIPEa/Y/7C1NPctuHvoiZ/o2bDa5YSWY+9M=";
|
||||
sha256 = "sha256-sUHVmueu70ZnXP8KoJ2mDzzEedzXYHM2yeGC4oVsZZU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioazuredevops";
|
||||
version = "1.3.5";
|
||||
version = "1.4.3";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4c98a995d0516f502ba191fa3ac973ee72b93425e7eab3cdf770516c6e93c780";
|
||||
sha256 = "sha256-vNTvSQYjjptdPsHz0zM9paq3iodZrhcEralPm6YRZJE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiogithubapi";
|
||||
version = "22.2.0";
|
||||
version = "22.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2M0EcDs3WmgG2tusvnXK750+ALE93RktlPyQO36+Ojw=";
|
||||
sha256 = "sha256-RmMI3h8ouFZYD+xeK4bVx0k529UP+Y2KH7r161zst7Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue