Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-06-17 06:01:47 +00:00 committed by GitHub
commit 5e3a16c8af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 307 additions and 315 deletions

View file

@ -1,20 +1,20 @@
{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac
, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain, gtk3, qtbase
, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain, gtk3, qtbase
, qttools, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "flacon";
version = "7.0.1";
version = "9.0.0";
src = fetchFromGitHub {
owner = "flacon";
repo = "flacon";
rev = "v${version}";
sha256 = "sha256-35tARJkyhC8EisIyDCwuT/UUruzLjJRUuZysuqeNssM=";
sha256 = "sha256-x27tp8NnAae8y8n9Z1JMobFrgPVRADVZj2cRyul7+cM=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ qtbase qttools libuchardet ];
buildInputs = [ qtbase qttools libuchardet taglib ];
bin_path = lib.makeBinPath [
shntool

View file

@ -1,82 +0,0 @@
{ lib, stdenv, alsa-lib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
, nss, pango, udev, xorg
}:
let
version = "4.7.1";
deps = [
alsa-lib
atk
at-spi2-atk
cairo
cups
dbus
expat
fontconfig
freetype
GConf
gdk-pixbuf
glib
gtk2
gtk3
libpulseaudio
nspr
nss
pango
stdenv.cc.cc
udev
xorg.libX11
xorg.libxcb
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXScrnSaver
xorg.libXtst
];
in
stdenv.mkDerivation {
pname = "google-play-music-desktop-player";
inherit version;
src = fetchurl {
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r";
};
dontBuild = true;
nativeBuildInputs = [ dpkg makeWrapper ];
unpackPhase = ''
dpkg -x $src .
'';
installPhase = ''
mkdir -p $out
cp -r ./usr/share $out
cp -r ./usr/bin $out
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
"$out/share/google-play-music-desktop-player/Google Play Music Desktop Player"
wrapProgram $out/bin/google-play-music-desktop-player \
--prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}"
'';
meta = {
homepage = "https://www.googleplaymusicdesktopplayer.com/";
description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music";
license = lib.licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ anna328p SuprDewd ];
};
}

View file

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "featherpad";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "tsujan";
repo = "FeatherPad";
rev = "V${version}";
sha256 = "sha256-qDhubKk6FLZmVxp4SkGm1B7zIg6rPtPRoFGCcBYUDFA=";
sha256 = "sha256-KKk3acjzqtNhetus/TZFSv2SUSYMzWrYYQ+Uj/XLSKc=";
};
nativeBuildInputs = [ cmake pkg-config qttools ];

View file

@ -3,7 +3,7 @@
}:
let
version = "13";
version = "14";
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
hash = "sha512-Xnh2OhnHOo++gGPx1o/WmcTHV7KNVeeT6ut9xH2Zo0EFtt43GFi2+HLOXm3u/IcjAzWlbGvIp9+TVUnwDusDoA==";
hash = "sha512-AEuUOiVCvZh4SjghQR2j8LBIubEBzEaZqWsb93icZU9K1sc6ddUanLD0NsQhzjK6oK1EDv5GG9PmqOXo6Sf1xg==";
};
buildCommand = ''

View file

@ -130,6 +130,7 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}
# TODO: a better way to organize the options

View file

@ -46,22 +46,22 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "7.8";
version = "7.10";
url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz";
sha256 = "sha256-j3bpyWtQ8qyOJOXe7fo+DZWWpXBnCSJvZalMahYAGbg=";
sha256 = "sha256-P+skzYWYwQ9q9xHnSsK10kQrtNO4wHj506JTroc2SA0=";
inherit (stable) gecko32 gecko64 patches;
mono = fetchurl rec {
version = "7.2.0";
version = "7.3.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
sha256 = "sha256-Xwbq+646SezDHfzqd3B1vUTwzBJuT7Tijs76ButDYyM=";
sha256 = "sha256-k54vVmlyDQ0Px+MFQmYioRozt644XE1+WB4p6iZOIv8=";
};
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-payP+lx/aGZErGbkpogNMgsE393e7F2VGrllDKu/Lws=";
sha256 = "sha256-5Pt98pla6t+B3FjB80hOWJUO64jY1EmOPQ0hEkFBWxY=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "cherrytree";
version = "0.99.46";
version = "0.99.47";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
sha256 = "sha256-yX9USGiiCwtBcg055D8xBHoiCafQWtQFqf5i5bsi13U=";
sha256 = "sha256-qKBf/7DBIpK1o/xlDlWeVXkSSV5a3y9hoWsAzeTIsf4=";
};
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "argocd";
version = "2.3.4";
version = "2.4.0";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
sha256 = "sha256-pWDwmsLCXoK8EzipOPXUdYu75hPm5AIExXmgoA102Dg=";
sha256 = "sha256-U3i3shXsItQQlkFl/DrGdSHY2AAhaYV5WX3B+6TlOPw=";
};
vendorSha256 = "sha256-XrIIMnn65Y10KnVTsmw6vLE53Zra1lWNFgklmaj3gF8=";
vendorSha256 = "sha256-j/35tvfUCcuFN8NGIjWgna1W0Q4CyhMLcOlepTAUl0w=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
@ -26,9 +26,9 @@ buildGoModule rec {
"-X ${package_url}.gitCommit=${src.rev}"
"-X ${package_url}.gitTag=${src.rev}"
"-X ${package_url}.gitTreeState=clean"
"-X ${package_url}.kubectlVersion=v0.23.1"
"-X ${package_url}.kubectlVersion=v0.23.3"
# NOTE: Update kubectlVersion when upgrading this package with
# go list -m k8s.io/client-go | head -n 1 | rev | cut -d' ' -f1 | rev
# https://github.com/argoproj/argo-cd/blob/master/go.mod#L95
# Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18
# Will need a way to automate it :P
];

View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.13.3";
version = "1.14.1";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "sha256-XvV6OlGHW/eB0EUrmyTlFVbDjbxUpVo6WvrEnh6Q68I=";
sha256 = "sha256-Y8Bo2niIyvBE3BPpnSanFrR8ZHIUdG7iKSOyD6YadIM=";
};
vendorSha256 = "sha256-Ex86yLMTqqiSkJns/eeodmGswAzPVQAQOf8Wqi7DRaE=";
vendorSha256 = "sha256-MnSOWJwTOQmHnABRYNJwU9kOr7g51rkUaERksupBTb4=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pgo-client";
version = "4.7.4";
version = "4.7.5";
src = fetchFromGitHub {
owner = "CrunchyData";
repo = "postgres-operator";
rev = "v${version}";
sha256 = "sha256-8L3eFMATCGIM6xxUM7mi/D3njHMFk7cgPLJotilAS5k=";
sha256 = "sha256-1GYpvw3ch03Cx4BReNwLnbgbds4uuSe/cjvbHuRhLOw=";
};
vendorSha256 = "sha256-4Vz7Lioj6iLU7dbz/B2BSAgfaCl2MyC8MM9yiyWLi2o=";
vendorSha256 = "sha256-5/mLlgNdlX/ABrpofPqowCskxFwJAEKVpbsMOvMvTWc=";
subPackages = [ "cmd/pgo" ];

View file

@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
];
installPhase = ''
mkdir -p $out/{bin,opt/${binaryName},share/pixmaps}
mkdir -p $out/{bin,opt/${binaryName},share/pixmaps,share/icons/hicolor/256x256/apps}
mv * $out/opt/${binaryName}
chmod +x $out/opt/${binaryName}/${binaryName}
@ -90,7 +90,9 @@ stdenv.mkDerivation rec {
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${
lib.strings.toLower binaryName
} || true
ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png
ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png
ln -s "${desktopItem}/share/applications" $out/share/
'';

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "jmeter";
version = "5.4.3";
version = "5.5";
src = fetchurl {
url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz";
sha256 = "sha256-clISFMDLh9rFuXTBxug6F6AJx/03e1W/I1JcckA7He4=";
sha256 = "sha256-YOicfEUjcxRn/bcX8z1hQIbBDwMWNpy6pFZQrhxALh8=";
};
nativeBuildInputs = [ makeWrapper jre ];

View file

@ -2,20 +2,24 @@
buildGoModule rec {
pname = "juju";
version = "2.9.27";
version = "2.9.31";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
sha256 = "sha256-4G+veQkPY6n/uRMsBWQgig/6IDc0Y2nXDpMUyC1ShF4=";
sha256 = "sha256-vRe7H7wtZUTsAJa6QVP+BTDDkJsfgIlBVpGcvtU1e0g=";
};
vendorSha256 = "sha256-Ieaf+Qp/7/6nv2ftHY3pbtOg+t7dYAuMv4BvhRaAZ9E=";
vendorSha256 = "sha256-Tx5RazLrNZ5GMRu4/jKhuNN7m1mQw4V7TBcIed/Gssg=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;
subPackages = [
"cmd/juju"
];
meta = with lib; {
description = "Open source modelling tool for operating software in the cloud";
homepage = "https://juju.is";

View file

@ -2,12 +2,12 @@
let
pname = "electron-mail";
version = "4.12.7";
version = "4.14.0";
name = "ElectronMail-${version}";
src = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
sha256 = "42d0b49a2feba628f4845940ffd9607739bd5fcdbe6ba37e15f993c511d21e46";
sha256 = "sha256-sahMEj9m10gsceTBnYk8wkWcQoM5s6s1ek1U6u3PTgw=";
};
appimageContents = appimageTools.extract { inherit name src; };
@ -24,6 +24,7 @@ in appimageTools.wrapType2 {
extraPkgs = pkgs: with pkgs; [
libsecret
libappindicator-gtk3
];
meta = with lib; {

View file

@ -4,13 +4,13 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
version = "1.20.1";
version = "1.20.2";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
hash = "sha256-QJevD/meVPEHnfwT1Eu3cwfVFU+ab/16eJBl6cuhGdA=";
hash = "sha256-U9sM7c2jCEVzTLBawRQGXZTS0jYbFH3OVFk7IkWk2bo=";
};
vendorSha256 = "sha256-NuiT2GytWaGkgSyl+qoe9DjCCL7wSHc6FU8C6rsy6Vc=";

View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "PageEdit";
version = "1.7.0";
version = "1.9.10";
src = fetchFromGitHub {
owner = "Sigil-Ebook";
repo = pname;
rev = version;
hash = "sha256-/t08ZS2iYWIDkco0nhACBQs1X+X77SJ/g+ow7KemfRY=";
hash = "sha256-y2Z5enEptiOrwEGBKlo4H4I9ojIPG9KP3BlvTCj4PVY=";
};
nativeBuildInputs = [ cmake qttranslations ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "super-productivity";
version = "7.10.1";
version = "7.11.5";
src = fetchurl {
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
sha256 = "sha256-jhCsC5G8epyclp2+DYpot1UMjo5mkMa0UO0bQZ1T0Ug=";
sha256 = "sha256-+RMQd2iQmvFfgBhpa5T5SQJsn9wZ3qocDkO9b0O+CsE=";
name = "${pname}-${version}.AppImage";
};

View file

@ -41,12 +41,12 @@
stdenv.mkDerivation rec {
pname = "zotero";
version = "6.0.4";
version = "6.0.8";
src = fetchurl {
url =
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "sha256-KPvsyN3qpnG8/qRwTlWe2mZWnI9OfxlHu6OUubItJZc=";
sha256 = "sha256-S3s82F6kpjIOIqMIxlZIBT/7eNpLf6dHjOOaCYxdh6E=";
};
nativeBuildInputs = [ wrapGAppsHook ];

View file

@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kstars";
version = "3.5.8";
version = "3.5.9";
src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
sha256 = "sha256-Zg2QKDe3q/OBDW4k9y/YTwREopvX1D4YlrGf7OHIjD8=";
sha256 = "sha256-SO8W1juP+MkXvXyNCP45AauYTbDrurAUtw4Gp4AA6X4=";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:
stdenv.mkDerivation rec {
pname = "gama";
version = "2.17";
version = "2.19";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-AyUjcYDUjAYI4p0vVDO7SGqhbO83Kesd+JUUgQf5GPU=";
sha256 = "sha256-OCyUcKkQzp1nz9lgGSR4MRrP7XBR1kpIfPEA7PdSA1I=";
};
buildInputs = [ expat ];

View file

@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, gitUpdater
, meson
, ninja
, vala
@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "monitor";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "stsdc";
repo = "monitor";
rev = version;
sha256 = "sha256-qwx60cp3Q6PL1iwRP+M9Rtmxcis0EByi8fk13H4cXfc=";
sha256 = "sha256-dw1FR9nU8MY6LBL3sF942azeSgKmCntXCk4+nhMb4Wo=";
fetchSubmodules = true;
};
@ -75,8 +75,9 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "ci.*";
};
};

View file

@ -12,13 +12,13 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.10.0";
version = "3.10.1";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jZkc9YA4kE/Gr4/FRzgd0VvEjSrw5rk7DB5qH8Z5o6c=";
sha256 = "sha256-ofadxKWhfeC2Sx1IJKXOTmukK5m1TOU5244e4kEGM90=";
};
nativeBuildInputs = [ installShellFiles ];

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.11.1.1129";
version = "1.11.1.1139";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-kib1gGN4krlvEuCGdAYV3ejaMXOIhJ7ZBaUO4ulc6SQ=";
sha256 = "sha256-UEqmYtXFEabWetAeOaaRBkwNQeMRYR/PgN8+ljwNFt8=";
};
nativeBuildInputs = [

View file

@ -1,37 +1,24 @@
{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, doxygen, xorg }:
{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, doxygen, xorg, python3 }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "partio";
version = "2018-03-01";
version = "1.14.6";
src = fetchFromGitHub {
owner = "wdas";
repo = "partio";
rev = "8b6ea0d20f1ab77cd7f18390999251e60932de4a";
sha256 = "16sdj103v02l2dgq9y9cna9jakafabz9jxzdxsd737ir6wn10ksb";
rev = "refs/tags/v${version}";
hash = "sha256-S8U5I3dllFzDSocU1mJ8FYCCmBpsOR4n174oiX5hvAM=";
};
outputs = [ "dev" "out" "lib" ];
nativeBuildInputs = [ unzip cmake doxygen ];
buildInputs = [ freeglut libGLU libGL zlib swig xorg.libXi xorg.libXmu ];
buildPhase = ''
make partio
mkdir $dev
mkdir $out
'';
buildInputs = [ freeglut libGLU libGL zlib swig xorg.libXi xorg.libXmu python3 ];
# TODO:
# Sexpr support
installPhase = ''
make install prefix=$out
mkdir $dev/include/partio
mv $dev/include/*.h $dev/include/partio
'';
strictDeps = true;
meta = with lib; {

View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
stdenv.mkDerivation rec {
pname = "smpeg-svn";
version = "390";
pname = "smpeg";
version = "0.4.5";
src = fetchsvn {
url = "svn://svn.icculus.org/smpeg/trunk";
rev = version;
sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0";
src = fetchFromGitHub {
owner = "icculus";
repo = "smpeg";
rev = "release_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "sha256-nq/i7cFGpJXIuTwN/ScLMX7FN8NMdgdsRM9xOD3uycs=";
};
patches = [
@ -19,10 +20,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ SDL gtk2 libGLU libGL ];
nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ];
buildInputs = [ SDL gtk2 libGLU libGL ];
preConfigure = ''
touch NEWS AUTHORS ChangeLog
sh autogen.sh

View file

@ -2,7 +2,7 @@
, autoconf
, automake
, darwin
, fetchsvn
, fetchFromGitHub
, makeWrapper
, pkg-config
, SDL2
@ -10,18 +10,15 @@
stdenv.mkDerivation rec {
pname = "smpeg2";
version = "unstable-2017-10-18";
version = "unstable-2022-05-26";
src = fetchsvn {
url = "svn://svn.icculus.org/smpeg/trunk";
rev = "413";
sha256 = "193amdwgxkb1zp7pgr72fvrdhcg3ly72qpixfxxm85rzz8g2kr77";
src = fetchFromGitHub {
owner = "icculus";
repo = "smpeg";
rev = "c5793e5f3f2765fc09c24380d7e92136a0e33d3b";
sha256 = "sha256-Z0u83K1GIXd0jUYo5ZyWUH2Zt7Hn8z+yr06DAtAEukw=";
};
patches = [
./hufftable-uint_max.patch
];
nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ];
buildInputs = [ SDL2 ]

View file

@ -1,33 +0,0 @@
--- a/audio/hufftable.cpp
+++ b/audio/hufftable.cpp
@@ -9,6 +9,7 @@
#include "config.h"
#endif
+#include <climits>
#include "MPEGaudio.h"
static const unsigned int
@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4,
const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
{
- { 0, 0-1, 0-1, 0, 0, htd33},
+ { 0, UINT_MAX, UINT_MAX, 0, 0, htd33},
{ 1, 2-1, 2-1, 0, 7,htd01},
{ 2, 3-1, 3-1, 0, 17,htd02},
{ 3, 3-1, 3-1, 0, 17,htd03},
- { 4, 0-1, 0-1, 0, 0, htd33},
+ { 4, UINT_MAX, UINT_MAX, 0, 0, htd33},
{ 5, 4-1, 4-1, 0, 31,htd05},
{ 6, 4-1, 4-1, 0, 31,htd06},
{ 7, 6-1, 6-1, 0, 71,htd07},
@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN
{11, 8-1, 8-1, 0,127,htd11},
{12, 8-1, 8-1, 0,127,htd12},
{13,16-1,16-1, 0,511,htd13},
- {14, 0-1, 0-1, 0, 0, htd33},
+ {14, UINT_MAX, UINT_MAX, 0, 0, htd33},
{15,16-1,16-1, 0,511,htd15},
{16,16-1,16-1, 1,511,htd16},
{17,16-1,16-1, 2,511,htd16},

View file

@ -7,6 +7,8 @@
, pango
, pkg-config
, wxGTK
# darwin deps
, Cocoa
}:
stdenv.mkDerivation rec {
@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
libexif
pango
wxGTK
];
] ++ lib.optional stdenv.isDarwin Cocoa;
meta = with lib; {
homepage = "http://wxsvg.sourceforge.net/";
@ -37,9 +39,8 @@ stdenv.mkDerivation rec {
wxSVG is C++ library to create, manipulate and render Scalable Vector
Graphics (SVG) files with the wxWidgets toolkit.
'';
license = with licenses; gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = wxGTK.meta.platforms;
broken = stdenv.isDarwin;
license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
inherit (wxGTK.meta) platforms;
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }:
{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite, Cocoa, setfile }:
stdenv.mkDerivation rec {
pname = "wxsqliteplus";
@ -11,27 +11,32 @@ stdenv.mkDerivation rec {
sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf";
};
buildInputs = [ wxGTK wxsqlite3 sqlite ];
buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.isDarwin Cocoa;
makeFlags = [
"LDFLAGS=-L${wxsqlite3}/lib"
] ++ lib.optionals stdenv.isDarwin [
"SETFILE=${setfile}/bin/SetFile"
];
preBuild = ''
sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile
sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile
sed -ie 's|-lwxsqlite |-lwxcode_gtk2u_wxsqlite3-3.0 |g' Makefile
sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.isDarwin then "osx_cocoau_wxsqlite3-3.0.0" else "gtk2u_wxsqlite3-3.0"} |g' Makefile
'';
installPhase = ''
install -D wxsqliteplus $out/bin/wxsqliteplus
install -D ${lib.optionalString stdenv.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
mv wxsqliteplus.app $out/Applications/
'';
meta = with lib; {
homepage = "https://github.com/guanlisheng/wxsqliteplus";
description = "A simple SQLite database browser built with wxWidgets";
platforms = platforms.unix;
maintainers = with maintainers; [ vrthra ];
homepage = "https://github.com/guanlisheng/wxsqliteplus";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
platforms = platforms.unix;
};
}

View file

@ -18,6 +18,7 @@
, withGtk2 ? true
, withWebKit ? false, webkitgtk
, AGL
, AVFoundation
, Carbon
, Cocoa
, Kernel
@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
++ lib.optional withMesa libGLU
++ lib.optional withWebKit webkitgtk
++ lib.optionals stdenv.isDarwin [
AVFoundation
Carbon
Cocoa
Kernel
@ -130,7 +132,6 @@ stdenv.mkDerivation rec {
license = licenses.wxWindows;
maintainers = with maintainers; [ ];
platforms = platforms.linux ++ platforms.darwin;
badPlatforms = [ "x86_64-darwin" ];
};
passthru = {

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "injector";
version = "0.19.0";
version = "0.20.0";
src = fetchPypi {
inherit pname version;
sha256 = "3eaaf51cd3ba7be1354d92a5210c8bba43dd324300eafd214e1f2568834a912f";
sha256 = "sha256-DILe3I4TVOj9Iqs9mbiL3e9t7bnHfWwixNids9FYN/U=";
};
propagatedBuildInputs = [ typing-extensions ];

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.20.0";
version = "1.20.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Qw6jgbYDfeJfT6QtIaT2llbfwZTpoLeH78mxJlFA7TI=";
sha256 = "sha256-xsPz7v5+rIO88F1Y/inBSUwVnI7uKZrV2nzVvJ9L02A=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

View file

@ -13,7 +13,7 @@
buildPythonApplication rec {
pname = "mkdocs-material";
version = "8.3.5";
version = "8.3.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonApplication rec {
owner = "squidfunk";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-1fRNq2vOWTaUa8OZE1EkLH/2pt9vpUBkWXmro+aqwmA=";
hash = "sha256-hPDzA1QybLx47ZEAwKZJRqiI48vF0R4DOR3w7EiCpvU=";
};
propagatedBuildInputs = [

View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "sqlite-utils";
version = "3.26.1";
version = "3.27";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-GK/036zijOSi9IWZSFifXrexY8dyo6cfwWyaF06x82c=";
hash = "sha256-SercPK2Svrq7rEULglvjq1J3FV0x0aHHKs72HmXkTGo=";
};
postPatch = ''

View file

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "types-pyyaml";
version = "6.0.8";
format = "setuptools";
src = fetchPypi {
pname = "types-PyYAML";
inherit version;
sha256 = "0f349hmw597f2gcja445fsrlnfzb0dj7fy62g8wcbydlgcvmsjfr";
};
# Module doesn't have tests
doCheck = false;
pythonImportsCheck = [
"yaml-stubs"
];
meta = with lib; {
description = "Typing stubs for PyYAML";
homepage = "https://github.com/python/typeshed";
license = licenses.asl20;
maintainers = with maintainers; [ dnr ];
};
}

View file

@ -5,23 +5,24 @@
buildGoModule rec {
pname = "tfsec";
version = "1.25.1";
version = "1.26.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-OgmVqwXIGtqzS27QfEeP9k4Ijwt5kXdq8Gocie5Zpqg=";
hash = "sha256-IYrLf2StBzIIl6xhN0gbgKGeopetuAko+kXjvlXAsBg=";
};
ldflags = [
"-s" "-w"
"-s"
"-w"
"-X github.com/aquasecurity/tfsec/version.Version=${version}"
## not sure if this is needed (https://github.com/aquasecurity/tfsec/blob/master/.goreleaser.yml#L6)
# "-extldflags '-fno-PIC -static'"
];
vendorSha256 = "sha256-dOfosQ0pwGgBwVtySKL0oqSMjxR7zIeZnpspo2rzfyY=";
vendorSha256 = "sha256-AayEYoybJGWdRES73wlf7pLpMukBbuxtaOU/RT9ObkI=";
subPackages = [
"cmd/tfsec"

View file

@ -14,7 +14,7 @@ let
mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ], preBuild ? "" }:
ocamlPackages.buildDunePackage rec {
inherit pname preBuild;
version = "1.7.0";
version = "1.7.1";
useDune2 = true;
minimumOcamlVersion = "4.08.1";
doCheck = true;
@ -23,7 +23,7 @@ let
owner = "comby-tools";
repo = "comby";
rev = version;
sha256 = "sha256-Y2RcYvJOSqppmxxG8IZ5GlFkXCOIQU+1jJZ6j+PBHC4";
sha256 = "0k60hj8wcrvrk0isr210vnalylkd63ria1kgz5n49inl7w1hfwpv";
};
nativeBuildInputs = [
@ -82,6 +82,7 @@ mkCombyPackage {
ocamlPackages.parany
ocamlPackages.conduit-lwt-unix
ocamlPackages.lwt_react
ocamlPackages.tar-unix
ocamlPackages.tls
combyKernel
combySemantic

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ddosify";
version = "0.7.9";
version = "0.8.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-7dPDYBypLz0YWcgwP57LtZV+WNEGd705/0jyDXT4xTY=";
sha256 = "sha256-ImVNiBXvKKYXuWtOajvLFobk956wNSQHLH7npdYY4SE=";
};
vendorSha256 = "sha256-WvchcVd0tql5Kxt2EP/auSq66hjiVqew7Iyi/ytaI64=";
vendorSha256 = "sha256-mq82KNa01gHvW+RUREra+ysaJ1YWIwX0v/uYMxmFN4M=";
ldflags = [
"-s -w"

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k6";
version = "0.37.0";
version = "0.38.3";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5pxOg+pwa2VrEWinDadx2ZFYXiQgochbU4bCkJEezQw=";
sha256 = "sha256-MV5GbsXVvq99tI5LCK6VgcXRtNUfffoz3FopwPljhdA=";
};
subPackages = [ "./" ];

View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "9.6.0";
version = "10.0.3";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "Mac6lmwQqbj9EPfpG0iLI8Qx04q7E0swmTqXx0J+Sdc=";
sha256 = "0lz9rf58dzn18yxs337sw3fia0xif039dmlmslxhlhn48g9yj67z";
};
# don't remove runtime deps

View file

@ -7,8 +7,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "18.3.0";
sha256 = "sha256-P2lKgWJuUFfNpXiY53HSE8/FpkmFX0zxxvbNFQxTBiU=";
version = "18.4.0";
sha256 = "sha256-lNbxmpcDYfjIrRdFBgQJU4n1HKagDc3lnCHzc+lau7U=";
patches = [
./disable-darwin-v8-system-instrumentation.patch
];

View file

@ -17,11 +17,11 @@ lua = luajitPackages;
unwrapped = stdenv.mkDerivation rec {
pname = "knot-resolver";
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
sha256 = "4e6f48c74d955f143d603f6072670cb41ab9acdd95d4455d6e74b6908562c55a";
sha256 = "9bad1edfd6631446da2d2331bd869887d7fe502f6eeaf62b2e43e2c113f02b6d";
};
outputs = [ "out" "dev" ];

View file

@ -1,13 +1,13 @@
{ lib, fetchurl, makeWrapper, runCommand, callPackage }:
let
version = "1.3.4";
version = "1.3.6";
programs = callPackage ./programs.nix { };
webapp = fetchurl {
url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz";
sha256 = "1qp96va5l0m7jp4g007bhgcpf4ydg3cpg2x9wa9rkpp9k1svdhjy";
sha256 = "sha256-UGzevhZDfQBoFgPZQIs5Ftgz1cUHGfY/IRSEWQHFVSQ=";
};
in

View file

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }:
let
version = "1.3.4";
version = "1.3.6";
src = fetchFromGitHub {
owner = "root-gg";
repo = "plik";
rev = version;
sha256 = "0kmcidnjw26vnxx9h3swcg72i507awg89s4nfxw6rwbyw36iiiqf";
sha256 = "sha256-Xfk7+60iB5/qJh/6j6AxW0aKXuzdINRfILXRzOFejW4=";
};
vendorSha256 = null;
@ -18,12 +18,18 @@ let
maintainers = with maintainers; [ freezeboy ];
license = licenses.mit;
};
postPatch = ''
substituteInPlace server/common/version.go \
--replace '"0.0.0"' '"${version}"'
'';
in
{
plik = buildGoModule {
pname = "plik";
inherit version meta src vendorSha256;
inherit version meta src vendorSha256 postPatch;
subPackages = [ "client" ];
postInstall = ''
@ -33,7 +39,7 @@ in
plikd-unwrapped = buildGoModule {
pname = "plikd-unwrapped";
inherit version src vendorSha256;
inherit version src vendorSha256 postPatch;
subPackages = [ "server" ];
postFixup = ''

View file

@ -18,13 +18,13 @@ let
in package.override rec {
pname = "snipe-it";
version = "6.0.2";
version = "6.0.4";
src = fetchFromGitHub {
owner = "snipe";
repo = pname;
rev = "v${version}";
sha256 = "174s2h3whim98d9h8l4qr3vpk199zfxgwyys3d3gblpx1m5mr07k";
sha256 = "06h8rnk8q85f0z0a1q0j010kzs4z2k5sxvi06avk7ndpkrisv4wz";
};
meta = with lib; {

View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nix curl jq nix-update
#! nix-shell -I nixpkgs=../../../.. -i bash -p nix curl jq nix-update
# check if composer2nix is installed
if ! command -v composer2nix &> /dev/null; then
@ -7,7 +7,7 @@ if ! command -v composer2nix &> /dev/null; then
exit 1
fi
CURRENT_VERSION=$(nix eval --raw '(with import ../../../.. {}; snipe-it.version)')
CURRENT_VERSION=$(nix eval -f ../../../.. --raw snipe-it.version)
TARGET_VERSION_REMOTE=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/snipe/snipe-it/releases/latest | jq -r ".tag_name")
TARGET_VERSION=${TARGET_VERSION_REMOTE:1}
SNIPE_IT=https://github.com/snipe/snipe-it/raw/$TARGET_VERSION_REMOTE

View file

@ -134,7 +134,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
version = "3.4.1";
version = "3.5.0";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@ -144,19 +144,9 @@ let
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-tvI7OEOwTbawqQ/qH28NDkDMAntKcyCYIAhj8oZKlOo=";
sha256 = "sha256-KR5Ox8bD/qVNwa7QV849QrNW+m9whlYnssffzsrv0hA=";
};
patches = [
# merged https://github.com/fish-shell/fish-shell/pull/8978
# "create_manpage_completions.py: Do not overstrip commands with dots"
(fetchpatch {
name = "fix-cmdname-completeion-generator.patch";
url = "https://github.com/fish-shell/fish-shell/commit/32d646a5483844e9b1fae4b73f252a34ec0d4c76.patch";
sha256 = "sha256-51hqgPHQ7oQbl1i3SfqvGsbkYMe2Jh+sEwCRu2kiv1U=";
})
];
# Fix FHS paths in tests
postPatch = ''
# src/fish_tests.cpp

View file

@ -8,11 +8,11 @@ let
py = python3.override {
packageOverrides = self: super: {
awscrt = super.awscrt.overridePythonAttrs (oldAttrs: rec {
version = "0.13.5";
version = "0.13.11";
src = self.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
sha256 = "sha256-dUNljMKsbl6eByhEYivWgRJczTBw3N1RVl8r3e898mg=";
sha256 = "sha256-Yx3I3RD57Nx6Cvm4moc5zmMbdsHeYiMghDfbQUor38E=";
};
});
jmespath = super.jmespath.overridePythonAttrs (oldAttrs: rec {
@ -29,13 +29,13 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.7.3"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.7.8"; # N.B: if you change this, check if overrides are still up-to-date
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
sha256 = "sha256-CM20zBuby1X+XOiphDDtWHUB08Mw7IYf0aZUWIvEAqI=";
sha256 = "sha256-6JlBgcHpR2ZfrljS+flxaog/KZQLvPUacJGLMQNsZ5Y=";
};
propagatedBuildInputs = [

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "exoscale-cli";
version = "1.56.0";
version = "1.57.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-YhVMlGSpigkzwppRnm5or0OErC01Mp93i1/uZcHskcQ=";
sha256 = "sha256-q+KbRtgZdyFaDIeRJ9H0bIXrgnUcuKNaMnbk701rzTs=";
};
vendorSha256 = null;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2022.06.07";
version = "2022.06.14";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
hash = "sha256-gMEqcdpJ4dFnxmGJHayM6ZH+n6osHvZ8Tlxk0Vvm1qI=";
hash = "sha256-dmd0iPRKm5/GNz3VJ9pJgYiCSTENB0ZAOt3rLjujlYs=";
};
meta = with lib; {

View file

@ -1,54 +1,80 @@
{ lib
, fetchFromGitHub
, python3Packages
, fetchpatch
, python3
, ffmpeg
}:
python3Packages.buildPythonApplication rec {
let
py = python3.override {
packageOverrides = self: super: {
google-auth-oauthlib = super.google-auth-oauthlib.overridePythonAttrs (oldAttrs: rec {
version = "0.5.2b1";
src = fetchFromGitHub {
owner = "gilesknap";
repo = "google-auth-library-python-oauthlib";
rev = "v${version}";
hash = "sha256-o4Jakm/JgLszumrSoTTnU+nc79Ei70abjpmn614qGyc=";
};
});
};
};
in
py.pkgs.buildPythonApplication rec {
pname = "gphotos-sync";
version = "2.14.2";
version = "3.04";
format = "pyproject";
SETUPTOOLS_SCM_PRETEND_VERSION = version;
src = fetchFromGitHub {
owner = "gilesknap";
repo = "gphotos-sync";
rev = version;
sha256 = "0cfmbrdy6w18hb623rjn0a4hnn3n63jw2jlmgn4a2k1sjqhpx3bf";
sha256 = "0mnlnqmlh3n1b6fjwpx2byl1z41vgghjb95598kz5gvdi95iirrs";
};
propagatedBuildInputs = with python3Packages; [
patches = [
./skip-network-tests.patch
];
propagatedBuildInputs = with py.pkgs; [
appdirs
attrs
exif
google-auth-oauthlib
psutil
pyyaml
requests-oauthlib
types-pyyaml
types-requests
];
postPatch = ''
# this is a patched release that we include via packageOverrides above
substituteInPlace setup.cfg \
--replace " @ https://github.com/gilesknap/google-auth-library-python-oauthlib/archive/refs/tags/v0.5.2b1.zip" ""
'';
buildInputs = [
ffmpeg
];
checkInputs = with python3Packages; [
pytestCheckHook
checkInputs = with py.pkgs; [
mock
pytestCheckHook
setuptools-scm
];
checkPhase = ''
preCheck = ''
export HOME=$(mktemp -d)
# patch to skip all tests that do network access
cat >>test/test_setup.py <<EOF
import pytest, requests
requests.Session.__init__ = lambda *args, **kwargs: pytest.skip("no network access")
EOF
pytestCheckPhase
substituteInPlace setup.cfg \
--replace "--cov=gphotos_sync --cov-report term --cov-report xml:cov.xml" ""
'';
meta = with lib; {
description = "Google Photos and Albums backup with Google Photos Library API";
homepage = "https://github.com/gilesknap/gphotos-sync";
license = licenses.mit;
license = licenses.asl20;
maintainers = with maintainers; [ dnr ];
};
}

View file

@ -0,0 +1,21 @@
diff --git a/tests/test_setup.py b/tests/test_setup.py
index 085b110..ea4a7d2 100644
--- a/tests/test_setup.py
+++ b/tests/test_setup.py
@@ -45,7 +45,8 @@ class SetupDbAndCredentials:
return self
def __exit__(self, exc_type=None, exc_value=None, traceback=None):
- self.gp.google_photos_down.close()
+ if hasattr(self.gp, 'google_photos_down'):
+ self.gp.google_photos_down.close()
def test_setup(self, test_name, args=None, trash_db=False, trash_files=False):
self.root = Path("/tmp/gpTests/{}".format(test_name))
@@ -76,3 +77,6 @@ class SetupDbAndCredentials:
def test_done(self):
self.gp.data_store.store()
+
+import pytest, requests
+requests.Session.__init__ = lambda *args, **kwargs: pytest.skip("no network access")

View file

@ -15,14 +15,14 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
version = "1.12.0";
version = "1.13.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-WCnTmb9EEFmA4nEBD3UzV3JfyHtJyJibMd85madoyto=";
sha256 = "sha256-mAa6AT8z+U2d6BSqYwnlwqQG7GEF8CgcdZweLBC+Wws=";
};
cargoHash = "sha256-FH+swtzO65fKWFLG3rDOysmbsVSjGFGeMiYtNQU62ww=";
cargoHash = "sha256-y5RRNy+9NPuiD3e62hYQGNQ9tkre9sQ1oCRG1AlcVos=";
nativeBuildInputs = [
installShellFiles

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "geekbench";
version = "5.4.4";
version = "5.4.5";
src = fetchurl {
url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
sha256 = "sha256-2kiaP7V/dGDHiYTqvVEwAaAMrSoLzYtvR4hgtG6iUoQ=";
sha256 = "sha256-JA9bvRb8u0qG6ZsQR9qJ3yaV9ni/MkdWo9xRtmPp92I=";
};
dontConfigure = true;

View file

@ -24,6 +24,9 @@ in stdenv.mkDerivation rec {
patches = [
./pipelight.patch
./wine-6.13-new-args.patch
# https://source.winehq.org/git/wine.git/commit/cf4a781e987a98a8d48610362a20a320c4a1016d
# adds ControlMask as a static variable.
./wine-7.10-ControlMask.patch
];
configurePhase = ''

View file

@ -0,0 +1,26 @@
diff --git a/src/windows/pluginloader/pluginloader.c b/src/windows/pluginloader/pluginloader.c
index 751e072..7a4589d 100644
--- a/src/windows/pluginloader/pluginloader.c
+++ b/src/windows/pluginloader/pluginloader.c
@@ -190,7 +190,7 @@ static inline WPARAM wParamFromX11State(uint32_t state){
if (state & Button3Mask) wParam |= MK_RBUTTON;
if (state & Button2Mask) wParam |= MK_MBUTTON;
if (state & ShiftMask) wParam |= MK_SHIFT;
- if (state & ControlMask) wParam |= MK_CONTROL;
+ if (state & ControlMask_) wParam |= MK_CONTROL;
return wParam;
}
diff --git a/src/windows/pluginloader/pluginloader.h b/src/windows/pluginloader/pluginloader.h
index ffe89a7..a1ebabc 100644
--- a/src/windows/pluginloader/pluginloader.h
+++ b/src/windows/pluginloader/pluginloader.h
@@ -149,7 +149,7 @@ typedef unsigned long int XID;
#define ShiftMask (1<<0)
#define LockMask (1<<1)
-#define ControlMask (1<<2)
+#define ControlMask_ (1<<2)
#define Button1Mask (1<<8)
#define Button2Mask (1<<9)
#define Button3Mask (1<<10)

View file

@ -14,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "1.7.1";
version = "1.8.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/vP8q2tWDR8EXDekpcONXIgdzRHh3mZzZGY04wb4aA0=";
sha256 = "sha256-+LfQ7ce8j7LBopV9bo+WjYcZCnwntOToKUHctPMaGXw=";
};
nativeBuildInputs = [ installShellFiles pkg-config ];
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
done
'';
cargoSha256 = "sha256-6y0Du3YGfH+SDbG3NdokJyG+Y1q5cI4UZp6XwFdvYxk=";
cargoSha256 = "sha256-XPbirDdSDzIgsukkMYJrS/ghfF3VCplZ4BuOrzIRK0E=";
preCheck = ''
HOME=$TMPDIR

View file

@ -80,6 +80,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ];
platforms = platforms.unix;
# cmake fails: Cannot specify link libraries for target "wxWidgets::ADV" which is not built by this project.
broken = enableDaemon;
broken = enableDaemon || stdenv.isDarwin;
};
}

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "nix-doc";
version = "0.5.4";
version = "0.5.5";
src = fetchFromGitHub {
rev = "v${version}";
owner = "lf-";
repo = "nix-doc";
sha256 = "sha256-bijcLIRBfoqirwz98Q3uQjHXSOaaqZECfav4TUvCuxg=";
sha256 = "sha256-JGzrDSAJMH7BaqGfyfLe041T2f8QdwLlFi11yHo+4JI=";
};
doCheck = true;
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-LpcAMsBeNa2GDGN7+9rTtkQluPfHSnAxanRtDtRahzc=";
cargoSha256 = "sha256-o49xT26X1QdkSWDlz//ZgnLs592DkxktyFaY5S4vVTM=";
meta = with lib; {
description = "An interactive Nix documentation tool";

View file

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, libcap, acl }:
{ lib, stdenv, fetchFromGitHub, libcap, acl, oniguruma }:
stdenv.mkDerivation rec {
pname = "bfs";
version = "2.3.1";
version = "2.6";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
sha256 = "sha256-V82UdCG0J04sZP3FTVQqANrez/LCwOLQY6zzFOoIeNo=";
sha256 = "sha256-QFhU8MElVaEtjCP0Wjt8d9/etCYsy4QrpOFldVdok8k=";
};
buildInputs = lib.optionals stdenv.isLinux [ libcap acl ];
buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl ];
# Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098
preConfigure = lib.optionalString stdenv.isDarwin ''

View file

@ -528,6 +528,7 @@ mapAliases ({
google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
gotags = throw "gotags has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16
go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22
go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02

View file

@ -21254,7 +21254,7 @@ with pkgs;
wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix {
withGtk2 = true;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
inherit (darwin.apple_sdk.frameworks) AGL AVFoundation Carbon Cocoa Kernel QTKit;
};
wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; };
wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; };
@ -21273,6 +21273,7 @@ with pkgs;
wxSVG = callPackage ../development/libraries/wxSVG {
wxGTK = wxGTK30-gtk3;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
wtk = callPackage ../development/libraries/wtk { };
@ -27035,10 +27036,6 @@ with pkgs;
google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; };
google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player {
inherit (gnome2) GConf;
};
gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; };
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
@ -35090,6 +35087,8 @@ with pkgs;
wxsqliteplus = callPackage ../development/libraries/wxsqliteplus {
wxGTK = wxGTK30;
inherit (darwin.apple_sdk.frameworks) Cocoa;
inherit (darwin.stubs) setfile;
};
x11idle = callPackage ../tools/misc/x11idle {};

View file

@ -10768,6 +10768,8 @@ in {
types-pytz = callPackage ../development/python-modules/types-pytz { };
types-pyyaml = callPackage ../development/python-modules/types-pyyaml { };
types-redis = callPackage ../development/python-modules/types-redis { };
types-requests = callPackage ../development/python-modules/types-requests { };