Merge remote-tracking branch 'origin/master' into haskell-updates

main
sternenseemann 2 years ago
commit 70530708a5
  1. 12
      maintainers/maintainer-list.nix
  2. 9
      maintainers/team-list.nix
  3. 7
      nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
  4. 2
      nixos/doc/manual/release-notes/rl-2205.section.md
  5. 3
      nixos/modules/services/backup/zrepl.nix
  6. 1
      nixos/tests/all-tests.nix
  7. 66
      nixos/tests/zrepl.nix
  8. 9
      pkgs/applications/audio/gtkpod/default.nix
  9. 2
      pkgs/applications/audio/strawberry/default.nix
  10. 2
      pkgs/applications/editors/jetbrains/default.nix
  11. 2
      pkgs/applications/graphics/drawing/default.nix
  12. 2
      pkgs/applications/graphics/sane/config.nix
  13. 9
      pkgs/applications/misc/1password/default.nix
  14. 4
      pkgs/applications/misc/dasel/default.nix
  15. 191
      pkgs/applications/networking/browsers/microsoft-edge/browser.nix
  16. 20
      pkgs/applications/networking/browsers/microsoft-edge/default.nix
  17. 50
      pkgs/applications/networking/browsers/microsoft-edge/update.sh
  18. 8
      pkgs/applications/networking/cluster/fluxcd/default.nix
  19. 4
      pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
  20. 8
      pkgs/applications/networking/instant-messengers/element/pin.json
  21. 34
      pkgs/applications/networking/sync/wdt/default.nix
  22. 6
      pkgs/applications/networking/termius/default.nix
  23. 4
      pkgs/applications/office/morgen/default.nix
  24. 4
      pkgs/applications/science/astronomy/gprojector/default.nix
  25. 36
      pkgs/applications/version-management/dvc/default.nix
  26. 2
      pkgs/applications/version-management/dvc/dvc-daemon.patch
  27. 4
      pkgs/applications/version-management/smartgithg/default.nix
  28. 20
      pkgs/applications/video/entangle/default.nix
  29. 18
      pkgs/applications/virtualization/spike/default.nix
  30. 23
      pkgs/desktops/gnome/apps/gnome-logs/default.nix
  31. 13
      pkgs/desktops/gnome/core/dconf-editor/default.nix
  32. 14
      pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch
  33. 11
      pkgs/desktops/gnome/extensions/collisions.json
  34. 22
      pkgs/desktops/gnome/extensions/extensionRenames.nix
  35. 165
      pkgs/desktops/gnome/extensions/extensions.json
  36. 2
      pkgs/development/compilers/cudatoolkit/default.nix
  37. 4
      pkgs/development/interpreters/janet/default.nix
  38. 39
      pkgs/development/interpreters/python-cosmopolitan/default.nix
  39. 0
      pkgs/development/interpreters/python-cosmopolitan/ioctl.patch
  40. 4
      pkgs/development/libraries/bullet/default.nix
  41. 61
      pkgs/development/libraries/cosmopolitan/default.nix
  42. 12
      pkgs/development/libraries/libgda/default.nix
  43. 51
      pkgs/development/libraries/libgpod/default.nix
  44. 4
      pkgs/development/libraries/lief/default.nix
  45. 4
      pkgs/development/libraries/poco/default.nix
  46. 4
      pkgs/development/node-packages/default.nix
  47. 4
      pkgs/development/python-modules/asyncmy/default.nix
  48. 17
      pkgs/development/python-modules/azure-keyvault-secrets/default.nix
  49. 4
      pkgs/development/python-modules/azure-storage-blob/default.nix
  50. 4
      pkgs/development/python-modules/geojson-client/default.nix
  51. 4
      pkgs/development/python-modules/gspread/default.nix
  52. 4
      pkgs/development/python-modules/hahomematic/default.nix
  53. 4
      pkgs/development/python-modules/iminuit/default.nix
  54. 10
      pkgs/development/python-modules/metar/default.nix
  55. 13
      pkgs/development/python-modules/msldap/default.nix
  56. 2
      pkgs/development/python-modules/paramiko/default.nix
  57. 4
      pkgs/development/python-modules/pylitterbot/default.nix
  58. 4
      pkgs/development/python-modules/pyoverkiz/default.nix
  59. 2
      pkgs/development/python-modules/pytest-relaxed/default.nix
  60. 4
      pkgs/development/python-modules/python-gitlab/default.nix
  61. 4
      pkgs/development/python-modules/pyviz-comms/default.nix
  62. 9
      pkgs/development/python-modules/rasterio/default.nix
  63. 9
      pkgs/development/python-modules/snowflake-connector-python/default.nix
  64. 4
      pkgs/development/python-modules/stripe/default.nix
  65. 4
      pkgs/development/tools/analysis/cppcheck/default.nix
  66. 18
      pkgs/development/tools/build-managers/shards/default.nix
  67. 4
      pkgs/development/tools/continuous-integration/fly/default.nix
  68. 40
      pkgs/development/tools/cosmoc/default.nix
  69. 4
      pkgs/development/tools/pipenv/default.nix
  70. 6
      pkgs/development/tools/rust/cargo-spellcheck/default.nix
  71. 6
      pkgs/development/tools/symfony-cli/default.nix
  72. 49
      pkgs/development/web/postman/darwin.nix
  73. 109
      pkgs/development/web/postman/default.nix
  74. 133
      pkgs/development/web/postman/linux.nix
  75. 4
      pkgs/games/2048-in-terminal/default.nix
  76. 7
      pkgs/os-specific/darwin/m-cli/default.nix
  77. 2
      pkgs/os-specific/linux/fuse/common.nix
  78. 12
      pkgs/os-specific/linux/nvidia-x11/default.nix
  79. 5
      pkgs/servers/etebase/default.nix
  80. 4
      pkgs/servers/teleport/0001-fix-add-nix-path-to-exec-env.patch
  81. 6
      pkgs/servers/x11/xorg/xwayland.nix
  82. 6
      pkgs/shells/zsh/oh-my-zsh/default.nix
  83. 4
      pkgs/tools/admin/mycli/default.nix
  84. 4
      pkgs/tools/backup/tsm-client/default.nix
  85. 7
      pkgs/tools/backup/zrepl/default.nix
  86. 4
      pkgs/tools/misc/diffoscope/default.nix
  87. 28
      pkgs/tools/misc/ntfy-sh/default.nix
  88. 12
      pkgs/tools/misc/onefetch/default.nix
  89. 2
      pkgs/tools/misc/onefetch/zstd-pkg-config.patch
  90. 4
      pkgs/tools/package-management/nfpm/default.nix
  91. 7
      pkgs/tools/security/evil-winrm/Gemfile
  92. 51
      pkgs/tools/security/evil-winrm/Gemfile.lock
  93. 36
      pkgs/tools/security/evil-winrm/default.nix
  94. 187
      pkgs/tools/security/evil-winrm/gemset.nix
  95. 6
      pkgs/tools/text/difftastic/default.nix
  96. 4
      pkgs/tools/typesetting/sile/default.nix
  97. 24
      pkgs/top-level/all-packages.nix

@ -14251,4 +14251,16 @@
github = "nigelgbanks";
githubId = 487373;
};
zanculmarktum = {
name = "Azure Zanculmarktum";
email = "zanculmarktum@gmail.com";
github = "zanculmarktum";
githubId = 16958511;
};
kuwii = {
name = "kuwii";
email = "kuwii.someone@gmail.com";
github = "kuwii";
githubId = 10705175;
};
}

@ -70,6 +70,14 @@ with lib.maintainers; {
scope = "Maintain the Chia blockchain and its dependencies";
};
cosmopolitan = {
members = [
lourkeur
tomberek
];
scope = "Maintain the Cosmopolitan LibC and related programs.";
};
deshaw = {
# Verify additions to this team with at least one already existing member of the team.
members = [
@ -117,6 +125,7 @@ with lib.maintainers; {
gnome = {
members = [
bobby285271
hedning
jtojnar
dasj19

@ -1261,6 +1261,13 @@
example.
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.cosmopolitan</literal> no longer provides the
<literal>cosmoc</literal> command. It has been moved to
<literal>pkgs.cosmoc</literal>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">

@ -446,6 +446,8 @@ In addition to numerous new and upgraded packages, this release has the followin
See the `vscode` package for a more detailed example.
- `pkgs.cosmopolitan` no longer provides the `cosmoc` command. It has been moved to `pkgs.cosmoc`.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Other Notable Changes {#sec-release-22.05-notable-changes}

@ -38,6 +38,9 @@ in
environment.etc."zrepl/zrepl.yml".source = configFile;
systemd.packages = [ pkgs.zrepl ];
# Note that pkgs.zrepl copies and adapts the upstream systemd unit, and
# the fields defined here only override certain fields from that unit.
systemd.services.zrepl = {
requires = [ "local-fs.target" ];
wantedBy = [ "zfs.target" ];

@ -590,5 +590,6 @@ in
zigbee2mqtt = handleTest ./zigbee2mqtt.nix {};
zoneminder = handleTest ./zoneminder.nix {};
zookeeper = handleTest ./zookeeper.nix {};
zrepl = handleTest ./zrepl.nix {};
zsh-history = handleTest ./zsh-history.nix {};
}

@ -0,0 +1,66 @@
import ./make-test-python.nix (
{
nodes.host = {config, pkgs, ...}: {
config = {
# Prerequisites for ZFS and tests.
boot.supportedFilesystems = [ "zfs" ];
environment.systemPackages = [ pkgs.zrepl ];
networking.hostId = "deadbeef";
services.zrepl = {
enable = true;
settings = {
# Enable Prometheus output for status assertions.
global.monitoring = [{
type = "prometheus";
listen = ":9811";
}];
# Create a periodic snapshot job for an ephemeral zpool.
jobs = [{
name = "snap_test";
type = "snap";
filesystems."test" = true;
snapshotting = {
type = "periodic";
prefix = "zrepl_";
interval = "1s";
};
pruning.keep = [{
type = "last_n";
count = 8;
}];
}];
};
};
};
};
testScript = ''
start_all()
with subtest("Wait for zrepl and network ready"):
host.wait_for_unit("network-online.target")
host.wait_for_unit("zrepl.service")
with subtest("Create test zpool"):
# ZFS requires 64MiB minimum pool size.
host.succeed("fallocate -l 64MiB /root/zpool.img")
host.succeed("zpool create test /root/zpool.img")
with subtest("Check for completed zrepl snapshot"):
# zrepl periodic snapshot job creates a snapshot with this prefix.
host.wait_until_succeeds("zfs list -t snapshot | grep -q zrepl_")
with subtest("Verify HTTP monitoring server is configured"):
out = host.succeed("curl -f localhost:9811/metrics")
assert (
"zrepl_version_daemon" in out
), "zrepl version metric was not found in Prometheus output"
assert (
"zrepl_zfs_snapshot_duration_count{filesystem=\"test\"}" in out
), "zrepl snapshot counter for test was not found in Prometheus output"
'';
})

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac,
gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl,
libvorbis, gdk-pixbuf }:
{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, libxml2, curl, flac
, gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl
, libvorbis, gdk-pixbuf
}:
stdenv.mkDerivation rec {
version = "2.1.5";
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
buildInputs = [
curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf
flex libgpod libid3tag flac libvorbis libxml2 gtk3 gdk-pixbuf
gdl gnome.adwaita-icon-theme gnome.anjuta
] ++ (with perlPackages; [ perl XMLParser ]);

@ -19,6 +19,7 @@
, protobuf
, sqlite
, taglib
, libgpod
, libpulseaudio
, libselinux
, libsepol
@ -63,6 +64,7 @@ mkDerivation rec {
qtbase
qtx11extras
] ++ lib.optionals stdenv.isLinux [
libgpod
libpulseaudio
libselinux
libsepol

@ -49,7 +49,7 @@ let
dontAutoPatchelf = true;
postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) ''
(
cd $out/clion-${version}
cd $out/clion
# bundled cmake does not find libc
rm -rf bin/cmake/linux
ln -s ${cmake} bin/cmake/linux

@ -13,6 +13,7 @@
, gdk-pixbuf
, pango
, gettext
, itstool
}:
python3.pkgs.buildPythonApplication rec {
@ -38,6 +39,7 @@ python3.pkgs.buildPythonApplication rec {
wrapGAppsHook
glib
gettext
itstool
];
buildInputs = [

@ -35,7 +35,7 @@ installSanePath = path: ''
in
stdenv.mkDerivation {
name = "sane-config";
phases = "installPhase";
dontUnpack = true;
installPhase = ''
function symlink () {

@ -42,12 +42,17 @@ stdenv.mkDerivation {
'';
installPhase = ''
runHook preInstall
install -D ${mainProgram} $out/bin/${mainProgram}
runHook postInstall
'';
postInstall = "installShellCompletion --cmd ${mainProgram}" + lib.concatMapStrings
(s: " --${s} <($out/bin/${mainProgram} completion ${s})") [ "bash" "fish" "zsh" ];
postInstall = ''
installShellCompletion --cmd ${mainProgram} \
--bash <($out/bin/${mainProgram} completion bash) \
--fish <($out/bin/${mainProgram} completion fish) \
--zsh <($out/bin/${mainProgram} completion zsh)
'';
dontStrip = stdenv.isDarwin;

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
version = "1.24.0";
version = "1.24.1";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${version}";
sha256 = "sha256-Em+WAI8G492h7FJTnTHFj5L7M4xBZhW4qC0MMc2JRUU=";
sha256 = "sha256-B6MWoGYNjFBUxnSqAXt2DRRjSlmgbqIC7qEoMFGQ+zU=";
};
vendorSha256 = "sha256-NP+Is7Dxz4LGzx5vpv8pJOJhodAYHia1JXYfhJD54as=";

@ -0,0 +1,191 @@
{ channel, version, revision, sha256 }:
{ stdenv
, fetchurl
, lib
, binutils-unwrapped
, xz
, gnutar
, file
, glibc
, glib
, nss
, nspr
, atk
, at-spi2-atk
, xorg
, cups
, dbus
, expat
, libdrm
, libxkbcommon
, gtk3
, pango
, cairo
, gdk-pixbuf
, mesa
, alsa-lib
, at-spi2-core
, libuuid
, systemd
}:
let
baseName = "microsoft-edge";
shortName = if channel == "stable"
then "msedge"
else "msedge-" + channel;
longName = if channel == "stable"
then baseName
else baseName + "-" + channel;
iconSuffix = if channel == "stable"
then ""
else "_${channel}";
desktopSuffix = if channel == "stable"
then ""
else "-${channel}";
in
stdenv.mkDerivation rec {
name="${baseName}-${channel}-${version}";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb";
inherit sha256;
};
unpackCmd = "${binutils-unwrapped}/bin/ar p $src data.tar.xz | ${xz}/bin/xz -dc | ${gnutar}/bin/tar -xf -";
sourceRoot = ".";
dontPatch = true;
dontConfigure = true;
dontPatchELF = true;
buildPhase = let
libPath = {
msedge = lib.makeLibraryPath [
glibc glib nss nspr atk at-spi2-atk xorg.libX11
xorg.libxcb cups.lib dbus.lib expat libdrm
xorg.libXcomposite xorg.libXdamage xorg.libXext
xorg.libXfixes xorg.libXrandr libxkbcommon
gtk3 pango cairo gdk-pixbuf mesa
alsa-lib at-spi2-core xorg.libxshmfence systemd
];
naclHelper = lib.makeLibraryPath [
glib nspr atk libdrm xorg.libxcb mesa xorg.libX11
xorg.libXext dbus.lib libxkbcommon
];
libwidevinecdm = lib.makeLibraryPath [
glib nss nspr
];
libGLESv2 = lib.makeLibraryPath [
xorg.libX11 xorg.libXext xorg.libxcb
];
libsmartscreen = lib.makeLibraryPath [
libuuid stdenv.cc.cc.lib
];
libsmartscreenn = lib.makeLibraryPath [
libuuid
];
liboneauth = lib.makeLibraryPath [
libuuid xorg.libX11
];
};
in ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath.msedge}" \
opt/microsoft/${shortName}/msedge
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
opt/microsoft/${shortName}/msedge-sandbox
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
opt/microsoft/${shortName}/msedge_crashpad_handler
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath.naclHelper}" \
opt/microsoft/${shortName}/nacl_helper
patchelf \
--set-rpath "${libPath.libwidevinecdm}" \
opt/microsoft/${shortName}/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
patchelf \
--set-rpath "${libPath.libGLESv2}" \
opt/microsoft/${shortName}/libGLESv2.so
patchelf \
--set-rpath "${libPath.libsmartscreen}" \
opt/microsoft/${shortName}/libsmartscreen.so
patchelf \
--set-rpath "${libPath.libsmartscreenn}" \
opt/microsoft/${shortName}/libsmartscreenn.so
patchelf \
--set-rpath "${libPath.liboneauth}" \
opt/microsoft/${shortName}/liboneauth.so
'';
installPhase = ''
mkdir -p $out
cp -R opt usr/bin usr/share $out
${if channel == "stable"
then ""
else "ln -sf $out/opt/microsoft/${shortName}/${baseName}-${channel} $out/opt/microsoft/${shortName}/${baseName}"}
ln -sf $out/opt/microsoft/${shortName}/${longName} $out/bin/${longName}
rm -rf $out/share/doc
rm -rf $out/opt/microsoft/${shortName}/cron
for icon in '16' '24' '32' '48' '64' '128' '256'
do
${ "icon_source=$out/opt/microsoft/${shortName}/product_logo_\${icon}${iconSuffix}.png" }
${ "icon_target=$out/share/icons/hicolor/\${icon}x\${icon}/apps" }
mkdir -p $icon_target
cp $icon_source $icon_target/microsoft-edge${desktopSuffix}.png
done
substituteInPlace $out/share/applications/${longName}.desktop \
--replace /usr/bin/${baseName}-${channel} $out/bin/${longName}
substituteInPlace $out/share/gnome-control-center/default-apps/${longName}.xml \
--replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}
substituteInPlace $out/share/menu/${longName}.menu \
--replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}
substituteInPlace $out/opt/microsoft/${shortName}/xdg-mime \
--replace "''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \
--replace "xdg_system_dirs=/usr/local/share/:/usr/share/" "xdg_system_dirs=/run/current-system/sw/share/" \
--replace /usr/bin/file ${file}/bin/file
substituteInPlace $out/opt/microsoft/${shortName}/default-app-block \
--replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}
substituteInPlace $out/opt/microsoft/${shortName}/xdg-settings \
--replace "''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \
--replace "''${XDG_CONFIG_DIRS:-/etc/xdg}" "''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}"
'';
meta = with lib; {
homepage = "https://www.microsoft.com/en-us/edge";
description = "The web browser from Microsoft";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ zanculmarktum kuwii ];
};
}

@ -0,0 +1,20 @@
{
beta = import ./browser.nix {
channel = "beta";
version = "99.0.1150.16";
revision = "1";
sha256 = "sha256:0qsgs889d6qwxz9qf42psmjqfhmrqgp07srq5r38npl5pncr137h";
};
dev = import ./browser.nix {
channel = "dev";
version = "100.0.1163.1";
revision = "1";
sha256 = "sha256:153faqxyw5f5b6cqnvd71dl7941znkzci8dwbcgaxway0b6882jq";
};
stable = import ./browser.nix {
channel = "stable";
version = "98.0.1108.56";
revision = "1";
sha256 = "sha256:03jbj2s2fs60fzfgsmyb284q7nckji87qgb86mvl5g0hbl19aza7";
};
}

@ -0,0 +1,50 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p curl gzip
# To update: ./update.sh > default.nix
index_file=$(curl -sL https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages.gz | gzip -dc)
echo "{"
packages=()
echo "$index_file" | while read -r line; do
if [[ "$line" =~ ^Package:[[:space:]]*(.*) ]]; then
Package="${BASH_REMATCH[1]}"
fi
if [[ "$line" =~ ^Version:[[:space:]]*(.*)-([a-zA-Z0-9+.~]*) ]]; then
Version="${BASH_REMATCH[1]}"
Revision="${BASH_REMATCH[2]}"
fi
if [[ "$line" =~ ^SHA256:[[:space:]]*(.*) ]]; then
SHA256="${BASH_REMATCH[1]}"
fi
if ! [[ "$line" ]]; then
found=0
for i in "${packages[@]}"; do
if [[ "$i" == "$Package" ]]; then
found=1
fi
done
if (( ! $found )); then
channel="${Package##*-}"
name="${Package%-${channel}}"
cat <<EOF
${channel} = import ./browser.nix {
channel = "${channel}";
version = "${Version}";
revision = "${Revision}";
sha256 = "sha256:$(nix-hash --type sha256 --to-base32 ${SHA256})";
};
EOF
fi
packages+=($Package)
Package=""
Version=""
fi
done
echo "}"

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.28.3";
sha256 = "1agzj8fgv6jp1i15asjvhnsxw4fj7i6g00ajjl4ihd9p166r83qy";
manifestsSha256 = "036d1y5dkb9mir9iy76zwdydlqxpbhz7j25fy1faznmicm2qxiqi";
version = "0.28.4";
sha256 = "1b98hna3qhg7gzs5rqpkrxdvas7zjzavzmi9rzn9936rw88lpgx6";
manifestsSha256 = "0k8hpkcnxw2w1pvdkvvmmqzrmsrrbij5f734iwh4n9fd326bqgwc";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-8TIeVcPW55vJn49y2xLfOOrefmqNAhDMmTWS/c8HuA8=";
vendorSha256 = "sha256-IL9RjmMQahFZ04FXKxH6L2PHsOM1MJnqCJorRdr49FY=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.10.7",
"version": "1.10.8",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@ -44,7 +44,7 @@
"counterpart": "^0.18.6",
"electron-store": "^6.0.1",
"electron-window-state": "^5.0.3",
"minimist": "^1.2.3",
"minimist": "^1.2.6",
"png-to-ico": "^2.1.1",
"request": "^2.88.2"
},

@ -1,6 +1,6 @@
{
"version": "1.10.7",
"desktopSrcHash": "HkGny9t8dNzVGyyqgr4tABbFZgWV4xqGZt9xH4ejkew=",
"desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0",
"webHash": "0gim79a1zpfc56ca5fndp2whmlv9jz1s32z666i268xppn4z53k1"
"version": "1.10.8",
"desktopSrcHash": "S9MQIn773BzCH4dsTkD1DpIThDzoIGr4Heaie2Qs0jY=",
"desktopYarnHash": "1imx43qbpj08l6d0fji31kcxqshcpr0ch8dzfbbgxyjvblq2p8ln",
"webHash": "02i6l3armzr19kki3hgshhzkdpb3001nilh4h10hr3xw5z711ppr"
}

@ -0,0 +1,34 @@
{ stdenv, lib, fetchFromGitHub, cmake, folly, boost, gflags, glog, openssl, double-conversion, fmt }:
stdenv.mkDerivation {
pname = "wdt";
version = "unstable-2022-03-24";
src = fetchFromGitHub {
owner = "facebook";
repo = "wdt";
rev = "43319e59d0c77092468367cdadab37d12d7a2383";
sha256 = "sha256-MajYK2eTUbWhEql0iTlgW5yLg9xAGZQk+Dx4fNxFFqw=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ folly boost gflags glog openssl double-conversion fmt ];
# source is expected to be named wdt
# https://github.com/facebook/wdt/blob/43319e59d0c77092468367cdadab37d12d7a2383/CMakeLists.txt#L238
postUnpack = ''
ln -s $sourceRoot wdt
'';
cmakeFlags = [
"-DWDT_USE_SYSTEM_FOLLY=ON"
];
meta = with lib; {
description = "Warp speed Data Transfer";
homepage = "https://github.com/facebook/wdt";
license = licenses.bsd3;
maintainers = with maintainers; [ nickcao ];
platforms = [ "x86_64-linux" ];
};
}

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "termius";
version = "7.36.1";
version = "7.37.0";
src = fetchurl {
# find the latest version with
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
# and the sha512 with
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_107.snap";
sha512 = "ef8514bdd0e6761a9bc7bf6b0b72d95c661905798c1507af932bd38a1e0c96713f71140b0d91454c3da5f3b97a0c8143b32918294eea2e46a7dca8faabda57e6";
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_108.snap";
sha512 = "05c4a0baeee8c1ff9547017288d099a9ef7b3049647ef0318ca4b1112df26f9f3a844bbae5f9ada59adaf07838987e2a685aee21ea494945202009236fe5f6bc";
};
desktopItem = makeDesktopItem {

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "morgen";
version = "2.4.4";
version = "2.5.0";
src = fetchurl {
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
sha256 = "sha256-5/85ro206o3SsvAvcZeDD2Dmo2jU4zXmtI3X4WdQaRI=";
sha256 = "sha256-6hBhfJ18ROCfmqoxrJZ5TiYCFb1xZKsJeobXFy5yfQM=";
};
nativeBuildInputs = [

@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation rec {
pname = "gprojector";
version = "3.0.2";
version = "3.0.3";
src = fetchzip {
url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz";
sha256 = "sha256-IvGZOYt2d8aWtlAJJzVrwkqOOhaUHUmEDlMeD/0NdwU=";
sha256 = "sha256-60UT6z5aQ3Tk4EujEUp4ntB5GakFVhJzk5eytoIwf78=";
};
desktopItems = [ (makeDesktopItem {

@ -1,6 +1,7 @@
{ lib
, python3
, fetchFromGitHub
, fetchpatch
, enableGoogle ? false
, enableAWS ? false
, enableAzure ? false
@ -9,16 +10,38 @@
python3.pkgs.buildPythonApplication rec {
pname = "dvc";
version = "2.9.3";
version = "2.9.5";
format = "setuptools";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-nRlgo7Wjs7RgTUxoMYQh5YEsqiJtdWH2ex79rhXagAQ=";
hash = "sha256-MviiA0ja1IaxMPlqu2dhIGBcdEXiEvBYnK9731dihMg=";
};
# make the patch apply
prePatch = ''
substituteInPlace setup.cfg \
--replace "scmrepo==0.0.7" "scmrepo==0.0.10"
'';
patches = [
./dvc-daemon.patch
(fetchpatch {
url = "https://github.com/iterative/dvc/commit/ab54b5bdfcef3576b455a17670b8df27beb504ce.patch";
sha256 = "sha256-wzMK6Br7/+d3EEGpfPuQ6Trj8IPfehdUvOvX3HZlS+o=";
})
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "grandalf==0.6" "grandalf>=0.6" \
--replace "scmrepo==0.0.13" "scmrepo"
substituteInPlace dvc/daemon.py \
--subst-var-by dvc "$out/bin/dcv"
'';
nativeBuildInputs = with python3.pkgs; [
setuptools-scm
setuptools-scm-git-archive
@ -73,15 +96,6 @@ python3.pkgs.buildPythonApplication rec {
importlib-resources
];
patches = [ ./dvc-daemon.patch ];
postPatch = ''
substituteInPlace setup.cfg \
--replace "grandalf==0.6" "grandalf>=0.6"
substituteInPlace dvc/daemon.py \
--subst-var-by dvc "$out/bin/dcv"
'';
# Tests require access to real cloud services
doCheck = false;

@ -12,7 +12,7 @@ index 9854a0e1..fefdd613 100644
- file_path = os.path.abspath(inspect.stack()[0][1])
- env["PYTHONPATH"] = os.path.dirname(os.path.dirname(file_path))
+ cmd = [ "@dvc@" , "daemon", "-q"] + args
+ env = None
+ env = os.environ.copy()
env[DVC_DAEMON] = "1"
_spawn(cmd, env)

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "smartgithg";
version = "20.2.5";
version = "21.2.2";
src = fetchurl {
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
sha256 = "05f3yhzf6mvr6c5v6qvjrx97pzrrnkh9mp444zlkbnpgnrsmdc6v";
sha256 = "10v6sg0lmjby3v8g3sk2rzzvdx5p69ia4zz2c0hbf30rk0p6gqn3";
};
nativeBuildInputs = [ wrapGAppsHook ];

@ -1,7 +1,8 @@
{ lib
, stdenv
, fetchFromGitLab
, cmake
, fetchpatch
, itstool
, libxml2
, meson
, ninja
@ -49,10 +50,19 @@ stdenv.mkDerivation rec {
sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0=";
};
patches = [
# Fix build with meson 0.61, can be removed on next update
# https://gitlab.com/entangle/entangle/-/issues/67
(fetchpatch {
url = "https://gitlab.com/entangle/entangle/-/commit/54795d275a93e94331a614c8712740fcedbdd4f0.patch";
sha256 = "iEgqGjKa0xwSdctwvNdEV361l9nx+bz53xn3fuDgtzY=";
})
];
nativeBuildInputs = [
cmake
glib.dev
libxml2.bin # for xmllint
itstool
glib
libxml2 # for xmllint
meson
ninja
perl # for pod2man and build scripts
@ -93,8 +103,6 @@ stdenv.mkDerivation rec {
libXtst
]);
dontUseCmakeConfigure = true;
# Disable building of doc/reference since it requires network connection to render XML to HTML
# Patch build script shebangs
postPatch = ''

@ -1,27 +1,19 @@
{ lib, stdenv, fetchFromGitHub, dtc, fetchpatch, pkgsCross }:
{ lib, stdenv, fetchFromGitHub, dtc, pkgsCross }:
stdenv.mkDerivation rec {
pname = "spike";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "riscv";
repo = "riscv-isa-sim";
rev = "v${version}";
sha256 = "1hcl01nj96s3rkz4mrq747s5lkw81lgdjdimb8b1b9h8qnida7ww";
sha256 = "sha256-4D2Fezej0ioOOupw3kgMT5VLs+/jXQjwvek6v0AVMzI=";
};
nativeBuildInputs = [ dtc ];
enableParallelBuilding = true;
patches = [
# Add missing headers to fix build.
(fetchpatch {
url = "https://github.com/riscv/riscv-isa-sim/commit/b3855682c2d744c613d2ffd6b53e3f021ecea4f3.patch";
sha256 = "1v1mpp4iddf5n4h3kmj65g075m7xc31bxww7gldnmgl607ma7cnl";
})
];
postPatch = ''
patchShebangs scripts/*.sh
patchShebangs tests/ebreak.py
@ -39,7 +31,9 @@ stdenv.mkDerivation rec {
''
runHook preInstallCheck
$out/bin/spike -m64 ${riscvPkgs.riscv-pk}/bin/pk ${riscvPkgs.hello}/bin/hello | grep -Fq "Hello, world"
echo -e "#include<stdio.h>\nint main() {printf(\"Hello, world\");return 0;}" > hello.c
${riscvPkgs.stdenv.cc}/bin/riscv64-none-elf-gcc -o hello hello.c
$out/bin/spike -m64 ${riscvPkgs.riscv-pk}/bin/pk hello | grep -Fq "Hello, world"
runHook postInstallCheck
'';

@ -1,6 +1,6 @@
{ lib, stdenv
{ stdenv
, lib
, fetchurl
, fetchpatch
, meson
, ninja
, pkg-config
@ -10,6 +10,7 @@
, wrapGAppsHook
, gettext
, itstool
, libhandy
, libxml2
, libxslt
, docbook_xsl
@ -21,21 +22,13 @@
stdenv.mkDerivation rec {
pname = "gnome-logs";
version = "3.36.0";
version = "42.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4";
url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "TV5FFp1r9DkC16npoHk8kW65LaumuoWzXI629nLNq9c=";
};
patches = [
# https://gitlab.gnome.org/GNOME/gnome-logs/-/issues/52
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/b42defceefc775220b525f665a3b662ab9593b81.patch";
sha256 = "1s0zscmhwy7r0xff17wh8ik8x9xw1vrkipw5vl5i770bxnljps8n";
})
];
nativeBuildInputs = [
python3
meson
@ -53,9 +46,9 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
gtk3
libhandy
systemd
gsettings-desktop-schemas
gnome.adwaita-icon-theme
];
mesonFlags = [
@ -80,7 +73,7 @@ stdenv.mkDerivation rec {
homepage = "https://wiki.gnome.org/Apps/Logs";
description = "A log viewer for the systemd journal";
maintainers = teams.gnome.members;
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, vala
@ -27,6 +28,18 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Vxr0x9rU8Em1PmzXKLea3fCMJ92ra8V7OW0hGGbueeM=";
};
patches = [
# Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR
# environment variable, to match what we patched GLib to do.
./schema-override-variable.patch
# Fix build with Meson 0.61.0
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/56474378568e6ff4af8aa912810323e808c1d977.patch";
sha256 = "iFyJcskqcmvz7tp1Z9jM9f8WvAhD0L9Vx1hu2c402MA=";
})
];
nativeBuildInputs = [
meson
ninja

@ -0,0 +1,14 @@
diff --git a/editor/source-manager.vala b/editor/source-manager.vala
index 27b2b17a..87f7ba86 100644
--- a/editor/source-manager.vala
+++ b/editor/source-manager.vala
@@ -121,6 +121,9 @@ private class SourceManager : Object
source = try_prepend_dir (source, Path.build_filename (system_data_dirs [i], "glib-2.0", "schemas"));
string user_data_dir = GLib.Environment.get_user_data_dir ();
source = try_prepend_dir (source, Path.build_filename (user_data_dir, "glib-2.0", "schemas"));
+ string? nix_var_schema_dir = GLib.Environment.get_variable ("NIX_GSETTINGS_OVERRIDES_DIR");
+ if (nix_var_schema_dir != null)
+ source = try_prepend_dir (source, (!) nix_var_schema_dir);
string? var_schema_dir = GLib.Environment.get_variable ("GSETTINGS_SCHEMA_DIR");
if (var_schema_dir != null)
source = try_prepend_dir (source, (!) var_schema_dir);

@ -136,7 +136,16 @@
"floating-dock": [
"floatingDock@sun.wxg@gmail.com",
"floating-dock@nandoferreira_prof@hotmail.com"
],
"wireguard-indicator": [
"wireguard-indicator@gregos.me",
"wireguard-indicator@atareao.es"
]
},
"42": {}
"42": {
"workspace-indicator": [
"workspace-indicator@gnome-shell-extensions.gcampax.github.com",
"horizontal-workspace-indicator@tty2.io"
]
}
}

@ -6,6 +6,15 @@
# - Make a separate section for each GNOME version. Collisions will come back eventually
# as the extensions are updated.
{
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
# ############################################################################
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
# Make sure to move them up once they are updated
# ####### GNOME 41 #######
"apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";
"Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
@ -15,15 +24,15 @@
"lockkeys@vaina.lt" = "lock-keys";
"lockkeys@fawtytoo" = "lock-keys-2";
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
"unredirect@vaina.lt" = "disable-unredirect-fullscreen-windows";
"unredirect@aunetx" = "disable-unredirect-fullscreen-windows-2";
"fuzzy-clock@keepawayfromfire.co.uk" = "fuzzy-clock-2";
"FuzzyClock@johngoetz" = "fuzzy-clock";
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
"wireguard-indicator@atareao.es" = "wireguard-indicator";
# At the moment, ShutdownTimer@deminder is a fork of ShutdownTimer@neumann which adds new features
# there seem to be upstream plans, so this should be checked periodically:
# https://github.com/Deminder/ShutdownTimer https://github.com/neumann-d/ShutdownTimer/pull/46
@ -31,10 +40,6 @@
"shutdown-timer-gnome-shell-extension" = "shutdowntimer-2";
"ShutdownTimer@deminder" = "shutdowntimer";
# ############################################################################
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
# Make sure to move them up once they are updated
# ####### GNOME 40 #######
"system-monitor@paradoxxx.zero.gmail.com" = "system-monitor"; # manually packaged
@ -49,9 +54,6 @@
"panel-date-format@keiii.github.com" = "panel-date-format";
"panel-date-format@atareao.es" = "panel-date-format-2";
"wireguard-indicator@gregos.me" = "wireguard-indicator-2";
"wireguard-indicator@atareao.es" = "wireguard-indicator";
"extension-list@tu.berry" = "extension-list";
"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug

File diff suppressed because one or more lines are too long

@ -86,5 +86,5 @@ rec {
gcc = gcc10; # can bump to 11 along with stdenv.cc
};
cudatoolkit_11 = cudatoolkit_11_6;
cudatoolkit_11 = cudatoolkit_11_5;
}

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.21.0";
version = "1.21.1";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-chVnD5mxnA50yEL65KUYJwpkZ4jPWiLVHHXeeFxtHBo=";
sha256 = "sha256-wJwlGliXoj0XmC9qb6SCo8mUy4aqHvJtFiigUB7PFLE=";
};
# This release fails the test suite on darwin, remove when debugged.

@ -0,0 +1,39 @@
{ lib, stdenv, cosmopolitan, unzip, bintools-unwrapped }:
stdenv.mkDerivation rec {
pname = "python-cosmopolitan";
version = "3.6.14";
src = cosmopolitan.dist;
patches = [
./ioctl.patch # required /dev/tty
];
nativeBuildInputs = [ bintools-unwrapped unzip ];
# slashes are significant because upstream uses o/$(MODE)/foo.o
buildFlags = "o//third_party/python";
checkTarget = "o//third_party/python/test";
enableParallelBuilding = true;
doCheck = true;
dontConfigure = true;
dontFixup = true;
installPhase = ''
runHook preInstall
install o/third_party/python/*.com -Dt $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://justine.lol/cosmopolitan/";
description = "Actually Portable Python using Cosmopolitan";
platforms = platforms.x86_64;
badPlatforms = platforms.darwin;
license = licenses.isc;
maintainers = teams.cosmopolitan.members;
mainProgram = "python.com";
};
}

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "bullet";
version = "3.21";
version = "3.22a";
src = fetchFromGitHub {
owner = "bulletphysics";
repo = "bullet3";
rev = version;
sha256 = "sha256-krzqZ2TPycyWjJzYJ69rb6Qgymlio5HGw2nPCjDZPGk=";
sha256 = "sha256-Ng+kg720y69aE0FgTnD60F05zwUX/LzLlImnrODzOuo=";
};
nativeBuildInputs = [ cmake ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, runCommand, unzip, cosmopolitan,bintools-unwrapped }:
{ lib, stdenv, fetchFromGitHub, unzip, bintools-unwrapped }:
stdenv.mkDerivation rec {
pname = "cosmopolitan";
@ -11,72 +11,35 @@ stdenv.mkDerivation rec {
sha256 = "sha256-UjL4wR5HhuXiQXg6Orcx2fKiVGRPMJk15P779BP1fRA=";
};
patches = [
./ioctl.patch # required /dev/tty
];
nativeBuildInputs = [ bintools-unwrapped unzip ];
postPatch = ''
patchShebangs build/
'';
outputs = [ "out" "dist" ];
# slashes are significant because upstream uses o/$(MODE)/foo.o
buildFlags = "o/cosmopolitan.h o//cosmopolitan.a o//libc/crt/crt.o o//ape/ape.o o//ape/ape.lds";
checkTarget = "o//test";
enableParallelBuilding = true;
doCheck = true;
dontConfigure = true;
dontFixup = true;
enableParallelBuilding = true;
nativeBuildInputs = [ bintools-unwrapped unzip ];
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,include,lib}
mkdir -p $out/{include,lib}
install o/cosmopolitan.h $out/include
install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib
cat > $out/bin/cosmoc <<EOF
#!${stdenv.shell}
exec ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}gcc \
-O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \
"\$@" \
-Wl,--gc-sections -Wl,-z,max-page-size=0x1000 \
-fuse-ld=bfd -Wl,-T,$out/lib/ape.lds \
-include $out/include/cosmopolitan.h \
-I $out/include \
$out/lib/{crt.o,ape.o,cosmopolitan.a}
EOF
chmod +x $out/bin/cosmoc
pushd o
find -iname "*.com" -type f -exec install -D {} $out/{} \;
popd
find -iname "*.h" -type f -exec install -m644 -D {} $out/include/{} \;
find -iname "*.inc" -type f -exec install -m644 -D {} $out/include/{} \;
cp -RT . "$dist"
runHook postInstall
'';
passthru.tests = lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) {
hello = runCommand "hello-world" { } ''
printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c
${stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \
-fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \
-include ${cosmopolitan}/include/cosmopolitan.h \
-I ${cosmopolitan}/include \
${cosmopolitan}/lib/{crt.o,ape.o,cosmopolitan.a}
${stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com
./hello.com
printf "test successful" > $out
'';
cosmoc = runCommand "cosmoc-hello" { } ''
printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c
${cosmopolitan}/bin/cosmoc hello.c
./a.out
printf "test successful" > $out
'';
};
meta = with lib; {
homepage = "https://justine.lol/cosmopolitan/";
description = "Your build-once run-anywhere c library";
platforms = platforms.x86_64;
badPlatforms = platforms.darwin;
license = licenses.isc;
maintainers = with maintainers; [ lourkeur tomberek ];
maintainers = teams.cosmopolitan.members;
};
}

@ -17,14 +17,11 @@
, autoconf-archive
, yelp-tools
, mysqlSupport ? false
, libmysqlclient ? null
, libmysqlclient
, postgresSupport ? false
, postgresql ? null
, postgresql
}:
assert mysqlSupport -> libmysqlclient != null;
assert postgresSupport -> postgresql != null;
stdenv.mkDerivation rec {
pname = "libgda";
version = "5.2.10";
@ -46,7 +43,6 @@ stdenv.mkDerivation rec {
pkg-config
intltool
itstool
libxml2
gobject-introspection
vala
autoreconfHook
@ -65,6 +61,10 @@ stdenv.mkDerivation rec {
postgresql
];
propagatedBuildInputs = [
libxml2
];
configureFlags = [
"--with-mysql=${if mysqlSupport then "yes" else "no"}"
"--with-postgres=${if postgresSupport then "yes" else "no"}"

@ -1,10 +1,23 @@
{ stdenv, lib, fetchurl, perlPackages, intltool, autoreconfHook,
pkg-config, glib, libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib,
libimobiledevice,
monoSupport ? false, mono, gtk-sharp-2_0
{ stdenv
, lib
, fetchurl
, perlPackages
, intltool
, autoreconfHook
, pkg-config
, glib
, libxml2
, sqlite
, zlib
, sg3_utils
, gdk-pixbuf
, taglib
, libimobiledevice
, monoSupport ? false
, mono
, gtk-sharp-2_0
}:
stdenv.mkDerivation rec {
pname = "libgpod";
version = "0.8.3";
@ -27,20 +40,30 @@ stdenv.mkDerivation rec {
"--with-udev-dir=${placeholder "out"}/lib/udev"
] ++ lib.optionals monoSupport [ "--with-mono" ];
dontStrip = true;
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
gdk-pixbuf taglib libimobiledevice ];
dontStrip = monoSupport;
nativeBuildInputs = [ autoreconfHook intltool pkg-config ]
++ (with perlPackages; [ perl XMLParser ])
++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
++ lib.optional monoSupport mono;
buildInputs = [
libxml2
sg3_utils
sqlite
taglib
] ++ lib.optional monoSupport gtk-sharp-2_0;
propagatedBuildInputs = [
gdk-pixbuf
glib
libimobiledevice
];
meta = {
homepage = "https://gtkpod.sourceforge.net/";
meta = with lib; {
homepage = "https://sourceforge.net/projects/gtkpod/";
description = "Library used by gtkpod to access the contents of an ipod";
license = "LGPL";
platforms = lib.platforms.gnu ++ lib.platforms.linux;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = [ ];
};
}

@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
pname = "lief";
version = "0.11.5";
version = "0.12.0";
src = fetchFromGitHub {
owner = "lief-project";
repo = "LIEF";
rev = version;
sha256 = "sha256-crYFBeX+YaIvVAv3uvGEeNCg+ZbUryr0NacDG56TUGE=";
sha256 = "sha256-ONU/geAkqVf8SDIi9dUvHxbJkmykHMCe2UVgUyRk0gg=";
};
outputs = [ "out" "py" ];

@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl unixODBC libmysqlclient ];
propagatedBuildInputs = [ zlib pcre expat sqlite ];
buildInputs = [ unixODBC libmysqlclient ];
propagatedBuildInputs = [ zlib pcre expat sqlite openssl ];
outputs = [ "out" "dev" ];

@ -452,6 +452,10 @@ let
'';
});
typescript = super.typescript.overrideAttrs (oldAttrs: {
meta = oldAttrs.meta // { mainProgram = "tsc"; };
});
typescript-language-server = super.typescript-language-server.override {
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "asyncmy";
version = "0.2.4";
version = "0.2.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "long2ice";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nuk8Zh82qN60FrH6Jjv7RDDDQsfZ5EmbaQe5EAcB2Tk=";
sha256 = "sha256-yLAse8p+2RYHJmDwD5vrHlf29URB+kdupjD1DwTcRAc=";
};
nativeBuildInputs = [

@ -1,4 +1,7 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, azure-common
, azure-core
, msrest
@ -6,13 +9,15 @@
buildPythonPackage rec {
pname = "azure-keyvault-secrets";
version = "4.3.0";
disabled = isPy27;
version = "4.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "26279ba3a6c727deba1fb61f549496867baddffbf062bd579d6fd2bc04e95276";
hash = "sha256-wLcy253oVdnDl2YGfPQ+L2bNuyi4WfA8eH4zkkzKgtc=";
};
propagatedBuildInputs = [
@ -21,7 +26,9 @@ buildPythonPackage rec {
msrest
];
pythonNamespaces = [ "azure.keyvault" ];
pythonNamespaces = [
"azure.keyvault"
];
# requires checkout from mono-repo
doCheck = false;

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-storage-blob";
version = "12.10.0";
version = "12.11.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-PH3CyT5/8qcxrNZqNqHwpiZgcrQVTeukiU2riRKF6jo=";
sha256 = "sha256-SVNbMZC7adDZ/3o4MkaxTaTSsb3/YMrl+Rc5IMZ8p+4=";
};
propagatedBuildInputs = [

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "geojson-client";
version = "0.7";
version = "0.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "exxamalte";
repo = "python-geojson-client";
rev = "v${version}";
sha256 = "sha256-7EhdIfVM6d5fp6k+RdX6z33O5sZGeF/ThNkSXL8EjE8=";
sha256 = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU=";
};
propagatedBuildInputs = [

@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
version = "5.2.0";
version = "5.3.0";
pname = "gspread";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JRc6wIFGnPnWIVFMZXbGz0bznIJfF4uMueeDdKY3sL8=";
sha256 = "sha256-viIg4ZcjVw7ZjouOtqW24Er6DwjsHwi4niF8NUSIoEc=";
};
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "1.0.0";
version = "1.0.3";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-neYFYzBNx/Rm3PWCsQ5ooisU3Z+kJO+O+KNpbwSsUB4=";
sha256 = "sha256-WteSLhO/Ei+467tXT7Y1S6bYNNFUILbP5Pm4ZhBYaeg=";
};
propagatedBuildInputs = [

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "iminuit";
version = "2.10.0";
version = "2.11.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-k7M8ptL/1z6AtA6KQAyj28cOBWYvG9OQ4rYEAnkQFIU=";
sha256 = "sha256-jK55F8otIsaR4AeSv7u4ErhKxcdRIOsq6Hn7StpB7mw=";
};
nativeBuildInputs = [ cmake ];

@ -22,15 +22,15 @@ buildPythonPackage rec {
url = "https://github.com/python-metar/python-metar/commit/716fa76682e6c2936643d1cf62e3d302ef29aedd.patch";
hash = "sha256-y82NN+KDryOiH+eG+2ycXCO9lqQLsah4+YpGn6lM2As=";
})
(fetchpatch {
# Fix failing test: https://github.com/python-metar/python-metar/issues/165
url = "https://github.com/python-metar/python-metar/commit/a4f9a4764b99bb0313876366d30728169db2770b.patch";
hash = "sha256-sURHUb4gCKVMqEWFklTsxF0kr0SxC02Yr0287rZIvC0=";
})
];
checkInputs = [ pytestCheckHook ];
disabledTests = [
# https://github.com/python-metar/python-metar/issues/165
"test_033_parseTime_auto_month"
];
pythonImportsCheck = [ "metar" ];
meta = with lib; {

@ -8,15 +8,19 @@
, tqdm
, winacl
, winsspi
, pythonOlder
}:
buildPythonPackage rec {
pname = "msldap";
version = "0.3.30";
version = "0.3.38";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fX+W1Bq4F0/6DyxWeA6zvoswFQCdDpSk29g7nq1cYYE=";
hash = "sha256-zJEp8/jPTAb3RpzyXySdtVl2uSLpSirGkJh7GB/3Qwc=";
};
propagatedBuildInputs = [
@ -31,7 +35,10 @@ buildPythonPackage rec {
# Project doesn't have tests
doCheck = false;
pythonImportsCheck = [ "msldap" ];
pythonImportsCheck = [
"msldap"
];
meta = with lib; {
description = "Python LDAP library for auditing MS AD";

@ -38,6 +38,8 @@ buildPythonPackage rec {
# with python 3.9.6+, the deprecation warnings will fail the test suite
# see: https://github.com/pyinvoke/invoke/issues/829
# pytest-relaxed does not work with pytest 6
# see: https://github.com/bitprophet/pytest-relaxed/issues/12
doCheck = false;
disabledTestPaths = [

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pylitterbot";
version = "2021.12.0";
version = "2022.3.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "natekspencer";
repo = pname;
rev = version;
sha256 = "sha256-hz+MQTxobf7IkOJTpwbDDd3i13FFtxFn2kmCwPV3pu4=";
sha256 = "sha256-hoDj7NbDQqXLA3I3Lmh9TBzmjluaJMz2aNPca6fXy+M=";
};
propagatedBuildInputs = [

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.3.12";
version = "1.3.13";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "v${version}";
hash = "sha256-guL//OHiwlKN55kyoRPIUXuoHOVrho+vSgeV3SAdfNM=";
hash = "sha256-CkEo8H5S2/nf7jWU51sVN+GCqaL5Kgx77m6669Pr4dU=";
};
nativeBuildInputs = [

@ -38,5 +38,7 @@ buildPythonPackage rec {
description = "Relaxed test discovery/organization for pytest";
license = licenses.bsd0;
maintainers = [ maintainers.costrouc ];
# see https://github.com/bitprophet/pytest-relaxed/issues/12
broken = true;
};
}

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "python-gitlab";
version = "3.2.0";
version = "3.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-j27oEQn+wjH8K3TixANbt94FSOr4LdEZ/ilN8sSlJL4=";
sha256 = "sha256-/vJdQaYvkdqC7iD3KnKLnGnu80zwowBc27mgtHHVtJg=";
};
propagatedBuildInputs = [

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pyviz_comms";
version = "2.1.0";
version = "2.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "f4a7126f318fb6b964fef3f92fa55bc46b9218f62a8464a8b18e968b3087dbc0";
sha256 = "sha256-uMncveAfOEeEP7TQTDs/TeeEkgxx5Eztnfu1YPbJIhg=";
};
propagatedBuildInputs = [ param ];

@ -1,23 +1,24 @@
{ buildPythonPackage, lib, fetchFromGitHub, isPy3k
, cython, setuptools
, numpy, affine, attrs, cligj, click-plugins, snuggs, gdal
, pytest, pytest-cov, packaging, hypothesis, boto3, mock
, pytest, pythonOlder, packaging, hypothesis, boto3
, certifi, shapely
}:
buildPythonPackage rec {
pname = "rasterio";
version = "1.2.6";
version = "1.2.10";
disabled = pythonOlder "3.6";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
owner = "mapbox";
repo = "rasterio";
rev = version;
sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc=";
sha256 = "sha256-xVGwQfQvxsqYihUYXENJAz9Qp9xBkhsGc/RheRTJxgo=";
};
checkInputs = [ boto3 pytest pytest-cov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock;
checkInputs = [ boto3 pytest packaging hypothesis shapely ];
nativeBuildInputs = [ cython gdal ];
propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ];

@ -24,14 +24,19 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
version = "2.7.4";
version = "2.7.6";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Es8Xe7yHetAl9bAO83ecTuv9r0cueRL4fCvNyfOGQAg=";
sha256 = "sha256-MxYo4MoCdkSSuDteR3A72FcRWuKTRrct4y1/t8nsVIs=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace "pyOpenSSL>=16.2.0,<22.0.0" "pyOpenSSL"
'';
propagatedBuildInputs = [
azure-storage-blob
asn1crypto

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "stripe";
version = "2.68.0";
version = "2.69.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-X3lYAxM/KlC4NjBJrq/4Gze37wpcVKTA11VaQRpAt68=";
hash = "sha256-iDB4/FvTc34dBYDDAIMjxYbaNreuhHmle40WE0DTy58=";
};
propagatedBuildInputs = [

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cppcheck";
version = "2.7.3";
version = "2.7.4";
src = fetchFromGitHub {
owner = "danmar";
repo = "cppcheck";
rev = version;
sha256 = "0bwk89nkq67nphplb24daxvg75pv9bgh0kcqr2samhpzmjpvzxm5";
sha256 = "sha256-bMDH3TRAdDoI1AaHTpIl4P/yk9wsV0ReNh6bMmCsKys=";
};
buildInputs = [ pcre

@ -5,7 +5,7 @@
let
generic =
{ version, sha256 }:
{ version, hash }:
crystal.buildCrystalPackage {
pname = "shards";
@ -15,7 +15,7 @@ let
owner = "crystal-lang";
repo = "shards";
rev = "v${version}";
inherit sha256;
inherit hash;
};
# we cannot use `make` or `shards` here as it would introduce a cyclical dependency
@ -36,16 +36,10 @@ let
in
rec {
shards_0_15 = generic {
version = "0.15.0";
sha256 = "sha256-/C6whh5RbTBkFWqpn0GqyVe0opbrklm8xPv5MIG99VU=";
};
shards_0_16 = generic {
version = "0.16.0";
sha256 = "sha256-go8sL4djIDGNwb7FsCcATONnMYahHY8qJUDyUiPLRUY=";
shards_0_17 = generic {
version = "0.17.0";
hash = "sha256-f9MptrKalW7gi0J2h0fokkzdjKBVa2TmoPX8BYffqzY=";
};
shards = shards_0_16;
shards = shards_0_17;
}

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fly";
version = "7.7.0";
version = "7.7.1";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
sha256 = "sha256-BKEUKQQxZ+Maq2JSHeWuQ7Lhgfc33pSiVS6VfAlMu/g=";
sha256 = "sha256-AJvD9re4jj+ixvZKWHDJM0QEv5EPFv3VFJus3lnm2LI=";
};
vendorSha256 = "sha256-G9HdhPi4iezUR6SIVYnjL0fznOfiusY4T9ClLPr1w5c=";

@ -0,0 +1,40 @@
{ stdenv, lib, cosmopolitan }:
stdenv.mkDerivation {
pname = "cosmoc";
inherit (cosmopolitan) version;
doInstallCheck = true;
dontUnpack = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cat <<EOF >$out/bin/cosmoc
#!${stdenv.shell}
exec ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}gcc \
-O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \
"\$@" \
-Wl,--gc-sections -Wl,-z,max-page-size=0x1000 \
-fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \
-include ${cosmopolitan}/include/cosmopolitan.h \
${cosmopolitan}/lib/{crt.o,ape.o,cosmopolitan.a}
EOF
chmod +x $out/bin/cosmoc
runHook postInstall
'';
installCheckPhase = ''
printf 'main() { printf("hello world\\n"); }\n' >hello.c
$out/bin/cosmoc hello.c
./a.out
'';
meta = with lib; {
homepage = "https://justine.lol/cosmopolitan/";
description = "compiler for Cosmopolitan C programs";
license = licenses.mit;
maintainers = teams.cosmopolitan.members;
};
}

@ -19,11 +19,11 @@ let
in buildPythonApplication rec {
pname = "pipenv";
version = "2022.3.24";
version = "2022.3.28";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-gAGY1DDnJPiZ5tsxnMZA1f1toqzbwwHOsaH5Z+mQQos=";
sha256 = "sha256-TnquYtrXZ5zoG1TMNFG+GfssRp4mkzWzaxQTL+XO7LM=";
};
LC_ALL = "en_US.UTF-8";

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-spellcheck";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "drahnr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-g8HsxY6moTLGdD1yBpzNNV+9uNdgbc0KG46ZxqwKH9A=";
sha256 = "sha256-Iafhx0bK386grGadsJc/t1lLjd/C89fCVuHrq3FMaE0=";
};
cargoSha256 = "sha256-ehOeussyO/0lhIN8xfbEDMvgfooC0SzJ9id/skw1sdA=";
cargoSha256 = "sha256-ZYZA4H1LvsFQR6mvKAie9Tha3MWocAVpNtG7LwdtcPg=";
buildInputs = lib.optional stdenv.isDarwin Security;

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "symfony-cli";
version = "5.4.2";
vendorSha256 = "sha256-MlsgII1QybyW+B7DGbSyn7VQ36n29yOC0pZnaemEHO8=";
version = "5.4.5";
vendorSha256 = "sha256-ss3AtHigm1U3KhVhulIAquNf0WG7y4BSQcxs4pwnHVY=";
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
rev = "v${version}";
sha256 = "sha256-Ci523YoocpCexbXMg3PjQ/x8z/STWt+nro64l+ckKzM=";
sha256 = "sha256-xYNq5hnkk6OIsnDHhN/vh1LNuP7isTNgtTY2WUwC8x4=";
};
# Tests requires network access

@ -0,0 +1,49 @@
{ stdenvNoCC
, fetchurl
, unzip
, pname
, version
, meta
}:
let
appName = "Postman.app";
dist = {
aarch64-darwin = {
arch = "arm64";
sha256 = "sha256-EtTf17LS18zC3JMbSoyZGGHuIcwGN3Q15XOhVqeh7C4=";
};
x86_64-darwin = {
arch = "64";
sha256 = "sha256-kTgbqGPgOn5dyjL/IMl3hg2+VUfB+jpPJsqXof8UL+c=";
};
}.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
in
stdenvNoCC.mkDerivation {
inherit pname version meta;
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/osx_${dist.arch}";
inherit (dist) sha256;
name = "${pname}-${version}.zip";
};
nativeBuildInputs = [ unzip ];
sourceRoot = appName;
installPhase = ''
runHook preInstall
mkdir -p $out/{Applications/${appName},bin}
cp -R . $out/Applications/${appName}
cat > $out/bin/${pname} << EOF
#!${stdenvNoCC.shell}
open -na $out/Applications/${appName} --args "$@"
EOF
chmod +x $out/bin/${pname}
runHook postInstall
'';
}

@ -1,107 +1,18 @@
{ lib, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
, atk, at-spi2-atk, at-spi2-core, alsa-lib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3
, freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi
, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes
, libXrender, libXtst, libXScrnSaver, libxkbcommon, libdrm, mesa, xorg
}:
{ stdenvNoCC, callPackage, lib }:
stdenv.mkDerivation rec {
let
pname = "postman";
version = "9.14.0";
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha256 = "sha256-pA3gT4xoIWhajY03JzVgHK5KyTx1uH6gyasuLTdt6cM=";
name = "${pname}.tar.gz";
};
dontBuild = true; # nothing to build
dontConfigure = true;
desktopItem = makeDesktopItem {
name = "postman";
exec = "postman";
icon = "postman";
comment = "API Development Environment";
desktopName = "Postman";
genericName = "Postman";
categories = [ "Development" ];
};
buildInputs = [
stdenv.cc.cc.lib
atk
at-spi2-atk
at-spi2-core
alsa-lib
cairo
cups
dbus
expat
gdk-pixbuf
glib
gtk3
freetype
fontconfig
mesa
nss
nspr
pango
udev
libdrm
libuuid
libX11
libxcb
libXi
libXcursor
libXdamage
libXrandr
libXcomposite
libXext
libXfixes
libXrender
libXtst
libXScrnSaver
libxkbcommon
xorg.libxshmfence
];
nativeBuildInputs = [ wrapGAppsHook ];
installPhase = ''
mkdir -p $out/share/postman
cp -R app/* $out/share/postman
rm $out/share/postman/Postman
mkdir -p $out/bin
ln -s $out/share/postman/postman $out/bin/postman
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
iconRootDir=$out/share/icons
iconSizeDir=$out/share/icons/hicolor/128x128/apps
mkdir -p $iconSizeDir
ln -s $out/share/postman/resources/app/assets/icon.png $iconRootDir/postman.png
ln -s $out/share/postman/resources/app/assets/icon.png $iconSizeDir/postman.png
'';
postFixup = ''
pushd $out/share/postman
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" postman
for file in $(find . -type f \( -name \*.node -o -name postman -o -name \*.so\* \) ); do
ORIGIN=$(patchelf --print-rpath $file); \
patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file
done
popd
'';
meta = with lib; {
homepage = "https://www.getpostman.com";
description = "API Development Environment";
license = licenses.postman;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ johnrichardrinehart evanjs ];
platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
maintainers = with maintainers; [ johnrichardrinehart evanjs tricktron ];
};
}
in
if stdenvNoCC.isDarwin
then callPackage ./darwin.nix { inherit pname version meta; }
else callPackage ./linux.nix { inherit pname version meta; }

@ -0,0 +1,133 @@
{ lib
, stdenv
, fetchurl
, makeDesktopItem
, wrapGAppsHook
, atk
, at-spi2-atk
, at-spi2-core
, alsa-lib
, cairo
, cups
, dbus
, expat
, gdk-pixbuf
, glib
, gtk3
, freetype
, fontconfig
, nss
, nspr
, pango
, udev
, libuuid
, libX11
, libxcb
, libXi
, libXcursor
, libXdamage
, libXrandr
, libXcomposite
, libXext
, libXfixes
, libXrender
, libXtst
, libXScrnSaver
, libxkbcommon
, libdrm
, mesa
, xorg
, pname
, version
, meta
, copyDesktopItems
}:
stdenv.mkDerivation rec {
inherit pname version meta;
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha256 = "sha256-pA3gT4xoIWhajY03JzVgHK5KyTx1uH6gyasuLTdt6cM=";
name = "${pname}.tar.gz";
};
dontConfigure = true;
desktopItems = [
(makeDesktopItem {
name = "postman";
exec = "postman";
icon = "postman";
comment = "API Development Environment";
desktopName = "Postman";
genericName = "Postman";
categories = [ "Development" ];
})
];
buildInputs = [
stdenv.cc.cc.lib
atk
at-spi2-atk
at-spi2-core
alsa-lib
cairo
cups
dbus
expat
gdk-pixbuf
glib
gtk3
freetype
fontconfig
mesa
nss
nspr
pango
udev
libdrm
libuuid
libX11
libxcb
libXi
libXcursor
libXdamage
libXrandr
libXcomposite
libXext
libXfixes
libXrender
libXtst
libXScrnSaver
libxkbcommon
xorg.libxshmfence
];
nativeBuildInputs = [ wrapGAppsHook copyDesktopItems ];
installPhase = ''
runHook preInstall
mkdir -p $out/share/postman
cp -R app/* $out/share/postman
rm $out/share/postman/Postman
mkdir -p $out/bin
ln -s $out/share/postman/postman $out/bin/postman
mkdir -p $out/share/icons/hicolor/128x128/apps
ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/postman.png
ln -s $out/share/postman/resources/app/assets/icon.png $out/share/icons/hicolor/128x128/apps/postman.png
runHook postInstall
'';
postFixup = ''
pushd $out/share/postman
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" postman
for file in $(find . -type f \( -name \*.node -o -name postman -o -name \*.so\* \) ); do
ORIGIN=$(patchelf --print-rpath $file); \
patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file
done
popd
'';
}

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "2048-in-terminal";
version = "2021-09-12";
version = "unstable-2021-09-12";
src = fetchFromGitHub {
sha256 = "1jgacyimn59kxqhrk8jp13qayc2mncxhx393spqcxbz0sj6lxq9p";
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
description = "Animated console version of the 2048 game";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "m-cli";
version = "0.2.5";
version = "0.3.0";
src = fetchFromGitHub {
owner = "rgcr";
repo = "m-cli";
repo = pname;
rev = "v${version}";
sha512 = "0mkcx7jq91pbfs8327qc8434gj73fvjgdfdsrza0lyd9wns6jhsqsf0585klzl68aqscvksgzi2asdnim4va35cdkp2fdzl0g3sm4kd";
sha256 = "sha256-KzlE1DdVMLnGmcOS1a2HK4pASofD1EHpdqbzVVIxeb4=";
};
dontBuild = true;
@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
platforms = platforms.darwin;
maintainers = with maintainers; [];
mainProgram = "m";
};
}

@ -92,7 +92,7 @@ in stdenv.mkDerivation rec {
provides the reference implementation for communicating with the FUSE
kernel module.
'';
inherit (src.meta) homepage;
homepage = "https://github.com/libfuse/libfuse";
changelog = "https://github.com/libfuse/libfuse/releases/tag/fuse-${version}";
platforms = platforms.linux;
license = with licenses; [ gpl2Only lgpl21Only ];

@ -54,10 +54,10 @@ rec {
# Last one supporting Kepler architecture
legacy_470 = generic {
version = "470.94";
sha256_64bit = "lYWqKTMOutm98izjyiusICbIWpoy8D18WfcUp3mFAOs=";
settingsSha256 = "blJNKuFu/Th/ceexkKhTH/eYk8miUlTT+ESrcIyJNn0=";
persistencedSha256 = "xnccQ/EgafwnReBlk5Y7iClAj4hwXyFq9gUmwqyEuwE=";
version = "470.103.01";
sha256_64bit = "VsIwn4nCE0Y7DEY2D3siddc3HTxyevP+3IjElu3Ih6U=";
settingsSha256 = "Roc2OFSNEnIGLVwP0D9f8vFTf5v3KkL99S0mZBWN7s0=";
persistencedSha256 = "AVI0j2bpfMCMBTKuQp+BoCewaXIW3Xt4NnV1fjAHOr0=";
};
# Last one supporting x86
@ -67,6 +67,8 @@ rec {
sha256_64bit = "09qcdfn4j5jza3iw59wqwgq4a489qf7kx355yssrcahaw9g87lxz";
settingsSha256 = "16qqw0jy31da65cdi17y3j2kcdhw09vra7g17bkcimaqnf70j0ni";
persistencedSha256 = "1ad81y4qfpxrx0vqsk81a3h0bi1yg8hw5gi5y5d58p76vc8083i9";
broken = kernel.kernelAtLeast "5.17";
};
legacy_340 = generic {
@ -77,7 +79,7 @@ rec {
persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn";
useGLVND = false;
broken = with kernel; kernelAtLeast "5.5";
broken = kernel.kernelAtLeast "5.5";
patches = [ ./vm_operations_struct-fault.patch ];
};
}

@ -11,14 +11,14 @@ in
buildPythonPackage rec {
pname = "etebase-server";
version = "0.7.0";
version = "0.8.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "etesync";
repo = "server";
rev = "v${version}";
sha256 = "1r2a7ki9w2h3l6rwqa3fzxjlqfj2lbgfrm8lynjhvcdv02s5abbi";
sha256 = "sha256-rPs34uzb5veiOw74SACLrDm4Io0CYH9EL9IuV38CkPY=";
};
patches = [ ./secret.patch ];
@ -30,6 +30,7 @@ buildPythonPackage rec {
django-cors-headers
djangorestframework
drf-nested-routers
fastapi
msgpack
psycopg2
pycparser

@ -16,10 +16,10 @@ index 253fbafef..815a2e1e0 100644
const (
- defaultPath = "/bin:/usr/bin:/usr/local/bin:/sbin"
+ defaultPath = "/bin:/usr/bin:/usr/local/bin:/sbin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/run/wrappers/bin"
+ defaultPath = "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/bin:/usr/bin:/usr/local/bin:/sbin"
defaultEnvPath = "PATH=" + defaultPath
- defaultRootPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ defaultRootPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/etc/profiles/per-user/root/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/run/wrappers/bin"
+ defaultRootPath = "/run/wrappers/bin:/etc/profiles/per-user/root/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
defaultEnvRootPath = "PATH=" + defaultRootPath
defaultTerm = "xterm"
defaultLoginDefsPath = "/etc/login.defs"

@ -23,6 +23,7 @@
, libxcb
, libxkbfile
, libxshmfence
, libxcvt
, mesa
, meson
, ninja
@ -43,10 +44,10 @@
stdenv.mkDerivation rec {
pname = "xwayland";
version = "21.1.4";
version = "22.1.0";
src = fetchurl {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
sha256 = "sha256-GfZ5XzHPqOs1Kx5bPDefIu5gIOmHAf8sxnnajE8RWfc=";
sha256 = "sha256-F1LW0Kkw5xKStaMI04EevVTYzGjKz/RN5lQmW4YXor8=";
};
depsBuildBuild = [
@ -82,6 +83,7 @@ stdenv.mkDerivation rec {
libxcb
libxkbfile
libxshmfence
libxcvt
mesa
openssl
pixman

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2022-03-28";
version = "2022-03-29";
pname = "oh-my-zsh";
rev = "3f214329d631b3ae39d6b283262c77819a0078de";
rev = "93435bff4947ca0855d4d8ecc4786877578f0dd3";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "rmSS8RnTbraA8yoU70/Mwx7wZ+uGuxkw4MO4BeuLulM=";
sha256 = "w9DU2eTf8fID/xDhkJYVPuvYbVIXE9GKW8pycKZ9jVA=";
};
installPhase = ''

@ -7,11 +7,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "mycli";
version = "1.24.3";
version = "1.24.4";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Qk2qOXfAM7xJv1fDt/mnb2NZFf5S/ExonQtLE4m22a4=";
sha256 = "sha256-Q0W5XJ/pRMqvgz3I4Ytj6vNBP798R04E2MDNKx11xQc=";
};
propagatedBuildInputs = [

@ -106,10 +106,10 @@ let
unwrapped = stdenv.mkDerivation rec {
name = "tsm-client-${version}-unwrapped";
version = "8.1.13.3";
version = "8.1.14.0";
src = fetchurl {
url = mkSrcUrl version;
sha256 = "1dwczf236drdaf4jcfzz5154vdwvxf5zraxhrhiddl6n80hnvbcd";
sha256 = "1iczc4w8rwzqnw01r89kwxcdr7pnwh3nqr3a0q8ncrxrhsy3qwn0";
};
inherit meta passthru;

@ -2,6 +2,7 @@
, buildGoModule
, fetchFromGitHub
, makeWrapper
, nixosTests
, openssh
}:
buildGoModule rec {
@ -32,11 +33,15 @@ buildGoModule rec {
--prefix PATH : ${lib.makeBinPath [ openssh ]}
'';
passthru.tests = {
inherit (nixosTests) zrepl;
};
meta = with lib; {
homepage = "https://zrepl.github.io/";
description = "A one-stop, integrated solution for ZFS replication";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ cole-h danderson ];
maintainers = with maintainers; [ cole-h danderson mdlayher ];
};
}

@ -11,11 +11,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "207";
version = "209";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-0PWnaOQV4Pj0hFMpn98xYhZDexctkweIE2ZM3ppYfvg=";
sha256 = "sha256-ZyHec9EbLrHmzCGd/Cwg/y9XCUQPtZhRH0xCouHKMp0=";
};
outputs = [ "out" "man" ];

@ -0,0 +1,28 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ntfy-sh";
version = "1.18.1";
src = fetchFromGitHub {
owner = "binwiederhier";
repo = "ntfy";
rev = "v${version}";
sha256 = "sha256-rXdkNJYpQ8s2BeFRR4fSIuCrdq60me4B3wee64ei8qM=";
};
vendorSha256 = "sha256-7b3cQczQLUZ//5ubKvq8s9U75qJpJaieLN+kzjXIyHg=";
doCheck = false;
preBuild = ''
make server-deps-static-sites
'';
meta = with lib; {
description = "Send push notifications to your phone or desktop via PUT/POST";
homepage = "https://ntfy.sh";
license = licenses.asl20;
maintainers = with maintainers; [ arjan-s ];
};
}

@ -2,7 +2,6 @@
, rustPlatform
, lib
, stdenv
, fetchpatch
, pkg-config
, zstd
, CoreFoundation
@ -13,26 +12,21 @@
rustPlatform.buildRustPackage rec {
pname = "onefetch";
version = "2.11.0";
version = "2.12.0";
src = fetchFromGitHub {
owner = "o2sh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-16oiZAyj6haBk6mgUT25pPDUrCMd7pGo2kAQ0gTe2kM=";
sha256 = "sha256-nSvqAXzA/4CSnOMCZri2ks58bW+9v+SoyIIzb+K5S88=";
};
cargoPatches = [
# enable pkg-config feature of zstd
./zstd-pkg-config.patch
# fix flaky test
(fetchpatch {
url = "https://github.com/o2sh/onefetch/commit/2c1f2f0b2c666f6ce94af0299f88048dd1d83484.patch";
sha256 = "sha256-pI3yCFYkqOmLgKnCwexv1LcCrCkhi44zhEAx0szaMkg=";
})
];
cargoSha256 = "sha256-6wnfn33mfye5o/vY1JQX1Lc4+jzHiKKgGsSLxeJWyFc=";
cargoSha256 = "sha256-uSef6x5QkXKwajglbwyoIsUFGbz0zntVM1ko0FZqnck=";
nativeBuildInputs = [ pkg-config ];

@ -23,7 +23,7 @@ index 8e0b5ff..48959b4 100644
@@ -57,6 +57,8 @@ libc = "0.2.112"
[dev-dependencies]
more-asserts = "0.2"
paste = "1.0.6"
paste = "1.0.7"
+# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library
+zstd-sys = { version = "1", features = [ "pkg-config" ] }

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nfpm";
version = "2.15.0";
version = "2.15.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-z9jGivdO7LduJuHbyKr4sl8xg+FGVvKwCm+RgVQPxJQ=";
sha256 = "sha256-D/1psEpOoDiA/dpnUc9sUaOq8Dk5QEImIWEp08FyV7o=";
};
vendorSha256 = "sha256-guJgLjmB29sOLIzs2+gKNp0WTWC3zS9Sb5DD5IistKY=";

@ -0,0 +1,7 @@
source 'https://rubygems.org'
gem 'winrm'
gem 'winrm-fs'
gem 'stringio'
gem 'logger'
gem 'fileutils'

@ -0,0 +1,51 @@
GEM
remote: https://rubygems.org/
specs:
builder (3.2.3)
erubis (2.7.0)
ffi (1.11.1)
fileutils (0.7.2)
gssapi (1.3.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
httpclient (2.8.3)
little-plugger (1.1.4)
logger (1.4.3)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
multi_json (1.14.1)
nori (2.6.0)
rexml (3.2.5)
rubyntlm (0.6.2)
rubyzip (1.3.0)
stringio (0.0.2)
winrm (2.3.2)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
gyoku (~> 1.0)
httpclient (~> 2.2, >= 2.2.0.2)
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
rexml (>= 3.2.3.1)
rubyntlm (~> 0.6.0, >= 0.6.1)
winrm-fs (1.3.2)
erubis (~> 2.7)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
winrm (~> 2.0)
PLATFORMS
ruby
DEPENDENCIES
fileutils
logger
stringio
winrm
winrm-fs
BUNDLED WITH
2.2.24

@ -0,0 +1,36 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, bundlerEnv }:
stdenv.mkDerivation rec {
pname = "evil-winrm";
version = "3.3";
src = fetchFromGitHub {
owner = "Hackplayers";
repo = "evil-winrm";
rev = "v${version}";
sha256 = "sha256-uWhRkq7I/XRWSUpR8lWRhDImE6x0pX9/B3gKhRIhkf8=";
};
env = bundlerEnv {
name = pname;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ env.wrappedRuby ];
installPhase = ''
mkdir -p $out/bin
cp evil-winrm.rb $out/bin/evil-winrm
'';
meta = with lib; {
homepage = "https://github.com/Hackplayers/evil-winrm";
changelog = "https://github.com/Hackplayers/evil-winrm/releases/tag/v${version}";
description = "WinRM shell for hacking/pentesting";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ elohmeier ];
};
}

@ -0,0 +1,187 @@
{
builder = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
type = "gem";
};
version = "3.2.3";
};
erubis = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
type = "gem";
};
version = "2.7.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
type = "gem";
};
version = "1.11.1";
};
fileutils = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "173z4dsqp9khcsl7x93dq1qj9d7rd378a7yfg53b1s6mczlkvh2k";
type = "gem";
};
version = "0.7.2";
};
gssapi = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh";
type = "gem";
};
version = "1.3.0";
};
gyoku = {
dependencies = ["builder"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh";
type = "gem";
};
version = "1.3.1";
};
httpclient = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
type = "gem";
};
version = "2.8.3";
};
little-plugger = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
type = "gem";
};
version = "1.1.4";
};
logger = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ihvvl2im9qii31d42c9kfscdg2flfqajs6ycbpslznclmfc71gc";
type = "gem";
};
version = "1.4.3";
};
logging = {
dependencies = ["little-plugger" "multi_json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
type = "gem";
};
version = "2.2.2";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr";
type = "gem";
};
version = "1.14.1";
};
nori = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn";
type = "gem";
};
version = "2.6.0";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.5";
};
rubyntlm = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
type = "gem";
};
version = "0.6.2";
};
rubyzip = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l";
type = "gem";
};
version = "1.3.0";
};
stringio = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hj8awh547kf6a7vgs565xh8hicffd0brb2a96jna5lr3a2fvmj8";
type = "gem";
};
version = "0.0.2";
};
winrm = {
dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rexml" "rubyntlm"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19vxrclxc5l8n2agwvv291740s6gna2phg3lkybjb0ldkmpi3sj2";
type = "gem";
};
version = "2.3.2";
};
winrm-fs = {
dependencies = ["erubis" "logging" "rubyzip" "winrm"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fy4yj52kssrm5hchq7l2mbry6w6yvi736p1wjpyv8m19rx7k0c3";
type = "gem";
};
version = "1.3.2";
};
}

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.23.0";
version = "0.24.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-y1rwuZlkrxO1iOSN2o8pIewbNENs0xsntzLEZgfUgZ4=";
sha256 = "sha256-Yp0WwzGo8nuRZuiHdUPxPM1SYBeeVA3SMDfHnQmqUqY=";
};
cargoSha256 = "sha256-mH6pkfWc8xXLXV/07LQ1jgk9hgt8WcIGdaNPpk7deLQ=";
cargoSha256 = "sha256-m80PT2UQYhA5KEh7ax/fhh6vuse0DXhbFsh2x4pwkWY=";
meta = with lib; {
description = "A syntax-aware diff";

@ -38,11 +38,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.12.2";
version = "0.12.4";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0ilnb4gmrj5h5i4q7pl2pyd6n2rdc358x7r163ap0dszypq6f0si";
sha256 = "1n46q7xwawz5nipmyz4gy0njaq5svidi9r54wxry6h95b70ax3r2";
};
configureFlags = [

@ -2745,6 +2745,8 @@ with pkgs;
wdomirror = callPackage ../tools/wayland/wdomirror { };
wdt = callPackage ../applications/networking/sync/wdt { };
wl-clipboard = callPackage ../tools/wayland/wl-clipboard { };
wl-clipboard-x11 = callPackage ../tools/wayland/wl-clipboard-x11 { };
@ -5076,6 +5078,8 @@ with pkgs;
epubcheck = callPackage ../tools/text/epubcheck { };
evil-winrm = callPackage ../tools/security/evil-winrm { };
luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup {
ssh = openssh;
};
@ -8496,6 +8500,8 @@ with pkgs;
ntfy = callPackage ../tools/misc/ntfy {};
ntfy-sh = callPackage ../tools/misc/ntfy-sh {};
ntirpc = callPackage ../development/libraries/ntirpc { };
ntopng = callPackage ../tools/networking/ntopng { };
@ -14174,10 +14180,9 @@ with pkgs;
pew = callPackage ../development/tools/pew {};
poetry = with python3Packages; toPythonApplication (callPackage ../development/tools/poetry2nix/poetry2nix/pkgs/poetry {
inherit python;
});
poetry = callPackage ../development/tools/poetry2nix/poetry2nix/pkgs/poetry {
python = python3;
};
poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix {
inherit pkgs lib;
};
@ -15830,8 +15835,7 @@ with pkgs;
shallot = callPackage ../tools/misc/shallot { };
inherit (callPackage ../development/tools/build-managers/shards { })
shards_0_15
shards_0_16
shards_0_17
shards;
shellcheck = callPackage ../development/tools/shellcheck {
@ -16545,8 +16549,12 @@ with pkgs;
cog = callPackage ../development/web/cog { };
cosmoc = callPackage ../development/tools/cosmoc { };
cosmopolitan = callPackage ../development/libraries/cosmopolitan { };
python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { };
ctl = callPackage ../development/libraries/ctl { };
ctpp2 = callPackage ../development/libraries/ctpp2 { };
@ -19293,6 +19301,10 @@ with pkgs;
microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { };
microsoft-edge = callPackage (import ../applications/networking/browsers/microsoft-edge).stable { };
microsoft-edge-beta = callPackage (import ../applications/networking/browsers/microsoft-edge).beta { };
microsoft-edge-dev = callPackage (import ../applications/networking/browsers/microsoft-edge).dev { };
micronucleus = callPackage ../development/tools/misc/micronucleus { };
markdown-anki-decks = callPackage ../tools/misc/markdown-anki-decks { };

Loading…
Cancel
Save