nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2023-08-12 00:11:03 +00:00 committed by GitHub
commit f4d5aa6125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
304 changed files with 7271 additions and 7382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
maintainers/maintainer-list.nix
View File

@ -644,6 +644,11 @@
githubId = 43479487;
name = "Titouan Biteau";
};
albertchae = {
github = "albertchae";
githubId = 217050;
name = "Albert Chae";
};
aldoborrero = {
email = "aldoborrero+nixos@pm.me";
github = "aldoborrero";
@ -1722,6 +1727,11 @@
githubId = 135230;
name = "Aycan iRiCAN";
};
aynish = {
github = "Chickensoupwithrice";
githubId = 22575913;
name = "Anish Lakhwara";
};
azahi = {
name = "Azat Bahawi";
email = "azat@bahawi.net";
@ -4329,6 +4339,11 @@
githubId = 997543;
name = "Dmitry Malikov";
};
DMills27 = {
github = "DMills27";
githubId = 5251658;
name = "Dominic Mills";
};
DmitryTsygankov = {
email = "dmitry.tsygankov@gmail.com";
github = "DmitryTsygankov";
@ -17178,6 +17193,12 @@
githubId = 27586264;
name = "Tobias Schmidt";
};
totalchaos = {
email = "basil.keeler@outlook.com";
github = "totalchaos05";
githubId = 70387628;
name = "Basil Keeler";
};
totoroot = {
name = "Matthias Thym";
email = "git@thym.at";
@ -18566,6 +18587,13 @@
githubId = 647076;
name = "Yorick van Pelt";
};
YorikSar = {
name = "Yuriy Taraday";
email = "yorik.sar@gmail.com";
matrix = "@yorik.sar:matrix.org";
github = "YorikSar";
githubId = 428074;
};
yrashk = {
email = "yrashk@gmail.com";
github = "yrashk";

1
maintainers/team-list.nix
View File

@ -732,6 +732,7 @@ with lib.maintainers; {
fridh
hexa
jonringer
tjni
];
scope = "Maintain the Python interpreter and related packages.";
shortName = "Python";

12
nixos/modules/security/pam.nix
View File

@ -697,7 +697,7 @@ let
session required ${config.systemd.package}/lib/security/pam_systemd_home.so
'' +
optionalString cfg.makeHomeDir ''
session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077
session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=${config.security.pam.makeHomeDir.umask}
'' +
optionalString cfg.updateWtmp ''
session required ${pkgs.pam}/lib/security/pam_lastlog.so silent
@ -902,6 +902,16 @@ in
'';
};
security.pam.makeHomeDir.umask = mkOption {
type = types.str;
default = "0077";
example = "0022";
description = lib.mdDoc ''
The user file mode creation mask to use on home directories
newly created by `pam_mkhomedir`.
'';
};
security.pam.enableSSHAgentAuth = mkOption {
type = types.bool;
default = false;

14
nixos/modules/services/monitoring/datadog-agent.nix
View File

@ -153,6 +153,18 @@ in {
type = types.bool;
};
processAgentPackage = mkOption {
default = pkgs.datadog-process-agent;
defaultText = literalExpression "pkgs.datadog-process-agent";
description = lib.mdDoc ''
Which DataDog v7 agent package to use. Note that the provided
package is expected to have an overridable `pythonPackages`-attribute
which configures the Python environment with the Datadog
checks.
'';
type = types.package;
};
enableTraceAgent = mkOption {
description = lib.mdDoc ''
Whether to enable the trace agent.
@ -270,7 +282,7 @@ in {
path = [ ];
script = ''
export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
${pkgs.datadog-process-agent}/bin/process-agent --config /etc/datadog-agent/datadog.yaml
${cfg.processAgentPackage}/bin/process-agent --config /etc/datadog-agent/datadog.yaml
'';
});

4
nixos/modules/services/networking/dae.nix
View File

@ -20,8 +20,8 @@ in
unitConfig = {
Description = "dae Service";
Documentation = "https://github.com/daeuniverse/dae";
After = [ "network.target" "systemd-sysctl.service" ];
Wants = [ "network.target" ];
After = [ "network-online.target" "systemd-sysctl.service" ];
Wants = [ "network-online.target" ];
};
serviceConfig = {

6
nixos/modules/services/web-servers/minio.nix
View File

@ -30,8 +30,8 @@ in
dataDir = mkOption {
default = [ "/var/lib/minio/data" ];
type = types.listOf types.path;
description = lib.mdDoc "The list of data directories for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode.";
type = types.listOf (types.either types.path types.str);
description = lib.mdDoc "The list of data directories or nodes for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode.";
};
configDir = mkOption {
@ -99,7 +99,7 @@ in
systemd = lib.mkMerge [{
tmpfiles.rules = [
"d '${cfg.configDir}' - minio minio - -"
] ++ (map (x: "d '" + x + "' - minio minio - - ") cfg.dataDir);
] ++ (map (x: "d '" + x + "' - minio minio - - ") (builtins.filter lib.types.path.check cfg.dataDir));
services.minio = {
description = "Minio Object Storage";

2
pkgs/applications/audio/feishin/darwin.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip";
hash = "sha256-WzU/Yd3cNMIpmkKWC29mQlviYXiYV5k8+80iyzilPGc=";
hash = "sha256-J5LB4uR/NJ6ykiTqBY1VepcLujprgqwpxy7sGD0NtZw=";
};
nativeBuildInputs = [ makeWrapper unzip ];

2
pkgs/applications/audio/feishin/default.nix
View File

@ -8,7 +8,7 @@ let
extraArgs = removeAttrs args [ "callPackage" ];
pname = "feishin";
version = "0.2.0";
version = "0.3.0";
appname = "Feishin";
meta = with lib; {

2
pkgs/applications/audio/feishin/linux.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz";
hash = "sha256-o+fEjdG2iN84FEchyAKWZCpsrqDm1K1k+Q2K+cwYBZE=";
hash = "sha256-sl2zM24bb0yBTfCxtNGizp6Yu+L4nj/Uf669zylnPmE=";
};

2
pkgs/applications/audio/sony-headphones-client/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config copyDesktopItems ];
buildInputs = [ bluez dbus glew glfw imgui ];
sourceRoot = "./source/Client";
sourceRoot = "./${src.name}/Client";
cmakeFlags = [ "-Wno-dev" ];

63
pkgs/applications/audio/termusic/default.nix
View File

@ -1,39 +1,66 @@
{ lib
, stdenv
, rustPlatform
, fetchCrate
, fetchpatch
{
alsa-lib
, AppKit
, CoreAudio
, CoreGraphics
, dbus
, Foundation
, fetchFromGitHub
, glib
, gst_all_1
, IOKit
, lib
, MediaPlayer
, openssl
, pkg-config
, alsa-lib
, darwin
, protobuf
, rustPlatform
, Security
, sqlite
, stdenv
}:
rustPlatform.buildRustPackage rec {
pname = "termusic";
version = "0.7.10";
version = "0.7.11";
src = fetchCrate {
inherit pname version;
hash = "sha256-m0hi5u4BcRcEDEpg1BoWXc25dfhD6+OJtqSZfSdV0HM=";
src = fetchFromGitHub {
owner = "tramhao";
repo = "termusic";
rev = "v${version}";
hash = "sha256-ykOBXM/WF+zasAt+6mgY2aSFCpGaYcqk+YI7YLM3MWs=";
};
cargoHash = "sha256-A83gLsaPm6t4nm7DJfcp9z1huDU/Sfy9gunP8pzBiCA=";
cargoHash = "sha256-BrOpU0RFdlRXQIMjfHfs/XYIdBCYKFSA+5by/rGzC8Y=";
nativeBuildInputs = [
pkg-config
protobuf
rustPlatform.bindgenHook
];
buildInputs = lib.optionals stdenv.isLinux [
alsa-lib
buildInputs = [
dbus
glib
gst_all_1.gstreamer
openssl
sqlite
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AudioUnit
AppKit
CoreAudio
CoreGraphics
Foundation
IOKit
MediaPlayer
Security
] ++ lib.optionals stdenv.isLinux [
alsa-lib
];
meta = with lib; {
meta = {
description = "Terminal Music Player TUI written in Rust";
homepage = "https://github.com/tramhao/termusic";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ devhell ];
license = with lib.licenses; [ gpl3Only ];
maintainers = with lib.maintainers; [ devhell ];
};
}

63
pkgs/applications/backup/proxmox-backup-client/default.nix
View File

@ -16,38 +16,45 @@
proxmox-backup-client,
}:
rustPlatform.buildRustPackage rec {
let
pname = "proxmox-backup-client";
version = "3.0.1";
srcs = [
(fetchgit {
url = "git://git.proxmox.com/git/proxmox-backup.git";
rev = "v${version}";
name = "proxmox-backup";
hash = "sha256-a6dPBZBBh//iANXoPmOdgxYO0qNszOYI3QtrjQr4Cxc=";
})
(fetchgit {
url = "git://git.proxmox.com/git/proxmox.git";
rev = "2a070da0651677411a245f1714895235b1caf584";
name = "proxmox";
hash = "sha256-WH6oW2MB2yN1Y2zqOuXewI9jHqev/xLcJtb7D1J4aUE=";
})
(fetchgit {
url = "git://git.proxmox.com/git/proxmox-fuse.git";
rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79";
name = "proxmox-fuse";
hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ=";
})
(fetchgit {
url = "git://git.proxmox.com/git/pxar.git";
rev = "6ad046f9f92b40413f59cc5f4c23d2bafdf141f2";
name = "pxar";
hash = "sha256-I9kk27oN9BDQpnLDWltjZMrh2yJitCpcD/XAhkmtJUg=";
})
];
proxmox-backup_src = fetchgit {
url = "git://git.proxmox.com/git/proxmox-backup.git";
rev = "v${version}";
name = "proxmox-backup";
hash = "sha256-a6dPBZBBh//iANXoPmOdgxYO0qNszOYI3QtrjQr4Cxc=";
};
sourceRoot = "proxmox-backup";
proxmox_src = fetchgit {
url = "git://git.proxmox.com/git/proxmox.git";
rev = "2a070da0651677411a245f1714895235b1caf584";
name = "proxmox";
hash = "sha256-WH6oW2MB2yN1Y2zqOuXewI9jHqev/xLcJtb7D1J4aUE=";
};
proxmox-fuse_src = fetchgit {
url = "git://git.proxmox.com/git/proxmox-fuse.git";
rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79";
name = "proxmox-fuse";
hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ=";
};
proxmox-pxar_src = fetchgit {
url = "git://git.proxmox.com/git/pxar.git";
rev = "6ad046f9f92b40413f59cc5f4c23d2bafdf141f2";
name = "pxar";
hash = "sha256-I9kk27oN9BDQpnLDWltjZMrh2yJitCpcD/XAhkmtJUg=";
};
in
rustPlatform.buildRustPackage {
inherit pname version;
srcs = [ proxmox-backup_src proxmox_src proxmox-fuse_src proxmox-pxar_src ];
sourceRoot = proxmox-backup_src.name;
# These patches are essentially un-upstreamable, due to being "workarounds" related to the
# project structure.

4
pkgs/applications/blockchains/framesh/default.nix
View File

@ -2,10 +2,10 @@
let
pname = "framesh";
version = "0.6.6";
version = "0.6.7";
src = fetchurl {
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
sha256 = "sha256-5LLnITQP9m2lMdnB/rrK/M+p3AA3rYZ9GOrDdCFA/r4=";
sha256 = "sha256-yPNgrC9ZQcl1gCStMXMbZvk15jZylM2NgKM9H3XcJVQ=";
};
appimageContents = appimageTools.extractType2 {

2
pkgs/applications/editors/vscode/generic.nix
View File

@ -69,7 +69,7 @@ let
buildInputs = [ libsecret libXScrnSaver libxshmfence ]
++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages);
runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland ];
runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ];
nativeBuildInputs = [ unzip ]
++ lib.optionals stdenv.isLinux [

12
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0dynpi8l2102z8kbzgdm8qwbpzm7jxjqvz8a3x0vsikxbfwhsdmy";
x86_64-darwin = "1z3vzwgcjj57xrw8mklhsdr8n9214rb4vj6jfnqv5nxpdgx4dw55";
aarch64-linux = "0jiwp6i9q8c87pfkhvj45viqi2m5x5aq94skrvxa8wjbkyafvm1d";
aarch64-darwin = "1as6zfrv2jymxspmc3m453vs61b7y1lh5qh34xr0ps8c4h6dbjas";
armv7l-linux = "17yd3bb4z99q4r0d91grifrbr50wln1fkz0bjp4s4snqnj9q9gfk";
x86_64-linux = "0wx53ajjwil82s3nl6wvpdf01mh33yqasf1ia54s1rfzz10fa1m6";
x86_64-darwin = "1avq0xlhsnxf6yfay1czi0rc0hy47ahj25rg07mzgb274p4x9q95";
aarch64-linux = "1chdcy59w4zm27ga71iph7yqq88lv2rw73br1nmmjznbqgzk9lpc";
aarch64-darwin = "140lrka50yqqd9dp9gb93jlc2zn2fjiq9palibwvgb14nzsb3x68";
armv7l-linux = "0qf95nxy55f9m2z91fykwjgffj7wqvlqjn2d2xnfapa457v5lbir";
}.${system} or throwSystem;
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.80.2.23209";
version = "1.81.1.23222";
pname = "vscodium";
executableName = "codium";

18
pkgs/applications/misc/1password-gui/default.nix
View File

@ -9,43 +9,43 @@
let
pname = "1password";
version = if channel == "stable" then "8.10.8" else "8.10.9-29.BETA";
version = if channel == "stable" then "8.10.9" else "8.10.12-10.BETA";
sources = {
stable = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-E7lXyxoBL2ziMIIisskJJhZ5ymKyuv4zXEqigUtU41I=";
hash = "sha256-Ef0ee41WVN46IOYbdyF1w8Ud2s7ncR71/5TFnQwOnVU=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-V/qJHt49pPEm1g92hEQCscmJ3ZkSHTY2oA69d6DxkmU=";
hash = "sha256-IuRPCphagpx0jynJmhL9ETSzS0JaWCpDaodt0TDm7xs=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-H2t4sEbm2Mp89a++r8oFSyvg19zc9dAsq3phX/h1VVg=";
hash = "sha256-KwMYxe6WpLFXaJ3jyEOc18IYO/pwZ7RiPF/7RN2c5xg=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-8lVc69Ra0wYxnlVcehtAIujrmUQXmsgsK8ATR4vkBe0=";
hash = "sha256-MDc2Okc8nZbAPPn0ihoraDe9kNI5xx654DdTe7AlD3E=";
};
};
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-gC+niXGxg37pzMWu/yzD5KcrzbI39u//syVlPne6nBQ=";
hash = "sha256-SnfFd+ksJc69r7GGFUYCLH0NAwwiSxEDyaIRTrj/VWo=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-y9P7032GaNKbDzL922HUwiu3DxqKzTiA5g1I3V+852k=";
hash = "sha256-5PDlMe/EZNBkfIrf6se4B5TKVYycSSoqiv0iMEPiIrA=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-/avHauTuFmKQiHL1WpRI488F8rcwvEOe26kmGF7sv3k=";
hash = "sha256-nn8lnn52MkKcFRluH9k8IoAu4vZ1C9Uk/+k6TQ6CKFs=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-kMrA8PhAtOjkgbl9m7NtzIJin+a05llQKdEzlkLE0sY=";
hash = "sha256-ACeFyaDzo1I4w/9CrkQ5iO/JBHYRbxxzMDhTX4oI548=";
};
};
};

3
pkgs/applications/misc/fuzzel/default.nix
View File

@ -65,11 +65,12 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}";
description = "Wayland-native application launcher, similar to rofi’s drun mode";
homepage = "https://codeberg.org/dnkl/fuzzel";
license = with licenses; [ mit zlib ];
mainProgram = "fuzzel";
maintainers = with maintainers; [ fionera polykernel rodrgz ];
platforms = with platforms; linux;
changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}";
};
}

4
pkgs/applications/misc/jetbrains-toolbox/default.nix
View File

@ -10,11 +10,11 @@
}:
let
pname = "jetbrains-toolbox";
version = "2.0.0.16559";
version = "2.0.1.16621";
src = fetchzip {
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
sha256 = "sha256-z+udyilfVwcVnaFhp6GYHCXqh1d7T5fj/TbbjMoen2I=";
sha256 = "sha256-FZuoLzouwi3HfTJct+Sh8DNzdzQoEsErBb04SgYrZN0=";
stripRoot = false;
};

5
pkgs/applications/misc/swappy/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "jtheoof";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo=";
hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo=";
};
nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ];
@ -40,9 +40,10 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://github.com/jtheoof/swappy";
description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS";
homepage = "https://github.com/jtheoof/swappy";
license = licenses.mit;
mainProgram = "swappy";
maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.linux;
};

51
pkgs/applications/misc/waypaper/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, python3
, fetchFromGitHub
, gobject-introspection
, gtk3
, wrapGAppsHook
}:
python3.pkgs.buildPythonApplication rec {
pname = "waypaper";
version = "1.2";
src = fetchFromGitHub {
owner = "anufrievroman";
repo = "waypaper";
rev = "refs/tags/${version}";
hash = "sha256-wD3DtxP4aUwIn+EoM3s1Y9VNEcUGhtyugNBEFHI9eqw=";
};
nativeBuildInputs = [
gobject-introspection
wrapGAppsHook
];
propagatedBuildInputs = with python3.pkgs; [
pygobject3
];
# has no tests
doCheck = false;
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
changelog = "https://github.com/anufrievroman/waypaper/releases/tag/${version}";
description = "GUI wallpaper setter for Wayland-based window managers";
longDescription = ''
GUI wallpaper setter for Wayland-based window managers that works as a frontend for popular backends like swaybg and swww.
If wallpaper does not change, make sure that swaybg or swww is installed.
'';
homepage = "https://github.com/anufrievroman/waypaper";
license = licenses.gpl3Only;
maintainers = with maintainers; [ totalchaos ];
platforms = platforms.linux;
};
}

9
pkgs/applications/networking/browsers/mullvad-browser/default.nix
View File

@ -78,12 +78,15 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "12.5.1";
version = "12.5.2";
sources = {
x86_64-linux = fetchurl {
url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz";
hash = "sha256-yG22oyTDb7i1OnM7L9uOSaMhDytONAxE68Tg5XQSYq4=";
urls = [
"https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"
"https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"
];
hash = "sha256-sVVgQTpPQFiG1mEIih0CemNV5qjC2l+JTxef37/nC9k=";
};
};

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.7.10";
version = "2.8.0";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
sha256 = "sha256-MHEmbZZjPxKu0PyDOjkS3pIsWJYozERPVhJfhleeqbQ=";
sha256 = "sha256-/BMagPR74pANVYcmvdJZmV4tB48cEyAy0FKtBlpoLDE=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-h4TKomZSG6fEUVxIDhsxNHaIO+1Xl40+pFWgJJ2VH4E=";
vendorHash = "sha256-xiCgQqP2XF+b2JQTBFqJ3h2klc6GjqyXoNUwatO0Ul8=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

11
pkgs/applications/networking/cluster/k0sctl/default.nix
View File

@ -6,22 +6,23 @@
buildGoModule rec {
pname = "k0sctl";
version = "0.15.2";
version = "0.15.4";
src = fetchFromGitHub {
owner = "k0sproject";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pti52JlnIxinKg2DxNfLewoJuhMohsAVmHgvR2N5shg=";
sha256 = "sha256-sMMYuE/KIWScZTCuzW9WQpCDHI+Og1zRxGlZzOuHgNo=";
};
vendorSha256 = "sha256-K4/sIHWVe1Wj8LJgrqfoOg1hHXvH3HEgU5vq82tzMSk=";
vendorSha256 = "sha256-6UWRh0NHFr7adJJSmrfTjzXH75Dmjed/+KxH6Kz//jk=";
ldflags = [
"-s"
"-w"
"-X github.com/k0sproject/k0sctl/version.Environment=production"
"-X github.com/k0sproject/k0sctl/version.Version=${version}"
"-X github.com/carlmjohnson/versioninfo.Version=${version}"
"-X github.com/carlmjohnson/versioninfo.Revision=${version}"
];
nativeBuildInputs = [ installShellFiles ];
@ -37,6 +38,6 @@ buildGoModule rec {
description = "A bootstrapping and management tool for k0s clusters.";
homepage = "https://k0sproject.io/";
license = licenses.asl20;
maintainers = with maintainers; [ nickcao ];
maintainers = with maintainers; [ nickcao qjoly ];
};
}

32
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -110,13 +110,13 @@
"vendorHash": null
},
"aws": {
"hash": "sha256-y4KAw4hX+Hl+laVzOoNVxUXo4AkjWEKYSf87ffpSh2w=",
"hash": "sha256-ajASdZaw61sDn5JsxLhvY0kI14KBF07Uc1GiRrQ7f8c=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v5.11.0",
"rev": "v5.12.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-lf/bx9Uwf2jkOKfgYc2JPJ9Rt0PKHpIHzHW5Dfmt5rM="
"vendorHash": "sha256-hDiazrFZDqBn4ErjYGZamjHMuQ3ImZu3eSeXKImm9Ww="
},
"azuread": {
"hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=",
@ -128,11 +128,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-7ekMsiMvyJuwp+/fzKJcvp7RirunsGykTH62Z8Znz4Q=",
"hash": "sha256-6a6JXzTpXRIscWf1sSZwubnDww1KTFrDnGNO7+aqjoY=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.68.0",
"rev": "v3.69.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -146,11 +146,11 @@
"vendorHash": null
},
"baiducloud": {
"hash": "sha256-n+Rk2J7ZqQ93GQSvdLfnjKW2R3v7+iWj+P6EZQ5QxhA=",
"hash": "sha256-exVqL9iUP27PwLGxncFCnnhFnnVWd6KcPqv412W9YMA=",
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
"owner": "baidubce",
"repo": "terraform-provider-baiducloud",
"rev": "v1.19.10",
"rev": "v1.19.11",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -191,13 +191,13 @@
"vendorHash": "sha256-oVXrSI+DU6NgmVIPcS4He4mHVrkA2tMxFUpxMnv0bu4="
},
"checkly": {
"hash": "sha256-69oRZpJNRFJCwAZNcmVfYTNKmtBgFocvEUZpr4jbJQg=",
"hash": "sha256-tOTrAi6hd4HFbHAj0p/LTYdxQl1R1WuQ9L4hzqmDVqI=",
"homepage": "https://registry.terraform.io/providers/checkly/checkly",
"owner": "checkly",
"repo": "terraform-provider-checkly",
"rev": "v1.6.8",
"rev": "v1.6.9",
"spdx": null,
"vendorHash": "sha256-cnvXf0zJrJvpRbQMm2pF7f2cuazxDR4193JCbyGuL2Y="
"vendorHash": "sha256-EhsfA53xkGFgiwJxBtpD1ZKjb0+14dKD9rQ0Jrrm3ck="
},
"ciscoasa": {
"hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=",
@ -664,13 +664,13 @@
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
},
"launchdarkly": {
"hash": "sha256-dK7JxmC/GRjsMpiJb2e8EyFl+V/KcxKlw8/5IbyFlXY=",
"hash": "sha256-gXpnYX4G+KYEPr4385VgbVfbfkNRc0z2txaaH16nJqI=",
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
"owner": "launchdarkly",
"repo": "terraform-provider-launchdarkly",
"rev": "v2.13.4",
"rev": "v2.14.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA="
"vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q="
},
"libvirt": {
"hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=",
@ -872,13 +872,13 @@
"vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI="
},
"opentelekomcloud": {
"hash": "sha256-+goODpTThegmo2cew5bKxGhtqAHd2ObeEzSG2vxWK4w=",
"hash": "sha256-WL7eER7FsuIpdFsp4K1RlrrhEEK6hMou7HYAn/XbvLU=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.35.4",
"rev": "v1.35.5",
"spdx": "MPL-2.0",
"vendorHash": "sha256-VPQml9PAb/41wwLHAFtHDSwGLwPYG9ePiPgKhtfdt9Y="
"vendorHash": "sha256-C2wZjhO6PAiHuoKWN97QJLnC0tYNEyDXMSErGlv2Zpg="
},
"opsgenie": {
"hash": "sha256-Jz3JMq39C2NvA0kvJdjjkOHNvZOMuw4Fq2+nyVHRIL4=",

2
pkgs/applications/networking/deck/default.nix
View File

@ -1,6 +1,6 @@
{ buildGoModule, lib, installShellFiles, fetchFromGitHub }:
let
short_hash = "86497a5";
short_hash = "63b9742";
in buildGoModule rec {
pname = "deck";
version = "1.26.0";

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.28";
ptb = "0.0.44";
canary = "0.0.162";
canary = "0.0.163";
development = "0.0.217";
} else {
stable = "0.0.273";
@ -24,7 +24,7 @@ let
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-eSWcwSw46hKJmDLxHtolBZgKrIS2QnTbVoYe0EI4Njs=";
sha256 = "sha256-QLQCv3hlCNZ8Ii/+GWHAZs4enBh+gOUEt+wlrkUP91Q=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

4
pkgs/applications/networking/kubo/default.nix
View File

@ -25,10 +25,6 @@ buildGoModule rec {
subPackages = [ "cmd/ipfs" ];
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];
tags = [ "openssl" ];
passthru.tests.kubo = nixosTests.kubo;
vendorSha256 = null;

3
pkgs/applications/networking/sync/rsync/default.nix
View File

@ -56,7 +56,8 @@ stdenv.mkDerivation rec {
description = "Fast incremental file transfer utility";
homepage = "https://rsync.samba.org/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
mainProgram = "rsync";
maintainers = with lib.maintainers; [ ehmry kampfschlaefer ivan ];
platforms = platforms.unix;
};
}

2
pkgs/applications/office/libreoffice/darwin/default.nix
View File

@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation {
};
nativeBuildInputs = [ undmg ];
sourceRoot = "${appName}";
sourceRoot = appName;
installPhase = ''
runHook preInstall

45
pkgs/applications/science/electronics/xyce/default.nix
View File

@ -31,27 +31,32 @@
assert withMPI -> trilinos.withMPI;
stdenv.mkDerivation rec {
pname = "xyce";
let
version = "7.6.0";
srcs = [
# useing fetchurl or fetchFromGitHub doesn't include the manuals
# due to .gitattributes files
(fetchgit {
url = "https://github.com/Xyce/Xyce.git";
rev = "Release-${version}";
sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw=";
})
(fetchFromGitHub {
owner = "Xyce";
repo = "Xyce_Regression";
rev = "Release-${version}";
sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74=";
})
];
# useing fetchurl or fetchFromGitHub doesn't include the manuals
# due to .gitattributes files
xyce_src = fetchgit {
url = "https://github.com/Xyce/Xyce.git";
rev = "Release-${version}";
sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw=";
};
sourceRoot = "./Xyce";
regression_src = fetchFromGitHub {
owner = "Xyce";
repo = "Xyce_Regression";
rev = "Release-${version}";
sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74=";
};
in
stdenv.mkDerivation rec {
pname = "xyce";
inherit version;
srcs = [ xyce_src regression_src ];
sourceRoot = "./${xyce_src.name}";
preConfigure = "./bootstrap";
@ -101,7 +106,7 @@ stdenv.mkDerivation rec {
doCheck = enableTests;
postPatch = ''
pushd ../source
pushd ../${regression_src.name}
find Netlists -type f -regex ".*\.sh\|.*\.pl" -exec chmod ugo+x {} \;
# some tests generate new files, some overwrite netlists
find . -type d -exec chmod u+w {} \;
@ -124,7 +129,7 @@ stdenv.mkDerivation rec {
checkPhase = ''
XYCE_BINARY="$(pwd)/src/Xyce"
EXECSTRING="${lib.optionalString withMPI "mpirun -np 2 "}$XYCE_BINARY"
TEST_ROOT="$(pwd)/../source"
TEST_ROOT="$(pwd)/../${regression_src.name}"
# Honor the TMP variable
sed -i -E 's|/tmp|\$TMP|' $TEST_ROOT/TestScripts/suggestXyceTagList.sh

4
pkgs/applications/science/logic/cbmc/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cbmc";
version = "5.88.1";
version = "5.89.0";
src = fetchFromGitHub {
owner = "diffblue";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-bfrtYqTMU/Nib0wZjS/t0kg5sBsuQuq9GaHX4PxL7tU=";
sha256 = "sha256-pgZdR1X0aOCfCKAGo2h9bAIO2XTTiWL8ERgandOQj/M=";
};
nativeBuildInputs = [

977
pkgs/applications/system/asusctl/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

15
pkgs/applications/system/asusctl/default.nix
View File

@ -13,13 +13,13 @@
rustPlatform.buildRustPackage rec {
pname = "asusctl";
version = "4.6.2";
version = "4.7.0";
src = fetchFromGitLab {
owner = "asus-linux";
repo = "asusctl";
rev = version;
hash = "sha256-qfl8MUSHjqlSnsaudoRD9fY5TM9zgy7L7DA+pctn/nc=";
hash = "sha256-SZijR9PotN0O72laj+FBSCVMXLXadmLRhCSD4XqobD0=";
};
cargoHash = "";
@ -28,22 +28,23 @@ rustPlatform.buildRustPackage rec {
outputHashes = {
"ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI=";
"notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs=";
"supergfxctl-5.1.1" = "sha256-AThaZ9dp5T/DtLPE6gZ9qgkw0xksiq+VCL9Y4G41voE=";
"supergfxctl-5.1.1" = "sha256-H00QHNILEjOtavXdj4Jd+rdLprJpVSlSVV3qkTeknzQ=";
};
};
postPatch = ''
files="
daemon-user/src/daemon.rs
daemon-user/src/config.rs
rog-control-center/src/main.rs
asusd-user/src/config.rs
asusd-user/src/daemon.rs
asusd/src/ctrl_anime/config.rs
rog-aura/src/aura_detection.rs
rog-control-center/src/main.rs
"
for file in $files; do
substituteInPlace $file --replace /usr/share $out/share
done
substituteInPlace daemon/src/ctrl_platform.rs --replace /usr/bin/chattr ${e2fsprogs}/bin/chattr
substituteInPlace asusd/src/ctrl_platform.rs --replace /usr/bin/chattr ${e2fsprogs}/bin/chattr
substituteInPlace data/asusd.rules --replace systemctl ${systemd}/bin/systemctl
substituteInPlace data/asusd.service \

1
pkgs/applications/terminal-emulators/wezterm/default.nix
View File

@ -140,6 +140,7 @@ rustPlatform.buildRustPackage rec {
description = "GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
homepage = "https://wezfurlong.org/wezterm";
license = licenses.mit;
mainProgram = "wezterm";
maintainers = with maintainers; [ SuperSandro2000 mimame ];
};
}

4
pkgs/applications/version-management/gitqlient/default.nix
View File

@ -63,8 +63,8 @@ mkDerivation rec {
postUnpack = ''
for dep in AuxiliarCustomWidgets QPinnableTabWidget QLogger git; do
rmdir "source/src/$dep"
ln -sf "../../$dep" "source/src/$dep"
rmdir "${main_src.name}/src/$dep"
ln -sf "../../$dep" "${main_src.name}/src/$dep"
done
'';

9
pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix
View File

@ -2,18 +2,19 @@
stdenvNoCC.mkDerivation rec {
pname = "mpv-playlistmanager";
version = "unstable-2022-08-26";
version = "unstable-2023-08-09";
src = fetchFromGitHub {
owner = "jonniek";
repo = "mpv-playlistmanager";
rev = "07393162f7f78f8188e976f616f1b89813cec741";
sha256 = "sha256-Vgh5F6c90ijp5LVrP2cdAOXo+QtJ9aXI9G/3C2HGqd4=";
rev = "e479cbc7e83a07c5444f335cfda13793681bcbd8";
sha256 = "sha256-Nh4g8uSkHWPjwl5wyqWtM+DW9fkEbmCcOsZa4eAF6Cs=";
};
postPatch = ''
substituteInPlace playlistmanager.lua \
--replace "youtube-dl" "${lib.getBin yt-dlp}/bin/yt-dlp"
--replace 'youtube_dl_executable = "youtube-dl",' \
'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"',
'';
dontBuild = true;

5
pkgs/applications/video/streamlink/default.nix
View File

@ -45,8 +45,9 @@ python3Packages.buildPythonApplication rec {
];
meta = with lib; {
homepage = "https://streamlink.github.io/";
changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md";
description = "CLI for extracting streams from various websites to video player of your choosing";
homepage = "https://streamlink.github.io/";
longDescription = ''
Streamlink is a CLI utility that pipes videos from online
streaming services to a variety of video players such as VLC, or
@ -54,8 +55,8 @@ python3Packages.buildPythonApplication rec {
Streamlink is a fork of the livestreamer project.
'';
changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md";
license = licenses.bsd2;
mainProgram = "streamlink";
maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ];
};
}

4
pkgs/applications/virtualization/runc/default.nix
View File

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "runc";
version = "1.1.8";
version = "1.1.9";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
hash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";
hash = "sha256-9vNzKoG+0Ze4+dhluNM6QtsUjV8/bpkuvEF8ASBfBRo=";
};
vendorHash = null;

5
pkgs/applications/window-managers/sway/bg.nix
View File

@ -26,14 +26,15 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Wallpaper tool for Wayland compositors";
inherit (src.meta) homepage;
longDescription = ''
A wallpaper utility for Wayland compositors, that is compatible with any
Wayland compositor which implements the following Wayland protocols:
wlr-layer-shell, xdg-output, and xdg-shell.
'';
inherit (src.meta) homepage;
license = licenses.mit;
platforms = platforms.linux;
mainProgram = "swaybg";
maintainers = with maintainers; [ primeos ];
platforms = platforms.linux;
};
}

7
pkgs/applications/window-managers/sway/idle.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "swaywm";
repo = "swayidle";
rev = version;
sha256 = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg=";
hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg=";
};
strictDeps = true;
@ -29,13 +29,14 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Idle management daemon for Wayland";
inherit (src.meta) homepage;
longDescription = ''
Sway's idle management daemon. It is compatible with any Wayland
compositor which implements the KDE idle protocol.
'';
inherit (src.meta) homepage;
license = licenses.mit;
platforms = platforms.linux;
mainProgram = "swayidle";
maintainers = with maintainers; [ primeos ];
platforms = platforms.linux;
};
}

1
pkgs/build-support/trivial-builders/default.nix
View File

@ -304,6 +304,7 @@ rec {
checkPhase = ''
${stdenv.shellDryRun} "$target"
'';
meta.mainProgram = name;
};
/*

8
pkgs/data/themes/mojave/default.nix
View File

@ -103,7 +103,7 @@ stdenvNoCC.mkDerivation rec {
done
${lib.optionalString wallpapers ''
for f in ../wallpapers/Mojave{,-timed}.xml; do
for f in ../${wallpapers_src.name}/Mojave{,-timed}.xml; do
substituteInPlace $f --replace /usr $out
done
''}
@ -123,9 +123,9 @@ stdenvNoCC.mkDerivation rec {
${lib.optionalString wallpapers ''
mkdir -p $out/share/backgrounds/Mojave
mkdir -p $out/share/gnome-background-properties
cp -a ../wallpapers/Mojave*.jpeg $out/share/backgrounds/Mojave/
cp -a ../wallpapers/Mojave-timed.xml $out/share/backgrounds/Mojave/
cp -a ../wallpapers/Mojave.xml $out/share/gnome-background-properties/
cp -a ../${wallpapers_src.name}/Mojave*.jpeg $out/share/backgrounds/Mojave/
cp -a ../${wallpapers_src.name}/Mojave-timed.xml $out/share/backgrounds/Mojave/
cp -a ../${wallpapers_src.name}/Mojave.xml $out/share/gnome-background-properties/
''}
# Replace duplicate files with soft links to the first file in each

4
pkgs/desktops/gnome/core/gnome-shell/default.nix
View File

@ -80,8 +80,10 @@ stdenv.mkDerivation rec {
# Hardcode paths to various dependencies so that they can be found at runtime.
(substituteAll {
src = ./fix-paths.patch;
inherit libgnomekbd unzip;
gkbd_keyboard_display = "${lib.getBin libgnomekbd}/bin/gkbd-keyboard-display";
glib_compile_schemas = "${glib.dev}/bin/glib-compile-schemas";
gsettings = "${glib.bin}/bin/gsettings";
unzip = "${lib.getBin unzip}/bin/unzip";
})
# Use absolute path for libshew installation to make our patched gobject-introspection

51
pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
View File

@ -10,27 +10,62 @@ index de91167c5..1c9965678 100644
+ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true
Restart=no
diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 8bf4646a6..59e88bb4c 100644
index 197cc1c1c..dd74aa167 100644
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -114,7 +114,7 @@ async function extractExtensionArchive(bytes, dir) {
@@ -110,7 +110,7 @@ async function extractExtensionArchive(bytes, dir) {
stream.close_async(GLib.PRIORITY_DEFAULT, null);
const unzip = Gio.Subprocess.new(
- ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
+ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()],
+ ['@unzip@', '-uod', dir.get_path(), '--', file.get_path()],
Gio.SubprocessFlags.NONE);
await unzip.wait_check_async(null);
}
@@ -132,7 +132,7 @@ async function extractExtensionArchive(bytes, dir) {
}
const compileSchema = Gio.Subprocess.new(
- ['glib-compile-schemas', '--strict', schemasPath.get_path()],
+ ['@glib_compile_schemas@', '--strict', schemasPath.get_path()],
Gio.SubprocessFlags.NONE);
try {
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index bc50f3d37..868eb5abf 100644
index fff4e73c2..92859b099 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -1080,6 +1080,6 @@ class InputSourceIndicator extends PanelMenu.Button {
@@ -1092,6 +1092,6 @@ class InputSourceIndicator extends PanelMenu.Button {
if (xkbVariant.length > 0)
description = '%s\t%s'.format(description, xkbVariant);
description = `${description}\t${xkbVariant}`;
- Util.spawn(['gkbd-keyboard-display', '-l', description]);
+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
+ Util.spawn(['@gkbd_keyboard_display@', '-l', description]);
}
});
diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c
index 11fb4b6b7..e00e4807b 100644
--- a/subprojects/extensions-tool/src/command-install.c
+++ b/subprojects/extensions-tool/src/command-install.c
@@ -158,7 +158,7 @@ install_extension (const char *bundle,
schemapath = g_file_get_path (schemadir);
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, &error,
- "glib-compile-schemas", "--strict", schemapath,
+ "@glib_compile_schemas@", "--strict", schemapath,
NULL);
if (!g_subprocess_wait_check (proc, NULL, &error))
diff --git a/subprojects/extensions-tool/src/command-pack.c b/subprojects/extensions-tool/src/command-pack.c
index f2cfcd51a..2a9a7efdf 100644
--- a/subprojects/extensions-tool/src/command-pack.c
+++ b/subprojects/extensions-tool/src/command-pack.c
@@ -168,7 +168,7 @@ extension_pack_add_schemas (ExtensionPack *pack,
#else
dstpath = g_file_get_path (dstdir);
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error,
- "glib-compile-schemas", "--strict", dstpath, NULL);
+ "@glib_compile_schemas@", "--strict", dstpath, NULL);
if (!g_subprocess_wait_check (proc, NULL, error))
return FALSE;

2
pkgs/development/compilers/acme/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1dzvip90yf1wg0fhfghn96dwrhg289d06b624px9a2wwy3vp5ryg";
};
sourceRoot = "code-0-r${src.rev}/src";
sourceRoot = "${src.name}/src";
postPatch = ''
substituteInPlace Makefile \

41
pkgs/development/compilers/flutter/engine-artifacts/default.nix
View File

@ -6,13 +6,43 @@
, fetchzip
, autoPatchelfHook
, gtk3
, flutterVersion
, unzip
, stdenvNoCC
}:
let
hashes = (import ./hashes.nix).${engineVersion} or
(throw "There are no known artifact hashes for Flutter engine version ${engineVersion}.");
noticeText = stdenvNoCC.mkDerivation (finalAttrs: {
pname = "flutter-notice";
version = engineVersion;
dontUnpack = true;
src = fetchurl {
url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE";
sha256 = hashes.skyNotice;
};
flutterNotice = fetchurl {
url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE";
sha256 = hashes.flutterNotice;
};
installPhase =
''
SRC_TEXT="$(cat $src)"
FLUTTER_NOTICE_TEXT="$(cat $flutterNotice)"
cat << EOF > $out
This artifact is from the Flutter SDK's engine.
This file carries third-party notices for its dependencies.
See also other files, that have LICENSE in the name, in the artifact directory.
Appendix 1/2: merged sky_engine LICENSE file (also found at ${finalAttrs.src.url})
$SRC_TEXT
Appendix 2/2: Flutter license (also found at ${finalAttrs.flutterNotice.url})
$FLUTTER_NOTICE_TEXT
EOF
'';
});
artifacts =
{
common = {
@ -165,6 +195,17 @@ let
destination = "$out/${if subdirectory == true then archiveBasename else if subdirectory != null then subdirectory else "."}";
in
''
# ship the notice near all artifacts. if the artifact directory is / multiple directories are nested in $src, link it there. If there isn't a directory, link it in root
# this *isn't the same as the subdirectory variable above*
DIR_CNT="$(echo */ | wc -w)"
if [[ "$DIR_CNT" == 0 ]]; then
ln -s ${noticeText} LICENSE.README
else
for dir in */
do
ln -s ${noticeText} "$dir/LICENSE.README"
done
fi
mkdir -p "${destination}"
cp -r . "${destination}"
'';

4
pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
View File

@ -1,5 +1,7 @@
{
"1a65d409c7a1438a34d21b60bf30a6fd5db59314" = {
skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
android-arm = {
"artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM=";
};
@ -113,6 +115,8 @@
};
};
"45f6e009110df4f34ec2cf99f63cf73b71b7a420" = {
skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
android-arm = {
"artifacts.zip" = "sha256-NOpUM+iFSPVzr99Dz0DBdDUQnMC0ad1eZnVhtqu9HnU=";
};

5
pkgs/development/compilers/flutter/wrapper.nix
View File

@ -56,7 +56,10 @@
}:
let
engineArtifacts = callPackage ./engine-artifacts { inherit (flutter) engineVersion; };
engineArtifacts = callPackage ./engine-artifacts {
inherit (flutter) engineVersion;
flutterVersion = flutter.version;
};
mkCommonArtifactLinkCommand = { artifact }:
''
mkdir -p $out/artifacts/engine/common

2
pkgs/development/compilers/gcl/2.6.13-pre.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
sed -e 's/<= obj-date/<= (if (= 0 obj-date) 1 obj-date)/' -i lsp/make.lisp
'';
sourceRoot = "gcl/gcl";
sourceRoot = "${src.name}/gcl";
# breaks when compiling in parallel
enableParallelBuilding = false;

44
pkgs/development/compilers/nextpnr/default.nix
View File

@ -11,29 +11,33 @@
let
boostPython = boost.override { python = python3; enablePython = true; };
in
stdenv.mkDerivation rec {
pname = "nextpnr";
version = "0.6";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr";
rev = "${pname}-${version}";
hash = "sha256-S6qvTzvkS2tBMvuTpmuCx6h0OcKP5NBbmgRgOpAVtnA=";
name = "nextpnr";
})
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr-tests";
rev = "00c55a9eb9ea2e062b51fe0d64741412b185d95d";
sha256 = "sha256-83suMftMtnaRFq3T2/I7Uahb11WZlXhwYt6Q/rqi2Yo=";
name = "nextpnr-tests";
})
];
main_src = fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr";
rev = "${pname}-${version}";
hash = "sha256-S6qvTzvkS2tBMvuTpmuCx6h0OcKP5NBbmgRgOpAVtnA=";
name = "nextpnr";
};
sourceRoot = "nextpnr";
test_src = fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr-tests";
rev = "00c55a9eb9ea2e062b51fe0d64741412b185d95d";
sha256 = "sha256-83suMftMtnaRFq3T2/I7Uahb11WZlXhwYt6Q/rqi2Yo=";
name = "nextpnr-tests";
};
in
stdenv.mkDerivation rec {
inherit pname version;
srcs = [ main_src test_src ];
sourceRoot = main_src.name;
nativeBuildInputs
= [ cmake ]
@ -66,7 +70,7 @@ stdenv.mkDerivation rec {
'';
preBuild = ''
ln -s ../nextpnr-tests tests
ln -s ../${test_src.name} tests
'';
doCheck = true;

6
pkgs/development/compilers/rust/cargo-auditable.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, makeRustPlatform, rustc, cargo, installShellFiles, stdenv }:
{ lib, buildPackages, fetchFromGitHub, makeRustPlatform, installShellFiles, stdenv }:
let
args = rec {
@ -30,8 +30,8 @@ let
};
rustPlatform = makeRustPlatform {
inherit rustc;
cargo = cargo.override {
inherit (buildPackages) rustc;
cargo = buildPackages.cargo.override {
auditable = false;
};
};

39
pkgs/development/embedded/fpga/trellis/default.nix
View File

@ -4,28 +4,29 @@ let
rev = "488f4e71073062de314c55a037ede7cf03a3324c";
# git describe --tags
realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}";
main_src = fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis";
inherit rev;
hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw=";
name = "trellis";
};
database_src = fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis-db";
rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa";
hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0=";
name = "trellis-database";
};
in stdenv.mkDerivation rec {
pname = "trellis";
version = "unstable-2022-09-14";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis";
inherit rev;
hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw=";
name = "trellis";
})
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis-db";
rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa";
hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0=";
name = "trellis-database";
})
];
sourceRoot = "trellis";
srcs = [ main_src database_src ];
sourceRoot = main_src.name;
buildInputs = [ boost ];
nativeBuildInputs = [ cmake python3 ];
@ -36,7 +37,7 @@ in stdenv.mkDerivation rec {
];
preConfigure = ''
rmdir database && ln -sfv ${builtins.elemAt srcs 1} ./database
rmdir database && ln -sfv ${database_src} ./database
cd libtrellis
'';

2
pkgs/development/interpreters/nickel/default.nix
View File

@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec {
'';
changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres felschr ];
maintainers = with maintainers; [ AndersonTorres felschr matthiasbeyer ];
};
}

4
pkgs/development/interpreters/risor/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "risor";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "risor-io";
repo = "risor";
rev = "v${version}";
hash = "sha256-4Tw8QJj14MYfuQ4mNkSO1z4F8/3/6HjORKgARljlfs8=";
hash = "sha256-lalT9kwq0+y3xaYAcl/DqcwGXE27lNuL1DCr1wEE8ZE=";
};
vendorHash = "sha256-diAbQwnlhMm43ZlLKq3llMl9mO3sIkc80aCI5UDn7F4=";

4
pkgs/development/libraries/blst/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation ( finalAttrs: {
pname = "blst";
version = "0.3.10";
version = "0.3.11";
src = fetchFromGitHub {
owner = "supranational";
repo = "blst";
rev = "v${finalAttrs.version}";
hash = "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=";
hash = "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=";
};
buildPhase = ''

27
pkgs/development/libraries/bulletml/default.nix
View File

@ -9,22 +9,25 @@ let
sha256 = hash;
};
in stdenv.mkDerivation {
lib_src = fetchurl {
url = "http://shinh.skr.jp/libbulletml/libbulletml-${version}.tar.bz2";
sha256 = "0yda0zgj2ydgkmby5676f5iiawabxadzh5p7bmy42998sp9g6dvw";
};
cpp_src = fetchurl {
url = "http://shinh.skr.jp/d/d_cpp.tar.bz2";
sha256 = "1ly9qmbb8q9nyadmdap1gmxs3vkniqgchlv2hw7riansz4gg1agh";
};
in
stdenv.mkDerivation {
pname = "bulletml";
inherit version;
srcs = [
(fetchurl {
url = "http://shinh.skr.jp/libbulletml/libbulletml-${version}.tar.bz2";
sha256 = "0yda0zgj2ydgkmby5676f5iiawabxadzh5p7bmy42998sp9g6dvw";
})
(fetchurl {
url = "http://shinh.skr.jp/d/d_cpp.tar.bz2";
sha256 = "1ly9qmbb8q9nyadmdap1gmxs3vkniqgchlv2hw7riansz4gg1agh";
})
];
sourceRoot = "bulletml";
srcs = [ lib_src cpp_src ];
postUnpack = "mv d_cpp bulletml/";
sourceRoot = "bulletml";
patches = [
(debianPatch "fixes" "0cnr968n0h50fjmjijx7idsa2pg2pv5cwy6nvfbkx9z8w2zf0mkl")

4
pkgs/development/libraries/catch2/3.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "catch2";
version = "3.3.2";
version = "3.4.0";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v${version}";
hash = "sha256-t/4iCrzPeDZNNlgibVqx5rhe+d3lXwm1GmBMDDId0VQ=";
hash = "sha256-DqGGfNjKPW9HFJrX9arFHyNYjB61uoL6NabZatTWrr0=";
};
nativeBuildInputs = [

2
pkgs/development/libraries/clipper/default.nix
View File

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
sourceRoot = "cpp";
buildInputs = [ ];
nativeBuildInputs = [ cmake ninja unzip ];
meta = with lib; {

4
pkgs/development/libraries/example-robot-data/default.nix
View File

@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
];
doCheck = true;
# The package expect to find an `example-robot-data/robots` folder somewhere
# either in install prefix or in the sources
# where it can find the meshes for unit tests
preCheck = "ln -s source ../../${finalAttrs.pname}";
pythonImportsCheck = [
"example_robot_data"
];

7
pkgs/development/libraries/freeimage/default.nix
View File

@ -3,7 +3,7 @@
, libjpeg, jxrlib, pkg-config
, fixDarwinDylibNames, autoSignDarwinBinariesHook }:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "freeimage";
version = "unstable-2021-11-01";
@ -12,7 +12,8 @@ stdenv.mkDerivation {
rev = "1900";
sha256 = "rWoNlU/BWKZBPzRb1HqU6T0sT7aK6dpqKPe88+o/4sA=";
};
sourceRoot = "svn-r1900/FreeImage/trunk";
sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk";
# Ensure that the bundled libraries are not used at all
prePatch = ''
@ -74,4 +75,4 @@ stdenv.mkDerivation {
maintainers = with lib.maintainers; [viric l-as];
platforms = with lib.platforms; unix;
};
}
})

37
pkgs/development/libraries/frozen/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
}:
stdenv.mkDerivation rec {
pname = "frozen";
# pin to a newer release if frozen releases again, see cesanta/frozen#72
version = "unstable-2021-02-23";
src = fetchFromGitHub {
owner = "cesanta";
repo = "frozen";
rev = "21f051e3abc2240d9a25b2add6629b38e963e102";
hash = "sha256-BpuYK9fbWSpeF8iPT8ImrV3CKKaA5RQ2W0ZQ03TciR0=";
};
nativeBuildInputs = [ meson ninja ];
# frozen has a simple Makefile and a GN BUILD file as building scripts.
# Since it has only two source files, the best course of action to support
# cross compilation is to create a small meson.build file.
# Relevant upstream issue: https://github.com/cesanta/frozen/pull/71
preConfigure = ''
cp ${./meson.build} meson.build
'';
meta = {
homepage = "https://github.com/cesanta/frozen";
description = "Minimal JSON parser for C, targeted for embedded systems";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ thillux ];
platforms = lib.platforms.unix;
};
}

19
pkgs/development/libraries/frozen/meson.build Normal file
View File

@ -0,0 +1,19 @@
project(
'frozen',
'c',
default_options: [
'c_args=-Wextra -fno-builtin -pedantic',
'c_std=c99',
'werror=true'
],
license: 'Apache-2.0',
version: '20210223'
)
library(
'frozen',
'frozen.c',
install: true
)
install_headers('frozen.h')

10
pkgs/development/libraries/getdns/default.nix
View File

@ -16,13 +16,9 @@ in rec {
outputs = [ "out" "dev" "lib" "man" ];
src = fetchurl {
url = "https://getdnsapi.net/releases/${pname}-${
with builtins;
concatStringsSep "-" (splitVersion version)
}/${pname}-${version}.tar.gz";
sha256 =
# upstream publishes hashes in hex format
"f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c";
url = with lib; "https://getdnsapi.net/releases/${pname}-${concatStringsSep "-" (splitVersion version)}/${pname}-${version}.tar.gz";
# upstream publishes hashes in hex format
sha256 = "f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c";
};
nativeBuildInputs = [ cmake doxygen ];

12
pkgs/development/libraries/libagar/default.nix
View File

@ -3,10 +3,14 @@
, libsndfile, portaudio, libmysqlclient, fontconfig
}:
let srcs = import ./srcs.nix { inherit fetchurl; }; in
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "libagar";
inherit (srcs) version src;
version = "1.5.0";
src = fetchurl {
url = "http://stable.hypertriton.com/agar/agar-${finalAttrs.version}.tar.gz";
sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42";
};
preConfigure = ''
substituteInPlace configure.in \
@ -40,4 +44,4 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; linux;
};
}
})

5
pkgs/development/libraries/libagar/libagar_test.nix
View File

@ -1,11 +1,10 @@
{ lib, stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
let srcs = import ./srcs.nix { inherit fetchurl; }; in
stdenv.mkDerivation {
pname = "libagar-test";
inherit (srcs) version src;
inherit (libagar) version src;
sourceRoot = "agar-1.5.0/tests";
sourceRoot = "agar-${libagar.version}/tests";
# Workaround build failure on -fno-common toolchains:
# ld: textdlg.o:(.bss+0x0): multiple definition of `someString';

10
pkgs/development/libraries/libagar/srcs.nix
View File

@ -1,10 +0,0 @@
{ fetchurl }:
rec {
version = "1.5.0";
src = fetchurl {
url = "http://stable.hypertriton.com/agar/agar-${version}.tar.gz";
sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42";
};
}

12
pkgs/development/libraries/libdivsufsort/default.nix
View File

@ -1,14 +1,18 @@
{lib, stdenv, fetchurl}:
{lib, stdenv, fetchFromGitHub, cmake}:
stdenv.mkDerivation rec {
pname = "libdivsufsort";
version = "2.0.1";
src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-${version}.tar.bz2";
sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m";
src = fetchFromGitHub {
owner = "y-256";
repo = pname;
rev = "${version}";
hash = "sha256-4p+L1bq9SBgWSHXx+WYWAe60V2g1AN+zlJvC+F367Tk=";
};
nativeBuildInputs = [ cmake ];
meta = {
homepage = "https://github.com/y-256/libdivsufsort";
license = lib.licenses.mit;

20
pkgs/development/libraries/libtickit/default.nix
View File

@ -2,9 +2,10 @@
, stdenv
, fetchFromGitHub
, pkg-config
, libtool
, perl
, libtermkey
, unibilium
, libtool
}:
stdenv.mkDerivation rec {
pname = "libtickit";
@ -22,8 +23,21 @@ stdenv.mkDerivation rec {
"LIBTOOL=${lib.getExe libtool}"
];
nativeBuildInputs = [ pkg-config libtool ];
buildInputs = [ libtermkey unibilium ];
nativeBuildInputs = [
pkg-config
libtool
];
buildInputs = [
libtermkey
unibilium
];
nativeCheckInputs = [ perl ];
patches = [
./skipTestMacOS.patch
];
doCheck = true;
meta = with lib; {
description = "A terminal interface construction kit";

27
pkgs/development/libraries/libtickit/skipTestMacOS.patch Normal file
View File

@ -0,0 +1,27 @@
From 6179359c0b9247ae981b8b2a2897eabc921147fd Mon Sep 17 00:00:00 2001
From: Gustavo Coutinho de Souza <dev@onemoresuza.mailer.me>
Date: Tue, 8 Aug 2023 15:45:43 -0300
Subject: [PATCH] test: skip test 18 if on MacOS
---
t/18term-builder.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/t/18term-builder.c b/t/18term-builder.c
index 8b23ab4..c1b64a2 100644
--- a/t/18term-builder.c
+++ b/t/18term-builder.c
@@ -21,6 +21,11 @@ static void output(TickitTerm *tt, const char *bytes, size_t len, void *user)
int main(int argc, char *argv[])
{
+
+ #if defined(__APPLE__) || defined(__MACH__)
+ skip_all("the test does not seem to work on MacOS");
+ return exit_status();
+ #endif
// getstr override
{
/* We need a termtype that isn't xterm, but that will actually load.
--
2.41.0

3
pkgs/development/libraries/minizip/default.nix
View File

@ -2,8 +2,7 @@
stdenv.mkDerivation {
pname = "minizip";
version = zlib.version;
inherit (zlib) src;
inherit (zlib) src version;
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib ];

35
pkgs/development/libraries/pinocchio/default.nix
View File

@ -4,21 +4,23 @@
, cmake
, boost
, eigen
, collisionSupport ? !stdenv.isDarwin
, hpp-fcl
, urdfdom
, pythonSupport ? false
, python3Packages
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pinocchio";
version = "2.6.19";
version = "2.6.20";
src = fetchFromGitHub {
owner = "stack-of-tasks";
repo = pname;
rev = "v${version}";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-P7jSAQ6LYcboJHqtpneT4W8Pu5G3fd3/a8Gju9im1e8=";
hash = "sha256-Pu/trCpqdue7sQKDbLhyxTfgj/+xRiVcG7Luz6ZQXtM=";
};
# error: use of undeclared identifier '__sincos'
@ -38,20 +40,37 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (!pythonSupport) [
boost
eigen
] ++ lib.optionals (!pythonSupport && collisionSupport) [
hpp-fcl
] ++ lib.optionals pythonSupport [
python3Packages.boost
python3Packages.eigenpy
] ++ lib.optionals (pythonSupport && collisionSupport) [
python3Packages.hpp-fcl
];
cmakeFlags = lib.optionals (!pythonSupport) [
cmakeFlags = lib.optionals collisionSupport [
"-DBUILD_WITH_COLLISION_SUPPORT=ON"
] ++ lib.optionals pythonSupport [
"-DBUILD_WITH_LIBPYTHON=ON"
] ++ lib.optionals (pythonSupport && stdenv.isDarwin) [
# AssertionError: '.' != '/tmp/nix-build-pinocchio-2.6.20.drv/sou[84 chars].dae'
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;test-py-bindings_geometry_model_urdf'"
] ++ lib.optionals (!pythonSupport) [
"-DBUILD_PYTHON_INTERFACE=OFF"
];
doCheck = true;
pythonImportsCheck = lib.optionals (!pythonSupport) [
"pinocchio"
];
meta = with lib; {
description = "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives";
homepage = "https://github.com/stack-of-tasks/pinocchio";
license = licenses.bsd2;
maintainers = with maintainers; [ wegank ];
maintainers = with maintainers; [ nim65s wegank ];
platforms = platforms.unix;
};
}
})

4
pkgs/development/libraries/qgnomeplatform/default.nix
View File

@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
src = ./hardcode-gsettings.patch;
gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas;
})
# Backport cursor fix for Qt6 apps
# Ajusted from https://github.com/FedoraQt/QGnomePlatform/pull/138
./qt6-cursor-fix.patch
];
nativeBuildInputs = [

53
pkgs/development/libraries/qgnomeplatform/qt6-cursor-fix.patch Normal file
View File

@ -0,0 +1,53 @@
diff --git a/src/common/gnomesettings.cpp b/src/common/gnomesettings.cpp
index 961f75d..d947eb2 100644
--- a/src/common/gnomesettings.cpp
+++ b/src/common/gnomesettings.cpp
@@ -210,7 +210,7 @@ GnomeSettingsPrivate::GnomeSettingsPrivate(QObject *parent)
QStringLiteral("SettingChanged"), this, SLOT(portalSettingChanged(QString,QString,QDBusVariant)));
}
- if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
+ if (true) {
cursorSizeChanged();
cursorThemeChanged();
}
@@ -347,11 +347,11 @@ void GnomeSettingsPrivate::gsettingPropertyChanged(GSettings *settings, gchar *k
} else if (changedProperty == QStringLiteral("monospace-font-name")) {
gnomeSettings->fontChanged();
} else if (changedProperty == QStringLiteral("cursor-size")) {
- if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
+ if (true) {
gnomeSettings->cursorSizeChanged();
}
} else if (changedProperty == QStringLiteral("cursor-theme")) {
- if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
+ if (true) {
gnomeSettings->cursorThemeChanged();
}
// Org.gnome.wm.preferences
@@ -393,13 +393,23 @@ void GnomeSettingsPrivate::cursorBlinkTimeChanged()
void GnomeSettingsPrivate::cursorSizeChanged()
{
int cursorSize = getSettingsProperty<int>(QStringLiteral("cursor-size"));
- qputenv("XCURSOR_SIZE", QString::number(cursorSize).toUtf8());
+ if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
+ qputenv("XCURSOR_SIZE", QString::number(cursorSize).toUtf8());
+ }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ m_hints[QPlatformTheme::MouseCursorSize] = QSize(cursorSize, cursorSize);
+#endif
}
void GnomeSettingsPrivate::cursorThemeChanged()
{
const QString cursorTheme = getSettingsProperty<QString>(QStringLiteral("cursor-theme"));
- qputenv("XCURSOR_THEME", cursorTheme.toUtf8());
+ if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
+ qputenv("XCURSOR_THEME", cursorTheme.toUtf8());
+ }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ m_hints[QPlatformTheme::MouseCursorTheme] = cursorTheme;
+#endif
}
void GnomeSettingsPrivate::fontChanged()

4
pkgs/development/libraries/speechd/default.nix
View File

@ -27,11 +27,11 @@ let
inherit (python3Packages) python pyxdg wrapPython;
in stdenv.mkDerivation rec {
pname = "speech-dispatcher";
version = "0.11.4";
version = "0.11.5";
src = fetchurl {
url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-jAkiG7ctnbXInP17kZdxgyuGw6N3LWRWAWlklO31Zrk=";
sha256 = "sha256-HOR1n/q7rxrrQzpewHOb4Gdum9+66URKezvhsq8+wSs=";
};
patches = [

38
pkgs/development/lisp-modules/ql.nix
View File

@ -223,7 +223,43 @@ let
lispLibs = o.lispLibs ++ [
self.mcclim
];
});
});
cl-charms = super.cl-charms.overrideLispAttrs (o: {
nativeLibs = [ pkgs.ncurses ];
});
libusb-ffi = super.libusb-ffi.overrideLispAttrs (o: {
nativeLibs = [ pkgs.libusb-compat-0_1 ];
});
cl-fam = super.cl-fam.overrideLispAttrs (o: {
nativeLibs = [ pkgs.fam ];
});
jpeg-turbo = super.jpeg-turbo.overrideLispAttrs (o: {
nativeLibs = [ pkgs.libjpeg_turbo ];
});
vorbisfile-ffi = super.vorbisfile-ffi.overrideLispAttrs (o: {
nativeLibs = [ pkgs.libvorbis ];
});
png = super.png.overrideLispAttrs (o: {
nativeLibs = [ pkgs.libpng ];
});
zmq = super.zmq.overrideLispAttrs (o: {
nativeLibs = [ pkgs.czmq ];
});
consfigurator = super.consfigurator.overrideLispAttrs (o: {
nativeLibs = [ pkgs.acl pkgs.libcap ];
});
cl-gss = super.cl-gss.overrideLispAttrs (o: {
nativeLibs = [ pkgs.libkrb5 ];
});
magicffi = super.magicffi.overrideLispAttrs (o: {
nativeLibs = [ pkgs.file ];
});
keystone = super.keystone.overrideLispAttrs (o: {
nativeLibs = [ pkgs.keystone ];
});
capstone = super.capstone.overrideLispAttrs (o: {
nativeLibs = [ pkgs.capstone ];
});
});
qlpkgs =

2
pkgs/development/misc/datafusion/default.nix
View File

@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-TWvbtuLmAdYS8otD2TpVlZx2FJS6DF03U2zM28FNsfc=";
};
sourceRoot = "datafusion-cli-source/datafusion-cli";
sourceRoot = "${src.name}/datafusion-cli";
cargoSha256 = "sha256-muWWVJDKm4rbpCK0SS7Zj6umFoMKGMScEAd2ZyZ5An8=";

4
pkgs/development/mobile/maestro/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "maestro";
version = "1.30.4";
version = "1.31.0";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
sha256 = "1dc02krdysaal1w3lrwr9xcz04r72jgm0kg3bpv70gd830yp9bkr";
sha256 = "0rgkviyxr0hwm0xhv8mfhdxk3wzhgqhbjpk8wv6c2b68xnwxwxha";
};
dontUnpack = true;

9054
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/ocaml-modules/camlpdf/default.nix
View File

@ -5,14 +5,14 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
version = "2.5";
version = "2.6";
pname = "ocaml${ocaml.version}-camlpdf";
src = fetchFromGitHub {
owner = "johnwhitington";
repo = "camlpdf";
rev = "v${version}";
sha256 = "sha256:1qmsa0xgi960y7r20mvf8hxiiml7l1908s4dm7nq262f19w51gsl";
hash = "sha256-CJWVvZSbvSzG3PIr7w0vmbmY6tH59AgBAWRfDpQ9MCk=";
};
nativeBuildInputs = [ which ocaml findlib ];

4
pkgs/development/ocaml-modules/cpdf/default.nix
View File

@ -6,13 +6,13 @@ else
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-cpdf";
version = "2.5.1";
version = "2.6";
src = fetchFromGitHub {
owner = "johnwhitington";
repo = "cpdf-source";
rev = "v${version}";
hash = "sha256-B1wYLcxTRUyzREtE9uvPMwSiwtB+q0RQsY02F0u3aa0=";
hash = "sha256-5gEv/lmca3FR16m4uxbCJ3y/XtTSBvoIojeKszc24ss=";
};
nativeBuildInputs = [ ocaml findlib ];

6
pkgs/development/python-modules/acquire/default.nix
View File

@ -17,16 +17,16 @@
buildPythonPackage rec {
pname = "acquire";
version = "3.7";
version = "3.8";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "fox-it";
repo = "acquire";
rev = "refs/tags/${version}";
hash = "sha256-wGoMah3Pj7hS5+k/l5pEaDaM25RzdWRIG9Hrf3oWkR8=";
hash = "sha256-JfZ0sc7hFj71XxGWTTZ50uGWuKoWKY4vYm0v+zS2YiQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/aioairzone/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.6.4";
version = "0.6.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-kOx28JmtB5hpCwsNk00bMLrU4K2tU/JY/ZWn6KmPDP4=";
hash = "sha256-HcO4t+9JigS6SVkwDk+rEWzqSfe0h5ZADdk3Jvxnr3Y=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aioesphomeapi/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "15.1.15";
version = "16.0.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-qNljw3V0rfMb6GDtTd+jy/hHBaM3kc9y+RCEoNTKHFM=";
hash = "sha256-ATfAI8srh5G1ejkp/2wl2Soowatjprq9e8h8tSAAXGs=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/aiohomekit/default.nix
View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "2.6.14";
version = "2.6.15";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-JPI1+sQVZe2/5YxW6OxZRosp36e93KEW+V1DAcLaYNY=";
hash = "sha256-PX2OIgfVOlCEudObJrz/WRQXW7c6Gq9PQqD52D3lmmo=";
};
nativeBuildInputs = [

21
pkgs/development/python-modules/aioslimproto/default.nix
View File

@ -2,10 +2,13 @@
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pillow
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
, wheel
}:
buildPythonPackage rec {
@ -13,7 +16,7 @@ buildPythonPackage rec {
version = "2.3.3";
format = "pyproject";
disabled = pythonOlder "3.9";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "home-assistant-libs";
@ -22,8 +25,18 @@ buildPythonPackage rec {
hash = "sha256-d+PEzCF1Cw/7NmumxIRRlr3hojpNsZM/JMQ0KWdosXk=";
};
patches = [
# https://github.com/home-assistant-libs/aioslimproto/pull/189
(fetchpatch {
name = "unpin-setuptools-version.patch";
url = "https://github.com/home-assistant-libs/aioslimproto/commit/06fd56987be8903ff147bad38af84b21bc31bc18.patch";
hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
})
];
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
@ -32,14 +45,10 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
];
disabledTests = [
# AssertionError: assert ['mixer', 'volume', '50'] == ['volume', '50']
"test_msg_instantiation"
];
pythonImportsCheck = [
"aioslimproto"
];

4
pkgs/development/python-modules/aiounifi/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "51";
version = "52";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-XR/yZLxTHVHxm/QLCKrp9XFJ7yZybPjPxKEhf1SOzD0=";
hash = "sha256-mghAUZrRBKHM+mIeUGnbJqWD+NhZyikdGsIhf1uohiM=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/awkward-cpp/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "awkward-cpp";
version = "17";
version = "21";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-gTO7rxgkjdUgSkF6Ztq5bhti5VUpsrhocOLz7L6xllE=";
hash = "sha256-sobmPegDBI/4EvdpxrY28TsNO8vyLhuRsV9s+5WThR4=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/awkward/default.nix
View File

@ -8,20 +8,21 @@
, numba
, numpy
, packaging
, setuptools
, typing-extensions
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "awkward";
version = "2.2.4";
version = "2.3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-v06mYdoP/WfIfz6x6+MJvS4YOsTsyWqhCyAykZ1d5v4=";
hash = "sha256-NLROXEbh4MKvBFuj+4+Wa2u37P9vuQ0Ww8kK+CYWt5E=";
};
nativeBuildInputs = [
@ -42,6 +43,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
numba
setuptools
];
disabledTestPaths = [

2
pkgs/development/python-modules/build/default.nix
View File

@ -86,6 +86,6 @@ buildPythonPackage rec {
homepage = "https://github.com/pypa/build";
changelog = "https://github.com/pypa/build/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
maintainers = teams.python.members ++ [ maintainers.fab ];
};
}

48
pkgs/development/python-modules/bx-python/default.nix
View File

@ -1,27 +1,49 @@
{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, numpy, cython, zlib, six
, python-lzo, nose }:
{ lib
, fetchFromGitHub
, buildPythonPackage
, pythonOlder
, numpy
, cython
, zlib
, python-lzo
, nose
}:
buildPythonPackage rec {
pname = "bx-python";
version = "0.9.0";
disabled = pythonOlder "3.6";
version = "0.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bxlab";
repo = "bx-python";
rev = "refs/tags/v${version}";
hash = "sha256-Pi4hV3FatCXoXY3nNgqm5UfWYIrpP/v5PzzCi3gmIbE=";
hash = "sha256-j2GKj2IGDBk4LBnISRx6ZW/lh5VSdQBasC0gCRj0Fiw=";
};
nativeBuildInputs = [ cython ];
buildInputs = [ zlib ];
propagatedBuildInputs = [ numpy six python-lzo ];
nativeCheckInputs = [ nose ];
nativeBuildInputs = [
cython
];
buildInputs = [
zlib
];
propagatedBuildInputs = [
numpy
python-lzo
];
nativeCheckInputs = [
nose
];
postInstall = ''
cp -r scripts/* $out/bin
# This is a small hack; the test suit uses the scripts which need to
# This is a small hack; the test suite uses the scripts which need to
# be patched. Linking the patched scripts in $out back to the
# working directory allows the tests to run
rm -rf scripts
@ -29,11 +51,11 @@ buildPythonPackage rec {
'';
meta = with lib; {
description = "Tools for manipulating biological data, particularly multiple sequence alignments";
homepage = "https://github.com/bxlab/bx-python";
description =
"Tools for manipulating biological data, particularly multiple sequence alignments";
changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}";
license = licenses.mit;
maintainers = [ maintainers.jbedo ];
maintainers = with maintainers; [ jbedo ];
platforms = [ "x86_64-linux" ];
};
}

8
pkgs/development/python-modules/ciscoconfparse/default.nix
View File

@ -31,6 +31,14 @@ buildPythonPackage rec {
];
postPatch = ''
# The line below is in the [build-system] section, which is invalid and
# rejected by PyPA's build tool. It belongs in [project] but upstream has
# had problems with putting that there (see comment in pyproject.toml).
sed -i '/requires-python/d' pyproject.toml
substituteInPlace pyproject.toml \
--replace '"poetry>=1.3.2",' ""
patchShebangs tests
'';

27
pkgs/development/python-modules/colour/default.nix
View File

@ -1,15 +1,36 @@
{ lib, buildPythonPackage, fetchPypi, d2to1 }:
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "colour";
version = "0.1.5";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "af20120fefd2afede8b001fbef2ea9da70ad7d49fafdb6489025dae8745c3aee";
hash = "sha256-ryASD+/Sr+3osAH77y6p2nCtfUn6/bZIkCXa6HRcOu4=";
};
buildInputs = [ d2to1 ];
patches = [
# https://github.com/vaab/colour/pull/66 (but does not merge cleanly)
./remove-unmaintained-d2to1.diff
];
nativeCheckInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"--doctest-glob=\"*.rst\""
"--doctest-modules"
];
pythonImportsCheck = [
"colour"
];
meta = with lib; {
description = "Converts and manipulates common color representation (RGB, HSV, web, ...)";

65
pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff Normal file
View File

@ -0,0 +1,65 @@
diff --git a/setup.cfg b/setup.cfg
index 41de928..1c18182 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,18 +1,14 @@
[metadata]
name = colour
version = 0.1.5
-summary = converts and manipulates various color representation (HSL, RVB, web, X11, ...)
-description-file =
- README.rst
- CHANGELOG.rst
- TODO.rst
-license_file = LICENSE
-requires-dist =
+description = converts and manipulates various color representation (HSL, RVB, web, X11, ...)
+long_description = file: README.rst, CHANGELOG.rst, TODO.rst
+license_files = LICENSE
author = Valentin LAB
author_email = valentin.lab@kalysto.org
-home_page = http://github.com/vaab/colour
+url = http://github.com/vaab/colour
license = BSD 3-Clause License
-classifier =
+classifiers =
Programming Language :: Python
Topic :: Software Development :: Libraries :: Python Modules
Development Status :: 3 - Alpha
@@ -26,16 +22,8 @@ classifier =
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
-[files]
-modules = colour
-extra_files =
- README.rst
- CHANGELOG.rst
- TODO.rst
- setup.py
-
-[backwards_compat]
-zip-safe = False
+[options]
+zip_safe = False
[bdist_wheel]
universal = 1
diff --git a/setup.py b/setup.py
index 47038f9..11a8d3a 100644
--- a/setup.py
+++ b/setup.py
@@ -54,12 +54,4 @@ if "%%short-version%%".startswith("%%"):
sys.exit(errlvl)
-##
-## Normal d2to1 setup
-##
-
-setup(
- setup_requires=['d2to1'],
- extras_require={'test': ['nose', ]},
- d2to1=True
-)
+setup(extras_require={'test': ['nose', ]})

11
pkgs/development/python-modules/cvxpy/default.nix
View File

@ -11,6 +11,7 @@
, scipy
, scs
, setuptools
, wheel
, useOpenmp ? (!stdenv.isDarwin)
}:
@ -26,6 +27,16 @@ buildPythonPackage rec {
hash = "sha256-C2heUEDxmfPXA/MPXSLR+GVZdiNFUVPR3ddwJFrvCXU=";
};
# we need to patch out numpy version caps from upstream
postPatch = ''
sed -i 's/\(numpy>=[0-9.]*\),<[0-9.]*;/\1;/g' pyproject.toml
'';
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
cvxopt
ecos

25
pkgs/development/python-modules/d2to1/default.nix
View File

@ -1,25 +0,0 @@
{ buildPythonPackage
, lib
, fetchFromGitHub
, nose
}:
buildPythonPackage rec {
pname = "d2to1";
version = "0.2.12.post1";
nativeCheckInputs = [ nose ];
src = fetchFromGitHub {
owner = "embray";
repo = pname;
rev = version;
sha256 = "1hzq51qbzsc27yy8swp08kf42mamag7qcabbrigzj4m6ivb5chi2";
};
meta = with lib;{
description = "Support for distutils2-like setup.cfg files as package metadata";
homepage = "https://github.com/embray/d2to1";
license = licenses.bsd2;
maintainers = with maintainers; [ makefu ];
};
}

12
pkgs/development/python-modules/datrie/default.nix
View File

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
, cython
, pytestCheckHook
, hypothesis
@ -17,17 +18,20 @@ buildPythonPackage rec {
hash = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0=";
};
postPatch = ''
substituteInPlace setup.py \
--replace '"pytest-runner", ' ""
'';
nativeBuildInputs = [
setuptools
wheel
cython
];
nativeCheckInputs = [
pytestCheckHook
];
checkInputs = [
hypothesis
pytestCheckHook
];
pythonImportsCheck = [ "datrie" ];

2
pkgs/development/python-modules/dbt-core/default.nix
View File

@ -40,7 +40,7 @@ buildPythonPackage rec {
hash = "sha256-ZgP11fVMtXpzo9QaTkejvKl0LzCAkIyGBMcOquBirxQ=";
};
sourceRoot = "source/core";
sourceRoot = "${src.name}/core";
nativeBuildInputs = [
pythonRelaxDepsHook

2
pkgs/development/python-modules/dbt-postgres/default.nix
View File

@ -11,7 +11,7 @@ buildPythonPackage {
inherit (dbt-core) version src;
sourceRoot = "source/plugins/postgres";
sourceRoot = "${dbt-core.src.name}/plugins/postgres";
env.DBT_PSYCOPG2_NAME = "psycopg2";

6
pkgs/development/python-modules/dissect-cstruct/default.nix
View File

@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "dissect-cstruct";
version = "3.8";
version = "3.9";
format = "pyproject";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.cstruct";
rev = "refs/tags/${version}";
hash = "sha256-ART7m0OR0KjkZYHXDoNGJDX0v7h+FgctAaWXNFohGV8=";
hash = "sha256-v0giDdH6bYCSrotd9WGSlIMzylTz7FHeCE/JkCw7frY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/dissect-etl/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dissect-etl";
version = "3.6";
version = "3.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fox-it";
repo = "dissect.etl";
rev = "refs/tags/${version}";
hash = "sha256-Z6IdSLHXwZULqV6aTZlXjRo5Xq/rRNw7b/nOhuKOth4=";
hash = "sha256-z6P7XpA+j9JIJJsp/Z4uewFw9OAPSZV+57eJu7rd17I=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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