Merge branch 'master' into haskell-updates

main
Malte Brandy 2 years ago
commit 859c2499fb
  1. 17
      nixos/modules/services/x11/desktop-managers/pantheon.nix
  2. 19
      pkgs/applications/finance/odoo/default.nix
  3. 27
      pkgs/applications/finance/odoo/update.sh
  4. 4
      pkgs/applications/graphics/ImageMagick/7.0.nix
  5. 2
      pkgs/applications/kde/fetch.sh
  6. 1856
      pkgs/applications/kde/srcs.nix
  7. 12
      pkgs/applications/maui/buho.nix
  8. 12
      pkgs/applications/maui/clip.nix
  9. 12
      pkgs/applications/maui/communicator.nix
  10. 82
      pkgs/applications/maui/default.nix
  11. 1
      pkgs/applications/maui/fetch.sh
  12. 12
      pkgs/applications/maui/index.nix
  13. 14
      pkgs/applications/maui/mauikit-accounts.nix
  14. 14
      pkgs/applications/maui/mauikit-filebrowsing.nix
  15. 36
      pkgs/applications/maui/mauikit-imagetools.nix
  16. 14
      pkgs/applications/maui/mauikit-texteditor.nix
  17. 15
      pkgs/applications/maui/mauikit.nix
  18. 12
      pkgs/applications/maui/nota.nix
  19. 52
      pkgs/applications/maui/pix.nix
  20. 12
      pkgs/applications/maui/shelf.nix
  21. 118
      pkgs/applications/maui/srcs.nix
  22. 12
      pkgs/applications/maui/vvave.nix
  23. 36
      pkgs/applications/misc/crow-translate/default.nix
  24. 9
      pkgs/applications/misc/goldendict/default.nix
  25. 70
      pkgs/applications/misc/privacyidea/default.nix
  26. 4
      pkgs/applications/networking/browsers/lagrange/default.nix
  27. 17
      pkgs/applications/office/calligra/default.nix
  28. 11
      pkgs/applications/radio/dmrconfig/default.nix
  29. 2
      pkgs/applications/radio/splat/default.nix
  30. 43
      pkgs/applications/science/physics/crystfel/0002-fix-ftbfs-with-gcc-10.patch
  31. 226
      pkgs/applications/science/physics/crystfel/default.nix
  32. 30
      pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch
  33. 26
      pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch
  34. 6
      pkgs/applications/virtualization/lima/default.nix
  35. 1
      pkgs/desktops/gnome/apps/gnome-music/default.nix
  36. 8
      pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
  37. 18
      pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
  38. 4
      pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
  39. 4
      pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
  40. 4
      pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
  41. 4
      pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
  42. 12
      pkgs/development/compilers/ocaml/ber-metaocaml.nix
  43. 12
      pkgs/development/compilers/openjdk/darwin/17.nix
  44. 57
      pkgs/development/compilers/tinygo/0001-Makefile.patch
  45. 55
      pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch
  46. 155
      pkgs/development/compilers/tinygo/default.nix
  47. 14
      pkgs/development/compilers/tinygo/go.mod
  48. 18
      pkgs/development/compilers/tinygo/main.go
  49. 8
      pkgs/development/interpreters/erlang/R25.nix
  50. 15
      pkgs/development/libraries/libfreeaptx/default.nix
  51. 12
      pkgs/development/libraries/nghttp3/default.nix
  52. 12
      pkgs/development/libraries/ngtcp2/default.nix
  53. 8
      pkgs/development/libraries/quictls/default.nix
  54. 6
      pkgs/development/libraries/sealcurses/default.nix
  55. 4
      pkgs/development/libraries/tracker-miners/default.nix
  56. 2
      pkgs/development/ocaml-modules/atdgen/default.nix
  57. 1
      pkgs/development/ocaml-modules/awa/default.nix
  58. 2
      pkgs/development/ocaml-modules/awa/lwt.nix
  59. 3
      pkgs/development/ocaml-modules/bap/default.nix
  60. 1
      pkgs/development/ocaml-modules/dns/cli.nix
  61. 3
      pkgs/development/ocaml-modules/earley/default.nix
  62. 1
      pkgs/development/ocaml-modules/hxd/default.nix
  63. 3
      pkgs/development/ocaml-modules/imagelib/default.nix
  64. 9
      pkgs/development/ocaml-modules/lablgtk/default.nix
  65. 3
      pkgs/development/ocaml-modules/mdx/default.nix
  66. 2
      pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix
  67. 1
      pkgs/development/ocaml-modules/ocaml-gettext/default.nix
  68. 4
      pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
  69. 3
      pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
  70. 3
      pkgs/development/ocaml-modules/pgsolver/default.nix
  71. 3
      pkgs/development/ocaml-modules/rebez/default.nix
  72. 5
      pkgs/development/ocaml-modules/twt/default.nix
  73. 29
      pkgs/development/python-modules/audible/default.nix
  74. 4
      pkgs/development/python-modules/bond-api/default.nix
  75. 6
      pkgs/development/python-modules/calmjs-parse/default.nix
  76. 38
      pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
  77. 6
      pkgs/development/python-modules/gcal-sync/default.nix
  78. 4
      pkgs/development/python-modules/google-cloud-datastore/default.nix
  79. 4
      pkgs/development/python-modules/google-cloud-dlp/default.nix
  80. 4
      pkgs/development/python-modules/google-cloud-firestore/default.nix
  81. 4
      pkgs/development/python-modules/google-cloud-language/default.nix
  82. 4
      pkgs/development/python-modules/google-cloud-speech/default.nix
  83. 4
      pkgs/development/python-modules/google-cloud-translate/default.nix
  84. 4
      pkgs/development/python-modules/google-resumable-media/default.nix
  85. 6
      pkgs/development/python-modules/habanero/default.nix
  86. 4
      pkgs/development/python-modules/identify/default.nix
  87. 1
      pkgs/development/python-modules/internetarchive/default.nix
  88. 4
      pkgs/development/python-modules/nats-py/default.nix
  89. 4
      pkgs/development/python-modules/peaqevcore/default.nix
  90. 39
      pkgs/development/python-modules/periodictable/default.nix
  91. 4
      pkgs/development/python-modules/plaid-python/default.nix
  92. 4
      pkgs/development/python-modules/pycfmodel/default.nix
  93. 4
      pkgs/development/python-modules/pynetgear/default.nix
  94. 4
      pkgs/development/python-modules/thinc/default.nix
  95. 4
      pkgs/development/python-modules/trimesh/default.nix
  96. 4
      pkgs/development/python-modules/types-dateutil/default.nix
  97. 4
      pkgs/development/python-modules/types-requests/default.nix
  98. 44
      pkgs/development/tools/jira-cli-go/default.nix
  99. 4
      pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
  100. 3
      pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -136,6 +136,7 @@ in
services.colord.enable = mkDefault true;
services.fwupd.enable = mkDefault true;
services.packagekit.enable = mkDefault true;
services.power-profiles-daemon.enable = mkDefault true;
services.touchegg.enable = mkDefault true;
services.touchegg.package = pkgs.pantheon.touchegg;
services.tumbler.enable = mkDefault true;
@ -167,10 +168,10 @@ in
isSystem = true;
};
services.udev.packages = [
pkgs.gnome.gnome-settings-daemon338
pkgs.pantheon.gnome-settings-daemon
];
systemd.packages = [
pkgs.gnome.gnome-settings-daemon338
pkgs.pantheon.gnome-settings-daemon
];
programs.dconf.enable = true;
networking.networkmanager.enable = mkDefault true;
@ -212,12 +213,10 @@ in
elementary-capnet-assist
elementary-notifications
elementary-settings-daemon
gnome-settings-daemon
pantheon-agent-geoclue2
pantheon-agent-polkit
]) ++ (utils.removePackagesByName [
gnome.gnome-font-viewer
gnome.gnome-settings-daemon338
] config.environment.pantheon.excludePackages);
]);
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
@ -272,7 +271,9 @@ in
})
(mkIf serviceCfg.apps.enable {
environment.systemPackages = with pkgs.pantheon; utils.removePackagesByName ([
environment.systemPackages = utils.removePackagesByName ([
pkgs.gnome.gnome-font-viewer
] ++ (with pkgs.pantheon; [
elementary-calculator
elementary-calendar
elementary-camera
@ -290,7 +291,7 @@ in
# Only install appcenter if flatpak is enabled before
# https://github.com/NixOS/nixpkgs/issues/15932 is resolved.
appcenter
]) config.environment.pantheon.excludePackages;
])) config.environment.pantheon.excludePackages;
# needed by screenshot
fonts.fonts = [

@ -4,6 +4,7 @@
, python3
, nodePackages
, wkhtmltopdf
, nixosTests
}:
let
@ -72,19 +73,18 @@ let
in python.pkgs.buildPythonApplication rec {
pname = "odoo";
major = "15";
minor = "0";
patch = "20220126";
odoo_version = "15.0";
odoo_release = "20220506";
version = "${major}.${minor}.${patch}";
version = "${odoo_version}.${odoo_release}";
format = "setuptools";
# latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile
src = fetchurl {
url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz";
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz";
name = "${pname}-${version}";
hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg=";
sha256 = "0mwlmfz5nhvg483ldrmlrjhwaf284c0c0pxf0fb0sfx2dnjjj3ib"; # odoo
};
# needs some investigation
@ -140,6 +140,13 @@ in python.pkgs.buildPythonApplication rec {
cd odoo*
'';
passthru = {
updateScript = ./update.sh;
tests = {
inherit (nixosTests) odoo;
};
};
meta = with lib; {
description = "Open Source ERP and CRM";
homepage = "https://www.odoo.com/";

@ -0,0 +1,27 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix coreutils
set -euo pipefail
DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/15.0/Dockerfile)
get_var() {
echo "$DOCKER" | grep -E "^[A-Z][A-Z][A-Z] ODOO_$1" | sed -r "s|^[A-Z]{3} ODOO_$1.||g"
}
VERSION=$(get_var VERSION)
RELEASE=$(get_var RELEASE)
latestVersion="$VERSION.$RELEASE"
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "odoo is up-to-date: $currentVersion"
exit 0
fi
cd "$(dirname "${BASH_SOURCE[0]}")"
sed -ri "s| sha256.+ # odoo| sha256 = \"$(nix-prefetch-url --type sha256 "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" default.nix
sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix
sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix

@ -45,13 +45,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-34";
version = "7.1.0-35";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-eASmIOTYupK5di3lggJ/8O5pkG88ZpFuvaYK23AWsq4=";
hash = "sha256-KLS7gKUVeOAA89Kfrk07JzSXEF6TH6AgfheECbWi0lE=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.0/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.1/src -A '*.tar.xz' )

File diff suppressed because it is too large Load Diff

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -17,17 +16,8 @@
, qtquickcontrols2
}:
mkDerivation rec {
mkDerivation {
pname = "buho";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "buho";
rev = "v${version}";
sha256 = "sha256-rHjjvjRY2WsyZfj3fzp46copZ1g2ae6PVv9lBNZDzcI=";
};
nativeBuildInputs = [
cmake

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -17,17 +16,8 @@
, ffmpeg
}:
mkDerivation rec {
mkDerivation {
pname = "clip";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "clip";
rev = "v${version}";
sha256 = "sha256-vW3A0PKJSC2QNs+QVZ9w0g4aVmcndhahrpkd4wWoUko=";
};
nativeBuildInputs = [
cmake

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -19,17 +18,8 @@
, kcontacts
}:
mkDerivation rec {
mkDerivation {
pname = "communicator";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "communicator";
rev = "v${version}";
sha256 = "sha256-tHuFQgssZ6bohELx8tHrd4vvnrWixTyqCqK8WKJEdRE=";
};
nativeBuildInputs = [
cmake

@ -0,0 +1,82 @@
/*
# New packages
READ THIS FIRST
This module is for the MauiKit framework and official Maui applications. All
available packages are listed in `callPackage ./srcs.nix`, although some are not yet
packaged in Nixpkgs.
IF YOUR PACKAGE IS NOT LISTED IN `callPackage ./srcs.nix`, IT DOES NOT GO HERE.
See also `pkgs/applications/kde` as this is what this is based on.
# Updates
1. Update the URL in `callPackage ./fetch.sh`.
2. Run `callPackage ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui`
from the top of the Nixpkgs tree.
3. Use `nixpkgs-review wip` to check that everything builds.
4. Commit the changes and open a pull request.
*/
{ lib
, libsForQt5
, fetchurl
}:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
mkDerivation = args:
let
inherit (args) pname;
inherit (srcs.${pname}) src version;
mkDerivation =
libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in
mkDerivation (args // {
inherit pname version src;
outputs = args.outputs or [ "out" ];
meta =
let meta = args.meta or {}; in
meta // {
homepage = meta.homepage or "https://mauikit.org/";
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
});
packages = self: with self;
let
callPackage = self.newScope {
inherit mkDerivation;
};
in {
# libraries
mauikit = callPackage ./mauikit.nix { };
mauikit-accounts = callPackage ./mauikit-accounts.nix { };
mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
# applications
buho = callPackage ./buho.nix { };
clip = callPackage ./clip.nix { };
communicator = callPackage ./communicator.nix { };
index = callPackage ./index.nix { };
nota = callPackage ./nota.nix { };
pix = callPackage ./pix.nix { };
shelf = callPackage ./shelf.nix { };
vvave = callPackage ./vvave.nix { };
};
in lib.makeScope libsForQt5.newScope packages

@ -0,0 +1 @@
WGET_ARGS=( https://download.kde.org/stable/maui/ -A '*-2.1.2.tar.xz' )

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, karchive
@ -14,17 +13,8 @@
, qtquickcontrols2
}:
mkDerivation rec {
mkDerivation {
pname = "index-fm";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "index-fm";
rev = "v${version}";
hash = "sha256-F4qgewkPxkbAbeR+MaeRDiw9KIsd/Xx4C0cYEYDkPOE=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@ -8,17 +7,8 @@
, mauikit
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit-accounts";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-accounts";
rev = "v${version}";
sha256 = "sha256-B0VmgE0L8kBOqR/lrWCHO3psCQ7GZVPIGljGAwpuymE=";
};
nativeBuildInputs = [
cmake
@ -34,7 +24,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-accounts";
description = "MauiKit utilities to handle User Accounts";
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ onny ];
};
}

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@ -8,17 +7,8 @@
, mauikit
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit-filebrowsing";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-filebrowsing";
rev = "v${version}";
hash = "sha256-2LzGvjh2t4RVZS9Js7ky3hM51L7bx0SHmDlKKPjl3LM=";
};
nativeBuildInputs = [
cmake
@ -34,7 +24,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-filebrowsing";
description = "MauiKit File Browsing utilities and controls";
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

@ -0,0 +1,36 @@
{ lib
, mkDerivation
, cmake
, extra-cmake-modules
, kconfig
, kio
, mauikit
, qtlocation
, exiv2
, kquickimageedit
}:
mkDerivation {
pname = "mauikit-imagetools";
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
kconfig
kio
mauikit
qtlocation
exiv2
kquickimageedit
];
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-imagetools";
description = "MauiKit Image Tools Components";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ onny ];
};
}

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@ -9,17 +8,8 @@
, syntax-highlighting
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit-texteditor";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-texteditor";
rev = "v${version}";
sha256 = "sha256-C0EOc0CE6Ef7vnmOKRqTzeJUamGXsvREpHRPGTcAaIc=";
};
nativeBuildInputs = [
cmake
@ -36,7 +26,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-texteditor";
description = "MauiKit Text Editor components";
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ onny ];
};
}

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@ -12,17 +11,8 @@
, qtx11extras
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit";
rev = "v${version}";
hash = "sha256-INvh+J484xkAsNGtYdf8NGGpFGp2AG7s9UYESoem3QY=";
};
nativeBuildInputs = [
cmake
@ -41,8 +31,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://mauikit.org/";
description = "Free and modular front-end framework for developing fast and compelling user experiences";
license = licenses.lgpl2Plus;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dotlambda ];
broken = versionOlder qtbase.version "5.15.0";
};
}

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -16,17 +15,8 @@
, qtquickcontrols2
}:
mkDerivation rec {
mkDerivation {
pname = "nota";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "nota";
rev = "v${version}";
sha256 = "sha256-Sgpm5njhQDe9ohAVFcN5iPNC6v9+QZnGRPYxuLvUno8=";
};
nativeBuildInputs = [
cmake

@ -0,0 +1,52 @@
{ lib
, mkDerivation
, cmake
, extra-cmake-modules
, applet-window-buttons
, karchive
, kcoreaddons
, ki18n
, kio
, kirigami2
, mauikit
, mauikit-filebrowsing
, mauikit-imagetools
, qtmultimedia
, qtquickcontrols2
, qtlocation
, exiv2
, kquickimageedit
}:
mkDerivation {
pname = "pix";
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
applet-window-buttons
karchive
kcoreaddons
ki18n
kio
kirigami2
mauikit
mauikit-filebrowsing
mauikit-imagetools
qtmultimedia
qtquickcontrols2
qtlocation
exiv2
kquickimageedit
];
meta = with lib; {
description = "Image gallery application";
homepage = "https://invent.kde.org/maui/pix";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ onny ];
};
}

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -17,17 +16,8 @@
, poppler
}:
mkDerivation rec {
mkDerivation {
pname = "shelf";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "shelf";
rev = "v${version}";
sha256 = "sha256-0a5UHrYrkLR35cezjin+K9cTk3+aLeUAkvBbmKMK61w=";
};
nativeBuildInputs = [
cmake

@ -0,0 +1,118 @@
# DO NOT EDIT! This file is generated automatically.
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui
{ fetchurl, mirror }:
{
buho = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/buho/2.1.2/buho-2.1.2.tar.xz";
sha256 = "0xc623w1zp0yh929b8h6mf9r4frnfabd30634ba43x4ac12jk7g8";
name = "buho-2.1.2.tar.xz";
};
};
clip = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/clip/2.1.2/clip-2.1.2.tar.xz";
sha256 = "168lz2qi4y56pwfwyzqnhwz4lgh2763w260l860527aw049crv4z";
name = "clip-2.1.2.tar.xz";
};
};
communicator = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/communicator/2.1.2/communicator-2.1.2.tar.xz";
sha256 = "0m7axdjpl7s9cz6fcaj4kwr9wdxybwdb76k9rz5yigyy35vigcfi";
name = "communicator-2.1.2.tar.xz";
};
};
index-fm = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/index/2.1.2/index-fm-2.1.2.tar.xz";
sha256 = "1yawnzx51h6yrlnivbwz9d7481k382pzg3jnczrajfjnv7ir29dn";
name = "index-fm-2.1.2.tar.xz";
};
};
mauikit = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit/2.1.2/mauikit-2.1.2.tar.xz";
sha256 = "1n5p8107lwa4m5gbwlcqmmdlyw15vjaq0dfaz5zal733s6rq2gm7";
name = "mauikit-2.1.2.tar.xz";
};
};
mauikit-accounts = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-accounts/2.1.2/mauikit-accounts-2.1.2.tar.xz";
sha256 = "00nc54gi34r8z6cwa0h8490gd0w01a245rh2g4d9fvbkrybwg7sk";
name = "mauikit-accounts-2.1.2.tar.xz";
};
};
mauikit-filebrowsing = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.1.2/mauikit-filebrowsing-2.1.2.tar.xz";
sha256 = "09pfjr449mkf27ywmwsvflzq0dgaiprw8b2lcms3m5ad7i6jvvyq";
name = "mauikit-filebrowsing-2.1.2.tar.xz";
};
};
mauikit-imagetools = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-imagetools/2.1.2/mauikit-imagetools-2.1.2.tar.xz";
sha256 = "1830x8xwyjs7bj0qi63pl1dk5h2qi6f84mki1schviddddq5cv6j";
name = "mauikit-imagetools-2.1.2.tar.xz";
};
};
mauikit-texteditor = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-texteditor/2.1.2/mauikit-texteditor-2.1.2.tar.xz";
sha256 = "19z9qry56h2624kdx5xnfjzd3spv5shc87p2m6ix33x9mmrf92p1";
name = "mauikit-texteditor-2.1.2.tar.xz";
};
};
nota = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/nota/2.1.2/nota-2.1.2.tar.xz";
sha256 = "11z1mw6yhwin3wj19gj9495az4p40yjkwrn0nb6i8h9b0nh44pn7";
name = "nota-2.1.2.tar.xz";
};
};
pix = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/pix/2.1.2/pix-2.1.2.tar.xz";
sha256 = "0ycpazi267pl4l178i34lwzc0ssjklp0indz79r7mcfpr1vicz1s";
name = "pix-2.1.2.tar.xz";
};
};
shelf = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/shelf/2.1.2/shelf-2.1.2.tar.xz";
sha256 = "0f3781l8wfbpj0irmri0zkp3ia3qlik4aaq3w6qk97xjv24d98xh";
name = "shelf-2.1.2.tar.xz";
};
};
station = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/station/2.1.2/station-2.1.2.tar.xz";
sha256 = "0lrw7rf8i277nl9bwyx5sc05bswgll00k1jzad1i69rwdfiy9ghg";
name = "station-2.1.2.tar.xz";
};
};
vvave = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/vvave/2.1.2/vvave-2.1.2.tar.xz";
sha256 = "14b6b034899vyvvhzl2jqifqq715lb26dnw3d5wxzxhdplfd7pdf";
name = "vvave-2.1.2.tar.xz";
};
};
}

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -17,17 +16,8 @@
, taglib
}:
mkDerivation rec {
mkDerivation {
pname = "vvave";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "vvave";
rev = "v${version}";
sha256 = "sha256-ykX1kd3106KTDTJQIGk6miSgbj+oROiXQl/nkCjTphE=";
};
nativeBuildInputs = [
cmake

@ -1,11 +1,11 @@
{ lib
, stdenv
, nix-update-script
, fetchFromGitHub
, fetchzip
, substituteAll
, cmake
, extra-cmake-modules
, qttools
, kwayland
, leptonica
, tesseract4
, qtmultimedia
@ -16,14 +16,11 @@
stdenv.mkDerivation rec {
pname = "crow-translate";
version = "2.9.5";
version = "2.9.8";
src = fetchFromGitHub {
owner = "crow-translate";
repo = pname;
rev = version;
sha256 = "sha256-AzwJJ85vxXsc0+W3QM8citN5f0AD6APQVd9628cfLgI=";
fetchSubmodules = true;
src = fetchzip {
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
hash = "sha256-ZqiQVpKwGpglSc05Y1r6uScZyG4qnklPXqTGKxpS3f8=";
};
patches = [
@ -34,21 +31,26 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ];
nativeBuildInputs = [
cmake
extra-cmake-modules
qttools
wrapQtAppsHook
];
buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ];
buildInputs = [
kwayland
leptonica
tesseract4
qtmultimedia
qtx11extras
];
postInstall = ''
substituteInPlace $out/share/applications/io.crow_translate.CrowTranslate.desktop \
--replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing";
homepage = "https://crow-translate.github.io/";

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "goldendict";
version = "2021-03-09";
version = "2022-05-10";
src = fetchFromGitHub {
owner = "goldendict";
repo = pname;
rev = "b2e673961d28ca5eb920a909091252d3321f09d6";
sha256 = "sha256-+AAamnICq0/B54ggFpgF/Uupm1a4YiEYgHXrhIK4M0E=";
rev = "f810c6bd724e61977b4e94ca2d8abfa5bd766379";
sha256 = "sha256-gNM+iahoGQy8TlNFLQx5ksITzQznv7MWMX/88QCTnL0";
};
patches = [
@ -27,7 +27,8 @@ mkDerivation rec {
postPatch = ''
substituteInPlace goldendict.pro \
--replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}"
--replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" \
--replace "opencc.2" "opencc"
'';
nativeBuildInputs = [ pkg-config qmake ];

@ -11,6 +11,11 @@ let
inherit version;
hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
};
doCheck = false;
});
# fails with `no tests ran in 1.75s`
alembic = super.alembic.overridePythonAttrs (lib.const {
doCheck = false;
});
flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec {
version = "2.7.0";
@ -20,33 +25,70 @@ let
sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";
};
});
werkzeug = self.callPackage ../../../development/python2-modules/werkzeug { };
flask = self.callPackage ../../../development/python2-modules/flask { };
sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: {
meta = meta // { broken = false; };
# Taken from by https://github.com/NixOS/nixpkgs/pull/173090/commits/d2c0c7eb4cc91beb0a1adbaf13abc0a526a21708
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
version = "1.0.1";
src = old.src.override {
inherit version;
sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
};
checkInputs = old.checkInputs ++ (with self; [
requests
]);
disabledTests = old.disabledTests ++ [
# ResourceWarning: unclosed file
"test_basic"
"test_date_to_unix"
"test_easteregg"
"test_file_rfc2231_filename_continuations"
"test_find_terminator"
"test_save_to_pathlib_dst"
];
disabledTestPaths = old.disabledTestPaths ++ [
# ResourceWarning: unclosed file
"tests/test_http.py"
];
});
pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
version = "1.7.1";
src = python3.pkgs.fetchPypi {
pname = "PyJWT";
# Required by flask-1.1
jinja2 = super.jinja2.overridePythonAttrs (old: rec {
version = "2.11.3";
src = old.src.override {
inherit version;
sha256 = "sha256-jVmpdvt3Pz5qOchWNjV8Tw4kJwc5TK2t2YFPXLqiDpY=";
sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y=";
};
# requires different testing dependencies, and privacyIDEA will test this as well
doCheck = false;
});
# Required by jinja2-2.11.3
markupsafe = super.markupsafe.overridePythonAttrs (old: rec {
version = "2.0.1";
src = old.src.override {
inherit version;
sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo=";
};
});
# Required by flask-babel
itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec {
version = "2.0.1";
src = old.src.override {
inherit version;
sha256 = "sha256-nnJNaPwikCoUNTUfhMP7hiPzA//8xWaky5Ut+MVyz/A=";
};
});
flask = self.callPackage ../../../development/python2-modules/flask { };
sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: {
meta = meta // { broken = false; };
});
};
};
in
python3'.pkgs.buildPythonPackage rec {
pname = "privacyIDEA";
version = "3.6.3";
version = "3.7.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-SsOEmbyEAKU3pdzsyqi5SwDgJMGEAzyCywoio9iFQAA=";
sha256 = "sha256-c5pWbBaOFQd7z3BvtYgrnZBiknLBDCE6So76Q68AptA=";
fetchSubmodules = true;
};
@ -55,7 +97,7 @@ python3'.pkgs.buildPythonPackage rec {
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
pydash ecdsa google-auth importlib-metadata
pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt
];
passthru.tests = { inherit (nixosTests) privacyidea; };

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
version = "1.13.3";
version = "1.13.5";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
sha256 = "sha256-ZCG7i5WmhONockaTt/YCww7N+WvxCX2DIwQIFjAk+K8=";
sha256 = "sha256-HZGI9vWSYCDH0lW+k6hvPm3UVW6lR8Lhr3H7blNupNk=";
};
nativeBuildInputs = [ cmake pkg-config zip ];

@ -30,18 +30,23 @@ mkDerivation rec {
sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma";
excludes = [ "CMakeLists.txt" ];
})
# Fixes for building calligra with modern poppler[-qt5]
(fetchpatch {
name = "poppler-22.03.0.patch";
url = "https://github.com/archlinux/svntogit-packages/raw/8f328bef497a9e3bc628e4e294c1a70b0c8b0eab/trunk/poppler-22.03.0.patch";
sha256 = "sha256-bOTnQcavXF49LIshNgzhXhyoEjzLmQJC/U7hO5P0bfY=";
})
# Fixes for building calligra with gcc11/c++17
(fetchpatch {
name = "build_c++17_poppler.patch";
url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch";
sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA=";
})
# Fixes for building calligra with modern poppler[-qt5]
(fetchpatch {
name = "calligra-poppler-22.03.patch";
url = "https://invent.kde.org/office/calligra/-/commit/236bacbe13739414e919de868283b0caf2df5d8a.patch";
sha256 = "sha256-9DmKPCvEFy2Cs3g7350iOCF5Vrx1HL+/8jr+Tb44CyE=";
})
(fetchpatch {
name = "calligra-poppler-22.04.patch";
url = "https://invent.kde.org/office/calligra/-/commit/6b75bec784c9835c78993349845d8c2ef22ec3de.patch";
sha256 = "sha256-z9/4he4x0WN2K/ZGrDAAtHF/W5X1PAtpeO6s7fgL/fA=";
})
];
postPatch = ''
substituteInPlace CMakeLists.txt \

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, libusb1, systemd }:
stdenv.mkDerivation rec {
@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab";
};
patches = [
# Pull upstream fix for -fno-common toolchains.
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/OpenRTX/dmrconfig/commit/1a6901488db26262a6b69f80b0e795864e9e8d0a.patch";
sha256 = "03px1y95a8aspd251i1jj8ggqfjvkqby4lhn5pb7l5c1lzh6h762";
})
];
buildInputs = [
libusb1 systemd
];

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
homepage = "https://www.qsl.net/kd2bd/splat.html";
maintainers = with maintainers; [ ehmry ];
platforms = platforms.linux;
platforms = platforms.x86_64;
};
}

@ -0,0 +1,43 @@
Description: Fixing argument mismatches in Fortran code, addressing #957430.
Author: Andrius Merkys <merkys@debian.org>
Forwarded: ccp4-dev@dl.ac.uk
--- a/fortran/pack_f.f
+++ b/fortran/pack_f.f
@@ -106,7 +106,7 @@
endif
10 continue
filnarray(len(filn) + 1) = 0
- call pack_wordimage_f(data, x, y, filnarray)
+ call pack_longimage_f(data, x, y, filnarray)
return
end
@@ -138,7 +138,7 @@
endif
10 continue
filnarray(len(filn) + 1) = 0
- call v2pack_wordimage_f(data, x, y, filnarray)
+ call v2pack_longimage_f(data, x, y, filnarray)
return
end
--- a/fortran/lgglib.f
+++ b/fortran/lgglib.f
@@ -1236,7 +1236,7 @@
B3(2) = XYZ(2) * CELL(2)
B3(3) = XYZ(3) * CELL(3)
C
- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1)
+ CALL matmult(3,3,3,1,ORTH,B3,XYZ)
END
c
c
@@ -1274,7 +1274,7 @@
B3(1) = XYZ(1)
B3(2) = XYZ(2)
B3(3) = XYZ(3)
- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1)
+ CALL matmult(3,3,3,1,ORTH,B3,XYZ)
END
character*80 function getnam(filnam)
character*(*) filnam

@ -0,0 +1,226 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, cmake
, lz4
, bzip2
, gfortran
, m4
, hdf5
, gsl
, slurm
, unzip
, makeWrapper
, meson
, git
, ninja
, eigen
, pkg-config
, wrapGAppsHook
, flex
, bison
, doxygen
, opencl-headers
, ncurses
, msgpack
, fftw
, zeromq
, ocl-icd
, gtk3
, gdk-pixbuf
, argp-standalone
, memorymappingHook
, withGui ? true
, withBitshuffle ? true
}:
let
libccp4 = stdenv.mkDerivation rec {
pname = "libccp4";
version = "6.5.1";
src = fetchurl {
# Original mirror, now times out
# url = "ftp://ftp.ccp4.ac.uk/opensource/${pname}-${version}.tar.gz";
url = "https://deb.debian.org/debian/pool/main/libc/${pname}/${pname}_${version}.orig.tar.gz";
sha256 = "1rfvjliny29vy5bdi6rrjaw9hhhhh72pw536xwvqipqcjlylf2r8";
};
nativeBuildInputs = [ gfortran m4 ];
buildInputs = [ hdf5 gsl ];
configureFlags = [ "FFLAGS=-fallow-argument-mismatch" ];
# libccp4 tries to read syminfo.lib by looking at an environment variable, which hinders reproducibility.
# We hard-code this by providing a little patch and then passing the absolute path to syminfo.lib as a
# preprocessor flag.
preBuild = ''
makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"$out/share/syminfo.lib\"')
export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS";
'';
makeFlags = [ "CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"" ];
patches = [
./libccp4-use-hardcoded-syminfo-lib.patch
./0002-fix-ftbfs-with-gcc-10.patch
];
};
# This is the statically-linked, pre-built binary of mosflm. Compiling it ourselves turns out to be very difficult
# since the build process is very hard-coded for a specific machine, architecture, and libraries.
mosflm =
let
version = "7.4.0";
src =
if stdenv.isDarwin then
fetchurl
{
url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-osx-64-noX11.zip";
sha256 = "1da5wimv3kl8bccp49j69vh8gi28cn7axg59lrmb38s68c618h7j";
}
else
fetchurl {
url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-linux-64-noX11.zip";
sha256 = "1rqh3nprxfmnyihllw31nb8i3wfhybmsic6y7z6wn4rafyv3w4fk";
};
mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11";
in
stdenv.mkDerivation rec {
pname = "mosflm";
inherit version src;
dontBuild = true;
nativeBuildInputs = [ unzip makeWrapper ];
sourceRoot = ".";
# mosflm statically links against its own libccp4, which as the syminfo.lib environment variable problem.
# Here, we circumvent it by creating a little wrapper script that calls mosflm after setting the SYMINFO variable.
installPhase = ''
mkdir -p $out/bin
cp ${mosflmBinary} $out/bin/mosflm-raw
makeWrapper $out/bin/mosflm-raw $out/bin/mosflm --set SYMINFO ${libccp4}/share/syminfo.lib --add-flags -n
'';
};
xgandalf = stdenv.mkDerivation rec {
pname = "xgandalf";
version = "c15afa2381d5f87d4aefcc8181a15b4a6fd3a955";
src = fetchurl {
url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
sha256 = "11i1w57a3rpnb4x5y4n8d3iffn5m9w1zydl69syzljdk3aqg2pv8";
};
nativeBuildInputs = [ meson pkg-config ninja ];
buildInputs = [ eigen ];
};
pinkIndexer = stdenv.mkDerivation rec {
pname = "pinkindexer";
version = "8a828788f8272a89d484b00afbd2500c2c1ff974";
src = fetchurl {
url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
sha256 = "1mkgf1xd91ay0z0632kzxm0z3wcxf0cayjvs6a3znds72dkhfsyh";
};
nativeBuildInputs = [ meson pkg-config ninja ];
buildInputs = [ eigen ];
};
fdip = stdenv.mkDerivation rec {
pname = "fdip";
version = "29da626f17f66d5c0780fc59b1eafb7c85b81dd6";
src = fetchurl {
url = "https://gitlab.desy.de/philipp.middendorf/fdip/-/archive/${version}/fdip-${version}.tar.gz";
sha256 = "184l76r4fgznq54rnhgjk7dg41kqdl0d1da02vr5y4cs2fyqppky";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ eigen ];
};
hdf5-external-filter-plugins = stdenv.mkDerivation rec {
pname = "HDF5-External-Filter-Plugins";
version = "0.1.0";
src = fetchFromGitHub {
owner = "nexusformat";
repo = pname;
rev = "d469f175e5273c1d488e71a6134f84088f57d39c";
sha256 = "1jrzzh75i68ad1yrim7s1nx9wy0s49ghkziahs71mm5azprm6gh9";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ hdf5 lz4 bzip2 ];
cmakeFlags = [
"-DENABLE_BITSHUFFLE_PLUGIN=yes"
"-DENABLE_LZ4_PLUGIN=yes"
"-DENABLE_BZIP2_PLUGIN=yes"
];
};
in
stdenv.mkDerivation rec {
pname = "crystfel";
version = "0.10.1";
src = fetchurl {
url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz";
sha256 = "0i9d5ggalic7alj97dxjdys7010kxhm2cb4lwakvigl023j8ms79";
};
nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers ]
++ lib.optionals withGui [ wrapGAppsHook ];
buildInputs = [
hdf5
gsl
ncurses
msgpack
fftw
fdip
zeromq
ocl-icd
libccp4
mosflm
pinkIndexer
xgandalf
] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ]
++ lib.optionals stdenv.isDarwin [
argp-standalone
memorymappingHook
]
# slurm is not available for Darwin; when it is, remove the condition
++ lib.optionals (!stdenv.isDarwin) [ slurm ]
# hdf5-external-filter-plugins doesn't link on Darwin
++ lib.optionals (withBitshuffle && !stdenv.isDarwin) [ hdf5-external-filter-plugins ];
patches = [ ./link-to-argp-standalone-if-needed.patch ];
# CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but
# we'd have to do that for every CrystFEL executable (indexamajig, crystfel, partialator). Better to just
# hard-code mosflm's path once.
postPatch = ''
sed -i -e 's#execlp("mosflm"#execl("${mosflm}/bin/mosflm"#' libcrystfel/src/indexers/mosflm.c;
'';
postInstall = lib.optionalString (withBitshuffle && !stdenv.isDarwin) ''
for file in $out/bin/*; do
wrapProgram $file --set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins
done
'';
meta = with lib; {
description = "Data processing for serial crystallography";
longDescription = ''
CrystFEL is a suite of programs for processing (and simulating) Bragg diffraction data from "serial crystallography" experiments, often (but not always) performed using an X-ray Free-Electron Laser. Compared to rotation data, some of the particular characteristics of such data which call for a specialised software suite are:
- The sliced, rather than integrated, measurement of intensity data. Many, if not all reflections are partially integrated.
- Many patterns (thousands) are required - high throughput is needed.
- The crystal orientations in each pattern are random and uncorrelated.
- Merging into lower symmetry point groups may require the resolution of indexing ambiguities.'';
homepage = "https://www.desy.de/~twhite/crystfel/";
changelog = "https://www.desy.de/~twhite/crystfel/changes.html";
downloadPage = "https://www.desy.de/~twhite/crystfel/download.html";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ pmiddend ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}

@ -0,0 +1,30 @@
diff --git a/ccp4/csymlib.c b/ccp4/csymlib.c
index 76bc70b..7a0c5dc 100644
--- a/ccp4/csymlib.c
+++ b/ccp4/csymlib.c
@@ -137,24 +137,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg,
}
/* Open the symop file: */
- if (!(symopfile = getenv("SYMINFO"))) {
- if (debug)
- printf("Environment variable SYMINFO not set ... guessing location of symmetry file. \n");
- if (!(ccp4dir = getenv("CLIBD"))) {
- printf("Environment variable CLIBD not set ... big trouble! \n");
- return NULL;
- }
-
- symopfile = ccp4_utils_malloc((strlen(ccp4dir)+22)*sizeof(char));
- strcpy(symopfile,ccp4_utils_joinfilenames(ccp4dir,"syminfo.lib"));
- symopfile[strlen(ccp4dir)+21] = '\0';
- ccp4printf(1," SYMINFO file set to %s \n",symopfile);
- } else {
- if (debug) {
- ccp4printf(1,"\n Spacegroup information obtained from library file: \n");
- ccp4printf(1," Logical Name: SYMINFO Filename: %s\n\n",symopfile);
- }
- }
+ symopfile = NIX_PROVIDED_SYMOP_FILE;
filein = fopen(symopfile,"r");
if (!filein) {

@ -0,0 +1,26 @@
diff --git a/meson.build b/meson.build
index efc9002b..070f37e4 100644
--- a/meson.build
+++ b/meson.build
@@ -34,6 +34,12 @@ if slurmdep.found()
conf_data.set10('HAVE_SLURM', 1)
endif
+if build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}')
+ argpdep = cc.find_library('argp')
+else
+ argpdep = dependency('', required : false)
+endif
+
# Find HDF5 using inbuilt Meson methods. Requires Meson >= 0.50.0
hdf5dep = dependency('hdf5', language: 'c', required: true)
@@ -180,7 +186,7 @@ if zmqdep.found()
endif
executable('indexamajig', indexamajig_sources,
- dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep],
+ dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep, argpdep],
install: true,
install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "lima";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-xlpNJjSBw1iL8CjbWE6v4u7Vq5PjkGv0tQKU5eRN13w=";
sha256 = "sha256-OqsLHxY7dZKN/zazeDASBt5UsQGieU5laIUeshtS55w=";
};
vendorSha256 = "sha256-uTkCi969RQ4K0ZJ2vOgqv3OJgzVVRX7b2sXNfmR6qoA=";
vendorSha256 = "sha256-0Z+SAEHFJio+N7ATiviBkLPn6cNFlhE3Dsj8CxVtf7c=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

@ -74,6 +74,7 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
gst-libav
]);
pythonPath = with python3.pkgs; [

@ -2,8 +2,6 @@
, stdenv
, fetchFromGitHub
, nix-update-script
, appstream-glib
, desktop-file-utils
, meson
, ninja
, pkg-config
@ -25,18 +23,16 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
version = "6.1.0";
version = "6.1.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "calendar";
rev = version;
sha256 = "sha256-LaVJ7QLc0UdSLgLIuHP4Anc7kPUelZW9PnIWuqKGtEQ=";
sha256 = "sha256-c2c8QNifBDzb0CelB72AIL4G694l6KCSXBjWIHrzZJo=";
};
nativeBuildInputs = [
appstream-glib
desktop-file-utils
meson
ninja
pkg-config

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
@ -10,41 +9,28 @@
, vala
, desktop-file-utils
, gtk3
, libxml2
, granite
, libhandy
, libnotify
, vte
, libgee
, appstream
, pcre2
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-terminal";
version = "6.0.1";
version = "6.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "terminal";
rev = version;
sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0=";
sha256 = "sha256-glcY47E9bGVI6k9gakItN6srzMtmA4hCEz/JVD5UUmI=";
};
patches = [
# Fix build with meson 0.61
# https://github.com/elementary/terminal/pull/649
(fetchpatch {
url = "https://github.com/elementary/terminal/commit/15e3ace08cb25e53941249fa1ee680a1e2f871b4.patch";
sha256 = "sha256-XVs+kq5qbX5KlxtkqxwJnatNYNeJiVLBec7sLjQsUxg=";
})
];
nativeBuildInputs = [
appstream
desktop-file-utils
libxml2
meson
ninja
pkg-config

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-power";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "006h8mrhmdrbd83vhdyahgrfk9wh6j9kjincpp7dz7sl8fsyhmcr";
sha256 = "sha256-8Hu2RIgA0gSc+tLNjDqGS+b/HpbsOdR4otpY4UqNzKs=";
};
nativeBuildInputs = [

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-pkpS7BR/eXA0rWV1C5AR+FdF5OkDnV8YDBAt1ZkaVPo=";
sha256 = "sha256-jT8aYE36ZAeB9ng3RojVqxzmLtzpbsNRHPuDQ03XKcI=";
};
nativeBuildInputs = [

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "elementary-capnet-assist";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "capnet-assist";
rev = version;
sha256 = "sha256-8hhp37EBzZxEVvPaRw9PohjaPWKQZ/AfqqvwLxQCBKk=";
sha256 = "sha256-aA71kxu4/dwODZt+DSp3vvely3P0dL23Ykqhd84hrZw=";
};
nativeBuildInputs = [

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "elementary-settings-daemon";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "settings-daemon";
rev = version;
sha256 = "sha256-1Xp1uJzDFuGZlhJhKj00cYtb4Q1syMAm+82fTOtk0VI=";
sha256 = "sha256-5QdCj2Z31t7dxZi7ZZ5g6qLgsMyw7rM5dRw0G8uoC6o=";
};
nativeBuildInputs = [

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl
, ncurses
, libX11, xorgproto, buildEnv
, fetchpatch
}:
let
@ -41,6 +42,17 @@ stdenv.mkDerivation rec {
dontStrip = true;
buildInputs = [ ncurses ] ++ optionals useX11 x11deps;
patches = [
# glibc 2.34 changed SIGSTKSZ from a #define'd integer to an
# expression involving a function call. This broke all code that
# used SIGSTKSZ as the size of a statically-allocated array. This
# patch is also applied by the ocaml/4.07.nix expression.
(fetchpatch {
url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch";
sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv";
})
];
postConfigure = ''
tar -xvzf $metaocaml
cd ${pname}-${version}

@ -5,16 +5,16 @@ let
dist = {
x86_64-darwin = {
arch = "x64";
zuluVersion = "17.30.15";
jdkVersion = "17.0.1";
sha256 = "sha256-CdZP5XY3O0MUQigRvIQC+7dwAXaCKw4eK/L/imytEOs=";
zuluVersion = "17.34.19";
jdkVersion = "17.0.3";
sha256 = "sha256-qImyxVC2y2QhxuVZwamKPyo46+n+7ytIFXpYI0e6w2c=";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "17.30.15";
jdkVersion = "17.0.1";
sha256 = "sha256-zhBCXOnO/fsj6+q+vAlEz7QVMRFKLVvYnjwZzFz6mRM=";
zuluVersion = "17.34.19";
jdkVersion = "17.0.3";
sha256 = "sha256-eaRX8Qa/Mqr9JhpHSEcf0Q9c4qmqLMgWqRhkEEwAjf8=";
};
}."${stdenv.hostPlatform.system}";

@ -0,0 +1,57 @@
From fcae473c4b6ac2120ec75c321d6db850d8ecd6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
Date: Sat, 30 Apr 2022 16:37:44 +0300
Subject: [PATCH 1/3] Makefile
diff --git a/Makefile b/Makefile
index dc388c21..7efc9901 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11
errifempty = $(if $(1),$(1),$(error $(2)))
detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2)))
toolSearchPathsVersion = $(1)-$(2)
-ifeq ($(shell uname -s),Darwin)
- # Also explicitly search Brew's copy, which is not in PATH by default.
- BREW_PREFIX := $(shell brew --prefix)
- toolSearchPathsVersion += $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)-$(2) $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)
-endif
# First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name.
findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1))
CLANG ?= $(call findLLVMTool,clang)
@@ -644,9 +639,8 @@ endif
wasmtest:
$(GO) test ./tests/wasm
-build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen)
+build/release:
@mkdir -p build/release/tinygo/bin
- @mkdir -p build/release/tinygo/lib/clang/include
@mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
@mkdir -p build/release/tinygo/lib/macos-minimal-sdk
@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
@@ -663,10 +657,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN
@mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4
@echo copying source files
@cp -p build/tinygo$(EXE) build/release/tinygo/bin
-ifneq ($(USE_SYSTEM_BINARYEN),1)
- @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin
-endif
- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
@cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
@cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
@cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk
@@ -705,8 +695,7 @@ endif
@cp -rp lib/picolibc/newlib/libm/common build/release/tinygo/lib/picolibc/newlib/libm
@cp -rp lib/picolibc-stdio.c build/release/tinygo/lib
@cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot
- @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins
- @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins
+ @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins
@cp -rp src build/release/tinygo/src
@cp -rp targets build/release/tinygo/targets
./build/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt
--
2.36.0

@ -0,0 +1,55 @@
From 4ee942ccc7cdb06ee51490e9cb44ecb36b25378a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
Date: Sat, 30 Apr 2022 16:18:31 +0300
Subject: [PATCH 2/3] Add clang header path
diff --git a/builder/builtins.go b/builder/builtins.go
index 479b541d..b35283c6 100644
--- a/builder/builtins.go
+++ b/builder/builtins.go
@@ -164,7 +164,7 @@ var aeabiBuiltins = []string{
var CompilerRT = Library{
name: "compiler-rt",
cflags: func(target, headerPath string) []string {
- return []string{"-Werror", "-Wall", "-std=c11", "-nostdlibinc"}
+ return []string{"-Werror", "-Wall", "-std=c11", "-isystem", "@clang_include@"}
},
sourceDir: func() string {
llvmDir := filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project/compiler-rt/lib/builtins")
diff --git a/builder/picolibc.go b/builder/picolibc.go
index f1b061ae..159f90cf 100644
--- a/builder/picolibc.go
+++ b/builder/picolibc.go
@@ -27,7 +27,7 @@ var Picolibc = Library{
"-D_COMPILING_NEWLIB",
"-DHAVE_ALIAS_ATTRIBUTE",
"-DTINY_STDIO",
- "-nostdlibinc",
+ "-isystem", "@clang_include@",
"-isystem", picolibcDir + "/include",
"-I" + picolibcDir + "/tinystdio",
"-I" + headerPath,
diff --git a/compileopts/config.go b/compileopts/config.go
index b30e653e..7561b3f2 100644
--- a/compileopts/config.go
+++ b/compileopts/config.go
@@ -288,6 +288,7 @@ func (c *Config) CFlags() []string {
path, _ := c.LibcPath("picolibc")
cflags = append(cflags,
"--sysroot="+path,
+ "-isystem", "@clang_include@",
"-isystem", filepath.Join(path, "include"), // necessary for Xtensa
"-isystem", filepath.Join(picolibcDir, "include"),
"-isystem", filepath.Join(picolibcDir, "tinystdio"),
@@ -297,7 +298,6 @@ func (c *Config) CFlags() []string {
path, _ := c.LibcPath("musl")
arch := MuslArchitecture(c.Triple())
cflags = append(cflags,
- "-nostdlibinc",
"-isystem", filepath.Join(path, "include"),
"-isystem", filepath.Join(root, "lib", "musl", "arch", arch),
"-isystem", filepath.Join(root, "lib", "musl", "include"),
--
2.36.0

@ -1,64 +1,147 @@
{ lib, buildGoModule, fetchFromGitHub, llvm, clang-unwrapped, lld, avrgcc
, avrdude, openocd, gcc-arm-embedded, makeWrapper, fetchurl }:
{ stdenv
, lib
, buildPackages
, buildGoModule
, fetchFromGitHub
, makeWrapper
, substituteAll
, llvmPackages
, go
, libffi
, zlib
, ncurses
, libxml2
, xar
, wasi-libc
, avrgcc
, binaryen
, avrdude
, gdb
, openocd
}:
let main = ./main.go;
gomod = ./go.mod;
let
llvmMajor = lib.versions.major llvm.version;
inherit (llvmPackages) llvm clang compiler-rt lld;
in
buildGoModule rec {
pname = "tinygo";
version = "0.16.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "tinygo-org";
repo = "tinygo";
rev = "v${version}";
sha256 = "063aszbsnr0myq56kms1slmrfs7m4nmg0zgh2p66lxdsifrfly7j";
sha256 = "sha256-YgQGAQJw9Xyw5BF2d9uZTQHfjHsu2evZGo4RV9DtStE=";
fetchSubmodules = true;
};
overrideModAttrs = (_: {
patches = [];
preBuild = ''
rm -rf *
cp ${main} main.go
cp ${gomod} go.mod
chmod +w go.mod
'';
});
vendorSha256 = "sha256-fK8BlCh+1NtHW6MwW68iSIB+Sw6AK+g3y4lMyMYrXkk=";
patches = [
./0001-Makefile.patch
(substituteAll {
src = ./0002-Add-clang-header-path.patch;
clang_include = "${clang.cc.lib}/lib/clang/${clang.cc.version}/include";
})
];
preBuild = "cp ${gomod} go.mod";
checkInputs = [ avrgcc binaryen ];
nativeBuildInputs = [ go makeWrapper ];
buildInputs = [ llvm clang.cc ]
++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ];
postBuild = "make gen-device";
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
vendorSha256 = "12k2gin0v7aqz5543m12yhifc0xsz26qyqra5l4c68xizvzcvkxb";
allowGoReference = true;
tags = [ "llvm${llvmMajor}" ];
subPackages = [ "." ];
doCheck = false;
# Output contains static libraries for different arm cpus
# and stripping could mess up these so only strip the compiler
stripDebugList = [ "bin" ];
prePatch = ''
sed -i s/', "-nostdlibinc"'// builder/builtins.go
sed -i s/'"-nostdlibinc", '// compileopts/config.go builder/picolibc.go
postConfigure = lib.optionalString stdenv.isDarwin ''
for i in vendor/tinygo.org/x/go-llvm/llvm_config_darwin*; do
substituteInPlace $i --replace "curses" "ncurses"
done
'';
subPackages = [ "." ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ llvm clang-unwrapped ];
propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ];
postInstall = ''
mkdir -p $out/share/tinygo
cp -a lib src targets $out/share/tinygo
wrapProgram $out/bin/tinygo --prefix "TINYGOROOT" : "$out/share/tinygo" \
--prefix "PATH" : "$out/libexec/tinygo"
postPatch = ''
# Copy wasi-libc, symlink seems not working
rm -rf lib/wasi-libc/*
mkdir -p lib/wasi-libc/sysroot/lib/wasm32-wasi lib/wasi-libc/sysroot/include
cp -a ${wasi-libc}/lib/* lib/wasi-libc/sysroot/lib/wasm32-wasi/
cp -a ${wasi-libc.dev}/include/* lib/wasi-libc/sysroot/include/
# Borrow compiler-rt builtins from our source
# See https://github.com/tinygo-org/tinygo/pull/2471
mkdir -p lib/compiler-rt-builtins
cp -a ${compiler-rt.src}/compiler-rt/lib/builtins/* lib/compiler-rt-builtins/
substituteInPlace Makefile \
--replace "\$(TINYGO)" "$(pwd)/build/tinygo" \
--replace "build/release/tinygo/bin" "$out/bin" \
--replace "build/release/" "$out/share/"
# TODO: Fix mingw and darwin
# Disable windows and darwin cross-compile tests
sed -i "/GOOS=windows/d" Makefile
sed -i "/GOOS=darwin/d" Makefile
# tinygo needs versioned binaries
mkdir -p $out/libexec/tinygo
ln -s ${clang-unwrapped}/bin/clang $out/libexec/tinygo/clang-10
ln -s ${lld}/bin/lld $out/libexec/tinygo/ld.lld-10
ln -sf $out/bin $out/share/tinygo
ln -s ${lib.getBin clang.cc}/bin/clang $out/libexec/tinygo/clang-${llvmMajor}
ln -s ${lib.getBin lld}/bin/ld.lld $out/libexec/tinygo/ld.lld-${llvmMajor}
ln -s ${lib.getBin lld}/bin/wasm-ld $out/libexec/tinygo/wasm-ld-${llvmMajor}
ln -s ${gdb}/bin/gdb $out/libexec/tinygo/gdb-multiarch
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Makefile \
--replace "./build/tinygo" "${buildPackages.tinygo}/bin/tinygo"
'';
preBuild = ''
export HOME=$TMPDIR
export GOCACHE=$TMPDIR/go-cache
export GOPATH=$TMPDIR/go
export PATH=$out/libexec/tinygo:$PATH
'';
postBuild = ''
# Move binary
mkdir -p build
mv $GOPATH/bin/tinygo build/tinygo
make gen-device
'';
checkPhase = ''
runHook preCheck
make smoketest XTENSA=0
runHook postCheck
'';
installPhase = ''
runHook preInstall
make build/release
wrapProgram $out/bin/tinygo \
--set TINYGOROOT $out/share/tinygo \
--prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:$out/libexec/tinygo
runHook postInstall
'';
disallowedReferences = [ wasi-libc ];
meta = with lib; {
homepage = "https://tinygo.org/";
description = "Go compiler for small places";
license = licenses.bsd3;
maintainers = with maintainers; [ Madouura ];
maintainers = with maintainers; [ Madouura muscaln ];
broken = stdenv.isDarwin;
};
}

@ -1,14 +0,0 @@
module github.com/tinygo-org/tinygo
go 1.11
require (
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
github.com/chromedp/cdproto v0.0.0-20200709115526-d1f6fc58448b
github.com/chromedp/chromedp v0.5.4-0.20200303084119-2bb39134ab9e
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
github.com/marcinbor85/gohex v0.0.0-20200531091804-343a4b548892
go.bug.st/serial v1.0.0
golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2
tinygo.org/x/go-llvm v0.0.0-20201104183921-570e7a6841d9
)

@ -1,18 +0,0 @@
package main
import (
"fmt"
_ "github.com/blakesmith/ar"
_ "github.com/google/shlex"
_ "github.com/marcinbor85/gohex"
_ "go.bug.st/serial"
_ "golang.org/x/tools/go/ast/astutil"
_ "golang.org/x/tools/go/ssa"
_ "google.golang.org/appengine"
_ "tinygo.org/x/go-llvm"
)
func main() {
fmt.Println("vim-go")
}

@ -0,0 +1,8 @@
{ mkDerivation }:
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "25.0-rc3";
sha256 = "1ir42hz81bzxn1shqq0gn824hxd6j774889vjy68psi95psfs8r2";
}

@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo=";
};
postPatch = if stdenv.isDarwin then ''
substituteInPlace Makefile \
--replace '-soname' '-install_name' \
--replace 'lib$(NAME).so' 'lib$(NAME).dylib'
'' else null;
makeFlags = [
"PREFIX=${placeholder "out"}"
# disable static builds
@ -21,11 +27,18 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = if stdenv.isDarwin then ''
install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec
install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc
install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib
install_name_tool -id $out/lib/libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0
'' else null;
meta = with lib; {
description = "Free Implementation of Audio Processing Technology codec (aptX)";
license = licenses.lgpl21Plus;
homepage = "https://github.com/iamthehorker/libfreeaptx";
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ kranzes ];
};
}

@ -1,19 +1,21 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config
, cunit, file, ncurses
, autoreconfHook, pkg-config, file
, cunit, ncurses
}:
stdenv.mkDerivation rec {
pname = "nghttp3";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "v${version}";
sha256 = "sha256-toGTkgJLdSLNWCPJFpT63IxF3xANbvtkhJo5NUg/ZBg=";
sha256 = "sha256-1+0ln0J8dqHqmE+fsawhbfbbMNlCkDpJx4xomUuoHdE=";
};
outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ autoreconfHook pkg-config file ];
checkInputs = [ cunit ncurses ];
@ -21,8 +23,6 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
'';
outputs = [ "out" "dev" ];
doCheck = true;
enableParallelBuilding = true;

@ -1,21 +1,23 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config
, cunit, file, ncurses
, autoreconfHook, pkg-config, file
, libev, nghttp3, quictls
, cunit, ncurses
, withJemalloc ? false, jemalloc
}:
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nmVVK2lpz01hgSxPAMmBfF+nNVZu9PWRGzCWh/5yhj8=";
sha256 = "sha256-hpIGsQBJCOyaEqopdES/hRXc2makIERonUju9D/HvgE=";
};
outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ autoreconfHook pkg-config file ];
buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc;
checkInputs = [ cunit ncurses ];
@ -24,8 +26,6 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
'';
outputs = [ "out" "dev" ];
doCheck = true;
enableParallelBuilding = true;

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "quictls";
version = "3.0.2+quick_unstable-2022-03.15";
version = "3.0.3+quick_unstable-2022-05.04";
src = fetchFromGitHub {
owner = "quictls";
repo = "openssl";
rev = "7f2ab56a2b842b8e6fefc7b9d20eb5ff9c6ef151";
sha256 = "sha256-We4ow0mGJFXqYM4PqbGn8qY5IYH/MtNaefrSaJreoRA=";
rev = "368c9d581b17f0bbe425f8dedeaa7b864a7b29ce";
sha256 = "sha256-W3bILxhyeziWQNZUHUg/D9eV8LnmHJqEFwyzWjJrRuc=";
};
patches = [
@ -156,7 +156,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "https://quictls.github.io/openssl/";
homepage = "https://quictls.github.io";
description = "TLS/SSL and crypto library with QUIC APIs";
license = licenses.openssl;
platforms = platforms.all;

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "sealcurses";
version = "unstable-2022-04-28"; # No release yet
version = "unstable-2022-05-18"; # No release yet
src = fetchFromGitea {
domain = "git.skyjake.fi";
owner = "skyjake";
repo = pname;
rev = "abf27cfd2567a0765aaa115cabab0abb7f862253";
hash = "sha256-c4zi/orHyr1hkuEisqZ9V8SaiH1IoxIbeGMrLBEkZ0A=";
rev = "417d77d790ede990b4c149f21c58fd13b8f273cc";
hash = "sha256-yOrJYy9vBv5n8yK6u7tfMq56LBBw5rmhUjORINW8gxo=";
};
nativeBuildInputs = [ cmake pkg-config ];

@ -80,7 +80,11 @@ stdenv.mkDerivation rec {
totem-pl-parser
tracker
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
gst_all_1.gstreamer
gst_all_1.gst-libav
icu
json-glib
libcue

@ -11,7 +11,7 @@ buildDunePackage {
doCheck = true;
checkInputs = [ alcotest atdgen-codec-runtime ];
meta = atd.meta // {
meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // {
description = "Generates efficient JSON serializers, deserializers and validators";
};
}

@ -36,6 +36,5 @@ buildDunePackage rec {
changelog = "https://github.com/mirage/awa-ssh/raw/v${version}/CHANGES.md";
license = licenses.isc;
maintainers = [ maintainers.sternenseemann ];
mainProgram = "awa_lwt_server";
};
}

@ -11,5 +11,5 @@ buildDunePackage {
awa cstruct mtime lwt cstruct-unix mirage-crypto-rng
];
inherit (awa) meta;
meta = awa.meta // { mainProgram = "awa_lwt_server"; };
}

@ -75,7 +75,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages.";
homepage = "https://github.com/BinaryAnalysisPlatform/bap/";
maintainers = [ maintainers.maurer ];
license = licenses.mit;
maintainers = [ maintainers.maurer ];
mainProgram = "bap";
};
}

@ -44,5 +44,6 @@ buildDunePackage {
meta = dns.meta // {
description = "Unix command line utilities using uDNS";
mainProgram = "odns";
};
}

@ -21,8 +21,9 @@ buildDunePackage rec {
meta = {
description = "Parser combinators based on Earley Algorithm";
homepage = "https://github.com/rlepigre/ocaml-earley";
license = lib.licenses.cecill-b;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/rlepigre/ocaml-earley";
mainProgram = "pa_ocaml";
};
}

@ -35,5 +35,6 @@ buildDunePackage rec {
homepage = "https://github.com/dinosaure/hxd";
license = licenses.mit;
maintainers = [ maintainers.sternenseemann ];
mainProgram = "hxd.xxd";
};
}

@ -21,8 +21,9 @@ buildDunePackage rec {
meta = {
description = "Image formats such as PNG and PPM in OCaml";
homepage = "https://github.com/rlepigre/ocaml-imagelib";
license = lib.licenses.lgpl3;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/rlepigre/ocaml-imagelib";
mainProgram = "imagetool";
};
}

@ -37,12 +37,11 @@ stdenv.mkDerivation {
dontStrip = true;
meta = with lib; {
inherit (ocaml.meta) platforms;
maintainers = with maintainers; [
maggesi roconnor vbgl
];
homepage = "http://lablgtk.forge.ocamlcore.org/";
description = "An OCaml interface to GTK";
homepage = "http://lablgtk.forge.ocamlcore.org/";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ maggesi roconnor vbgl ];
mainProgram = "lablgtk2";
inherit (ocaml.meta) platforms;
};
}

@ -31,10 +31,11 @@ buildDunePackage rec {
'';
meta = {
homepage = "https://github.com/realworldocaml/mdx";
description = "Executable OCaml code blocks inside markdown files";
homepage = "https://github.com/realworldocaml/mdx";
changelog = "https://github.com/realworldocaml/mdx/raw/${version}/CHANGES.md";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.romildo ];
mainProgram = "ocaml-mdx";
};
}

@ -9,7 +9,7 @@ buildDunePackage {
doCheck = true;
checkInputs = [ ounit fileutils ];
meta = ocaml_gettext.meta // {
meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // {
description = "Internationalization library using camomile (i18n)";
};

@ -28,5 +28,6 @@ buildDunePackage rec {
homepage = "https://github.com/gildor478/ocaml-gettext";
license = licenses.lgpl21;
maintainers = [ maintainers.volth ];
mainProgram = "ocaml-gettext";
};
}

@ -4,7 +4,7 @@ buildDunePackage rec {
pname = "gettext-stub";
inherit (ocaml_gettext) src version useDune2 meta;
inherit (ocaml_gettext) src version useDune2;
buildInputs = [ dune-configurator ];
@ -13,4 +13,6 @@ buildDunePackage rec {
doCheck = true;
checkInputs = [ ounit ];
meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ];
}

@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
meta = {
description = "A simple tool and library to embed files and directories inside OCaml executables";
license = lib.licenses.lgpl3Plus;
homepage = "https://www.typerex.org/ocp-ocamlres.html";
license = lib.licenses.lgpl3Plus;
maintainers = [ lib.maintainers.vbgl ];
mainProgram = "ocp-ocamlres";
inherit (ocaml.meta) platforms;
};
}

@ -15,9 +15,10 @@ buildOasisPackage rec {
propagatedBuildInputs = [ tcslib ocaml-sat-solvers ];
meta = {
homepage = "https://github.com/tcsprojects/pgsolver";
description = "A collection of tools for generating, manipulating and - most of all - solving parity games";
homepage = "https://github.com/tcsprojects/pgsolver";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ mgttlinger ];
mainProgram = "pgsolver-bin";
};
}

@ -16,7 +16,8 @@ buildDunePackage rec {
meta = with lib; {
description = "Cubic bezier implementation in Reason / OCaml";
homepage = "https://github.com/jchavarri/rebez/";
maintainers = with maintainers; [ superherointj ];
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
mainProgram = "RebezApp.exe";
};
}

@ -27,10 +27,11 @@ stdenv.mkDerivation rec {
dontStrip = true;
meta = with lib; {
homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/";
description = "The Whitespace Thing for OCaml";
homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/";
license = licenses.mit;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [ ];
mainProgram = "ocaml+twt";
inherit (ocaml.meta) platforms;
};
}

@ -0,0 +1,29 @@
{ lib, fetchFromGitHub, buildPythonPackage, beautifulsoup4, httpx, pbkdf2, pillow, pyaes, rsa }:
buildPythonPackage rec {
pname = "audible";
version = "0.8.1";
src = fetchFromGitHub {
owner = "mkb79";
repo = "Audible";
rev = "v${version}";
sha256 = "0fsb5av4s7fvpn0iryl8jj3lwffwlxgbwj46l3fidy0l58nq3b1d";
};
propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ];
postPatch = ''
substituteInPlace setup.py \
--replace 'httpx>=0.20.*,<=0.22.*' 'httpx'
'';
pythonImportsCheck = [ "audible"];
meta = with lib; {
description = "A(Sync) Interface for internal Audible API written in pure Python";
license = licenses.agpl3;
homepage = "https://github.com/mkb79/Audible";
maintainers = with maintainers; [ jvanbruegge ];
};
}

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "bond-api";
version = "0.1.17";
version = "0.1.18";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "prystupa";
repo = "bond-api";
rev = "v${version}";
hash = "sha256-fuVYyDy3fG+XobFe2GCzMWRWPk8VDPLU4RHJzcF5MLg=";
hash = "sha256-+87/j94eHyW3EMMBK+aXaNTVoNxsixeLusyBsPWa9yM=";
};
propagatedBuildInputs = [

@ -8,13 +8,15 @@
buildPythonPackage rec {
pname = "calmjs-parse";
version = "1.2.5";
version = "1.3.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "calmjs";
repo = "calmjs.parse";
rev = version;
sha256 = "0ypfbas33k1706p6w1bf9gnrv38z8fa4qci1iaks80dp58g8sv4r";
hash = "sha256-QhHNp9g88RhGHqRRjg4nk7aXjAgGCOauOagWJoJ3fqc=";
};
propagatedBuildInputs = [

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, djangorestframework
}:
buildPythonPackage rec {
pname = "djangorestframework-dataclasses";
version = "1.1.1";
src = fetchFromGitHub {
owner = "oxan";
repo = "djangorestframework-dataclasses";
rev = "v${version}";
sha256 = "sha256-wXgA/4Dik6yG0nKl9GbrHgb2lhrPsgS23+cEyaD9MRY=";
};
postPatch = ''
patchShebangs manage.py
'';
propagatedBuildInputs = [
djangorestframework
];
checkPhase = ''
./manage.py test
'';
pythonImportsCheck = [ "rest_framework_dataclasses" ];
meta = with lib; {
description = " Dataclasses serializer for Django REST framework";
homepage = "https://github.com/oxan/djangorestframework-dataclasses";
license = licenses.bsd3;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

@ -12,15 +12,15 @@
buildPythonPackage rec {
pname = "gcal-sync";
version = "0.8.0";
version = "0.9.0";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "allenporter";
repo = "gcal_sync";
rev = version;
hash = "sha256-Qk4WlMVyzOK2uyrUlJw9Q8ENtNT3PZ7FKTlCtPsm2v0=";
rev = "refs/tags/${version}";
hash = "sha256-7XvwN1sShvmg7Co3FyzPYJFCe961Ly4/854A1po22ds=";
};
propagatedBuildInputs = [

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-datastore";
version = "2.5.1";
version = "2.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1fpWovsg60uyAGps9QKXTdqV4WqZOOyeDFxX8YfgAMc=";
sha256 = "sha256-6DHp8kz+CiZkzXDxPfT7KB4Yh11CwcEj3MTn5yd404Q=";
};
propagatedBuildInputs = [

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "3.6.2";
version = "3.7.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-MMTeoyC30MW9NdrXLAqelIeeIdsdNi7u5zwVhLeeTyk=";
hash = "sha256-aUabWEz+ou12Lgys7PZnldjHnifPWPPqO8iJqkDgx9U=";
};
propagatedBuildInputs = [

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-firestore";
version = "2.4.0";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-9+esejwSitfYEkD03KsPiTIKxmYhRxTrgfy3QKqIIO4=";
sha256 = "sha256-g/IgGlVWHjkqJKDFvkmp/TVNA0TgN+Xf65M10+x3f+o=";
};
propagatedBuildInputs = [

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.4.1";
version = "2.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk=";
sha256 = "sha256-kxJySGikHdichitekEiPjzs48bDqWaXMBhmI6IAwKRM=";
};
propagatedBuildInputs = [

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.13.1";
version = "2.14.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-JxhIC4OMsXjdJYNDomEhmHPUCzveFS0oeDWsX/wd5zA=";
hash = "sha256-D8t8+rscImUvpHCEFGTzLU5FpAMZ62iHhRfLzUXqGV8=";
};
propagatedBuildInputs = [

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.7.2";
version = "3.7.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-icZG33G/noii9V0rsHTG/Qe8cKDVDfASRKy2XRYM5Yg=";
hash = "sha256-c++DP97IhMKHKZqXWpVO/9Rw1q8eYs1ybNZDhviwB/A=";
};
propagatedBuildInputs = [

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-resumable-media";
version = "2.3.2";
version = "2.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-BpJOix558VjwIC590VGtdbDqnVm5l8hQ9WvdSlo2FRM=";
sha256 = "sha256-J8UmIL02TRyBFuqsTqKvy/uBrpE5+zGZZS/KwXJL+2w=";
};
propagatedBuildInputs = [ google-auth google-crc32c requests ];

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "habanero";
version = "1.2.0";
version = "1.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "sckott";
repo = pname;
rev = "v${version}";
hash = "sha256-jxaO8nCR5jhXCPjhjVLKaGeQp9JF3ECQ1+j3TOJKawg=";
rev = "refs/tags/v${version}";
hash = "sha256-i6tgMEiaDcaBR8XfGvEMXQfTaDp1RJRosj/EfF1dQU4=";
};
propagatedBuildInputs = [

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.5.0";
version = "2.5.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gbR2z4mo5EFHS2N3pg5mwFQAfL9ysqYaC+tSSYBK7YI=";
sha256 = "sha256-D66bw014FWGf26rG0e65wg6F/N1bl0z/Uemq+jUxJ74=";
};
checkInputs = [

@ -56,5 +56,6 @@ buildPythonPackage rec {
changelog = "https://github.com/jjjake/internetarchive/raw/v${version}/HISTORY.rst";
license = licenses.agpl3Plus;
maintainers = [ maintainers.marsam ];
mainProgram = "ia";
};
}

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "nats-py";
version = "2.1.0";
version = "2.1.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "nats-io";
repo = "nats.py";
rev = "refs/tags/v${version}";
hash = "sha256-OwxTcjHB1YLijEtTA+QFjEmihqXsiitIcCtdl/3uipI=";
hash = "sha256-i197ZePxngAhGh7xzaJoo7m8el+7t7yJrvhO2CTmajU=";
};
propagatedBuildInputs = [

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "0.0.24";
version = "0.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-rAC0NXkK18DmPiZJbqSZh5O0i6KvMpWvaANWyK3zMXQ=";
hash = "sha256-jGKB2LYp2RGy+E76ZvRdOzPdT+7fL4ZTEilHDiXbAMw=";
};
postPatch = ''

@ -1,22 +1,41 @@
{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytest-cov, pytestCheckHook }:
{ lib
, fetchPypi
, buildPythonPackage
, numpy
, pyparsing
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "periodictable";
version = "1.6.0";
version = "1.6.1";
format = "setuptools";
propagatedBuildInputs = [numpy pyparsing];
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23";
hash = "sha256-fFAcn3PXex+yjLUehbKEKcLESpnOPRJ0iUVkxy1xJgM=";
};
checkInputs = [ pytest-cov pytestCheckHook ];
propagatedBuildInputs = [
numpy
pyparsing
];
meta = {
homepage = "https://www.reflectometry.org/danse/software.html";
description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments";
license = lib.licenses.publicDomain;
maintainers = with lib.maintainers; [ rprospero ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"periodictable"
];
meta = with lib; {
description = "Extensible periodic table of the elements";
homepage = "https://github.com/pkienzle/periodictable";
license = licenses.publicDomain;
maintainers = with maintainers; [ rprospero ];
};
}

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "9.3.0";
version = "9.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-7H6fpJl192L8MEWrQW89Fa/BTZ2GZXjDRcy0yc17hDI=";
hash = "sha256-Md4vzAirCm5fjcTAeiLIQwH0MAP47r2AT8O5yigGqv8=";
};
propagatedBuildInputs = [

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pycfmodel";
version = "0.19.1";
version = "0.20.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Skyscanner";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-k059AfI3dTPMLAOColmTG4kz0z2bLO1oi8Bg0QeLork=";
hash = "sha256-c6RbglmG/A1fVOLmJLRsyMy9EgEIzpXnIe9Co/OLMSg=";
};
propagatedBuildInputs = [

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pynetgear";
version = "0.10.0";
version = "0.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "MatMaul";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-l+hfE1YdSoMWLonSWKX0809M0OCYxpcvPd4gV9mS4DI=";
sha256 = "sha256-XGD1kA64rUC6WvG7VGX+f3g7fBvWqfA4ujiWAQzKeEA=";
};
propagatedBuildInputs = [

@ -30,14 +30,14 @@
buildPythonPackage rec {
pname = "thinc";
version = "8.0.15";
version = "8.0.16";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-LjFQINqFw3keGR+/N8SiQz9XzzIuJzgNoM1N6Z2WBTs=";
sha256 = "sha256-S8eBpRqHiaxAKzbvLgfRdjbRKniQACdU+NcPBbto31E=";
};
postPatch = ''

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.12.0";
version = "3.12.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-RcRFF5vIMOQsPXbd2g8DSnOrWnpLLNe3Sa8PqAdwFvU=";
sha256 = "sha256-MrvfSC6Uz/EJXQ3F5jAbWR0YJYRjqjwO7SIe0AUSOfA=";
};
propagatedBuildInputs = [ numpy ];

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-python-dateutil";
version = "2.8.15";
version = "2.8.16";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fbHk7UkWvRKMvuPuze4OBsxWhNoqHN/Vf5hUHN++CGE=";
sha256 = "sha256-OqrEwTjra47LwlUJluwl1uRbXTKIfR5pPQhC7i+mWdI=";
};
pythonImportsCheck = [ "dateutil-stubs" ];

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.27.26";
version = "2.27.27";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pqBMAnTAlJ/QUl812LU6w053r+y+s8STLdxs5nWsAJw=";
sha256 = "sha256-1hjZgJ+jL1FM8XzqhGCBTaZxxWNm+xyQiszKi/GDESs=";
};
propagatedBuildInputs = [

@ -0,0 +1,44 @@
{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testVersion, jira-cli-go }:
buildGoModule rec {
pname = "jira-cli-go";
version = "0.3.0";
src = fetchFromGitHub {
owner = "ankitpokhrel";
repo = "jira-cli";
rev = "v${version}";
sha256 = "sha256-sPoFv3Gzue5H6TJuQZJvqB/Dx/URp9Kt2UuIvKSnAxg=";
};
vendorSha256 = "sha256-UO30/D65vpu3PgEsfSDL3nYgkwo5Cj+1WKiokk7KKKg=";
ldflags = [
"-s" "-w"
"-X github.com/ankitpokhrel/jira-cli/internal/version.GitCommit=${src.rev}"
"-X github.com/ankitpokhrel/jira-cli/internal/version.SourceDateEpoch=0"
"-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}"
];
checkInputs = [ less more ]; # Tests expect a pager in $PATH
passthru.tests.version = testVersion {
package = jira-cli-go;
command = "jira version";
inherit version;
};
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd jira \
--bash <($out/bin/jira completion bash) \
--zsh <($out/bin/jira completion zsh)
'';
meta = with lib; {
description = "Feature-rich interactive Jira command line";
homepage = "https://github.com/ankitpokhrel/jira-cli";
license = licenses.mit;
maintainers = with maintainers; [ bryanasdev000 ];
};
}

@ -15,7 +15,7 @@ buildDunePackage rec {
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
};
inherit (js_of_ocaml-compiler) meta;
buildInputs = [ camlp4 ocsigen_deriving ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}

@ -21,8 +21,9 @@ buildDunePackage rec {
meta = {
description = "Compiler from OCaml bytecode to Javascript";
homepage = "https://ocsigen.org/js_of_ocaml/";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://ocsigen.org/js_of_ocaml/";
mainProgram = "js_of_ocaml";
};
}

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

Loading…
Cancel
Save