Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit d9a56077c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      pkgs/applications/audio/exaile/default.nix
  2. 4
      pkgs/applications/audio/headset/default.nix
  3. 4
      pkgs/applications/blockchains/fulcrum/default.nix
  4. 7
      pkgs/applications/emulators/dolphin-emu/master.nix
  5. 4
      pkgs/applications/misc/cherrytree/default.nix
  6. 4
      pkgs/applications/misc/dbeaver/default.nix
  7. 4
      pkgs/applications/misc/gallery-dl/default.nix
  8. 15
      pkgs/applications/misc/synergy/darwin-no-UserNotifications-includes.patch
  9. 14
      pkgs/applications/misc/synergy/darwin-non-static-openssl.patch
  10. 82
      pkgs/applications/misc/synergy/default.nix
  11. 29
      pkgs/applications/misc/synergy/macos_build_fix.patch
  12. 4
      pkgs/applications/networking/cluster/glooctl/default.nix
  13. 14
      pkgs/applications/networking/cluster/k3s/default.nix
  14. 6
      pkgs/applications/networking/cluster/pinniped/default.nix
  15. 4
      pkgs/applications/networking/feedreaders/rssguard/default.nix
  16. 4
      pkgs/applications/networking/instant-messengers/linphone/default.nix
  17. 4
      pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
  18. 4
      pkgs/applications/science/biology/igv/default.nix
  19. 4
      pkgs/applications/science/geometry/gama/default.nix
  20. 2
      pkgs/applications/science/logic/acgtk/default.nix
  21. 2
      pkgs/applications/science/logic/alt-ergo/default.nix
  22. 4
      pkgs/applications/science/logic/fast-downward/default.nix
  23. 33
      pkgs/applications/virtualization/virt-top/default.nix
  24. 4
      pkgs/data/misc/ddccontrol-db/default.nix
  25. 27
      pkgs/desktops/gnome/extensions/paperwm/default.nix
  26. 3
      pkgs/development/coq-modules/interval/default.nix
  27. 4
      pkgs/development/libraries/appstream/default.nix
  28. 4
      pkgs/development/libraries/coordgenlibs/default.nix
  29. 4
      pkgs/development/libraries/egl-wayland/default.nix
  30. 4
      pkgs/development/libraries/liblouis/default.nix
  31. 4
      pkgs/development/libraries/libltc/default.nix
  32. 25
      pkgs/development/libraries/libvirt/default.nix
  33. 4
      pkgs/development/libraries/rubberband/default.nix
  34. 12
      pkgs/development/ocaml-modules/alcotest/default.nix
  35. 6
      pkgs/development/ocaml-modules/alcotest/lwt.nix
  36. 2
      pkgs/development/ocaml-modules/alcotest/mirage.nix
  37. 4
      pkgs/development/ocaml-modules/cooltt/default.nix
  38. 9
      pkgs/development/ocaml-modules/crowbar/default.nix
  39. 22
      pkgs/development/ocaml-modules/crowbar/pprint.patch
  40. 4
      pkgs/development/ocaml-modules/dedukti/default.nix
  41. 19
      pkgs/development/ocaml-modules/functoria/default.nix
  42. 6
      pkgs/development/ocaml-modules/functoria/runtime.nix
  43. 2
      pkgs/development/ocaml-modules/git/unix.nix
  44. 3
      pkgs/development/ocaml-modules/irmin/pack.nix
  45. 6
      pkgs/development/ocaml-modules/lambdapi/default.nix
  46. 4
      pkgs/development/ocaml-modules/mdx/default.nix
  47. 7
      pkgs/development/ocaml-modules/mirage/default.nix
  48. 17
      pkgs/development/ocaml-modules/mirage/runtime.nix
  49. 13
      pkgs/development/ocaml-modules/mirage/types-lwt.nix
  50. 19
      pkgs/development/ocaml-modules/mirage/types.nix
  51. 12
      pkgs/development/python-modules/emoji/default.nix
  52. 4
      pkgs/development/python-modules/pebble/default.nix
  53. 15
      pkgs/development/python-modules/pypdf2/default.nix
  54. 6
      pkgs/development/tools/bacon/default.nix
  55. 4
      pkgs/development/tools/misc/objconv/default.nix
  56. 6
      pkgs/development/tools/ocaml/crunch/default.nix
  57. 17
      pkgs/development/tools/ocaml/dune-release/default.nix
  58. 4
      pkgs/development/tools/ocaml/ocp-build/default.nix
  59. 6
      pkgs/development/tools/oras/default.nix
  60. 7
      pkgs/development/tools/quick-lint-js/default.nix
  61. 12
      pkgs/games/ddnet/default.nix
  62. 20
      pkgs/games/everspace/default.nix
  63. 4
      pkgs/servers/metabase/default.nix
  64. 4
      pkgs/shells/murex/default.nix
  65. 9
      pkgs/tools/X11/smart-wallpaper/default.nix
  66. 4
      pkgs/tools/misc/cyberchef/default.nix
  67. 6
      pkgs/tools/misc/macchina/default.nix
  68. 4
      pkgs/tools/misc/profile-sync-daemon/default.nix
  69. 5
      pkgs/tools/misc/ytfzf/default.nix
  70. 1
      pkgs/tools/networking/aria2/default.nix
  71. 12
      pkgs/tools/networking/hurl/default.nix
  72. 1
      pkgs/tools/networking/tinyproxy/default.nix
  73. 4
      pkgs/tools/system/gdu/default.nix
  74. 6
      pkgs/tools/text/difftastic/default.nix
  75. 4
      pkgs/top-level/all-packages.nix
  76. 13
      pkgs/top-level/ocaml-packages.nix

@ -23,20 +23,14 @@
stdenv.mkDerivation rec {
pname = "exaile";
version = "4.1.1";
version = "4.1.2";
src = fetchFromGitHub {
owner = "exaile";
repo = pname;
rev = version;
sha256 = "0s29lm0i4slgaw5l5s9a2zx0b83xac43rnil5cvyi210dxm5s048";
sha256 = "sha256-GZyCuPy57NhGwgbLMrRKW5xmc1Udon7WtsrD4upviuQ=";
};
patches = [
(fetchpatch {
url = "https://github.com/exaile/exaile/pull/751.patch";
sha256 = "sha256-jCJh85Z3HQcyS4ntQP5HwYJgM7WNHcWzjf0BdNJitsM=";
})
];
nativeBuildInputs = [
gobject-introspection
@ -76,7 +70,6 @@ stdenv.mkDerivation rec {
++ lib.optional wikipediaSupport webkitgtk;
checkInputs = with python3.pkgs; [
mox3
pytest
];

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "headset";
version = "4.0.0";
version = "4.2.1";
src = fetchurl {
url = "https://github.com/headsetapp/headset-electron/releases/download/v${version}/headset_${version}_amd64.deb";
hash = "sha256-M1HMZgYczZWFq0EGlCMEGOGUNoUcmq37J8Ycen72PhM=";
hash = "sha256-81gsIq74sggauE6g8pM6z05KTmsbe49CZa9aRQEDwMo=";
};
dontConfigure = true;

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "fulcrum";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "cculianu";
repo = "Fulcrum";
rev = "v${version}";
sha256 = "sha256-g80XL7dzq2Ed08zAcgBjrHfL1Qqxhr5sL9koaE4fl/I=";
sha256 = "sha256-GaXXqIHuMTGn8iLymAhL8i0HzXmaO6RxtvIzgWw6QI0=";
};
nativeBuildInputs = [ pkg-config qmake ];

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu";
version = "5.0-16793";
version = "5.0-17269";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
rev = "3cd82b619388d0877436390093a6edc2319a6904";
sha256 = "sha256-0k+kmq/jkCy52wGcmvtwmnLxUfxk3k0mvsr5wfX8p30=";
rev = "48c9c224cf9f82f0f9f2690b7cc6283d7448480c";
sha256 = "sha256-WC3jukRygZigLx987CzRmOmJ7DeS1atXrMzU98sRzEg=";
fetchSubmodules = true;
};
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DUSE_SHARED_ENET=ON"
"-DENABLE_LTO=ON"
"-DDOLPHIN_WC_REVISION=${src.rev}"
"-DDOLPHIN_WC_DESCRIBE=${version}"
"-DDOLPHIN_WC_BRANCH=master"

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "cherrytree";
version = "0.99.48";
version = "0.99.49";
src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
sha256 = "sha256-mNWep+ZMQzb2PBHgzUKRpfMhP0ok1RZiuIoyH3P7+TI=";
sha256 = "sha256-p7kiOxy4o0RwmN3LFfLSpkz08KcYYMVxVAEUvAX1KEA=";
};
nativeBuildInputs = [

@ -23,13 +23,13 @@
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
}) rec {
pname = "dbeaver";
version = "22.1.5"; # When updating also update mvnSha256
version = "22.2.0"; # When updating also update mvnSha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-KMrevQ37c84UD46XygKa0Q06qacJianoYqfe4j4MfEI=";
sha256 = "sha256-T2S5qoOqjqJGf7M4h+IFO+bBER3aNcbxC7CY1fJFqpg=";
};
mvnSha256 = "KVE+AYYEWN9bjAWop4mpiPq8yU3GdSGqOTmLG4pdflQ=";

@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
version = "1.23.0";
version = "1.23.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cGLtz5UPTIp0WfChKWdnrD4C+mGv+d83eHRrzpD7MIs=";
sha256 = "sha256-JEPGCwC81nAIphinwD6qvrkipaHTs3/kroArgqht/fQ=";
};
propagatedBuildInputs = [ requests yt-dlp ];

@ -0,0 +1,15 @@
diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm
index 0c98afc1..38c190a6 100644
--- a/src/gui/src/OSXHelpers.mm
+++ b/src/gui/src/OSXHelpers.mm
@@ -20,10 +20,6 @@
#import <Foundation/Foundation.h>
#import <CoreData/CoreData.h>
#import <Cocoa/Cocoa.h>
-#import <UserNotifications/UNNotification.h>
-#import <UserNotifications/UNUserNotificationCenter.h>
-#import <UserNotifications/UNNotificationContent.h>
-#import <UserNotifications/UNNotificationTrigger.h>
#import <QtGlobal>

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63764a75..46db60f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,9 +339,6 @@ endif()
# Apple has to use static libraries because
# "Use of the Apple-provided OpenSSL libraries by apps is strongly discouraged."
# https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html
-if(APPLE OR DEFINED ENV{SYNERGY_STATIC_OPENSSL})
- set(OPENSSL_USE_STATIC_LIBS TRUE)
-endif()
find_package(OpenSSL REQUIRED)
#

@ -1,7 +1,6 @@
{ withGUI ? true
, stdenv
, lib
, fetchpatch
, fetchFromGitHub
, wrapQtAppsHook
@ -17,13 +16,16 @@
, qttools
, xlibsWrapper
, libX11
, libxkbfile
, libXi
, libXtst
, libXrandr
, libXinerama
, xkeyboardconfig
, xinput
, avahi-compat
# macOS / darwin
# MacOS / darwin
, ApplicationServices
, Carbon
, Cocoa
@ -33,39 +35,41 @@
stdenv.mkDerivation rec {
pname = "synergy";
version = "1.14.1.32";
version = "1.14.5.17";
src = fetchFromGitHub {
owner = "symless";
repo = "synergy-core";
rev = "${version}-stable";
rev = version;
sha256 = "sha256-9B6KPa1TsS4khCf7ccmwQZJ1KDEuLNw/W0PScYCgtlE=";
fetchSubmodules = true;
sha256 = "123p75rm22vb3prw1igh0yii2y4bvv7r18iykfvmnr41hh4w7z2p";
};
patches = [ ./macos_build_fix.patch ];
patches = [
# Without this OpenSSL from nixpkgs is not detected
./darwin-non-static-openssl.patch
# We cannot include UserNotifications because of a build failure in the Apple SDK.
# The functions used from it are already implicitly included anyways.
./darwin-no-UserNotifications-includes.patch
];
postPatch = ''
substituteInPlace src/gui/src/SslCertificate.cpp \
--replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \
--replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
'';
cmakeFlags = lib.optionals (!withGUI) [
"-DSYNERGY_BUILD_LEGACY_GUI=OFF"
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.09"
];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override";
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
dontWrapQtApps = true;
nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optional withGUI wrapQtAppsHook;
buildInputs = [
qttools # Used for translations even when not building the GUI
openssl
pcre
] ++ lib.optionals withGUI [
qttools
] ++ lib.optionals stdenv.isDarwin [
ApplicationServices
Carbon
@ -81,37 +85,57 @@ stdenv.mkDerivation rec {
libXi
libXtst
libXrandr
libXinerama
libxkbfile
xinput
avahi-compat
gdk-pixbuf
libnotify
];
# Silences many warnings
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override";
cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"
++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.targetPlatform.darwinSdkVersion}";
doCheck = true;
checkPhase = ''
runHook preCheck
bin/unittests
runHook postCheck
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/
'' + lib.optionalString withGUI ''
cp bin/synergy $out/bin/
wrapQtApp $out/bin/synergy
'' + lib.optionalString stdenv.isLinux ''
mkdir -p $out/share/icons/hicolor/scalable/apps
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
mkdir -p $out/share/applications
substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin
substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \
--replace "/usr/bin" "$out/bin"
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications/
mv bundle/Synergy.app $out/Applications/
mkdir -p $out/Applications
cp -r bundle/Synergy.app $out/Applications
ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS
'' + ''
runHook postInstall
'';
doCheck = true;
checkPhase = "bin/unittests";
dontWrapQtApps = lib.optional (!withGUI) true;
meta = with lib; {
description = "Share one mouse and keyboard between multiple computers";
homepage = "https://symless.com/synergy";
license = licenses.gpl2;
maintainers = with maintainers; [ talyz ];
platforms = platforms.all;
changelog = "https://github.com/symless/synergy-core/blob/${version}/ChangeLog";
mainProgram = lib.optionalString (!withGUI) "synergyc";
license = licenses.gpl2Only;
maintainers = with maintainers; [ talyz ivar ];
platforms = platforms.unix;
};
}

@ -1,29 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50e712fa..d39c2ce4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -326,9 +326,6 @@ endif()
# Apple has to use static libraries because
# "Use of the Apple-provided OpenSSL libraries by apps is strongly discouraged."
# https://developer.apple.com/library/archive/documentation/Security/Conceptual/cryptoservices/SecureNetworkCommunicationAPIs/SecureNetworkCommunicationAPIs.html
-if(APPLE)
- set(OPENSSL_USE_STATIC_LIBS TRUE)
-endif()
find_package(OpenSSL REQUIRED)
#
diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm
index 0c98afc1..38c190a6 100644
--- a/src/gui/src/OSXHelpers.mm
+++ b/src/gui/src/OSXHelpers.mm
@@ -20,10 +20,6 @@
#import <Foundation/Foundation.h>
#import <CoreData/CoreData.h>
#import <Cocoa/Cocoa.h>
-#import <UserNotifications/UNNotification.h>
-#import <UserNotifications/UNUserNotificationCenter.h>
-#import <UserNotifications/UNNotificationContent.h>
-#import <UserNotifications/UNNotificationTrigger.h>
#import <QtGlobal>

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "glooctl";
version = "1.12.18";
version = "1.12.20";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-FzJxYbDo0bVMHLo3XBCciS/N4Jx87tDP8SQttWNqkUc=";
hash = "sha256-VQUet+KwVLltbISTnaUPElJBuTc0d2lKOA4yzhEn8tY=";
};
subPackages = [ "projects/gloo/cli/cmd" ];

@ -46,10 +46,10 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.24.4+k3s1"; # k3s git tag
k3sCommit = "c3f830e9b9ed8a4d9d0e2aa663b4591b923a296e"; # k3s git commit at the above version
k3sRepoSha256 = "00ns6n7jxnacah8ahndhgdb160prgsqhswbb5809kkgvig7k8b27";
k3sVendorSha256 = "sha256-ReZvJCgxqffG2H39JlynGPUBSV5ngPkRtAoZ++OQZZI=";
k3sVersion = "1.25.0+k3s1"; # k3s git tag
k3sCommit = "26e9405767263a2915723cb72b1ffd7f50687a8f"; # k3s git commit at the above version
k3sRepoSha256 = "0rk0svqx26rn6qlvvyj5rsqb87195h1qcf84qmmvf874qwszwpgh";
k3sVendorSha256 = "sha256-YX/yLOLtDxGhRB4tic6oTli/qeeSnpP+f+S+sVXXDSs=";
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
@ -66,11 +66,11 @@ let
# taken from go.mod, the 'github.com/containerd/containerd' line
# run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
containerdVersion = "1.5.13-k3s1";
containerdSha256 = "09bj4ghwbsj9whkv1d5icqs52k64m449j8b73dmak2wz62fbzbvp";
containerdVersion = "1.5.13-k3s2";
containerdSha256 = "1pfr2ji4aij9js90gf4a3hqnhyw5hshcjdccm62l700j68gs5z97";
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
criCtlVersion = "1.24.0-k3s1";
criCtlVersion = "1.25.0-k3s1";
baseMeta = {
description = "A lightweight Kubernetes distribution";

@ -2,18 +2,18 @@
buildGoModule rec{
pname = "pinniped";
version = "0.17.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "pinniped";
rev = "v${version}";
sha256 = "sha256-0h7zyKe2gmC1n9EB5FRVI/io7Yj+91ZAtLy+1u3gyO0=";
sha256 = "sha256-VGvT0jj2f4+jiaPQkebL0GE+W4U8+RfSEsGr2sNBu2Q=";
};
subPackages = "cmd/pinniped";
vendorSha256 = "sha256-8ohyyciL1ORYOxPu64W0jXASTv+vVZR8StutzbF9N4Y=";
vendorSha256 = "sha256-7jQRUYJiRdYuAy3x+VPK4Nh5GF6ME7juloagm85oOVg=";
ldflags = [ "-s" "-w" ];

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rssguard";
version = "4.2.3";
version = "4.2.4";
src = fetchFromGitHub {
owner = "martinrotter";
repo = pname;
rev = version;
sha256 = "sha256-s5SrQgu1PHNuuLeVKhLdFdLkxsPMFXGo09NBPe6/sv0=";
sha256 = "sha256-6JRANTUbHyMAuA7lhAQtlgJIW6l39XNUtKQMVN6FHJU=";
};
buildInputs = [ qtwebengine qttools ];

@ -33,7 +33,7 @@
mkDerivation rec {
pname = "linphone-desktop";
version = "4.4.8";
version = "4.4.9";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -41,7 +41,7 @@ mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-o/IyUvIthCrka6oTa0xMKg0sDj4zdon3kBr2gJ2Id8w=";
sha256 = "sha256-xvKkFMZ7rUyEjnQK7rBkrzO8fhfHjpQ1DHQBUlizZ+o=";
};
patches = [

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20220825";
version = "20220914-1";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
sha256 = "sha256-dqP30or4UvtnzUW6r0FqQxt1S6Y61Q1CljpAFGq2gSM=";
sha256 = "sha256-6tRIjOs6NZUQy7j5oePJ/9FuvfDhy3+uKq6CSuAi5hU=";
};
postPatch = ''

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "igv";
version = "2.14.0";
version = "2.14.1";
src = fetchzip {
url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
sha256 = "sha256-CwS3I3xyjCHTvYik8YAN30UxM/djO6eEl/CRLMXDfxU=";
sha256 = "sha256-IXUyMAhKyNMb7tINlr+9JmPlDRpHzgGS/SXo1Mz5o0Q=";
};
installPhase = ''

@ -1,11 +1,11 @@
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:
stdenv.mkDerivation rec {
pname = "gama";
version = "2.21";
version = "2.22";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-h+Mo+j/Kr7jmMY9fy4hHwn0FM1C9hMI7f7XY/xjBzHY=";
sha256 = "sha256-jOyoWPcZvHWuddLasjIjHSn8MOV3viIgmBrsuzY7P6U=";
};
buildInputs = [ expat ];

@ -14,7 +14,7 @@ stdenv.mkDerivation {
};
buildInputs = [ dune_2 ] ++ (with ocamlPackages; [
ocaml findlib ansiterminal cairo2 cmdliner_1_1 fmt logs menhir menhirLib mtime sedlex yojson
ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime sedlex yojson
]);
buildPhase = "dune build --profile=release";

@ -38,7 +38,7 @@ ocamlPackages.buildDunePackage {
configureFlags = [ pname ];
nativeBuildInputs = [ which ocamlPackages.menhir ];
buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner_1_1 ];
buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ];
meta = {
description = "High-performance theorem prover and SMT solver";

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "fast-downward";
version = "22.06.0";
version = "22.06.1";
src = fetchFromGitHub {
owner = "aibasel";
repo = "downward";
rev = "release-${version}";
sha256 = "sha256-WzxLUuwZy+oNqmgj0n4Pe1QBYXXAaJqYhT+JSLbmyiM=";
sha256 = "sha256-SBksyZoLR1MtyJUbGigGIbT72qVpN+nznU/bmJGYRz8=";
};
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];

@ -1,32 +1,39 @@
{ lib, stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }:
{ lib, stdenv, fetchgit, ocamlPackages, autoreconfHook, libxml2, pkg-config, getopt }:
stdenv.mkDerivation rec {
pname = "virt-top";
version = "1.0.9";
version = "1.1.1";
src = fetchgit {
url = "git://git.annexia.org/virt-top.git";
rev = "v${version}";
sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga";
hash = "sha256-IKIkqzx7YWki0L6D5WbwQiVWJfDFGdI2nsGgg212CcE=";
};
patches = [
(fetchpatch {
name = "ocaml-libvirt-0.6.1.5-fix.patch";
url = "http://git.annexia.org/?p=virt-top.git;a=patch;h=24a461715d5bce47f63cb0097606fc336230589f";
sha256 = "15w7w9iggvlw8m9w8g4h08251wzb3m3zkb58glr7ifsgi3flbn61";
})
nativeBuildInputs = [
autoreconfHook
pkg-config
getopt
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt gettext-stub curses csv xml-light ];
buildInputs = with ocamlPackages; [
calendar
curses
findlib
gettext-stub
ocaml
ocaml_libvirt
] ++ [ libxml2 ];
buildPhase = "make opt";
prePatch = ''
substituteInPlace ocaml-dep.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
'';
meta = with lib; {
description = "A top-like utility for showing stats of virtualized domains";
homepage = "https://people.redhat.com/~rjones/virt-top/";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = [ ];
platforms = platforms.linux;
};

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "ddccontrol-db";
version = "20220829";
version = "20220903";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = "ddccontrol-db";
rev = version;
sha256 = "sha256-mYKHFnFnfolcWqKRiyfmCBrrqwOXRjbYm1M08ltv5mI=";
sha256 = "sha256-OmroJ2AEQdELE2Wuk1qPXzp+/9RUUULrEAdEpmXrJxw=";
};
preConfigure = ''

@ -1,18 +1,20 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell-extension-paperwm";
version = "38.1";
version = "38.2";
src = fetchFromGitHub {
owner = "paperwm";
repo = "PaperWM";
rev = version;
sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs";
rev = finalAttrs.version;
hash = "sha256-Unhz2+MOygOog6B5sOLtYTpdeodQH+/CMI93gC5nDvI=";
};
passthru.extensionUuid = "paperwm@hedning:matrix.org";
dontConfigure = true;
dontBuild = true;
installPhase = ''
@ -23,9 +25,12 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Tiled scrollable window management for Gnome Shell";
homepage = "https://github.com/paperwm/PaperWM";
license = licenses.gpl3;
maintainers = with maintainers; [ hedning ];
description = "Tiled scrollable window management for Gnome Shell";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ hedning AndersonTorres ];
platforms = platforms.all;
};
}
passthru.extensionUuid = "paperwm@hedning:matrix.org";
})

@ -7,11 +7,12 @@ mkCoqDerivation rec {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.8" "8.15"; out = "4.5.1"; }
{ case = range "8.8" "8.16"; out = "4.5.2"; }
{ case = range "8.8" "8.12"; out = "4.0.0"; }
{ case = range "8.7" "8.11"; out = "3.4.2"; }
{ case = range "8.5" "8.6"; out = "3.3.0"; }
] null;
release."4.5.2".sha256 = "sha256-r0yE9pkC4EYlqsimxkdlCXevRcwKa3HGFZiUH+ueUY8=";
release."4.5.1".sha256 = "sha256-5OxbSPdw/1FFENubulKSk6fEIEYSPCxfvMMgtgN6j6s=";
release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko=";
release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE=";

@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "appstream";
version = "0.15.2";
version = "0.15.5";
# When bumping this package, please also check whether
# fix-build-for-qt-olderthan-514.patch still applies by
# building libsForQt512.appstream-qt.
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "ximion";
repo = "appstream";
rev = "v${version}";
sha256 = "sha256-/JZ49wjtcInbGUOVVjevVSrLCHcA60FMT165rhfb78Q=";
sha256 = "sha256-KVZCtu1w5FMgXZMiSW55rbrI6W/A9zWWKKvACtk/jjk=";
};
patches = [

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "coordgenlibs";
version = "3.0.0";
version = "3.0.1";
src = fetchFromGitHub {
owner = "schrodinger";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iy5VFp+50ldyoGJtPI1w3VfndIAGwBb1Xh6Qp18q/wU=";
sha256 = "sha256-u8UmJ4bu00t7qxiNZ3nL7cd+8AIC0LoICj5FNPboCTQ=";
};
nativeBuildInputs = [ cmake ];

@ -42,7 +42,7 @@ let
in stdenv.mkDerivation rec {
pname = "egl-wayland";
version = "1.1.10";
version = "1.1.11";
outputs = [ "out" "dev" ];
@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
owner = "Nvidia";
repo = pname;
rev = version;
sha256 = "sha256-dbcEMtPnzF2t7O8YtKVUGSvJqb5WPMmmW+SyqOFnDY4=";
sha256 = "sha256-xb0d8spr4GoGZl/8C8BoPMPN7PAlzuQV11tEJbOQQ4U=";
};
depsBuildBuild = [

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "liblouis";
version = "3.22.0";
version = "3.23.0";
outputs = [ "out" "dev" "info" "doc" ]
# configure: WARNING: cannot generate manual pages while cross compiling
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
sha256 = "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=";
sha256 = "sha256-jXNhHzydWaMhFbEKoFHyZ77GCvAqxyT3P0xIAgFlTzY=";
};
nativeBuildInputs = [

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libltc";
version = "1.3.1";
version = "1.3.2";
src = fetchurl {
url = "https://github.com/x42/libltc/releases/download/v${version}/libltc-${version}.tar.gz";
sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh";
sha256 = "sha256-Cm1CzWwh6SWif6Vg3EWsgAV9J18jNCECglkJwC07Ekk=";
};
meta = with lib; {

@ -1,8 +1,7 @@
{ lib
, autoreconfHook
, bash
, bash-completion
, bridge-utils
, cmake
, coreutils
, curl
, darwin
@ -10,7 +9,6 @@
, dnsmasq
, docutils
, fetchFromGitLab
, fetchurl
, gettext
, glib
, gnutls
@ -140,6 +138,14 @@ stdenv.mkDerivation rec {
sed -i '/virnetsockettest/d' tests/meson.build
# delete only the first occurrence of this
sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build
for binary in mount umount mkfs; do
substituteInPlace meson.build \
--replace "find_program('$binary'" "find_program('${lib.getBin util-linux}/bin/$binary'"
done
substituteInPlace meson.build \
--replace "'dbus-daemon'," "'${lib.getBin dbus}/bin/dbus-daemon',"
'' + optionalString isLinux ''
sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \
src/storage/storage_backend_disk.c \
@ -156,35 +162,32 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [
meson # needs to be first
cmake
meson
docutils
libxml2 # for xmllint
libxslt # for xsltproc
gettext
makeWrapper
ninja
perl
pkg-config
util-linux # for mount
perl
perlPackages.XMLXPath
]
++ optional (!isDarwin) rpcsvc-proto
# NOTE: needed for rpcgen
++ optional isDarwin darwin.developer_cmds;
buildInputs = [
bash
bash-completion
curl
dbus
gettext
glib
gnutls
libgcrypt
libpcap
libtasn1
libxml2
perlPackages.XMLXPath
pkg-config
python3
readline
xhtml1

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "rubberband";
version = "2.0.2";
version = "3.0.0";
src = fetchurl {
url = "https://breakfastquay.com/files/releases/${pname}-${version}.tar.bz2";
sha256 = "sha256-uerAJ+eXeJrplhHJ6urxw6RMyAT5yKBEGg0dJvPWvfk=";
sha256 = "sha256-32UwtAPIMAojlz3yLzbzwmPwENU3kgY+QR9jPOu57YU=";
};
nativeBuildInputs = [ pkg-config meson ninja ];

@ -1,21 +1,19 @@
{ lib, buildDunePackage, fetchurl
, astring, cmdliner, fmt, uuidm, re, stdlib-shims, uutf, ocaml-syntax-shims
, astring, cmdliner, fmt, re, stdlib-shims, uutf, ocaml-syntax-shims
}:
buildDunePackage rec {
pname = "alcotest";
version = "1.5.0";
useDune2 = true;
version = "1.6.0";
src = fetchurl {
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-js-${version}.tbz";
sha256 = "sha256-VCgZB+AteJld8kbcLhDtGCgoKUrSBZNHoeOhM1SEj2w=";
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz";
sha256 = "sha256-/QD5ZoOVh0/zsdfvVm0U78Avp900Ej6yXVk1W+lLIyk=";
};
nativeBuildInputs = [ ocaml-syntax-shims ];
propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ];
propagatedBuildInputs = [ astring cmdliner fmt re stdlib-shims uutf ];
doCheck = true;

@ -1,13 +1,13 @@
{ lib, buildDunePackage, alcotest, logs, ocaml_lwt, fmt
{ lib, buildDunePackage, alcotest, logs, lwt, fmt
, re, cmdliner
}:
buildDunePackage {
pname = "alcotest-lwt";
inherit (alcotest) version src useDune2;
inherit (alcotest) version src;
propagatedBuildInputs = [ alcotest logs ocaml_lwt fmt ];
propagatedBuildInputs = [ alcotest logs lwt fmt ];
doCheck = true;
checkInputs = [ re cmdliner ];

@ -3,7 +3,7 @@
buildDunePackage {
pname = "alcotest-mirage";
inherit (alcotest) version src useDune2;
inherit (alcotest) version src;
propagatedBuildInputs = [ alcotest lwt logs mirage-clock duration ];

@ -3,7 +3,7 @@
, fetchurl
, buildDunePackage
, bwd
, cmdliner_1_1
, cmdliner
, containers
, ezjsonm
, menhir
@ -70,7 +70,7 @@ buildDunePackage {
};
nativeBuildInputs = [
cmdliner_1_1
cmdliner
menhir
ppxlib
];

@ -3,22 +3,17 @@
buildDunePackage rec {
pname = "crowbar";
version = "0.2";
useDune2 = true;
version = "0.2.1";
src = fetchFromGitHub {
owner = "stedolan";
repo = pname;
rev = "v${version}";
sha256 = "0wjfc9irvirfkic32ivvj6qb7r838w08b0d3vmngigbjpjyc9b14";
sha256 = "sha256-0jjwiOZ9Ut+dv5Iw4xNvf396WTehT1VClxY9VHicw4U=";
};
minimalOCamlVersion = "4.08";
# Fix tests with pprint ≥ 20220103
patches = [ ./pprint.patch ];
# disable xmldiff tests, so we don't need to package unmaintained and legacy pkgs
postPatch = "rm -rf examples/xmldiff";

@ -1,22 +0,0 @@
commit 77b5e54d33a66445f45ddc48577d835207be8cef
Author: Stephen Dolan <stephen.dolan@cl.cam.ac.uk>
Date: Fri Jun 12 19:34:51 2020 +0100
Unbreak small example logic
diff --git a/examples/pprint/test_pprint.ml b/examples/pprint/test_pprint.ml
index 77789ef..44124e7 100644
--- a/examples/pprint/test_pprint.ml
+++ b/examples/pprint/test_pprint.ml
@@ -1,9 +1,9 @@
-open Crowbar
open PPrint
+open Crowbar
type t = (string * PPrint.document)
let doc = fix (fun doc -> choose [
const ("", empty);
- const ("a", char 'a');
+ const ("a", PPrint.char 'a');
const ("123", string "123");
const ("Hello", string "Hello");
const ("awordwhichisalittlebittoolong",

@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, buildDunePackage
, cmdliner_1_1
, cmdliner
, menhir
}:
@ -19,7 +19,7 @@ buildDunePackage rec {
};
nativeBuildInputs = [ menhir ];
buildInputs = [ cmdliner_1_1 ];
buildInputs = [ cmdliner ];
doCheck = false; # requires `tezt`

@ -1,24 +1,21 @@
{ lib, fetchurl, buildDunePackage, alcotest, cmdliner
, rresult, astring, fmt, ocamlgraph, logs, bos, fpath, ptime
{ lib, fetchurl, buildDunePackage, cmdliner
, rresult, astring, fmt, logs, bos, fpath, emile, uri
}:
buildDunePackage rec {
pname = "functoria";
version = "3.1.1";
version = "4.2.0";
useDune2 = true;
minimumOCamlVersion = "4.04";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0bihxbq16zwsi7frk4b8wz8993mvy2ym3n6288jhv0n0gb7c2f7m";
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz";
sha256 = "sha256-rZ9y8+wbDjqjY1sx+TmSoR42hUKRMGpehCCR2cEgbv8=";
};
propagatedBuildInputs = [ cmdliner rresult astring fmt ocamlgraph logs bos fpath ptime ];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ];
doCheck = true;
doCheck = false;
meta = with lib; {
description = "A DSL to organize functor applications";

@ -1,13 +1,11 @@
{ lib, buildDunePackage, functoria, cmdliner, fmt, alcotest }:
{ lib, buildDunePackage, functoria, cmdliner, fmt }:
buildDunePackage {
pname = "functoria-runtime";
inherit (functoria) version useDune2 src;
inherit (functoria) version src;
propagatedBuildInputs = [ cmdliner fmt ];
checkInputs = [ alcotest functoria];
doCheck = true;
meta = with lib; {
inherit (functoria.meta) homepage license;

@ -39,5 +39,7 @@ buildDunePackage {
meta = {
description = "Unix backend for the Git protocol(s)";
inherit (git.meta) homepage license maintainers;
# Not compatible with cmdliner ≥ 1.1
broken = true;
};
}

@ -16,7 +16,8 @@ buildDunePackage rec {
checkInputs = [ alcotest-lwt irmin-test ];
doCheck = true;
# Check fails with cmdliner ≥ 1.1
doCheck = false;
meta = irmin.meta // {
description = "Irmin backend which stores values in a pack file";

@ -5,7 +5,7 @@
, dedukti
, bindlib
, camlp-streams
, cmdliner_1_1
, cmdliner
, menhir
, pratter
, sedlex
@ -30,11 +30,11 @@ buildDunePackage rec {
nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [
bindlib camlp-streams cmdliner_1_1 pratter sedlex stdlib-shims timed why3 yojson
bindlib camlp-streams cmdliner pratter sedlex stdlib-shims timed why3 yojson
];
checkInputs = [ alcotest dedukti ];
doCheck = false; # "Error: Unbound module Cmd"
doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory")
meta = with lib; {
homepage = "https://github.com/Deducteam/lambdapi";

@ -6,7 +6,6 @@
buildDunePackage rec {
pname = "mdx";
version = "2.1.0";
useDune2 = true;
minimalOCamlVersion = "4.08";
@ -20,7 +19,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc-parser re ];
checkInputs = [ alcotest ocaml_lwt pandoc ];
doCheck = true;
# Check fails with cmdliner ≥ 1.1
doCheck = false;
outputs = [ "bin" "lib" "out" ];

@ -7,9 +7,7 @@ buildDunePackage rec {
pname = "mirage";
inherit (mirage-runtime) version src;
minimumOCamlVersion = "4.08";
useDune2 = true;
minimalOCamlVersion = "4.08";
outputs = [ "out" "dev" ];
@ -23,7 +21,8 @@ buildDunePackage rec {
stdlib-shims
];
doCheck = true;
# Tests need opam-monorepo
doCheck = false;
checkInputs = [
alcotest
];

@ -1,20 +1,15 @@
{ lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime
, fmt, logs, ocaml_lwt, alcotest }:
, fmt, logs, lwt
, alcotest
}:
buildDunePackage rec {
pname = "mirage-runtime";
version = "3.10.7";
inherit (functoria-runtime) src version;
useDune2 = true;
minimalOCamlVersion = "4.08";
minimumOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz";
sha256 = "fec4492239c6d1fdd73db4da0782e33e66202e19595bf1d52aa98972296cc72d";
};
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ];
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ];
checkInputs = [ alcotest ];
doCheck = true;

@ -1,13 +0,0 @@
{ lib, buildDunePackage, mirage-types
}:
buildDunePackage {
pname = "mirage-types-lwt";
inherit (mirage-types) version src useDune2;
propagatedBuildInputs = [ mirage-types ];
meta = mirage-types.meta // {
description = "Lwt module type definitions for MirageOS applications";
};
}

@ -1,19 +0,0 @@
{ lib, buildDunePackage, mirage
, mirage-block, mirage-channel, mirage-clock, mirage-console, mirage-device
, mirage-flow, mirage-fs, mirage-kv, mirage-net, mirage-protocols, mirage-random
, mirage-stack, mirage-time
}:
buildDunePackage {
pname = "mirage-types";
inherit (mirage) src version useDune2;
propagatedBuildInputs = [ mirage-block mirage-channel mirage-clock
mirage-console mirage-device mirage-flow mirage-fs mirage-kv mirage-net
mirage-protocols mirage-random mirage-stack mirage-time
];
meta = mirage.meta // {
description = "Module type definitions for MirageOS applications";
};
}

@ -2,17 +2,21 @@
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "emoji";
version = "2.0.0";
version = "2.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "carpedm20";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-8Wm0yqCnscUc5da4c2hLOQsFMcr3XVe8FArX9wllo8Q=";
hash = "sha256-mcbrlPD2BHjm4WJQZrymv+2wK2NUjv+qvpD/G7iCjwA=";
};
checkInputs = [
@ -23,7 +27,9 @@ buildPythonPackage rec {
"test_emojize_name_only"
];
pythonImportsCheck = [ "emoji" ];
pythonImportsCheck = [
"emoji"
];
meta = with lib; {
description = "Emoji for Python";

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pebble";
version = "4.6.3";
version = "5.0.0";
disabled = isPy27;
src = fetchPypi {
pname = "Pebble";
inherit version;
sha256 = "694e1105db888f3576b8f00662f90b057cf3780e6f8b7f57955a568008d0f497";
sha256 = "sha256-rdKgfXHmZphfG9AkAkeH3XkPcfGi27n1+sA3y7NY4M4=";
};
doCheck = !stdenv.isDarwin;

@ -5,16 +5,15 @@
, glibcLocales
, typing-extensions
, unittestCheckHook
, isPy3k
}:
buildPythonPackage rec {
pname = "PyPDF2";
version = "2.10.7";
version = "2.10.9";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-PHkw2fK6JdybGC2cIpOtbeOtryo5NMfoxBeGVa6Mejk=";
sha256 = "sha256-8tpSVPBU6O+BDFMf4Rr28KQ2or4VmF7g0oho2GmOWj8=";
};
LC_ALL = "en_US.UTF-8";
@ -24,14 +23,16 @@ buildPythonPackage rec {
typing-extensions
];
# Tests broken on Python 3.x
#doCheck = !(isPy3k);
checkInputs = [ unittestCheckHook ];
pythonImportsCheck = [
"PyPDF2"
];
meta = with lib; {
description = "A Pure-Python library built as a PDF toolkit";
homepage = "http://mstamy2.github.com/PyPDF2/";
homepage = "https://github.com/py-pdf/PyPDF2";
changelog = "https://github.com/py-pdf/PyPDF2/raw/${version}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ desiderius vrthra ];
};

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "bacon";
version = "2.2.1";
version = "2.2.3";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "sha256-DpTN/Aw27M1s8T6ka1gwlI4WZ2MqP3PJ96XwxqlS0eM=";
sha256 = "sha256-9HyGHj1JWZ2S7XZCj69VdzlG4nwgzr1BKW4+4f+L+yM=";
};
cargoSha256 = "sha256-yY8oFvb++vye17aSCGw5BZ/Jgd46vPNJpqK+gKRoPvw=";
cargoSha256 = "sha256-DlBOZUdIg7yqLeLWqiiOFb+NSeTYJUl0RIJRG35oV4M=";
buildInputs = lib.optional stdenv.isDarwin CoreServices;

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "objconv";
version = "2.52";
version = "2.54";
src = fetchurl {
# Versioned archive of objconv sources maintained by orivej.
url = "https://archive.org/download/objconv/${pname}-${version}.zip";
sha256 = "0r117r7yvqvvdgwgwxpkyzi6p5nm0xb6p67wvkmvggm9fdyl3z8v";
sha256 = "sha256-SDwnpPHc2NyctxKROrhjCDXs36WGj8js5blaQkUibWE=";
};
nativeBuildInputs = [ unzip ];

@ -1,16 +1,18 @@
{ lib, buildDunePackage, fetchurl, ocaml, cmdliner_1_1, ptime }:
{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, ptime }:
buildDunePackage rec {
pname = "crunch";
version = "3.3.1";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-${version}.tbz";
sha256 = "sha256-LFug1BELy7dzHLpOr7bESnSHw/iMGtR0AScbaf+o7Wo=";
};
buildInputs = [ cmdliner_1_1 ];
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ ptime ];

@ -10,13 +10,13 @@
let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ];
in buildDunePackage rec {
pname = "dune-release";
version = "1.5.2";
version = "1.6.2";
minimumOCamlVersion = "4.06";
minimalOCamlVersion = "4.06";
src = fetchurl {
url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "1r6bz1zz1al5y762ws3w98d8bnyi5ipffajgczixacmbrxvp3zgx";
sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4=";
};
nativeBuildInputs = [ makeWrapper ];
@ -25,17 +25,6 @@ in buildDunePackage rec {
checkInputs = [ alcotest ] ++ runtimeInputs;
doCheck = true;
useDune2 = true;
patches = [
# add missing git config calls to avoid failing due to the lack of a global git config
(fetchpatch {
name = "tests-missing-git-config.patch";
url = "https://github.com/ocamllabs/dune-release/commit/87e7ffe2a9c574620d4e2fc0d79eed8772eab973.patch";
sha256 = "0wrzcpzr54dwrdjdc75mijh78xk4bmsmqs1pci06fb2nf03vbd2k";
})
];
postPatch = ''
# remove check for curl in PATH, since curly is patched
# to have a fixed path to the binary in nix store

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner, re }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner_1_0, re }:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-ocp-build";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
})
];
buildInputs = [ ocaml findlib cmdliner re ];
buildInputs = [ ocaml findlib cmdliner_1_0 re ];
propagatedBuildInputs = [ ncurses ];
preInstall = "mkdir -p $out/bin";

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "oras";
version = "0.14.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "oras-project";
repo = "oras";
rev = "v${version}";
sha256 = "sha256-mngFLFZG3JPd+GiiMjmU6OhqC3P7Y+Weaw+UgIVO0KQ=";
sha256 = "sha256-SE79SQtQT+HRHjxRXnu2bWNKj56P5Szhdo+CpvQRwlI=";
};
vendorSha256 = "sha256-tJSxickFtPx5T5408wbijpYBRXgR5nHL8hZ/yWV83lc=";
vendorSha256 = "sha256-ufTQlqMRIFgyH+xO+fPKBTQ9blqM9thiYrVlQDmgUqQ=";
ldflags = [
"-s"

@ -3,18 +3,21 @@
stdenv.mkDerivation rec {
pname = "quick-lint-js";
version = "2.6.0";
version = "2.9.0";
src = fetchFromGitHub {
owner = "quick-lint";
repo = "quick-lint-js";
rev = version;
sha256 = "sha256-ZZxLiZ7ptaUAUXa2HA5ICEP5Ym6221Ehfd6ufj78kXM=";
sha256 = "sha256-hWwEaUf+TntRfxI3HjJV+hJ+dV6TRncxSCbaxE1sIjs=";
};
nativeBuildInputs = [ cmake ninja ];
doCheck = true;
# Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
passthru.tests = {
version = testers.testVersion { package = quick-lint-js; };
};

@ -22,17 +22,21 @@
, vulkan-loader
, glslang
, spirv-tools
, Carbon
, Cocoa
, OpenGL
, Security
}:
stdenv.mkDerivation rec {
pname = "ddnet";
version = "16.3.1";
version = "16.3.2";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
sha256 = "sha256-0SkTIpCnoEbu1sOagYjHBHj1I3EgLwJ8sYxWqnJGYLc=";
sha256 = "sha256-VvMcb3Im071MZmOvTOu7zRNKcp5dSJGS3kMvTLD/sFQ=";
};
nativeBuildInputs = [ cmake ninja pkg-config ];
@ -56,7 +60,7 @@ stdenv.mkDerivation rec {
vulkan-headers
glslang
spirv-tools
];
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
@ -82,5 +86,7 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = with maintainers; [ sirseruju lom ];
mainProgram = "DDNet";
# error: use of undeclared identifier 'pthread_attr_set_qos_class_np'
broken = stdenv.isDarwin;
};
}

@ -1,6 +1,6 @@
{
# Packaging Dependencies
lib, stdenv, requireFile, autoPatchelfHook, unzip,
lib, stdenv, requireFile, autoPatchelfHook, unzip, copyDesktopItems, makeDesktopItem,
# Everspace Dependencies
cairo, gdk-pixbuf, pango, gtk2-x11, libGL, openal,
@ -11,7 +11,7 @@
# Known issues:
# - Video playback (upon starting a new game) does not work (screen is black)
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "everspace";
version = "1.3.5.3655";
@ -23,6 +23,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
unzip
];
@ -89,9 +90,24 @@ stdenv.mkDerivation {
mkdir -p "$out/bin"
ln -s "$out/opt/everspace/game/RSG/Binaries/Linux/RSG-Linux-Shipping" "$out/bin/everspace"
mkdir -p "$out/share/pixmaps"
ln -s "$out/opt/everspace/support/icon.png" "$out/share/pixmaps/everspace-gog.png"
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
type = "Application";
name = "everspace-gog";
desktopName = "EVERSPACE";
comment = meta.description;
exec = "everspace";
icon = "everspace-gog";
categories = [ "Game" ];
})
];
meta = with lib; {
description = "Action-focused single-player space shooter with roguelike elements";
homepage = "https://classic.everspace-game.com/";

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
version = "0.44.1";
version = "0.44.2";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
hash = "sha256-TIQrmzdLD/pwMbd1dyLh3d2bauu7Wv6C2CtuuXMNN5E=";
hash = "sha256-I0cShK9/29kIjLtPDGlyysypofFV9Ai4Dbqt4IwTSA8=";
};
nativeBuildInputs = [ makeWrapper ];

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "murex";
version = "2.10.2400";
version = "2.11.2000";
src = fetchFromGitHub {
owner = "lmorg";
repo = pname;
rev = "v${version}";
sha256 = "0bqd91m7m4i4lfvz4p1lbrfs01kyh73p0g236q13bv4x1n1lkqr3";
sha256 = "sha256-PQFckkoNIpeYrPKuhg7K1y1MFYhmF7tCH+Dnh2RIsUI=";
};
vendorSha256 = "sha256-hLz36ESf6To6sT/ha/yXyhG0U1gGw8HDfnrPJnws25g=";

@ -5,17 +5,18 @@
, xdpyinfo
, killall
, xwinwrap
, swaybg
}:
stdenvNoCC.mkDerivation {
pname = "smart-wallpaper";
version = "unstable-2022-09-01";
version = "unstable-2022-09-15";
src = fetchFromGitHub {
owner = "Baitinq";
repo = "smart-wallpaper";
rev = "d175695d3485fb14144c1908eb3569b20caa6ba5";
sha256 = "sha256-cFgvuntdKPzdQJ7xE2DIT+aNAazocIhM6BBbcQOlryU=";
rev = "a23e6ed658342a405544ebe055ec1ac2fd464484";
sha256 = "sha256-IymFjyfqNycTLalZBiqmjJP5U6AFefe9BSWn3Mpoz4c=";
};
nativeBuildInputs = [ makeWrapper ];
@ -23,7 +24,7 @@ stdenvNoCC.mkDerivation {
installPhase = ''
install -Dm755 -t $out/bin smart-wallpaper
wrapProgram $out/bin/smart-wallpaper \
--prefix PATH : ${lib.makeBinPath [ xdpyinfo killall xwinwrap ]}
--prefix PATH : ${lib.makeBinPath [ xdpyinfo killall xwinwrap swaybg ]}
'';
meta = with lib; {

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cyberchef";
version = "9.46.4";
version = "9.46.5";
src = fetchzip {
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
sha256 = "sha256-3QcrJN7ahyPGZsY6EM6K5sgr0eLZQazlh+G0TdN0uQc=";
sha256 = "sha256-1Snj4rY3elEil7m1n/HFigZWlE2+TJtEiAMjWy0J0xU=";
stripRoot = false;
};

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "macchina";
version = "6.1.2";
version = "6.1.4";
src = fetchFromGitHub {
owner = "Macchina-CLI";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zJr5RG1bbcKhPGygERSROC9JVfVigHauFzaqfY4KXC4=";
sha256 = "sha256-v6Bro5uJBF2/EaXOjVFVi+XaSYJLn/SKY3cXBJJ3xMk=";
};
cargoSha256 = "sha256-QwZWm50D3N4OES9ypnIQOxEPYcUXVUcwKQ0/SUy7jyI=";
cargoSha256 = "sha256-xmy/lymDJNeIHIPrja8LXtM9UxMRILajtEWFAof5euE=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "profile-sync-daemon";
version = "6.45";
version = "6.47";
src = fetchFromGitHub {
owner = "graysky2";
repo = "profile-sync-daemon";
rev = "v${version}";
hash = "sha256-gUGtoa0NUCzhghEMPgb020UdXjFQMZkx4ZmPJDXNGJc=";
hash = "sha256-BAr+EvSjSPBKdSX49tEgXOpMK3NB5JZ+cmfuKkyDbGs=";
};
installPhase = ''

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "ytfzf";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ytfzf";
rev = "v${version}";
hash = "sha256-nci2VXto9LptfNHBmLGxfMXQnzbVP1+GlvllOqWFGKU=";
hash = "sha256-P5cEdcbL9f9tJbcfiOLA0lSPW6m2x39Cz4tL1yFFbCg=";
};
nativeBuildInputs = [ makeWrapper ];
@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
description = "A posix script to find and watch youtube videos from the terminal";
homepage = "https://github.com/pystardust/ytfzf";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ dotlambda ];
};
}

@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://aria2.github.io";
description = "A lightweight, multi-protocol, multi-source, command-line download utility";
mainProgram = "aria2c";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ Br1ght0ne koral ];

@ -3,7 +3,6 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, python3
, installShellFiles
, libxml2
, openssl
@ -12,18 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "hurl";
version = "1.6.1";
version = "1.7.0";
src = fetchFromGitHub {
owner = "Orange-OpenSource";
repo = pname;
rev = version;
sha256 = "sha256-ud4ARpiyMcYwPKsLbeK4MMBLzkD/tecF1L1vWyYpKmY=";
sha256 = "sha256-bv51OOOQFHkFjtv/VXeemMybohtzrhyGfXQkVPDjcps=";
};
nativeBuildInputs = [
pkg-config
python3
installShellFiles
];
@ -37,12 +35,10 @@ rustPlatform.buildRustPackage rec {
# Tests require network access to a test server
doCheck = false;
cargoSha256 = "sha256-tmHP7xwVce/hh8nX1LO/zwPIlDZkICPMlBjZjuv37xU=";
cargoSha256 = "sha256-BIt8xZveOeDUktLldtymYQqlkgqa7MJjKeSPby70Czg=";
postInstall = ''
python ci/gen_manpage.py docs/hurl.md > hurl.1
python ci/gen_manpage.py docs/hurlfmt.md > hurlfmt.1
installManPage hurl.1 hurlfmt.1
installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1
'';
meta = with lib; {

@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
configureFlags = lib.optionals withDebug [ "--enable-debug" ]; # Enable debugging support code and methods.
meta = with lib; {
broken = stdenv.isDarwin;
homepage = "https://tinyproxy.github.io/";
description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems";
license = licenses.gpl2Only;

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gdu";
version = "5.17.1";
version = "5.18.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IKD28berto3OAuzFnk9oGByOLfNPBgF7hzOfjFKBes0=";
sha256 = "sha256-JmxnpMKzQorStGJqwQoblmdsGZxd7/XTPDcfje/IkCQ=";
};
vendorSha256 = "sha256-rppVLeX1VDOW+eUHSM77DgY2KjOrUHdyqGWRAYRIbUE=";

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.35.0";
version = "0.36.1";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-gf8Q/x9JXQcYEPa7fHoxwEvLFjpXVraY5aEcA89xJsc=";
sha256 = "sha256-rBqw79+d14XFrInl++Z5+9jhh95OpYU2TgSQv0y/SU0=";
};
depsExtraArgs = {
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
popd
'';
};
cargoSha256 = "sha256-CUbiEqFNEQCe9CKhpa8m8+/XVOOTv1ltmx0sXssx+e8=";
cargoSha256 = "sha256-soiYqdsBLirJQlVygKgEWGrS+k4NJ7aeIjzgwIbVlew=";
passthru.tests.version = testers.testVersion { package = difftastic; };

@ -33159,7 +33159,9 @@ with pkgs;
stdenv = gcc10StdenvCompat;
};
ddnet = callPackage ../games/ddnet { };
ddnet = callPackage ../games/ddnet {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security;
};
devilutionx = callPackage ../games/devilutionx {
SDL2 = SDL2.override {

@ -193,7 +193,10 @@ let
# The 1.1.0 release broke a lot of packages and is not compatible with
# OCaml < 4.08.
cmdliner = cmdliner_1_0;
cmdliner =
if lib.versionAtLeast ocaml.version "4.08"
then cmdliner_1_1
else cmdliner_1_0;
cohttp = callPackage ../development/ocaml-modules/cohttp { };
@ -531,9 +534,7 @@ let
hpack = callPackage ../development/ocaml-modules/hpack { };
hxd = callPackage ../development/ocaml-modules/hxd {
cmdliner = cmdliner_1_1;
};
hxd = callPackage ../development/ocaml-modules/hxd { };
imagelib = callPackage ../development/ocaml-modules/imagelib { };
@ -907,10 +908,6 @@ let
mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { };
mirage-types = callPackage ../development/ocaml-modules/mirage/types.nix { };
mirage-types-lwt = callPackage ../development/ocaml-modules/mirage/types-lwt.nix { };
mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { };
mirage-xen = callPackage ../development/ocaml-modules/mirage-xen { };

Loading…
Cancel
Save