nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
58a71457 eb81abe9

+773 -599
+3 -3
CONTRIBUTING.md
··· 53 53 54 54 Package version upgrades usually allow for simpler commit messages, including attribute name, old and new version, as well as a reference to the relevant release notes/changelog. Every once in a while a package upgrade requires more extensive changes, and that subsequently warrants a more verbose message. 55 55 56 - We prefer not to use the "squash merge" feature in nixpkgs: in order to keep as much information as possible in the commit history, we expect pull requests to consist of self-contained commits as described above. 57 - This means that, after addressing review comments and before the PR is merged, you will sometimes need to rewrite your branch's history and then force-push it with `git push --force-with-lease`. 58 - Useful commands to be comfortable with are `git commit --amend`, `git commit --fixup` and `git rebase -i` (and don't forget that git lets you define aliases!). 56 + Pull requests should not be squash merged in order to keep complete commit messages and GPG signatures intact and must not be when the change doesn't make sense as a single commit. 57 + This means that, when addressing review comments in order to keep the pull request in an always mergeable status, you will sometimes need to rewrite your branch's history and then force-push it with `git push --force-with-lease`. 58 + Useful git commands that can help a lot with this are `git commit --patch --amend` and `git rebase --interactive @~3`. For more details consult the git man pages. 59 59 60 60 ## Rebasing between branches (i.e. from master to staging) 61 61
-10
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
··· 98 98 <listitem> 99 99 <para> 100 100 The 101 - <link linkend="opt-services.avahi.openFirewall">services.avahi.openFirewall</link> 102 - module option default value has been changed from 103 - <literal>true</literal> to <literal>false</literal>. You will 104 - need to explicitely set this option to 105 - <literal>true</literal>, or configure your firewall. 106 - </para> 107 - </listitem> 108 - <listitem> 109 - <para> 110 - The 111 101 <link linkend="opt-services.tmate-ssh-server.openFirewall">services.tmate-ssh-server.openFirewall</link> 112 102 module option default value has been changed from 113 103 <literal>true</literal> to <literal>false</literal>. You will
-2
nixos/doc/manual/release-notes/rl-2305.section.md
··· 33 33 34 34 - The [services.snapserver.openFirewall](#opt-services.snapserver.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall. 35 35 36 - - The [services.avahi.openFirewall](#opt-services.avahi.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall. 37 - 38 36 - The [services.tmate-ssh-server.openFirewall](#opt-services.tmate-ssh-server.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall. 39 37 40 38 - The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
+1
nixos/modules/profiles/base.nix
··· 42 42 pkgs.smartmontools # for diagnosing hard disks 43 43 pkgs.pciutils 44 44 pkgs.usbutils 45 + pkgs.nvme-cli 45 46 46 47 # Tools to create / manipulate filesystems. 47 48 pkgs.ntfsprogs # for resizing NTFS partitions
+4
nixos/modules/services/desktops/pipewire/wireplumber.nix
··· 32 32 assertion = !config.services.pipewire.media-session.enable; 33 33 message = "WirePlumber and pipewire-media-session can't be enabled at the same time."; 34 34 } 35 + { 36 + assertion = !config.hardware.bluetooth.hsphfpd.enable; 37 + message = "Using Wireplumber conflicts with hsphfpd, as it provides the same functionality. `hardware.bluetooth.hsphfpd.enable` needs be set to false"; 38 + } 35 39 ]; 36 40 37 41 environment.systemPackages = [ cfg.package ];
+3 -2
nixos/modules/services/networking/avahi-daemon.nix
··· 103 103 104 104 openFirewall = mkOption { 105 105 type = types.bool; 106 - default = false; 106 + default = true; 107 107 description = lib.mdDoc '' 108 108 Whether to open the firewall for UDP port 5353. 109 + Disabling this setting also disables discovering of network devices. 109 110 ''; 110 111 }; 111 112 112 113 allowPointToPoint = mkOption { 113 114 type = types.bool; 114 115 default = false; 115 - description= lib.mdDoc '' 116 + description = lib.mdDoc '' 116 117 Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large 117 118 latencies with such links and opens a potential security hole by allowing mDNS access from Internet 118 119 connections.
+5 -3
nixos/modules/services/torrent/transmission.nix
··· 174 174 }; 175 175 }; 176 176 177 + package = mkPackageOption pkgs "transmission" {}; 178 + 177 179 downloadDirPermissions = mkOption { 178 180 type = with types; nullOr str; 179 181 default = null; ··· 289 287 install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \ 290 288 '${cfg.home}/${settingsDir}/settings.json' 291 289 '')]; 292 - ExecStart="${pkgs.transmission}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir} ${escapeShellArgs cfg.extraFlags}"; 290 + ExecStart="${cfg.package}/bin/transmission-daemon -f -g ${cfg.home}/${settingsDir} ${escapeShellArgs cfg.extraFlags}"; 293 291 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; 294 292 User = cfg.user; 295 293 Group = cfg.group; ··· 387 385 }; 388 386 389 387 # It's useful to have transmission in path, e.g. for remote control 390 - environment.systemPackages = [ pkgs.transmission ]; 388 + environment.systemPackages = [ cfg.package ]; 391 389 392 390 users.users = optionalAttrs (cfg.user == "transmission") ({ 393 391 transmission = { ··· 459 457 ]; 460 458 461 459 security.apparmor.policies."bin.transmission-daemon".profile = '' 462 - include "${pkgs.transmission.apparmor}/bin.transmission-daemon" 460 + include "${cfg.package.apparmor}/bin.transmission-daemon" 463 461 ''; 464 462 security.apparmor.includes."local/bin.transmission-daemon" = '' 465 463 r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE},
+17 -2
pkgs/applications/emulators/box64/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 5 + , gitUpdater 4 6 , cmake 5 7 , python3 6 8 }: 7 9 8 10 stdenv.mkDerivation rec { 9 11 pname = "box64"; 10 - version = "0.1.8"; 12 + version = "0.2.0"; 11 13 12 14 src = fetchFromGitHub { 13 15 owner = "ptitSeb"; 14 16 repo = pname; 15 17 rev = "v${version}"; 16 - hash = "sha256-6k8Enbafnj19ATtgmw8W7LxtRpM3Ousj1bpZbbtq8TM="; 18 + hash = "sha256-eMp2eSWMRJQvLRQKUirBua6Kt7ZtyebfUnKIlibkNFU="; 17 19 }; 20 + 21 + patches = [ 22 + # Fix mmx & cppThreads tests on x86_64 23 + # Remove when version > 0.2.0 24 + (fetchpatch { 25 + url = "https://github.com/ptitSeb/box64/commit/3819aecf078fcf47b2bc73713531361406a51895.patch"; 26 + hash = "sha256-11hy5Ol5FSE/kNJmXAIwNLbapldhlZGKtOLIoL6pYrg="; 27 + }) 28 + ]; 18 29 19 30 nativeBuildInputs = [ 20 31 cmake ··· 66 55 $out/bin/box64 -v 67 56 runHook postInstallCheck 68 57 ''; 58 + 59 + passthru.updateScript = gitUpdater { 60 + rev-prefix = "v"; 61 + }; 69 62 70 63 meta = with lib; { 71 64 homepage = "https://box86.org/";
+3 -3
pkgs/applications/emulators/proton-caller/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "proton-caller"; 5 - version = "3.1.0"; 5 + version = "3.1.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "caverym"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "sha256-eyHFKAGx8du4osoGDsMFzVE/TC/ZMPsx6mrWUPDCLJ4="; 11 + sha256 = "sha256-fN/8woLkTFD0aGILwweHhpey3cGQw2NolvpOmdkEEGA="; 12 12 }; 13 13 14 - cargoSha256 = "sha256-/4+r5rvRUqQL8EVIg/22ZytXyE4+SV4UEcXiEw4795U="; 14 + cargoSha256 = "sha256-2zczu9MtsDDbfjbmLXCiPJrxNoNNBN0KAGeN+a53SRg="; 15 15 16 16 meta = with lib; { 17 17 description = "Run Windows programs with Proton";
+4 -2
pkgs/applications/misc/bottles/default.nix
··· 28 28 }: 29 29 python3Packages.buildPythonApplication rec { 30 30 pname = "bottles-unwrapped"; 31 - version = "2022.11.14"; 31 + version = "2022.12.14"; 32 32 33 33 src = fetchFromGitHub { 34 34 owner = "bottlesdevs"; 35 35 repo = "bottles"; 36 36 rev = version; 37 - sha256 = "sha256-bigrJtqx9iZURYojwxlGe7xSGWS13wSaGcrTTROP9J8="; 37 + sha256 = "sha256-G2FQy+mea/+2RjK/WjLeX+7TP+HU6fCUFYuprFGKEyw="; 38 38 }; 39 39 40 40 patches = [ ./vulkan_icd.patch ]; 41 41 42 + # https://github.com/bottlesdevs/Bottles/wiki/Packaging 42 43 nativeBuildInputs = [ 43 44 blueprint-compiler 44 45 meson ··· 59 58 ]; 60 59 61 60 propagatedBuildInputs = with python3Packages; [ 61 + pycurl 62 62 pyyaml 63 63 requests 64 64 pygobject3
+19 -6
pkgs/applications/misc/heimer/default.nix
··· 1 - { mkDerivation, lib, fetchFromGitHub, cmake, qttools, qtbase }: 1 + { lib 2 + , mkDerivation 3 + , fetchFromGitHub 4 + , cmake 5 + , qttools 6 + , qtbase 7 + }: 2 8 3 9 mkDerivation rec { 4 10 pname = "heimer"; 5 - version = "3.6.2"; 11 + version = "3.6.3"; 6 12 7 13 src = fetchFromGitHub { 8 14 owner = "juzzlin"; 9 15 repo = pname; 10 16 rev = version; 11 - sha256 = "sha256-NAjl7eRmMkRrVhlza87ErllEa1QfPZ8GRI1aljY6itI="; 17 + hash = "sha256-G0prFxKXHiRtV6uVp1Ckym0/rOFxrOHrEI5K9hkWjfU="; 12 18 }; 13 19 14 - nativeBuildInputs = [ cmake ]; 15 - buildInputs = [ qttools qtbase ]; 20 + nativeBuildInputs = [ 21 + cmake 22 + ]; 23 + 24 + buildInputs = [ 25 + qttools 26 + qtbase 27 + ]; 16 28 17 29 meta = with lib; { 18 30 description = "Simple cross-platform mind map and note-taking tool written in Qt"; 19 31 homepage = "https://github.com/juzzlin/Heimer"; 20 - license = licenses.gpl3; 32 + changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG"; 33 + license = licenses.gpl3Plus; 21 34 maintainers = with maintainers; [ dtzWill ]; 22 35 platforms = platforms.linux; 23 36 };
+2 -2
pkgs/applications/misc/todoist/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "todoist"; 5 - version = "0.16.0"; 5 + version = "0.17.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "sachaos"; 9 9 repo = "todoist"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-cfhwbL7RaeD5LWxlfqnHfPPPkC5AA3Z034p+hlFBWtg="; 11 + sha256 = "sha256-lnx02fFzf8oaJ9T7MV+Gx4EpA4h7TVJK91o9+GU/Yvs="; 12 12 }; 13 13 14 14 vendorSha256 = "sha256-ly+OcRo8tGeNX4FnqNVaqjPx/A1FALOnScxs04lIOiU=";
+3 -3
pkgs/applications/misc/tut/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "tut"; 5 - version = "1.0.24"; 5 + version = "1.0.25"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "RasmusLindroth"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "sha256-UkgZOBNEeeYkcdp8beePrFmFLa7UWGbQ4dynl8QwnK8="; 11 + sha256 = "sha256-wSCT8GaBMBzxtPsspc+kS4mMVayMEBBSzXZB3dQ3Nj8="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-af+uO3NEkMt+aZoOa8NWccgtLD0Kggr2ZZwfIxoP3EU="; 14 + vendorSha256 = "sha256-dyt7JDHsmbdMccIHVaG6N1lAwcM5xKeYoZ2Giwfkgqc="; 15 15 16 16 meta = with lib; { 17 17 description = "A TUI for Mastodon with vim inspired keys";
+5 -5
pkgs/applications/networking/browsers/librewolf/src.json
··· 1 1 { 2 - "packageVersion": "107.0.1-2", 2 + "packageVersion": "108.0-1", 3 3 "source": { 4 - "rev": "107.0.1-2", 5 - "sha256": "1s009nbsqihmhnaa20j9g1qyifl3kgsbpgxc8ms5ahx3j97hbpk5" 4 + "rev": "108.0-1", 5 + "sha256": "1gfqxlcgf7qxgisbj565ndrfhkk68py2jpwrx7k2j7zpszkb2f4m" 6 6 }, 7 7 "firefox": { 8 - "version": "107.0.1", 9 - "sha512": "e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea" 8 + "version": "108.0", 9 + "sha512": "fa800f62cca395a51b9a04373a27be48fc3860208e34ecf74d908127638d1eb8c41cf9898be6896777d408127d5c4b7104d9ee89c97da923b2dc6ea32186187e" 10 10 } 11 11 }
+33
pkgs/applications/networking/cluster/acorn/default.nix
··· 1 + { lib, buildGoModule, fetchFromGitHub }: 2 + 3 + buildGoModule rec { 4 + pname = "acorn"; 5 + version = "0.4.2"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "acorn-io"; 9 + repo = pname; 10 + rev = "v${version}"; 11 + hash = "sha256-IzjCYVQ9RhuAmgloue421F43ARviaHW7mTkLhLW/VPM="; 12 + }; 13 + 14 + vendorHash = "sha256-z2ya/CgH9AcxHe73Yt9XWbJqH4OrZWt0bRDsna5hYeo="; 15 + 16 + ldflags = [ 17 + "-s" 18 + "-w" 19 + "-X github.com/acorn-io/acorn/pkg/version.Tag=v${version}" 20 + "-X github.com/acorn-io/acorn/pkg/config.AcornDNSEndpointDefault=https://alpha-dns.acrn.io/v1" 21 + ]; 22 + 23 + # integration tests require network and kubernetes master 24 + doCheck = false; 25 + 26 + meta = with lib; { 27 + homepage = "https://docs.acorn.io"; 28 + changelog = "https://github.com/acorn-io/${pname}/releases/tag/v${version}"; 29 + description = "A simple application deployment framework for Kubernetes"; 30 + license = licenses.asl20; 31 + maintainers = with maintainers; [ urandom ]; 32 + }; 33 + }
+2 -2
pkgs/applications/networking/cluster/helm/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "kubernetes-helm"; 5 - version = "3.10.2"; 5 + version = "3.10.3"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "helm"; 9 9 repo = "helm"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-ly48zSsi+dV4te68LX8NtaJ9eLC46sSakExR2a+3b5U="; 11 + sha256 = "sha256-SUPa6bbops2rrzzzYM5fH0l4DT7/rIkOqc396lTesao="; 12 12 }; 13 13 vendorSha256 = "sha256-vyHT/N5lat/vqM2jK4Q+jJOtZpS52YCYGcJqfa5e0KM="; 14 14
+2 -2
pkgs/applications/networking/cluster/sonobuoy/default.nix
··· 5 5 in 6 6 buildGoModule rec { 7 7 pname = "sonobuoy"; 8 - version = "0.56.12"; # Do not forget to update `rev` above 8 + version = "0.56.13"; # Do not forget to update `rev` above 9 9 10 10 ldflags = 11 11 let t = "github.com/vmware-tanzu/sonobuoy"; ··· 20 20 owner = "vmware-tanzu"; 21 21 repo = "sonobuoy"; 22 22 rev = "v${version}"; 23 - sha256 = "sha256-i+fg5tPkpnNl1Oef1KPmhHC+5t4y9vvfRpw9DHbsf4w="; 23 + sha256 = "sha256-T0G0S8bj0QO1/eC/XMwiJ0ZcJC6KYB6gmj/bq2yYgAE="; 24 24 }; 25 25 26 26 vendorSha256 = "sha256-SRR4TmNHbMOOMv6AXv/Qpn2KUQh+ZsFlzc5DpdyPLEU=";
+7 -7
pkgs/applications/networking/cluster/terraform-providers/providers.json
··· 268 268 "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" 269 269 }, 270 270 "consul": { 271 - "hash": "sha256-DS27LGhXDYVr+c0wIZe5PjssK8l8Aq4zzh3I+G4WCU8=", 271 + "hash": "sha256-UaTvFxwbLf9krUdsslFP6MXzpacnj/AKXiyUe7iSRCs=", 272 272 "homepage": "https://registry.terraform.io/providers/hashicorp/consul", 273 273 "owner": "hashicorp", 274 274 "repo": "terraform-provider-consul", 275 - "rev": "v2.16.2", 275 + "rev": "v2.17.0", 276 276 "spdx": "MPL-2.0", 277 - "vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=" 277 + "vendorHash": "sha256-v1RHxXYTvpyWzyph6qg3GW75OPYc5qYQ/yyDI8WkbNc=" 278 278 }, 279 279 "ct": { 280 280 "hash": "sha256-poEyXP6VfKYKuTCxQxkiWBuc7/1S2J7RolrrPb6nvUI=", ··· 498 498 "vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg=" 499 499 }, 500 500 "helm": { 501 - "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", 501 + "hash": "sha256-MSBCn4AriAWys2FIYJIGamcaLGx0gtO5IiB/WxcN2rg=", 502 502 "homepage": "https://registry.terraform.io/providers/hashicorp/helm", 503 503 "owner": "hashicorp", 504 504 "repo": "terraform-provider-helm", 505 - "rev": "v2.7.1", 505 + "rev": "v2.8.0", 506 506 "spdx": "MPL-2.0", 507 507 "vendorHash": null 508 508 }, ··· 1095 1095 "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" 1096 1096 }, 1097 1097 "tencentcloud": { 1098 - "hash": "sha256-jel9zn2i/xt7Up4o8Tf5S5Z63zRbQszt9IY5xjcQhLo=", 1098 + "hash": "sha256-mN52iD0HdsfzPxo9hLFlKxiwIm7641cnjUYk8XyRP0s=", 1099 1099 "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", 1100 1100 "owner": "tencentcloudstack", 1101 1101 "repo": "terraform-provider-tencentcloud", 1102 - "rev": "v1.79.1", 1102 + "rev": "v1.79.2", 1103 1103 "spdx": "MPL-2.0", 1104 1104 "vendorHash": null 1105 1105 },
+3 -3
pkgs/applications/networking/cluster/terragrunt/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "terragrunt"; 5 - version = "0.42.3"; 5 + version = "0.42.4"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "gruntwork-io"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-CK2+leFJuNQqX1t34LLTJ6eVEUFdZSb/0E3XTf3S9gQ="; 11 + sha256 = "sha256-PaCI39Z2WaHZ6IYRxFNZvG9c40pWzNbwoHrJFXLOqMk="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-Qc0FnNxyErtieVvEj/eKPW5PpvYFwiYtv+ReJTVFAPA="; 14 + vendorSha256 = "sha256-ByFn2j2m5dON0No6mt1QiYm4vMRSymS5Tezaws9B9c4="; 15 15 16 16 doCheck = false; 17 17
+9 -5
pkgs/applications/networking/remote/remmina/default.nix
··· 7 7 , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz 8 8 # The themes here are soft dependencies; only icons are missing without them. 9 9 , gnome 10 + , withKf5Wallet ? true, libsForQt5 10 11 , withLibsecret ? true 11 12 , withVte ? true 12 13 }: 13 - 14 - with lib; 15 14 16 15 stdenv.mkDerivation rec { 17 16 pname = "remmina"; ··· 24 25 }; 25 26 26 27 nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; 28 + 27 29 buildInputs = [ 28 30 gsettings-desktop-schemas 29 31 glib gtk3 gettext libxkbfile libX11 ··· 36 36 libepoxy at-spi2-core 37 37 openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk_4_1 38 38 harfbuzz python3 39 - ] ++ optionals withLibsecret [ libsecret ] 40 - ++ optionals withVte [ vte ]; 39 + ] ++ lib.optionals withLibsecret [ libsecret ] 40 + ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] 41 + ++ lib.optionals withVte [ vte ]; 41 42 42 43 cmakeFlags = [ 43 44 "-DWITH_VTE=${if withVte then "ON" else "OFF"}" 44 45 "-DWITH_TELEPATHY=OFF" 45 46 "-DWITH_AVAHI=OFF" 47 + "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" 46 48 "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" 47 49 "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so" 48 50 "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so" ··· 52 50 "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2" 53 51 ]; 54 52 53 + dontWrapQtApps = true; 54 + 55 55 preFixup = '' 56 56 gappsWrapperArgs+=( 57 57 --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" 58 58 ) 59 59 ''; 60 60 61 - meta = { 61 + meta = with lib; { 62 62 license = licenses.gpl2Plus; 63 63 homepage = "https://gitlab.com/Remmina/Remmina"; 64 64 description = "Remote desktop client written in GTK";
+8 -6
pkgs/applications/office/jameica/default.nix
··· 5 5 _build = "484"; 6 6 version = "${_version}-${_build}"; 7 7 8 - swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux" 9 - else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" 10 - else if stdenv.hostPlatform.system == "x86_64-darwin" then "macos64" 11 - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; 8 + swtSystem = 9 + if stdenv.hostPlatform.system == "i686-linux" then "linux" 10 + else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" 11 + else if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm64" 12 + else if stdenv.hostPlatform.system == "x86_64-darwin" then "macos64" 13 + else throw "Unsupported system: ${stdenv.hostPlatform.system}"; 12 14 13 15 desktopItem = makeDesktopItem { 14 16 name = "jameica"; ··· 28 26 29 27 nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ]; 30 28 buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] 31 - ++ lib.optional stdenv.isDarwin Cocoa; 29 + ++ lib.optional stdenv.isDarwin Cocoa; 32 30 33 31 src = fetchFromGitHub { 34 32 owner = "willuhn"; ··· 81 79 binaryBytecode # source bundles dependencies as jars 82 80 ]; 83 81 license = licenses.gpl2Plus; 84 - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; 82 + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; 85 83 maintainers = with maintainers; [ flokli r3dl3g ]; 86 84 }; 87 85 }
+23 -127
pkgs/applications/office/mendeley/default.nix
··· 1 - { fetchurl, lib, stdenv, mkDerivation, dpkg, which 2 - , makeWrapper 3 - , alsa-lib 4 - , desktop-file-utils 5 - , dbus 6 - , libcap 7 - , fontconfig 8 - , freetype 9 - , gcc 1 + { lib 2 + , fetchurl 3 + , appimageTools 10 4 , gconf 11 - , glib 12 - , icu 13 - , libxml2 14 - , libxslt 15 - , orc 16 - , nss 17 - , nspr 18 - , qtbase 19 - , qtsvg 20 - , qtdeclarative 21 - , qtwebchannel 22 - , qtquickcontrols 23 - , qtwebkit 24 - , qtwebengine 25 - , sqlite 26 - , xorg 27 - , zlib 28 - # The provided wrapper does this, but since we don't use it 29 - # we emulate the behavior. The downside is that this 30 - # will leave entries on your system after uninstalling mendeley. 31 - # (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u') 32 - , autorunLinkHandler ? true 33 - # Update script 34 - , writeScript 35 - , runtimeShell 5 + , imagemagick 36 6 }: 37 7 38 8 let 39 - arch32 = "i686-linux"; 9 + name = "mendeley"; 10 + version = "2.80.1"; 40 11 41 - arch = if stdenv.hostPlatform.system == arch32 42 - then "i386" 43 - else "amd64"; 44 - 45 - shortVersion = "1.19.5-stable"; 46 - 47 - version = "${shortVersion}_${arch}"; 48 - 49 - url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; 50 - sha256 = if stdenv.hostPlatform.system == arch32 51 - then "01x83a44qlxi937b128y8y0px0q4w37g72z652lc42kv50dhyy3f" 52 - else "1cagqq0xziznaj97z30bqfhrwjv3a4h83ckhwigq35nhk1ggq1ry"; 53 - 54 - deps = [ 55 - qtbase 56 - qtsvg 57 - qtdeclarative 58 - qtwebchannel 59 - qtquickcontrols 60 - qtwebkit 61 - qtwebengine 62 - alsa-lib 63 - dbus 64 - freetype 65 - fontconfig 66 - gcc.cc 67 - gconf 68 - glib 69 - icu 70 - libcap 71 - libxml2 72 - libxslt 73 - nspr 74 - nss 75 - orc 76 - sqlite 77 - xorg.libX11 78 - xorg.xcbutilkeysyms 79 - xorg.libxcb 80 - xorg.libXcomposite 81 - xorg.libXext 82 - xorg.libXrender 83 - xorg.libXi 84 - xorg.libXcursor 85 - xorg.libXtst 86 - xorg.libXrandr 87 - xorg.xcbutilimage 88 - zlib 89 - ]; 90 - 91 - in 92 - 93 - mkDerivation { 94 - pname = "mendeley"; 95 - inherit version; 12 + executableName = "${name}-reference-manager"; 96 13 97 14 src = fetchurl { 98 - url = url; 99 - sha256 = sha256; 15 + url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-2.80.1-x86_64.AppImage"; 16 + sha256 = "sha256-uqmu7Yf4tXDlNGkeEZut4m339S6ZNKhAmej+epKLB/8="; 100 17 }; 101 18 102 - nativeBuildInputs = [ makeWrapper ]; 103 - buildInputs = [ dpkg which ] ++ deps; 19 + appimageContents = appimageTools.extractType2 { 20 + inherit name src; 21 + }; 22 + in appimageTools.wrapType2 rec { 23 + inherit name src; 104 24 105 - propagatedUserEnvPkgs = [ gconf ]; 25 + extraInstallCommands = '' 26 + mv $out/bin/${name} $out/bin/${executableName} 27 + install -m 444 -D ${appimageContents}/${executableName}.desktop $out/share/applications/${executableName}.desktop 28 + ${imagemagick}/bin/convert ${appimageContents}/${executableName}.png -resize 512x512 ${name}_512.png 29 + install -m 444 -D ${name}_512.png $out/share/icons/hicolor/512x512/apps/${executableName}.png 106 30 107 - dontUnpack = true; 108 - 109 - dontWrapQtApps = true; 110 - 111 - installPhase = '' 112 - dpkg-deb -x $src $out 113 - mv $out/opt/mendeleydesktop/{bin,lib,share} $out 114 - 115 - interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) 116 - patchelf --set-interpreter $interpreter \ 117 - --set-rpath ${lib.makeLibraryPath deps}:$out/lib \ 118 - $out/bin/mendeleydesktop 119 - 120 - wrapQtApp $out/bin/mendeleydesktop \ 121 - --add-flags "--unix-distro-build" \ 122 - ${lib.optionalString autorunLinkHandler # ignore errors installing the link handler 123 - ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop ||:"''} 124 - 125 - # Remove bundled qt bits 126 - rm -rf $out/lib/qt 127 - rm $out/bin/qt* $out/bin/Qt* 128 - 129 - # Patch up link handler script 130 - wrapProgram $out/bin/install-mendeley-link-handler.sh \ 131 - --prefix PATH ':' ${lib.makeBinPath [ which gconf desktop-file-utils ] } 31 + substituteInPlace $out/share/applications/${executableName}.desktop \ 32 + --replace 'Exec=AppRun' 'Exec=${executableName}' 132 33 ''; 133 - 134 - dontStrip = true; 135 - dontPatchELF = true; 136 - 137 - updateScript = import ./update.nix { inherit writeScript runtimeShell; }; 138 34 139 35 meta = with lib; { 140 36 homepage = "https://www.mendeley.com"; 141 37 description = "A reference manager and academic social network"; 142 38 sourceProvenance = with sourceTypes; [ binaryNativeCode ]; 143 39 license = licenses.unfree; 144 - platforms = [ "x86_64-linux" "i686-linux" ]; 145 - maintainers = with maintainers; [ dtzWill ]; 40 + platforms = [ "x86_64-linux" ]; 41 + maintainers = with maintainers; [ dtzWill atila ]; 146 42 }; 147 43 148 44 }
-44
pkgs/applications/video/losslesscut-bin/appimage.nix
··· 1 - { appimageTools, lib, fetchurl, version, sha256 }: 2 - 3 - let 4 - pname = "losslesscut"; 5 - nameRepo = "lossless-cut"; 6 - nameCamel = "LosslessCut"; 7 - name = "${pname}-${version}"; 8 - nameSource = "${nameCamel}-linux-x86_64.AppImage"; 9 - nameExecutable = "losslesscut"; 10 - owner = "mifi"; 11 - src = fetchurl { 12 - url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; 13 - name = nameSource; 14 - inherit sha256; 15 - }; 16 - extracted = appimageTools.extractType2 { 17 - inherit name src; 18 - }; 19 - in appimageTools.wrapType2 { 20 - inherit name src; 21 - 22 - profile = '' 23 - export LC_ALL=C.UTF-8 24 - ''; 25 - 26 - extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; 27 - 28 - extraInstallCommands = '' 29 - mv $out/bin/{${name},${nameExecutable}} 30 - ( 31 - mkdir -p $out/share 32 - cd ${extracted}/usr 33 - find share -mindepth 1 -type d -exec mkdir -p $out/{} \; 34 - find share -mindepth 1 -type f,l -exec ln -s $PWD/{} $out/{} \; 35 - ) 36 - ln -s ${extracted}/${nameExecutable}.png $out/share/icons/${nameExecutable}.png 37 - mkdir $out/share/applications 38 - cp ${extracted}/${nameExecutable}.desktop $out/share/applications 39 - substituteInPlace $out/share/applications/${nameExecutable}.desktop \ 40 - --replace AppRun ${nameExecutable} 41 - ''; 42 - 43 - meta.platforms = with lib.platforms; [ "x86_64-linux" ]; 44 - }
+58
pkgs/applications/video/losslesscut-bin/build-from-appimage.nix
··· 1 + { lib 2 + , appimageTools 3 + , fetchurl 4 + , makeWrapper 5 + , gtk3 6 + , gsettings-desktop-schemas 7 + , pname 8 + , version 9 + , hash 10 + , metaCommon ? { } 11 + }: 12 + 13 + let 14 + pname = "losslesscut"; 15 + 16 + src = fetchurl { 17 + url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-linux-x86_64.AppImage"; 18 + inherit hash; 19 + }; 20 + 21 + extracted = appimageTools.extractType2 { 22 + inherit pname version src; 23 + }; 24 + in 25 + (appimageTools.wrapType2 { 26 + inherit pname version src; 27 + 28 + profile = '' 29 + export LC_ALL=C.UTF-8 30 + ''; 31 + 32 + extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; 33 + 34 + extraInstallCommands = '' 35 + mv $out/bin/{${pname}-${version},losslesscut} 36 + ( 37 + mkdir -p $out/share 38 + cd ${extracted}/usr 39 + find share -mindepth 1 -type d -exec mkdir -p $out/{} \; 40 + find share -mindepth 1 -type f,l -exec ln -s $PWD/{} $out/{} \; 41 + ) 42 + ln -s ${extracted}/losslesscut.png $out/share/icons/losslesscut.png 43 + mkdir $out/share/applications 44 + cp ${extracted}/losslesscut.desktop $out/share/applications 45 + substituteInPlace $out/share/applications/losslesscut.desktop \ 46 + --replace AppRun losslesscut 47 + source "${makeWrapper}/nix-support/setup-hook" 48 + wrapProgram "$out/bin/losslesscut" \ 49 + --add-flags "--disable-seccomp-filter-sandbox" 50 + ''; 51 + 52 + meta = metaCommon // { 53 + platforms = [ "x86_64-linux" ]; 54 + mainProgram = "losslesscut"; 55 + }; 56 + }) // { 57 + inherit pname version; 58 + }
+37
pkgs/applications/video/losslesscut-bin/build-from-dmg.nix
··· 1 + { lib 2 + , stdenvNoCC 3 + , fetchurl 4 + , undmg 5 + , pname 6 + , version 7 + , hash 8 + , isAarch64 9 + , metaCommon ? { } 10 + }: 11 + 12 + let 13 + pname = "losslesscut"; 14 + src = fetchurl { 15 + url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-mac-${if isAarch64 then "arm64" else "x64"}.dmg"; 16 + inherit hash; 17 + }; 18 + in 19 + stdenvNoCC.mkDerivation { 20 + inherit pname version src; 21 + 22 + nativeBuildInputs = [ undmg ]; 23 + 24 + sourceRoot = "LosslessCut.app"; 25 + 26 + installPhase = '' 27 + mkdir -p "$out/Applications/LosslessCut.app" 28 + cp -R . "$out/Applications/LosslessCut.app" 29 + mkdir -p "$out/bin" 30 + ln -s "$out/Applications/LosslessCut.app/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" 31 + ''; 32 + 33 + meta = metaCommon // (with lib; { 34 + platforms = singleton (if isAarch64 then "aarch64-darwin" else "x86_64-darwin"); 35 + mainProgram = "losslesscut"; 36 + }); 37 + }
+37
pkgs/applications/video/losslesscut-bin/build-from-windows.nix
··· 1 + { lib 2 + , stdenvNoCC 3 + , fetchurl 4 + , p7zip 5 + , pname 6 + , version 7 + , hash 8 + , metaCommon ? { } 9 + }: 10 + 11 + stdenvNoCC.mkDerivation { 12 + inherit pname version; 13 + 14 + src = fetchurl { 15 + url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-win-x64.7z"; 16 + inherit hash; 17 + }; 18 + 19 + nativeBuildInputs = [ p7zip ]; 20 + 21 + unpackPhase = '' 22 + 7z x $src -oLosslessCut-win-x64 23 + ''; 24 + 25 + sourceRoot = "LosslessCut-win-x64"; 26 + 27 + installPhase = '' 28 + mkdir -p $out/bin $out/libexec 29 + (cd .. && mv LosslessCut-win-x64 $out/libexec) 30 + ln -s "$out/libexec/LosslessCut-win-x64/LosslessCut.exe" "$out/bin/LosslessCut.exe" 31 + ''; 32 + 33 + meta = metaCommon // (with lib; { 34 + platforms = platforms.windows; 35 + mainProgram = "LosslessCut.exe"; 36 + }); 37 + }
+48 -18
pkgs/applications/video/losslesscut-bin/default.nix
··· 1 - { callPackage, stdenvNoCC, lib }: 1 + { lib 2 + , callPackage 3 + , buildPackages 4 + , hostPlatform 5 + }: 6 + 2 7 let 3 - version = "3.46.2"; 4 - appimage = callPackage ./appimage.nix { inherit version; sha256 = "sha256-p+HscYsChR90JHdYjurY4OOHgveGXbJomz1klBCsF2Q="; }; 5 - dmg = callPackage ./dmg.nix { inherit version; sha256 = "sha256-350MHWwyjCdvIv6W6lX6Hr6PLDiAwO/e+KW0yKi/Yoc="; }; 6 - windows = callPackage ./windows.nix { inherit version; sha256 = "sha256-48ifhvIWSPmmnBnW8tP7NeWPIWJYWNqGP925O50CAwQ="; }; 7 - in ( 8 - if stdenvNoCC.isDarwin then dmg 9 - else if stdenvNoCC.isCygwin then windows 10 - else appimage 11 - ).overrideAttrs 12 - (oldAttrs: { 13 - meta = with lib; { 8 + pname = "losslesscut"; 9 + version = "3.48.2"; 10 + metaCommon = with lib; { 14 11 description = "The swiss army knife of lossless video/audio editing"; 15 12 homepage = "https://mifi.no/losslesscut/"; 16 13 license = licenses.gpl2Only; 17 14 maintainers = with maintainers; [ ShamrockLee ]; 18 - } // oldAttrs.meta // { 19 - platforms = 20 - appimage.meta.platforms 21 - ++ dmg.meta.platforms 22 - ++ windows.meta.platforms; 23 15 }; 24 - }) 16 + x86_64-appimage = callPackage ./build-from-appimage.nix { 17 + inherit pname version metaCommon; 18 + hash = "sha256-5T5+eBVbyOI89YA9NMLWweHagD09RB3P03HFvaDAOZ8="; 19 + inherit (buildPackages) makeWrapper; 20 + }; 21 + x86_64-dmg = callPackage ./build-from-dmg.nix { 22 + inherit pname version metaCommon; 23 + hash = "sha256-PzjE0oJOuPG0S+mA7pgNU3MRgaE2jAPxWEN9J4PfqMQ="; 24 + isAarch64 = false; 25 + }; 26 + aarch64-dmg = callPackage ./build-from-dmg.nix { 27 + inherit pname version metaCommon; 28 + hash = "sha256-927CSczgFJcbBJm2cYXucFRidkGAtcowoLMlm2GTafc="; 29 + isAarch64 = true; 30 + }; 31 + x86_64-windows = callPackage ./build-from-windows.nix { 32 + inherit pname version metaCommon; 33 + hash = "sha256-+isxkGKxW7H+IjuA5G4yXuvDmX+4UlsD8sXwoHxgLM8="; 34 + }; 35 + in 36 + ( 37 + if hostPlatform.system == "aarch64-darwin" then aarch64-dmg 38 + else if hostPlatform.isDarwin then x86_64-dmg 39 + else if hostPlatform.isCygwin then x86_64-windows 40 + else x86_64-appimage 41 + ).overrideAttrs 42 + (oldAttrs: { 43 + passthru = (oldAttrs.passthru or { }) // { 44 + inherit x86_64-appimage x86_64-dmg aarch64-dmg x86_64-windows; 45 + }; 46 + meta = oldAttrs.meta // { 47 + platforms = lib.unique ( 48 + x86_64-appimage.meta.platforms 49 + ++ x86_64-dmg.meta.platforms 50 + ++ aarch64-dmg.meta.platforms 51 + ++ x86_64-windows.meta.platforms 52 + ); 53 + }; 54 + })
-31
pkgs/applications/video/losslesscut-bin/dmg.nix
··· 1 - { stdenvNoCC, lib, fetchurl, undmg, version , sha256 }: 2 - 3 - let 4 - pname = "losslesscut"; 5 - nameRepo = "lossless-cut"; 6 - nameCamel = "LosslessCut"; 7 - nameSource = "${nameCamel}-mac-x64.dmg"; 8 - nameApp = nameCamel + ".app"; 9 - owner = "mifi"; 10 - src = fetchurl { 11 - url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; 12 - name = nameSource; 13 - inherit sha256; 14 - }; 15 - in stdenvNoCC.mkDerivation { 16 - inherit pname version src; 17 - 18 - nativeBuildInputs = [ undmg ]; 19 - 20 - unpackPhase = '' 21 - undmg ${src} 22 - ''; 23 - sourceRoot = nameApp; 24 - 25 - installPhase = '' 26 - mkdir -p $out/Applications/${nameApp} 27 - cp -R . $out/Applications/${nameApp} 28 - ''; 29 - 30 - meta.platforms = lib.platforms.darwin; 31 - }
-46
pkgs/applications/video/losslesscut-bin/windows.nix
··· 1 - { stdenvNoCC 2 - , lib 3 - , fetchurl 4 - , p7zip 5 - , version 6 - , sha256 7 - , useMklink ? false 8 - , customSymlinkCommand ? null 9 - }: 10 - let 11 - pname = "losslesscut"; 12 - nameRepo = "lossless-cut"; 13 - nameCamel = "LosslessCut"; 14 - nameSourceBase = "${nameCamel}-win-x64"; 15 - nameSource = "${nameSourceBase}.7z"; 16 - nameExecutable = "${nameCamel}.exe"; 17 - owner = "mifi"; 18 - getSymlinkCommand = if (customSymlinkCommand != null) then customSymlinkCommand 19 - else if useMklink then (targetPath: linkPath: "mklink ${targetPath} ${linkPath}") 20 - else (targetPath: linkPath: "ln -s ${targetPath} ${linkPath}"); 21 - in stdenvNoCC.mkDerivation { 22 - inherit pname version sha256; 23 - 24 - src = fetchurl { 25 - name = nameSource; 26 - url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; 27 - inherit sha256; 28 - }; 29 - 30 - nativeBuildInputs = [ p7zip ]; 31 - 32 - unpackPhase = '' 33 - 7z x $src -o${nameSourceBase} 34 - ''; 35 - 36 - sourceRoot = nameSourceBase; 37 - 38 - installPhase = '' 39 - mkdir -p $out/bin $out/libexec 40 - cd .. 41 - mv ${nameSourceBase} $out/libexec 42 - 43 - '' + (getSymlinkCommand "${nameSourceBase}/${nameExecutable}" "$out/bin/${nameExecutable}"); 44 - 45 - meta.platforms = lib.platforms.windows; 46 - }
+8 -19
pkgs/desktops/gnome/core/mutter/default.nix
··· 47 47 , wayland-protocols 48 48 }: 49 49 50 - let self = stdenv.mkDerivation rec { 50 + stdenv.mkDerivation (finalAttrs: { 51 51 pname = "mutter"; 52 52 version = "43.2"; 53 53 54 54 outputs = [ "out" "dev" "man" "devdoc" ]; 55 55 56 56 src = fetchurl { 57 - url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; 57 + url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; 58 58 sha256 = "/S63B63DM8wnevhoXlzzkTXhxNeYofnQXojkU9w+u4Q="; 59 59 }; 60 60 ··· 64 64 (fetchpatch { 65 65 url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; 66 66 sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; 67 - }) 68 - 69 - # Revert clutter optimization causing issues on X11 70 - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2667 71 - # Will be replaced with a proper fix in 43.2 72 - # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6054 73 - (fetchpatch { 74 - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/7e7a639cc5132cf3355e861235f325540fe56548.patch"; 75 - sha256 = "NYoKCRh5o1Q15c11a79Hk5tGKq/jOa+e6GpgBjPEepo="; 76 - revert = true; 77 67 }) 78 68 ]; 79 69 ··· 150 160 separateDebugInfo = true; 151 161 152 162 passthru = { 153 - libdir = "${self}/lib/mutter-11"; 163 + libdir = "${finalAttrs.finalPackage}/lib/mutter-11"; 154 164 155 165 tests = { 156 166 libdirExists = runCommand "mutter-libdir-exists" {} '' 157 - if [[ ! -d ${self.libdir} ]]; then 158 - echo "passthru.libdir should contain a directory, “${self.libdir}” is not one." 167 + if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then 168 + echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." 159 169 exit 1 160 170 fi 161 171 touch $out ··· 163 173 }; 164 174 165 175 updateScript = gnome.updateScript { 166 - packageName = pname; 167 - attrPath = "gnome.${pname}"; 176 + packageName = "mutter"; 177 + attrPath = "gnome.mutter"; 168 178 }; 169 179 }; 170 180 ··· 175 185 maintainers = teams.gnome.members; 176 186 platforms = platforms.linux; 177 187 }; 178 - }; 179 - in self 188 + })
+2 -2
pkgs/development/libraries/avahi/default.nix
··· 13 13 , libevent 14 14 , nixosTests 15 15 , gtk3Support ? false 16 - , gtk3 ? null 17 - , qt5 ? null 16 + , gtk3 17 + , qt5 18 18 , qt5Support ? false 19 19 , withLibdnssdCompat ? false 20 20 , python ? null
+31
pkgs/development/libraries/cpp-jwt/default.nix
··· 1 + { lib, stdenv, fetchFromGitHub, cmake, openssl, gtest, nlohmann_json }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "cpp-jwt"; 5 + version = "1.4"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "arun11299"; 9 + repo = pname; 10 + rev = "v${version}"; 11 + sha256 = "sha256-5hVsFanTCT/uLLXrnb2kMvmL6qs9RXVkvxdWaT6m4mk="; 12 + }; 13 + 14 + cmakeFlags = [ 15 + "-DCPP_JWT_USE_VENDORED_NLOHMANN_JSON=OFF" 16 + "-DCPP_JWT_BUILD_EXAMPLES=OFF" 17 + ]; 18 + 19 + nativeBuildInputs = [ cmake gtest ]; 20 + 21 + buildInputs = [ openssl nlohmann_json ]; 22 + 23 + doCheck = true; 24 + 25 + meta = { 26 + description = "JSON Web Token library for C++"; 27 + homepage = "https://github.com/arun11299/cpp-jwt"; 28 + license = lib.licenses.mit; 29 + maintainers = with lib.maintainers; [ fpletz ]; 30 + }; 31 + }
-49
pkgs/development/libraries/intel-media-driver/32bit.patch
··· 1 - diff --git a/media_driver/linux/common/ddi/media_libva_util.cpp b/media_driver/linux/common/ddi/media_libva_util.cpp 2 - index 25b4cb0b5..49254c2f0 100755 3 - --- a/media_driver/linux/common/ddi/media_libva_util.cpp 4 - +++ b/media_driver/linux/common/ddi/media_libva_util.cpp 5 - @@ -34,6 +34,7 @@ 6 - #include <fcntl.h> 7 - #include <dlfcn.h> 8 - #include <errno.h> 9 - +#include "inttypes.h" 10 - 11 - #include "media_libva_util.h" 12 - #include "mos_utilities.h" 13 - @@ -91,7 +92,7 @@ void DdiMediaUtil_MediaPrintFps() 14 - int64_t diff = (tv2.tv_sec - tv1.tv_sec)*1000000 + tv2.tv_usec - tv1.tv_usec; 15 - float fps = frameCountFps / (diff / 1000000.0); 16 - DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); 17 - - sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); 18 - + sprintf(temp,"FPS:%6.4f, Interval:%" PRIu64"\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); 19 - 20 - MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME); 21 - sprintf(fpsFileName, FPS_FILE_NAME); 22 - diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp 23 - index 66fab63de..38b1fae28 100644 24 - --- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp 25 - +++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp 26 - @@ -24,6 +24,7 @@ 27 - //! \brief libva util next implementaion. 28 - //! 29 - #include <sys/time.h> 30 - +#include "inttypes.h" 31 - #include "media_libva_util_next.h" 32 - #include "mos_utilities.h" 33 - #include "mos_os.h" 34 - @@ -2196,7 +2197,7 @@ void MediaLibvaUtilNext::MediaPrintFps() 35 - int64_t diff = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec; 36 - float fps = m_frameCountFps / (diff / 1000000.0); 37 - DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); 38 - - sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); 39 - + sprintf(temp,"FPS:%6.4f, Interval:%" PRIu64"\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000)); 40 - 41 - MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME); 42 - sprintf(fpsFileName, FPS_FILE_NAME); 43 - @@ -2213,4 +2214,4 @@ void MediaLibvaUtilNext::MediaPrintFps() 44 - pthread_mutex_unlock(&m_fpsMutex); 45 - return; 46 - } 47 - -#endif 48 - \ No newline at end of file 49 - +#endif
+3 -5
pkgs/development/libraries/intel-media-driver/default.nix
··· 16 16 17 17 stdenv.mkDerivation rec { 18 18 pname = "intel-media-driver"; 19 - version = "22.6.3"; 19 + version = "22.6.4"; 20 20 21 21 outputs = [ "out" "dev" ]; 22 22 ··· 24 24 owner = "intel"; 25 25 repo = "media-driver"; 26 26 rev = "intel-media-${version}"; 27 - sha256 = "sha256-lQg+L64DW2ZIBeJRimNkba7EL+SM4jSnX9PWIx4j2AY="; 27 + sha256 = "sha256-0Il51cWqgJwtsnsltHey5Sp+7RYUpqo4GtTRzrzw09A="; 28 28 }; 29 29 30 30 patches = [ ··· 33 33 url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; 34 34 sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0="; 35 35 }) 36 - # fix compilation on 32bit 37 - # https://github.com/intel/media-driver/pull/1557 38 - ./32bit.patch 39 36 ]; 40 37 41 38 cmakeFlags = [ ··· 40 43 "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri" 41 44 # Works only on hosts with suitable CPUs. 42 45 "-DMEDIA_RUN_TEST_SUITE=OFF" 46 + "-DMEDIA_BUILD_FATAL_WARNINGS=OFF" 43 47 ]; 44 48 45 49 NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
+2 -2
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
··· 8 8 nv-codec-headers = nv-codec-headers-11; 9 9 }).overrideAttrs (old: rec { 10 10 pname = "jellyfin-ffmpeg"; 11 - version = "5.1.2-4"; 11 + version = "5.1.2-5"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "jellyfin"; 15 15 repo = "jellyfin-ffmpeg"; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-yzaS50sPgyRRLnvzaOiKOEaHKL3Yuf89KsHyPebjoL8="; 17 + sha256 = "sha256-2mSixlrTgAVD2ZRGoi1+UEbhba7QEVvKmigwC9dLk2g="; 18 18 }; 19 19 20 20 configureFlags = old.configureFlags ++ [
+2 -2
pkgs/development/libraries/libpg_query/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "libpg_query"; 5 - version = "13-2.2.0"; 5 + version = "14-3.0.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "pganalyze"; 9 9 repo = "libpg_query"; 10 10 rev = version; 11 - sha256 = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs="; 11 + sha256 = "sha256-rICN8fkPcYw32N6TdpbrszGUoRzwQdfRSW6A0AC8toM="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ which ];
+1 -1
pkgs/development/libraries/polkit/default.nix
··· 144 144 --replace /bin/false ${coreutils}/bin/false 145 145 ''; 146 146 147 - postConfigure = lib.optionalString (!stdenv.hostPlatform.isMusl) '' 147 + postConfigure = lib.optionalString doCheck '' 148 148 # Unpacked by meson 149 149 chmod +x subprojects/mocklibc-1.0/bin/mocklibc 150 150 patchShebangs subprojects/mocklibc-1.0/bin/mocklibc
+2 -6
pkgs/development/libraries/rapidfuzz-cpp/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "rapidfuzz-cpp"; 10 - version = "1.10.1"; 10 + version = "1.10.4"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "maxbachmann"; 14 14 repo = "rapidfuzz-cpp"; 15 15 rev = "v${version}"; 16 - hash = "sha256-c9ESzsDcoUw5XAEZDHdG8jazjI5Oyqic1gaT0qGQsbI="; 16 + hash = "sha256-I7MdeLs+J5a57ypgUJIW0/pSFPzK4nZA4ZrVRdKX7J4="; 17 17 }; 18 - 19 - patches = [ 20 - ./dont-fetch-project-options.patch 21 - ]; 22 18 23 19 nativeBuildInputs = [ 24 20 cmake
-58
pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch
··· 1 - diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt 2 - index 5ba4464..ad72319 100644 3 - --- a/test/CMakeLists.txt 4 - +++ b/test/CMakeLists.txt 5 - @@ -12,39 +12,10 @@ else() 6 - FetchContent_MakeAvailable(Catch2) 7 - endif() 8 - 9 - -# include aminya & jason turner's C++ best practices recommended cmake project utilities 10 - -include(FetchContent) 11 - -FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.20.0.zip) 12 - -FetchContent_MakeAvailable(_project_options) 13 - -include(${_project_options_SOURCE_DIR}/Index.cmake) 14 - - 15 - -project_options( 16 - - # ENABLE_CACHE 17 - - # ENABLE_CONAN 18 - - WARNINGS_AS_ERRORS 19 - - # ENABLE_CPPCHECK 20 - - # ENABLE_CLANG_TIDY 21 - - # ENABLE_INCLUDE_WHAT_YOU_USE 22 - - # ENABLE_COVERAGE 23 - - # ENABLE_PCH 24 - - # PCH_HEADERS <Eigen/Dense> <fmt/core.h> <vector> <utility> <string> <string_view> 25 - - # ENABLE_DOXYGEN 26 - - # ENABLE_IPO 27 - - # ENABLE_USER_LINKER 28 - - # ENABLE_BUILD_WITH_TIME_TRACE 29 - - # ENABLE_UNITY 30 - - # ENABLE_SANITIZER_ADDRESS 31 - - # ENABLE_SANITIZER_LEAK 32 - - # ENABLE_SANITIZER_UNDEFINED_BEHAVIOR 33 - - # ENABLE_SANITIZER_THREAD 34 - - # ENABLE_SANITIZER_MEMORY 35 - - # CLANG_WARNINGS "-Weverything" 36 - -) 37 - - 38 - function(rapidfuzz_add_test test) 39 - add_executable(test_${test} tests-${test}.cpp) 40 - target_link_libraries(test_${test} ${PROJECT_NAME}) 41 - - target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) 42 - + target_link_libraries(test_${test} Catch2::Catch2WithMain) 43 - add_test(NAME ${test} COMMAND test_${test}) 44 - endfunction() 45 - 46 - diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt 47 - index 2a70054..7a43c88 100644 48 - --- a/test/distance/CMakeLists.txt 49 - +++ b/test/distance/CMakeLists.txt 50 - @@ -1,7 +1,7 @@ 51 - function(rapidfuzz_add_test test) 52 - add_executable(test_${test} tests-${test}.cpp) 53 - target_link_libraries(test_${test} ${PROJECT_NAME}) 54 - - target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) 55 - + target_link_libraries(test_${test} Catch2::Catch2WithMain) 56 - add_test(NAME ${test} COMMAND test_${test}) 57 - endfunction() 58 -
+6 -6
pkgs/development/ocaml-modules/batteries/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, ounit 1 + { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, camlp-streams 2 2 , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 3 3 }: 4 4 ··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 pname = "ocaml${ocaml.version}-batteries"; 11 - version = "3.5.1"; 11 + version = "3.6.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "ocaml-batteries-team"; 15 15 repo = "batteries-included"; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-lLlpsg1v7mYFJ61rTdLV2v8/McK1R4HDTTuyka48aBw="; 17 + hash = "sha256-D/0h0/70V8jmzHIUR6i2sT2Jz9/+tfR2dQgp4Bxtimc="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ ocaml findlib ocamlbuild ]; 21 - checkInputs = [ qtest ounit qcheck ]; 22 - propagatedBuildInputs = [ num ]; 21 + checkInputs = [ qtest qcheck ]; 22 + propagatedBuildInputs = [ camlp-streams num ]; 23 23 24 24 strictDeps = !doCheck; 25 25 ··· 29 29 createFindlibDestdir = true; 30 30 31 31 meta = { 32 - homepage = "http://batteries.forge.ocamlcore.org/"; 32 + homepage = "https://ocaml-batteries-team.github.io/batteries-included/hdoc2/"; 33 33 description = "OCaml Batteries Included"; 34 34 longDescription = '' 35 35 A community-driven effort to standardize on an consistent, documented,
+2 -2
pkgs/development/python-modules/add-trailing-comma/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "add-trailing-comma"; 11 - version = "2.3.0"; 11 + version = "2.4.0"; 12 12 format = "setuptools"; 13 13 14 14 disabled = pythonOlder "3.7"; ··· 17 17 owner = "asottile"; 18 18 repo = pname; 19 19 rev = "v${version}"; 20 - sha256 = "sha256-NEXPIkPeH6ZAm1uzqc8iRWnlLbhKmvGQGGraLu989sw="; 20 + sha256 = "sha256-/dA3OwBBMjykSYaIbvhJZj9Z8/0+mfL5pW4GqgMgops="; 21 21 }; 22 22 23 23 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/aioesphomeapi/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "aioesphomeapi"; 15 - version = "13.0.1"; 15 + version = "13.0.2"; 16 16 format = "setuptools"; 17 17 18 18 disabled = pythonOlder "3.9"; ··· 21 21 owner = "esphome"; 22 22 repo = pname; 23 23 rev = "refs/tags/v${version}"; 24 - hash = "sha256-33iaM5+5OV9TAk3SAZWzJfwQbeDSPQiVLBPAAOyyFm0="; 24 + hash = "sha256-z1QFAKvkJuOH2utYertORca5PpW43VS3YB2mhjBsh+A="; 25 25 }; 26 26 27 27 postPatch = ''
+2 -2
pkgs/development/python-modules/aioshelly/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "aioshelly"; 12 - version = "5.1.1"; 12 + version = "5.2.0"; 13 13 format = "setuptools"; 14 14 15 15 disabled = pythonOlder "3.9"; ··· 18 18 owner = "home-assistant-libs"; 19 19 repo = pname; 20 20 rev = "refs/tags/${version}"; 21 - hash = "sha256-6HUykGN0zx97K4372dU1RPncajJt2n20zp2FhrJG1sM="; 21 + hash = "sha256-pa7ijfT/VbXNxwf9RITWxhUVUbimuBEjlU3xnDm3Zzk="; 22 22 }; 23 23 24 24 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/nltk/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "nltk"; 13 - version = "3.7"; 13 + version = "3.8"; 14 14 format = "setuptools"; 15 15 16 16 disabled = pythonOlder "3.7"; ··· 18 18 src = fetchPypi { 19 19 inherit pname version; 20 20 extension = "zip"; 21 - hash = "sha256-1lB9ZGDOx21wr+pCQqImp1QvhcZpF3ucf1YrfPGwVQI="; 21 + hash = "sha256-dLMIJqN9eNU0JxBbvQN92IAlG+Jp/KZO5TCDikbtVfw="; 22 22 }; 23 23 24 24 propagatedBuildInputs = [
-2
pkgs/development/python-modules/numcodecs/default.nix
··· 9 9 , msgpack 10 10 , pytestCheckHook 11 11 , python 12 - , gcc8 13 12 }: 14 13 15 14 buildPythonPackage rec { ··· 24 25 nativeBuildInputs = [ 25 26 setuptools-scm 26 27 cython 27 - gcc8 28 28 ]; 29 29 30 30 propagatedBuildInputs = [
+4 -2
pkgs/development/python-modules/openrazer/common.nix
··· 1 1 { lib 2 2 , fetchFromGitHub 3 3 }: rec { 4 - version = "3.3.0"; 4 + version = "3.5.1"; 5 + 5 6 src = fetchFromGitHub { 6 7 owner = "openrazer"; 7 8 repo = "openrazer"; 8 9 rev = "v${version}"; 9 - sha256 = "1lw2cpj2xzwcsn5igrqj3f6m2v5n6zp1xa9vv3j9f9r2fbb48jcl"; 10 + sha256 = "sha256-6YU2tl17LpDZe9pQ1a+B2SGIhqGdwME3Db6umVz7RLc="; 10 11 }; 12 + 11 13 meta = with lib; { 12 14 homepage = "https://openrazer.github.io/"; 13 15 license = licenses.gpl2Only;
+12 -9
pkgs/development/python-modules/openrazer/daemon.nix
··· 16 16 let 17 17 common = import ./common.nix { inherit lib fetchFromGitHub; }; 18 18 in 19 - buildPythonPackage (common // rec { 19 + buildPythonPackage (common // { 20 20 pname = "openrazer_daemon"; 21 21 22 22 disabled = !isPy3k; 23 23 24 24 outputs = [ "out" "man" ]; 25 + 26 + prePatch = '' 27 + cd daemon 28 + ''; 29 + 30 + postPatch = '' 31 + substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer" 32 + ''; 25 33 26 34 nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; 27 35 ··· 43 35 setproctitle 44 36 ]; 45 37 46 - prePatch = '' 47 - cd daemon 48 - ''; 49 - 50 - postPatch = '' 51 - substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer" 52 - ''; 53 - 54 38 postBuild = '' 55 39 DESTDIR="$out" PREFIX="" make install manpages 56 40 ''; 41 + 42 + # no tests run 43 + doCheck = false; 57 44 58 45 meta = common.meta // { 59 46 description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux";
+4 -1
pkgs/development/python-modules/openrazer/pylib.nix
··· 9 9 let 10 10 common = import ./common.nix { inherit lib fetchFromGitHub; }; 11 11 in 12 - buildPythonPackage (common // rec { 12 + buildPythonPackage (common // { 13 13 pname = "openrazer"; 14 14 15 15 sourceRoot = "source/pylib"; ··· 19 19 numpy 20 20 openrazer-daemon 21 21 ]; 22 + 23 + # no tests run 24 + doCheck = false; 22 25 23 26 meta = common.meta // { 24 27 description = "An entirely open source Python library that allows you to manage your Razer peripherals on GNU/Linux";
+7 -2
pkgs/development/python-modules/param/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , pytestCheckHook 5 + , pythonOlder 5 6 }: 6 7 7 8 buildPythonPackage rec { 8 9 pname = "param"; 9 - version = "1.12.2"; 10 + version = "1.12.3"; 11 + format = "setuptools"; 12 + 13 + disabled = pythonOlder "3.7"; 10 14 11 15 src = fetchFromGitHub { 12 16 owner = "holoviz"; 13 17 repo = pname; 14 18 rev = "refs/tags/v${version}"; 15 - sha256 = "sha256-NrMsIDcpZc/R2j8VuXitbnIlhP3NtLxU/OkygXqYok8="; 19 + hash = "sha256-XVHYx0M/BLjNNneObxygPHtid65ti7nctKsUMF21fmw="; 16 20 }; 17 21 18 22 checkInputs = [ ··· 36 32 meta = with lib; { 37 33 description = "Declarative Python programming using Parameters"; 38 34 homepage = "https://github.com/pyviz/param"; 35 + changelog = "https://github.com/holoviz/param/releases/tag/v${version}"; 39 36 license = licenses.bsd3; 40 37 maintainers = with maintainers; [ costrouc ]; 41 38 };
+2 -2
pkgs/development/python-modules/patiencediff/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "patiencediff"; 11 - version = "0.2.10"; 11 + version = "0.2.11"; 12 12 format = "pyproject"; 13 13 14 14 disabled = pythonOlder "3.7"; ··· 17 17 owner = "breezy-team"; 18 18 repo = pname; 19 19 rev = "refs/tags/v${version}"; 20 - hash = "sha256-AlJ61Sp6HSy6nJ6trVF2OD9ziSIW241peRXcda3xWnQ="; 20 + hash = "sha256-JUcqODJo4F+gIa9kznWyUW65MGkSrVRlOWvjBNQip3A="; 21 21 }; 22 22 23 23 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/pglast/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "pglast"; 11 - version = "3.17"; 11 + version = "4.0"; 12 12 format = "setuptools"; 13 13 14 14 disabled = pythonOlder "3.7"; 15 15 16 16 src = fetchPypi { 17 17 inherit pname version; 18 - hash = "sha256-C2SWuX6Lt4R62rkNJ9qOoVK50j+TUkhoGUw+seWjTQw="; 18 + hash = "sha256-GmDM+90joF3+IHjUibeNZX54z6jR8rCC+R/fcJ03dHM="; 19 19 }; 20 20 21 21 propagatedBuildInputs = [
+3 -3
pkgs/development/python-modules/phik/default.nix
··· 20 20 21 21 buildPythonPackage rec { 22 22 pname = "phik"; 23 - version = "0.12.2"; 23 + version = "0.12.3"; 24 24 disabled = !isPy3k; 25 25 format = "pyproject"; 26 26 27 27 src = fetchFromGitHub { 28 28 owner = "KaveIO"; 29 29 repo = "PhiK"; 30 - rev = "v${version}"; 31 - hash = "sha256-nr3804MLIBPFw/PlJ9B8xKFFGI5LDp8m2gLtJB7YcEE="; 30 + rev = "refs/tags/v${version}"; 31 + hash = "sha256-9o3EDhgmne2J1QfzjjNQc1mUcyCzoVrCnWXqjWkiZU0="; 32 32 }; 33 33 34 34 checkInputs = [
+16 -4
pkgs/development/python-modules/pyotp/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, isPy27 }: 1 + { lib 2 + , buildPythonPackage 3 + , pythonOlder 4 + , fetchPypi 5 + , unittestCheckHook 6 + }: 2 7 3 8 buildPythonPackage rec { 4 9 pname = "pyotp"; 5 - version = "2.7.0"; 6 - disabled = isPy27; 10 + version = "2.8.0"; 11 + disabled = pythonOlder "3.7"; 12 + 13 + format = "setuptools"; 7 14 8 15 src = fetchPypi { 9 16 inherit pname version; 10 - sha256 = "sha256-zpifq6Dfd9wDK0XlHGzKQrzyCJbI09HnzXWaU9x9bLU="; 17 + hash = "sha256-wvXhfZ2pLY7B995jMasIEWuRFa26vLpuII1G/EmpjFo="; 11 18 }; 19 + 20 + checkInputs = [ 21 + unittestCheckHook 22 + ]; 12 23 13 24 pythonImportsCheck = [ "pyotp" ]; 14 25 15 26 meta = with lib; { 27 + changelog = "https://github.com/pyauth/pyotp/blob/v${version}/Changes.rst"; 16 28 description = "Python One Time Password Library"; 17 29 homepage = "https://github.com/pyauth/pyotp"; 18 30 license = licenses.mit;
+1
pkgs/development/python-modules/wandb/default.nix
··· 114 114 "tests/unit_tests_old/test_footer.py" 115 115 "tests/unit_tests_old/test_internal_api.py" 116 116 "tests/unit_tests_old/test_keras.py" 117 + "tests/unit_tests_old/test_logging.py" 117 118 "tests/unit_tests_old/test_metric_internal.py" 118 119 "tests/unit_tests_old/test_public_api.py" 119 120 "tests/unit_tests_old/test_report_api.py"
+2 -2
pkgs/development/quickemu/default.nix
··· 50 50 51 51 stdenv.mkDerivation rec { 52 52 pname = "quickemu"; 53 - version = "4.4"; 53 + version = "4.5"; 54 54 55 55 src = fetchFromGitHub { 56 56 owner = "quickemu-project"; 57 57 repo = "quickemu"; 58 58 rev = version; 59 - hash = "sha256-82ojq1WTcgkVh+DQup2ymmqa6d6+LVR2p5cqEHA3hSM="; 59 + hash = "sha256-31f4BIIYCh2acbueUtGZShKnlhctd1FfKkFqsNiUqrI="; 60 60 }; 61 61 62 62 postPatch = ''
+2 -2
pkgs/development/tools/continuous-integration/github-runner/default.nix
··· 49 49 in 50 50 stdenv.mkDerivation rec { 51 51 pname = "github-runner"; 52 - version = "2.299.1"; 52 + version = "2.300.0"; 53 53 54 54 inherit sdkSource; 55 55 ··· 57 57 owner = "actions"; 58 58 repo = "runner"; 59 59 rev = "v${version}"; 60 - hash = "sha256-o6N7GDfSEWX6QaEga5hQpbpDcBh7Alcy9mK3QlODTbs="; 60 + hash = "sha256-pEBudX285qMz0W8Sog0ph2CA5UclBItQ+ixaBi6dl8I="; 61 61 }; 62 62 63 63 nativeBuildInputs = [
+4 -4
pkgs/development/tools/continuous-integration/github-runner/patches/use-get-directory-for-diag.patch
··· 1 1 diff --git a/src/Runner.Common/HostContext.cs b/src/Runner.Common/HostContext.cs 2 - index d4ea48c..15c1800 100644 2 + index 9e43464..a953694 100644 3 3 --- a/src/Runner.Common/HostContext.cs 4 4 +++ b/src/Runner.Common/HostContext.cs 5 - @@ -109,7 +109,7 @@ namespace GitHub.Runner.Common 5 + @@ -119,7 +119,7 @@ namespace GitHub.Runner.Common 6 6 } 7 7 8 8 // this should give us _diag folder under runner root directory 9 9 - string diagLogDirectory = Path.Combine(new DirectoryInfo(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)).Parent.FullName, Constants.Path.DiagDirectory); 10 10 + string diagLogDirectory = GetDirectory(WellKnownDirectory.Diag); 11 - _traceManager = new TraceManager(new HostTraceListener(diagLogDirectory, hostType, logPageSize, logRetentionDays), this.SecretMasker); 11 + _traceManager = new TraceManager(new HostTraceListener(diagLogDirectory, hostType, logPageSize, logRetentionDays), stdoutTraceListener, this.SecretMasker); 12 12 } 13 13 else 14 - @@ -272,7 +272,10 @@ namespace GitHub.Runner.Common 14 + @@ -297,7 +297,10 @@ namespace GitHub.Runner.Common 15 15 throw new NotSupportedException($"Unexpected well known directory: '{directory}'"); 16 16 } 17 17
+3 -3
pkgs/development/tools/gopls/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "gopls"; 5 - version = "0.10.1"; 5 + version = "0.11.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "golang"; 9 9 repo = "tools"; 10 10 rev = "gopls/v${version}"; 11 - sha256 = "sha256-9WDqd8Xgiov/OFAFl5yZmon4o3grbOxzZs3wnNu7pbg="; 11 + sha256 = "sha256-49TDAxFx4kSwCn1YGQgMn3xLG3RHCCttMzqUfm4OPtE="; 12 12 }; 13 13 14 14 modRoot = "gopls"; 15 - vendorSha256 = "sha256-EZ/XPta2vQfemywoC2kbTamJ43K4tr4I7mwVzrTbRkA="; 15 + vendorSha256 = "sha256-1/stMvxsCs2OPMN7KGbZ61s2qGT5Yg7kHVHsWi6ekcY="; 16 16 17 17 doCheck = false; 18 18
+2 -2
pkgs/development/tools/goresym/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "goresym"; 5 - version = "1.8"; 5 + version = "2.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "mandiant"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-GFr3ppZJsGwi3dyrlpIjYrdJ2QYp2i01SX+EKEAmDE8="; 11 + sha256 = "sha256-ju0xk0oA8eBJ2kUTrv5KgzOTXf5gRJUSSs16B/6NEyU="; 12 12 }; 13 13 14 14 subPackages = [ "." ];
+8
pkgs/development/tools/kubernetes-controller-tools/default.nix
··· 11 11 sha256 = "sha256-244o+QZ0BGVe8t8AWf1wU6VHgYyzkATpr5ZTbZezk10="; 12 12 }; 13 13 14 + patches = [ ./version.patch ]; 15 + 14 16 vendorSha256 = "sha256-sVdSKu6TDGIDV2o+kuCvGCItbFe9MwlM2Qjiz8n2rZU="; 17 + 18 + ldflags = [ 19 + "-s" 20 + "-w" 21 + "-X sigs.k8s.io/controller-tools/pkg/version.version=v${version}" 22 + ]; 15 23 16 24 doCheck = false; 17 25
+23
pkgs/development/tools/kubernetes-controller-tools/version.patch
··· 1 + diff --git a/pkg/version/version.go b/pkg/version/version.go 2 + index 09c8efcf..b9ec798a 100644 3 + --- a/pkg/version/version.go 4 + +++ b/pkg/version/version.go 5 + @@ -20,14 +20,12 @@ import ( 6 + "runtime/debug" 7 + ) 8 + 9 + +var version string 10 + + 11 + // Version returns the version of the main module 12 + func Version() string { 13 + - info, ok := debug.ReadBuildInfo() 14 + - if !ok || info == nil || info.Main.Version == "" { 15 + - // binary has not been built with module support or doesn't contain a version. 16 + - return "(unknown)" 17 + - } 18 + - return info.Main.Version 19 + + _ = debug.ReadBuildInfo 20 + + return version 21 + } 22 + 23 + // Print prints the main module version on stdout.
+3 -3
pkgs/development/tools/misc/pwninit/default.nix
··· 10 10 11 11 rustPlatform.buildRustPackage rec { 12 12 pname = "pwninit"; 13 - version = "3.2.0"; 13 + version = "3.3.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "io12"; 17 17 repo = "pwninit"; 18 18 rev = version; 19 - sha256 = "sha256-XKDYJH2SG3TkwL+FN6rXDap8la07icR0GPFiYcnOHeI="; 19 + sha256 = "sha256-Tskbwavr+MFa8wmwaFGe7o4/6ZpZqczzwOnqFR66mmM="; 20 20 }; 21 21 22 22 buildInputs = [ openssl xz ] ++ lib.optionals stdenv.isDarwin [ Security ]; 23 23 nativeBuildInputs = [ pkg-config ]; 24 24 doCheck = false; # there are no tests to run 25 25 26 - cargoSha256 = "sha256-2HCHiU309hbdwohUKVT3TEfGvOfxQWtEGj7FIS8OS7s="; 26 + cargoSha256 = "sha256-LPypmFeF9NZOX1ogpIqc++Pun7pInKzpxYiGUvSUcso="; 27 27 28 28 meta = { 29 29 description = "Automate starting binary exploit challenges";
+3 -3
pkgs/development/tools/pscale/default.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "pscale"; 11 - version = "0.124.0"; 11 + version = "0.125.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "planetscale"; 15 15 repo = "cli"; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-bNMUUohiMa/fSP1HjrB0UR3kWh+HNqqqpLcraw6UNjs="; 17 + sha256 = "sha256-B765hV5hs5FfpzkRwQY9szu6l8ImDTUoEl77IcgRngA="; 18 18 }; 19 19 20 - vendorSha256 = "sha256-cd4oAS81zUMImCkFsTIcgYJDB2pvMWYRnTPFkznSr+I="; 20 + vendorSha256 = "sha256-YOytSBJDktWIwN1vhD1imIZVTg6t+Lmfg4cFtE3lys4="; 21 21 22 22 ldflags = [ 23 23 "-s" "-w"
-1
pkgs/development/tools/regclient/default.nix
··· 33 33 ); 34 34 35 35 meta = with lib; { 36 - broken = stdenv.isDarwin; 37 36 description = "Docker and OCI Registry Client in Go and tooling using those libraries"; 38 37 homepage = "https://github.com/regclient/regclient"; 39 38 license = licenses.asl20;
+3 -3
pkgs/development/tools/rgp/default.nix
··· 19 19 }: 20 20 21 21 let 22 - buildNum = "2022-08-01-115"; 22 + buildNum = "2022-12-12-1037"; 23 23 in 24 24 stdenv.mkDerivation rec { 25 25 pname = "rgp"; 26 - version = "1.13.1"; 26 + version = "1.14"; 27 27 28 28 src = fetchurl { 29 29 url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; 30 - hash = "sha256-e88vk+ZtDPB/1HrDKXbzkDaMESNE+qIW7ERwrqe+ZN8="; 30 + hash = "sha256-T13SOy+77lLxmlcczXEFZAnyx9Lm52G/WiCcC1Py4HA="; 31 31 }; 32 32 33 33 nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
+3 -3
pkgs/development/tools/rust/rust-analyzer/default.nix
··· 12 12 13 13 rustPlatform.buildRustPackage rec { 14 14 pname = "rust-analyzer-unwrapped"; 15 - version = "2022-12-05"; 16 - cargoSha256 = "sha256-lD52qI6LX5ORBWknCC4gAWQG8FPlNhOj6xQo1eXpO30="; 15 + version = "2022-12-12"; 16 + cargoSha256 = "sha256-YTakd4qRwXUoxzFWXCj8l9nA3wjJtfVmKbhX9XlaEbE="; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "rust-lang"; 20 20 repo = "rust-analyzer"; 21 21 rev = version; 22 - sha256 = "sha256-2Syd2jVpY0UIfsYlmzvWICZTDVRG4UchcbRlNhuJSpM="; 22 + sha256 = "sha256-QLKX/JhK+jRE61teK+Cr4f2KuAzgYuawStxOgJymqRg="; 23 23 }; 24 24 25 25 cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
+2 -2
pkgs/development/web/shopify-themekit/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "shopify-themekit"; 5 - version = "1.3.0"; 5 + version = "1.3.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "Shopify"; 9 9 repo = "themekit"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-7uUKyaLzeiioW0TsEu82lJU0DoM1suwVcmacY1X0SEM="; 11 + sha256 = "sha256-HtgA+R6THZ49WYtGlHS1EzekjuuGgPe657Y6ewraD4o="; 12 12 }; 13 13 14 14 vendorSha256 = "sha256-8QpkYj0fQb4plzvk6yCrZho8rq9VBiLft/EO3cczciI=";
+2 -2
pkgs/games/prismlauncher/default.nix
··· 34 34 35 35 stdenv.mkDerivation rec { 36 36 pname = "prismlauncher"; 37 - version = "5.2"; 37 + version = "6.0"; 38 38 39 39 src = fetchFromGitHub { 40 40 owner = "PrismLauncher"; 41 41 repo = "PrismLauncher"; 42 42 rev = version; 43 - sha256 = "sha256-sKAhcbDoRbWf/DuwcBmDjb+VSMM0K2C33gu1K9AlPoQ="; 43 + sha256 = "sha256-Kwj1GvlT12jRcf84WMSnD4xkgGL3X9AVqdGDCxMmS4E="; 44 44 }; 45 45 46 46 nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ];
+26
pkgs/misc/tmux-plugins/default.nix
··· 257 257 ''; 258 258 }; 259 259 260 + fuzzback = mkTmuxPlugin { 261 + pluginName = "fuzzback"; 262 + version = "unstable-2022-11-21"; 263 + src = fetchFromGitHub { 264 + owner = "roosta"; 265 + repo = "tmux-fuzzback"; 266 + rev = "bfd9cf0ef1c35488f0080f0c5ca4fddfdd7e18ec"; 267 + sha256 = "w788xDBkfiLdUVv1oJi0YikFPqVk6LiN6PDfHu8on5E="; 268 + }; 269 + nativeBuildInputs = [ pkgs.makeWrapper ]; 270 + postInstall = '' 271 + for f in fuzzback.sh preview.sh supported.sh; do 272 + chmod +x $target/scripts/$f 273 + wrapProgram $target/scripts/$f \ 274 + --prefix PATH : ${with pkgs; lib.makeBinPath [ coreutils fzf gawk gnused ]} 275 + done 276 + ''; 277 + meta = { 278 + homepage = "https://github.com/roosta/tmux-fuzzback"; 279 + description = "Fuzzy search for terminal scrollback"; 280 + license = lib.licenses.mit; 281 + platforms = lib.platforms.unix; 282 + maintainers = with lib.maintainers; [ deejayem ]; 283 + }; 284 + }; 285 + 260 286 fzf-tmux-url = mkTmuxPlugin { 261 287 pluginName = "fzf-tmux-url"; 262 288 rtpFilePath = "fzf-url.tmux";
+41
pkgs/os-specific/linux/below/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , rustPlatform 5 + , clang 6 + , pkgconfig 7 + , elfutils 8 + , rustfmt 9 + , zlib 10 + }: 11 + 12 + rustPlatform.buildRustPackage rec { 13 + pname = "below"; 14 + version = "0.6.3"; 15 + 16 + src = fetchFromGitHub { 17 + owner = "facebookincubator"; 18 + repo = "below"; 19 + rev = "v${version}"; 20 + sha256 = "sha256-d5a/M2XEw2E2iydopzedqZ/XfQU7KQyTC5NrPTeeNLg="; 21 + }; 22 + 23 + cargoSha256 = "sha256-EoRCmEe9SAySZCm+QhaR4ngik4Arnm4SZjgDM5fSRmk="; 24 + 25 + # bpf code compilation 26 + hardeningDisable = [ "stackprotector" ]; 27 + 28 + nativeBuildInputs = [ clang pkgconfig rustfmt ]; 29 + buildInputs = [ elfutils zlib ]; 30 + 31 + # needs /sys/fs/cgroup 32 + doCheck = false; 33 + 34 + meta = with lib; { 35 + platforms = platforms.linux; 36 + maintainers = with maintainers; [ globin ]; 37 + description = "A time traveling resource monitor for modern Linux systems"; 38 + license = licenses.asl20; 39 + homepage = "https://github.com/facebookincubator/below"; 40 + }; 41 + }
+3 -3
pkgs/os-specific/linux/rtl8821cu/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "rtl8821cu"; 5 - version = "${kernel.version}-unstable-2022-05-07"; 5 + version = "${kernel.version}-unstable-2022-12-07"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "morrownr"; 9 9 repo = "8821cu-20210118"; 10 - rev = "14aac4269afe5d21d1cc0032bdc1426128f83734"; 11 - hash = "sha256-TLakNRhHvYAbK0slKsFgSjqJdxVStzZhi1EEajmr7hg="; 10 + rev = "7b8c45a270454f05e2dbf3beeb4afcf817db65da"; 11 + hash = "sha256-Dg+At0iHvi4pl8umhQyml1bODhkeK8YWYpEckqqzNcQ="; 12 12 }; 13 13 14 14 hardeningDisable = [ "pic" ];
+3 -3
pkgs/servers/consul/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "consul"; 5 - version = "1.14.2"; 5 + version = "1.14.3"; 6 6 rev = "v${version}"; 7 7 8 8 # Note: Currently only release tags are supported, because they have the Consul UI ··· 17 17 owner = "hashicorp"; 18 18 repo = pname; 19 19 inherit rev; 20 - sha256 = "sha256-fSEQZ+F3b8l1F/80A4hDPHE7kZMPARQXt/PJg/m4Srw="; 20 + sha256 = "sha256-zTsFLBd+7G+8HT8EGLSQaMhFfh/7s1tfu2gZtIMbkDs="; 21 21 }; 22 22 23 23 passthru.tests.consul = nixosTests.consul; ··· 26 26 # has a split module structure in one repo 27 27 subPackages = ["." "connect/certgen"]; 28 28 29 - vendorSha256 = "sha256-4tidE6LKYhi8ilM08Rn3F5snhxebdgOOeSrIIkXZ384="; 29 + vendorSha256 = "sha256-tekrveDmUq6qYafRMm7knxp9+FevaDbu4DZusO6KDtA="; 30 30 31 31 doCheck = false; 32 32
+1 -1
pkgs/servers/home-assistant/component-packages.nix
··· 2 2 # Do not edit! 3 3 4 4 { 5 - version = "2022.12.5"; 5 + version = "2022.12.6"; 6 6 components = { 7 7 "3_day_blinds" = ps: with ps; [ 8 8 ];
+2 -2
pkgs/servers/home-assistant/default.nix
··· 188 188 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); 189 189 190 190 # Don't forget to run parse-requirements.py after updating 191 - hassVersion = "2022.12.5"; 191 + hassVersion = "2022.12.6"; 192 192 193 193 in python.pkgs.buildPythonApplication rec { 194 194 pname = "homeassistant"; ··· 206 206 owner = "home-assistant"; 207 207 repo = "core"; 208 208 rev = version; 209 - hash = "sha256-TWePQ++C0ISl61Qq+XPnWuZWbwrCnOuviAuDT1D5KuI="; 209 + hash = "sha256-9dukY04sh35kj5vUbNmqnN+MPGqJT/YUuHC64pHzWjw="; 210 210 }; 211 211 212 212 # leave this in, so users don't have to constantly update their downstream patch handling
+33
pkgs/servers/imaginary/default.nix
··· 1 + { lib, buildGoModule, fetchFromGitHub, pkg-config, vips }: 2 + 3 + buildGoModule rec { 4 + pname = "imaginary"; 5 + version = "1.2.4"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "h2non"; 9 + repo = pname; 10 + rev = "v${version}"; 11 + hash = "sha256-oEkFoZMaNNJPMisqpIneeLK/sA23gaTWJ4nqtDHkrwA="; 12 + }; 13 + 14 + vendorHash = "sha256-BluY6Fz4yAKJ/A9aFuPPsgQN9N/5yd8g8rDfIZeYz5U="; 15 + 16 + buildInputs = [ vips ]; 17 + 18 + nativeBuildInputs = [ pkg-config ]; 19 + 20 + ldflags = [ 21 + "-s" 22 + "-w" 23 + "-X main.Version=${version}" 24 + ]; 25 + 26 + meta = with lib; { 27 + homepage = "https://fly.io/docs/app-guides/run-a-global-image-service"; 28 + changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}"; 29 + description = "Fast, simple, scalable, Docker-ready HTTP microservice for high-level image processing"; 30 + license = licenses.mit; 31 + maintainers = with maintainers; [ urandom ]; 32 + }; 33 + }
+35 -13
pkgs/servers/ma1sd/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , fetchpatch 5 + , jre 6 + , git 7 + , gradle 8 + , perl 9 + , makeWrapper 10 + }: 2 11 3 12 let 4 13 pname = "ma1sd"; 5 - version = "2.4.0"; 6 - rev = version; 14 + version = "2.5.0"; 7 15 8 16 src = fetchFromGitHub { 9 - inherit rev; 10 17 owner = "ma1uta"; 11 18 repo = "ma1sd"; 12 - hash = "sha256-8UnhrGa8KKmMAAkzUXztMkxgYOX8MU1ioXuEStGi4Vc="; 19 + rev = version; 20 + hash = "sha256-K3kaujAhWsRQuTMW3SZOnE7Rmu8+tDXaxpLrb45OI4A="; 13 21 }; 14 22 23 + patches = [ 24 + # https://github.com/ma1uta/ma1sd/pull/122 25 + (fetchpatch { 26 + name = "java-16-compatibility.patch"; 27 + url = "https://github.com/ma1uta/ma1sd/commit/be2e2e97ce21741ca6a2e29a06f5748f45dd414e.patch"; 28 + hash = "sha256-dvCeK/0InNJtUG9CWrsg7BE0FGWtXuHo3TU0iFFUmIk="; 29 + }) 30 + ]; 15 31 16 32 deps = stdenv.mkDerivation { 17 33 pname = "${pname}-deps"; 18 - inherit src version; 19 - nativeBuildInputs = [ gradle_6 perl git ]; 34 + inherit src version patches; 35 + nativeBuildInputs = [ gradle perl git ]; 20 36 21 37 buildPhase = '' 22 - export MA1SD_BUILD_VERSION=${rev} 38 + export MA1SD_BUILD_VERSION=${version} 23 39 export GRADLE_USER_HOME=$(mktemp -d); 24 40 gradle --no-daemon build -x test 25 41 ''; ··· 51 35 52 36 outputHashAlgo = "sha256"; 53 37 outputHashMode = "recursive"; 54 - outputHash = "0x2wmmhjgnb6p72d3kvnv2vg52l0c4151rs4jrazs9rvxjfc88dr"; 38 + outputHash = "sha256-Px8FLnREBC6pADcEPn/GfhrtGnmZqjXIX7l1xPjiCvQ="; 55 39 }; 56 40 57 41 in 58 42 stdenv.mkDerivation { 59 - inherit pname src version; 60 - nativeBuildInputs = [ gradle_6 perl makeWrapper ]; 43 + inherit pname src version patches; 44 + nativeBuildInputs = [ gradle perl makeWrapper ]; 61 45 buildInputs = [ jre ]; 46 + 47 + postPatch = '' 48 + substituteInPlace build.gradle \ 49 + --replace 'gradlePluginPortal()' "" \ 50 + --replace 'mavenCentral()' "mavenLocal(); maven { url '${deps}' }" 51 + ''; 62 52 63 53 buildPhase = '' 64 54 runHook preBuild 65 - export MA1SD_BUILD_VERSION=${rev} 55 + export MA1SD_BUILD_VERSION=${version} 66 56 export GRADLE_USER_HOME=$(mktemp -d) 67 57 68 - sed -ie "s#jcenter()#mavenLocal(); maven { url '${deps}' }#g" build.gradle 69 58 gradle --offline --no-daemon build -x test 70 59 runHook postBuild 71 60 ''; ··· 85 64 meta = with lib; { 86 65 description = "a federated matrix identity server; fork of mxisd"; 87 66 homepage = "https://github.com/ma1uta/ma1sd"; 67 + changelog = "https://github.com/ma1uta/ma1sd/releases/tag/${version}"; 88 68 sourceProvenance = with sourceTypes; [ 89 69 fromSource 90 70 binaryBytecode # deps
+3 -3
pkgs/servers/monitoring/telegraf/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "telegraf"; 5 - version = "1.24.4"; 5 + version = "1.25.0"; 6 6 7 7 excludedPackages = "test"; 8 8 ··· 12 12 owner = "influxdata"; 13 13 repo = "telegraf"; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-GlbkCT85gbQehN2SgWY0WNSQ1FbpgZKBpqm6ImlWASk="; 15 + sha256 = "sha256-p+2nsJT3WHYmJ1toIwFi/a/I0//OaUoJIHmQcFHHJ/A="; 16 16 }; 17 17 18 - vendorSha256 = "sha256-sBCUs9m04bdkeAIRCJ2Esw68JJIsyVNcoZ3W1WrNKJ4="; 18 + vendorSha256 = "sha256-xNio3bMFopMgDwdQdtFmkp3F0iWYHVqu9T42S5KNMU8="; 19 19 proxyVendor = true; 20 20 21 21 ldflags = [
+2 -2
pkgs/servers/web-apps/healthchecks/default.nix
··· 13 13 in 14 14 py.pkgs.buildPythonApplication rec { 15 15 pname = "healthchecks"; 16 - version = "2.4.1"; 16 + version = "2.5"; 17 17 format = "other"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "healthchecks"; 21 21 repo = pname; 22 22 rev = "v${version}"; 23 - sha256 = "sha256-K2zA0ZkAPMgm+IofNiCf+mVTF/RIoorTupWLOowT29g="; 23 + sha256 = "sha256-luwFY1iBtFL+Ye7nP68eIgqlpvMUKnxwdNxkBI7pX/c="; 24 24 }; 25 25 26 26 propagatedBuildInputs = with py.pkgs; [
+6 -1
pkgs/shells/dash/default.nix
··· 2 2 , stdenv 3 3 , buildPackages 4 4 , autoreconfHook 5 + , pkg-config 5 6 , fetchurl 6 7 , fetchpatch 7 8 , libedit ··· 38 37 39 38 strictDeps = true; 40 39 # configure.ac patched; remove on next release 41 - nativeBuildInputs = [ autoreconfHook ]; 40 + nativeBuildInputs = [ autoreconfHook ] 41 + ++ lib.optionals stdenv.hostPlatform.isStatic [ pkg-config ]; 42 42 43 43 depsBuildBuild = [ buildPackages.stdenv.cc ]; 44 44 buildInputs = [ libedit ]; 45 45 46 46 configureFlags = [ "--with-libedit" ]; 47 + preConfigure = lib.optional stdenv.hostPlatform.isStatic '' 48 + export LIBS="$(pkg-config --libs --static libedit)" 49 + ''; 47 50 48 51 enableParallelBuilding = true; 49 52
+6 -5
pkgs/tools/admin/qovery-cli/default.nix
··· 1 - { buildGoModule 1 + { lib 2 + , buildGoModule 2 3 , fetchFromGitHub 3 4 , installShellFiles 4 - , lib 5 5 , qovery-cli 6 6 , testers 7 7 }: 8 8 9 9 buildGoModule rec { 10 10 pname = "qovery-cli"; 11 - version = "0.46.4"; 11 + version = "0.46.7"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "Qovery"; 15 15 repo = pname; 16 16 rev = "v${version}"; 17 - hash = "sha256-ROUMFpAgUmcKt7QG+Lfd3OipJQK8DLezvCxvev1yNlo="; 17 + hash = "sha256-cMoT0vbWTcuMI7MMDGQ8+G7FqTuaJl4+rp22Uy4e83g="; 18 18 }; 19 19 20 - vendorSha256 = "sha256-4TY7/prMbvw5zVPJRoMLg7Omrxvh1HPGsdz1wqPn4uU="; 20 + vendorHash = "sha256-4TY7/prMbvw5zVPJRoMLg7Omrxvh1HPGsdz1wqPn4uU="; 21 21 22 22 nativeBuildInputs = [ installShellFiles ]; 23 23 ··· 36 36 meta = with lib; { 37 37 description = "Qovery Command Line Interface"; 38 38 homepage = "https://github.com/Qovery/qovery-cli"; 39 + changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${version}"; 39 40 license = with licenses; [ asl20 ]; 40 41 maintainers = with maintainers; [ fab ]; 41 42 };
+3 -3
pkgs/tools/backup/bupstash/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: 2 2 rustPlatform.buildRustPackage rec { 3 3 pname = "bupstash"; 4 - version = "0.11.0"; 4 + version = "0.12.0"; 5 5 6 6 src = fetchFromGitHub { 7 7 owner = "andrewchambers"; 8 8 repo = pname; 9 9 rev = "v${version}"; 10 - sha256 = "sha256-9yWQQ8uzDkN3Pi2OiEn+oEazc3nH53dF2GswBCu8d3c="; 10 + sha256 = "sha256-Ekjxna3u+71s1q7jjXp7PxYUQIfbp2E+jAqKGuszU6g="; 11 11 }; 12 12 13 - cargoSha256 = "sha256-JAclSUFuQk768cgDEvG1rxux2xBGHl1d/NAoxw161YU="; 13 + cargoSha256 = "sha256-hkGmE7WseEjMxmmPyR8C4osbdbpIt8qG9sfVGuC4d84="; 14 14 15 15 nativeBuildInputs = [ ronn pkg-config installShellFiles ]; 16 16 buildInputs = [ libsodium ];
+2 -2
pkgs/tools/filesystems/mergerfs/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "mergerfs"; 5 - version = "2.33.5"; 5 + version = "2.34.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "trapexit"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "sha256-Hj124GzJV5WNGJHvgelem5B/Ru+F/ILzsX2X8gs7Jww="; 11 + sha256 = "sha256-67LkMbs3JGpkwMHGWJf03yy8aGfSVb64TF4DPLlLMgY="; 12 12 }; 13 13 14 14 nativeBuildInputs = [
+2 -2
pkgs/tools/filesystems/tar2ext4/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "tar2ext4"; 5 - version = "0.9.5"; 5 + version = "0.9.6"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "microsoft"; 9 9 repo = "hcsshim"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-p64BQlxwXU9+6MbT2Aw9EcW82t2i3E6mKfOWoEEFf9g="; 11 + sha256 = "sha256-sBcagAFjmnLfPFYwOhWIt6bnEXyOKYobvMI2rQf4S5A="; 12 12 }; 13 13 14 14 sourceRoot = "source/cmd/tar2ext4";
+3 -3
pkgs/tools/networking/minio-client/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "minio-client"; 5 - version = "2022-12-02T23-48-47Z"; 5 + version = "2022-12-13T00-23-28Z"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "minio"; 9 9 repo = "mc"; 10 10 rev = "RELEASE.${version}"; 11 - sha256 = "sha256-6OPc56QN5va0S1iFbwA+qlF+AXUFxb//MYb55eRMsF0="; 11 + sha256 = "sha256-wRkpc1S9booT9jVrDdmuj1eQInXafax2ZGvHgcuoiTA="; 12 12 }; 13 13 14 - vendorSha256 = "sha256-janS8S3ezloT0M92dGe3x4WZb1cN8hmreVin6sjtPU4="; 14 + vendorSha256 = "sha256-D3d+aSEe1d1Tw0//L8MGuZHt5GjURTn3Vni9l4BafEI="; 15 15 16 16 subPackages = [ "." ]; 17 17
+2 -2
pkgs/tools/networking/pritunl-client/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "pritunl-client"; 5 - version = "1.3.3370.14"; 5 + version = "1.3.3373.6"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "pritunl"; 9 9 repo = "pritunl-client-electron"; 10 10 rev = version; 11 - sha256 = "sha256-/HXnD2P2fsNxWXMe5U7SUgxzOaHokktTogYIdiH8Kk8="; 11 + sha256 = "sha256-Ttg6SNDcNIQlbNnKQY32hmsrgLhzHkeQfwlmCHe0bI0="; 12 12 }; 13 13 14 14 modRoot = "cli";
+3 -3
pkgs/tools/security/sbctl/default.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "sbctl"; 11 - version = "0.9"; 11 + version = "0.10"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "Foxboron"; 15 15 repo = pname; 16 16 rev = version; 17 - hash = "sha256-mntb3EMB+QTnFU476Dq6T6rAAv0JeYbvWJ/pbL3a4RE="; 17 + hash = "sha256-rjqfWOJRG+9GbNNeRafkNx7Khm/vtGeMlfKkz0qFXJY="; 18 18 }; 19 19 20 - vendorSha256 = "sha256-k6AIYigjxbitH0hH+vwRt2urhNYTToIF0eSsIWbzslI="; 20 + vendorSha256 = "sha256-3wT/pWKIdEpkLUpOmpKhLA9AyO36LqZBAwamzOUGhFY="; 21 21 22 22 ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" ]; 23 23
+73
pkgs/tools/video/wtwitch/default.nix
··· 1 + { bash 2 + , coreutils-prefixed 3 + , curl 4 + , fetchFromGitHub 5 + , gnused 6 + , gnugrep 7 + , installShellFiles 8 + , jq 9 + , lib 10 + , makeWrapper 11 + , mplayer 12 + , mpv 13 + , ncurses 14 + , procps 15 + , scdoc 16 + , stdenv 17 + , streamlink 18 + , sudo 19 + , vlc 20 + }: 21 + 22 + stdenv.mkDerivation rec { 23 + pname = "wtwitch"; 24 + version = "2.6.0"; 25 + 26 + src = fetchFromGitHub { 27 + owner = "krathalan"; 28 + repo = pname; 29 + rev = version; 30 + hash = "sha256-KkuXZOquihY3IRVp4FM+AdN3kYi0MqmrXFuNmydTpio="; 31 + }; 32 + 33 + # hardcode SCRIPT_NAME because #150841 34 + postPatch = '' 35 + substituteInPlace src/wtwitch --replace 'readonly SCRIPT_NAME="''${0##*/}"' 'readonly SCRIPT_NAME="wtwitch"' 36 + ''; 37 + 38 + buildPhase = '' 39 + scdoc < src/wtwitch.1.scd > wtwitch.1 40 + ''; 41 + 42 + nativeBuildInputs = [ scdoc installShellFiles makeWrapper ]; 43 + 44 + installPhase = '' 45 + installManPage wtwitch.1 46 + installShellCompletion --cmd wtwitch \ 47 + --bash src/wtwitch-completion.bash \ 48 + --zsh src/_wtwitch 49 + install -Dm755 src/wtwitch $out/bin/wtwitch 50 + wrapProgram $out/bin/wtwitch \ 51 + --set-default LANG en_US.UTF-8 \ 52 + --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isLinux [ vlc ] ++ [ 53 + bash 54 + coreutils-prefixed 55 + curl 56 + gnused 57 + gnugrep 58 + jq 59 + mplayer 60 + mpv 61 + procps 62 + streamlink 63 + ])} 64 + ''; 65 + 66 + meta = with lib; { 67 + description = "Terminal user interface for Twitch"; 68 + homepage = "https://github.com/krathalan/wtwitch"; 69 + license = licenses.gpl3Only; 70 + maintainers = with maintainers; [ urandom ]; 71 + platforms = platforms.all; 72 + }; 73 + }
+2 -2
pkgs/tools/virtualization/govc/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "govc"; 5 - version = "0.29.0"; 5 + version = "0.30.0"; 6 6 7 7 subPackages = [ "govc" ]; 8 8 ··· 10 10 rev = "v${version}"; 11 11 owner = "vmware"; 12 12 repo = "govmomi"; 13 - sha256 = "sha256-SVQyl1uI3wGBBDhz2VLm0uJj+aREqNot7K+iGRHGmhI="; 13 + sha256 = "sha256-BMkty2H42fAILw/zRiAWE5cOX9WCZIs0503QODLHqxo="; 14 14 }; 15 15 16 16 vendorSha256 = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k=";
+10
pkgs/top-level/all-packages.nix
··· 1502 1502 wine = wineWowPackages.staging; 1503 1503 }; 1504 1504 1505 + wtwitch = callPackage ../tools/video/wtwitch {}; 1506 + 1505 1507 wwcd = callPackage ../tools/misc/wwcd { }; 1506 1508 1507 1509 writedisk = callPackage ../tools/misc/writedisk { }; ··· 18771 18769 boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found 18772 18770 }; 18773 18771 18772 + cpp-jwt = callPackage ../development/libraries/cpp-jwt { }; 18773 + 18774 18774 ubus = callPackage ../development/libraries/ubus { }; 18775 18775 18776 18776 uci = callPackage ../development/libraries/uci { }; ··· 23935 23931 23936 23932 inspircdMinimal = inspircd.override { extraModules = []; }; 23937 23933 23934 + imaginary = callPackage ../servers/imaginary {}; 23935 + 23938 23936 imgproxy = callPackage ../servers/imgproxy { }; 23939 23937 23940 23938 irccat = callPackage ../servers/irc/irccat { }; ··· 25002 24996 b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { }; 25003 24997 25004 24998 b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; 24999 + 25000 + below = callPackage ../os-specific/linux/below { }; 25005 25001 25006 25002 bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { }; 25007 25003 ··· 27421 27413 buildPythonApplication appdirs colorama python-dateutil 27422 27414 requests requests-toolbelt setuptools sqlalchemy fusepy; 27423 27415 }; 27416 + 27417 + acorn = callPackage ../applications/networking/cluster/acorn {}; 27424 27418 27425 27419 adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; 27426 27420