mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
fe1afe6938
@ -50,6 +50,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
- `mkosi` was updated to v19. Parts of the user interface have changed. Consult the
|
||||
[release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.
|
||||
|
||||
- The `kanata` package has been updated to v1.5.0, which includes [breaking changes](https://github.com/jtroo/kanata/releases/tag/v1.5.0).
|
||||
|
||||
- The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows:
|
||||
- If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)
|
||||
- If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default.
|
||||
|
||||
@ -44,6 +44,7 @@ with lib;
|
||||
};
|
||||
imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };
|
||||
imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };
|
||||
intel-vaapi-driver = super.intel-vaapi-driver.override { enableGui = false; };
|
||||
libdevil = super.libdevil-nox;
|
||||
libextractor = super.libextractor.override { gtkSupport = false; };
|
||||
libva = super.libva-minimal;
|
||||
|
||||
@ -105,6 +105,8 @@ with lib;
|
||||
];
|
||||
|
||||
boot.swraid.enable = true;
|
||||
# remove warning about unset mail
|
||||
boot.swraid.mdadmConf = "PROGRAM ${pkgs.coreutils}/bin/true";
|
||||
|
||||
# Show all debug messages from the kernel but don't log refused packets
|
||||
# because we have the firewall enabled. This makes installs from the
|
||||
|
||||
@ -32,5 +32,7 @@ with lib;
|
||||
systemd.packages = [ pkgs.gnome.gpaste ];
|
||||
# gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.
|
||||
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];
|
||||
# gpaste-reloaded applet doesn't work without the typelib
|
||||
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -228,14 +228,8 @@ in
|
||||
description = "Guix daemon socket";
|
||||
before = [ "multi-user.target" ];
|
||||
listenStreams = [ "${cfg.stateDir}/guix/daemon-socket/socket" ];
|
||||
unitConfig = {
|
||||
RequiresMountsFor = [
|
||||
cfg.storeDir
|
||||
cfg.stateDir
|
||||
];
|
||||
ConditionPathIsReadWrite = "${cfg.stateDir}/guix/daemon-socket";
|
||||
};
|
||||
wantedBy = [ "socket.target" ];
|
||||
unitConfig.RequiresMountsFor = [ cfg.storeDir cfg.stateDir ];
|
||||
wantedBy = [ "sockets.target" ];
|
||||
};
|
||||
|
||||
systemd.mounts = [{
|
||||
|
||||
@ -294,7 +294,6 @@ in
|
||||
systemd.services.freshrss-updater = {
|
||||
description = "FreshRSS feed updater";
|
||||
after = [ "freshrss-config.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
startAt = "*:0/5";
|
||||
environment = {
|
||||
DATA_PATH = cfg.dataDir;
|
||||
|
||||
@ -56,6 +56,10 @@ in
|
||||
retry(instance_is_up)
|
||||
machine.succeed("echo true | incus exec container /run/current-system/sw/bin/bash -")
|
||||
|
||||
with subtest("Container mounts lxcfs overlays"):
|
||||
machine.succeed("incus exec container mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'")
|
||||
machine.succeed("incus exec container mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'")
|
||||
|
||||
with subtest("Container CPU limits can be managed"):
|
||||
set_container("limits.cpu 1")
|
||||
cpuinfo = machine.succeed("incus exec container grep -- -c ^processor /proc/cpuinfo").strip()
|
||||
|
||||
@ -37,8 +37,10 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
with subtest("ensure munin-node starts and listens on 4949"):
|
||||
one.wait_for_unit("munin-node.service")
|
||||
one.wait_for_open_port(4949)
|
||||
|
||||
with subtest("ensure munin-cron output is correct"):
|
||||
one.wait_for_file("/var/lib/munin/one/one-uptime-uptime-g.rrd")
|
||||
one.wait_for_file("/var/www/munin/one/index.html")
|
||||
one.wait_for_file("/var/www/munin/one/one/diskstat_iops_vda-day.png", timeout=60)
|
||||
'';
|
||||
})
|
||||
|
||||
@ -5,20 +5,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lsp-plugins";
|
||||
version = "1.2.13";
|
||||
version = "1.2.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
|
||||
sha256 = "sha256-eJO+1fCNzqjTdGrPlhIrHc3UimkJOydRqTq49IN+Iwo=";
|
||||
sha256 = "sha256-GjNZ7ouKgpcb1+nuq+Q/WM5rSkeT2F+xb5exAOTt7po=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lsp-plugins/lsp-dsp-lib/commit/58c3f985f009c84347fa91236f164a9e47aafa93.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "modules/lsp-dsp-lib/";
|
||||
hash = "sha256-pCLucLijXOgp69xNjSRCRxgVoQziT0YiHLnQGbkefqE=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
|
||||
@ -33,14 +33,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
version = "25.1";
|
||||
version = "26.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
];
|
||||
# hash retrieved from signed SHA256SUMS
|
||||
sha256 = "bec2a598d8dfa8c2365b77f13012a733ec84b8c30386343b7ac1996e901198c9";
|
||||
sha256 = "ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
@ -55,9 +55,9 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals withGui [ qrencode qtbase qttools ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd bitcoin-cli --bash contrib/completions/bash/bitcoin-cli.bash-completion
|
||||
installShellCompletion --cmd bitcoind --bash contrib/completions/bash/bitcoind.bash-completion
|
||||
installShellCompletion --cmd bitcoin-tx --bash contrib/completions/bash/bitcoin-tx.bash-completion
|
||||
installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash
|
||||
installShellCompletion --bash contrib/completions/bash/bitcoind.bash
|
||||
installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash
|
||||
|
||||
installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish
|
||||
installShellCompletion --fish contrib/completions/fish/bitcoind.fish
|
||||
|
||||
@ -25,16 +25,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
pname = "neovide";
|
||||
version = "0.11.2";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovide";
|
||||
repo = "neovide";
|
||||
rev = version;
|
||||
sha256 = "sha256-JCSFG7W4I1uXsVM7J059tHYq/DB16AZfGjsG0UvfctE=";
|
||||
sha256 = "sha256-m3ZdzdmkW69j1sZ9h7M1m5fDNnJ7BM7nwYPx7QhsIso=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-rH4jjbd0C1MKu3RE0bLvLo4iqyUXr0DvCudvFs1F+AA=";
|
||||
cargoSha256 = "sha256-AAHMx4xxbC/JdmAPE2bub7qdF5sFNWjqXI1nuCUxsZA=";
|
||||
|
||||
SKIA_SOURCE_DIR =
|
||||
let
|
||||
@ -42,8 +42,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
owner = "rust-skia";
|
||||
repo = "skia";
|
||||
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
|
||||
rev = "m113-0.61.8";
|
||||
sha256 = "sha256-xGfkc1JLBGQW4WcblFyluZ2paEuisCVPNDU4Rfkv3BE=";
|
||||
rev = "m119-0.67.3";
|
||||
sha256 = "sha256-U75NuJnQa5+SNlOrsBmdlvflGdjo3el63EeIsbnE7ms=";
|
||||
};
|
||||
# The externals for skia are taken from skia/DEPS
|
||||
externals = linkFarm "skia-externals" (lib.mapAttrsToList
|
||||
@ -116,5 +116,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
changelog = "https://github.com/neovide/neovide/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ck3d multisn8 ];
|
||||
platforms = platforms.all;
|
||||
badPlatforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
},
|
||||
"libjpeg-turbo": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
|
||||
"rev": "22f1a22c99e9dde8cd3c72ead333f425c5a7aa77",
|
||||
"sha256": "sha256-5MaYvyrhADFGKBxcS3kbKcn9tj0FNXAN/rAXXYW6ljs="
|
||||
"rev": "ed683925e4897a84b3bffc5c1414c85b97a129a3",
|
||||
"sha256": "sha256-DYJP3phe4OzCtRN2pMc07ITTWR8MuIlOWWg9PBsQAVw="
|
||||
},
|
||||
"icu": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
|
||||
@ -21,13 +21,13 @@
|
||||
},
|
||||
"harfbuzz": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "09a266236147497bd8149240062c31c16fbc81e3",
|
||||
"sha256": "sha256-NLydUJI15zRBFFDc7VRDXjgc0AwS3l6GMt2usMWOSG4="
|
||||
"rev": "4cfc6d8e173e800df086d7be078da2e8c5cfca19",
|
||||
"sha256": "sha256-rrstyAz7Eb8ZgFJZKUASY8nU4YFZAptd5VS9B2cs2Yg="
|
||||
},
|
||||
"wuffs": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
"rev": "a0041ac0310b3156b963e2f2bea09245f25ec073",
|
||||
"sha256": "sha256-obRMrrKY3rPdFwQNa5IplpuKqiodHvRC8jbIOjp7R2w="
|
||||
"rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
|
||||
"sha256": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw="
|
||||
},
|
||||
"libpng": {
|
||||
"url": "https://skia.googlesource.com/third_party/libpng.git",
|
||||
|
||||
@ -344,8 +344,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-neovim";
|
||||
publisher = "asvetliakov";
|
||||
version = "1.0.1";
|
||||
sha256 = "1yf065syb5hskds47glnv18nk0fg7d84w1j72hg1pqb082gn1sdv";
|
||||
version = "1.5.0";
|
||||
sha256 = "1glad9xmzq58jc7js8afjmqrxgd3rqm80fk528wv5kqcmn90bgk3";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sameboy";
|
||||
version = "0.15.8";
|
||||
version = "0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LIJI32";
|
||||
repo = "SameBoy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SBK+aYekEJreD0XBvYaU12eIKmm9JNYIpPt1XhUtH4c=";
|
||||
sha256 = "sha256-sQVTCHOSc2N+Qs/rl0DfsUzg7P5Egws2UuNBQ9fpkoQ=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xemu";
|
||||
version = "0.7.117";
|
||||
version = "0.7.118";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xemu-project";
|
||||
repo = "xemu";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-R6BPDBMrVhxUkjMWK8Jz9vqEz5P3v62PIyulHp6Q+KM=";
|
||||
hash = "sha256-IGzPxwNxuqMsZhQ63VUyDzPSBpAgc0U0oUjM/blEd7g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cheat";
|
||||
version = "4.4.0";
|
||||
version = "4.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cheat";
|
||||
repo = "cheat";
|
||||
rev = version;
|
||||
sha256 = "sha256-lEMwPGXvgI8wtXska9ngAy9R2tr41Jq5yO6xQk9V5n4=";
|
||||
sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/cheat" ];
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{
|
||||
"packageVersion": "120.0.1-1",
|
||||
"packageVersion": "121.0-1",
|
||||
"source": {
|
||||
"rev": "120.0.1-1",
|
||||
"sha256": "0kvfa97m7dq1b030d62zblpb445fkbgb2w19bckxwxv7mx36awy7"
|
||||
"rev": "121.0-1",
|
||||
"sha256": "1vd4vz4i27p1lwx5ibaxqf7r1ll5zlvf54n6mqmaya3q0lrawb14"
|
||||
},
|
||||
"settings": {
|
||||
"rev": "9dac02778ebed3e2614da52c36b7cede45f4f602",
|
||||
"sha256": "0flk6v50cyiaajzcz9gm1hig00vkw9xdbjd5rdxidrmhcqxy24vy"
|
||||
"rev": "41623492f2b6970972014f6ce196015d3d7f1b59",
|
||||
"sha256": "0ayyyw44q0gh668bzlv6cfl7baa0818bnz83g53l5j2f10xd52by"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "120.0.1",
|
||||
"sha512": "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c"
|
||||
"version": "121.0",
|
||||
"sha512": "52e9e21ce825c4e58f09fd2c7347f1ac4efbca47e119136a712f0d4ee80c769ef80a43bad74a4c88cd377f804f5780b07f7af5b779f3fb5d244fa095e6b3b18a"
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
|
||||
let
|
||||
generic =
|
||||
{ buildGoModule, version, sha256, vendorHash, ... }@attrs:
|
||||
let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorHash" ];
|
||||
{ buildGoModule, version, sha256, vendorHash, license, ... }@attrs:
|
||||
let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorHash" "license" ];
|
||||
in
|
||||
buildGoModule (rec {
|
||||
pname = "nomad";
|
||||
@ -40,7 +40,7 @@ let
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nomadproject.io/";
|
||||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
license = licenses.mpl20;
|
||||
inherit license;
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes amaxine techknowlogick cottand ];
|
||||
};
|
||||
} // attrs');
|
||||
@ -59,6 +59,7 @@ rec {
|
||||
version = "1.4.12";
|
||||
sha256 = "sha256-dO98FOaO5MB5pWzeF705s/aBDTaF0OyWnVxWGB91suI=";
|
||||
vendorHash = "sha256-D5TcTZa64Jr47u4mrTXK4lUIC5gfBQNVgL6QKh1CaQM=";
|
||||
license = lib.licenses.mpl20;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
};
|
||||
|
||||
@ -67,6 +68,7 @@ rec {
|
||||
version = "1.5.12";
|
||||
sha256 = "sha256-BhKetWtwysWTYI0ruEp/Ixh4eoGxDX0Geup2PCXfsZY=";
|
||||
vendorHash = "sha256-X4pBxKWr5QFRxh9tw5QDpytyuVNXQvV1LHm5IbPELY0=";
|
||||
license = lib.licenses.mpl20;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
|
||||
@ -78,6 +80,7 @@ rec {
|
||||
version = "1.6.5";
|
||||
sha256 = "sha256-10s/yRWGoYTRbMytWShuTgYc1b388IID5doAvWXpyCU=";
|
||||
vendorHash = "sha256-gd6a/CBJ+OOTNHEaRLoDky2f2cDCyW9wSZzD6K22voQ=";
|
||||
license = lib.licenses.mpl20;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
|
||||
@ -89,6 +92,7 @@ rec {
|
||||
version = "1.7.2";
|
||||
sha256 = "sha256-tFmsX9C++nuUBqLjjpMMyVCwQHn4nlB3OywIPMYE32Q=";
|
||||
vendorHash = "sha256-iMEEBDxK7ALa19GMIabofzq557aXcYpt0H3/jAKnBBM=";
|
||||
license = lib.licenses.bsl11;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.270";
|
||||
version = "1.2.275";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8AF+D/kbRkalUOQmpGamyhq5LEu1Uyxj6NuzWviDKRM=";
|
||||
hash = "sha256-8WMkarh/5ylCz1IqyLefivjvCBAl15TvT6TLqBmG7Hs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-20bPsBRya7Gg7p/hSSnnYLoSHf/fRwk1UrA/KlMT3Jk=";
|
||||
vendorHash = "sha256-LXjGqI9cowou5ZHVRldwCD1vOzwCyU269TkTflIkdAc=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yor";
|
||||
version = "0.1.185";
|
||||
version = "0.1.187";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-5CBOLbqsEVzYyU67c7QTGTe471XQlEC/826wYCPHzEo=";
|
||||
hash = "sha256-w82kJhMnupVv4eq3SUDFaWSvkVrxOSPsN+OXl8aIKog=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZeTjGmlu8LndD2DKNncPzlpECdvkOjfwaVvV6S3sL9E=";
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abaddon";
|
||||
version = "0.1.13";
|
||||
version = "0.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uowuo";
|
||||
repo = "abaddon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2iozeRuY/+JDnaHfAYiXNS1VgSrHAxXPuI8BevEEKTc=";
|
||||
hash = "sha256-Amp6PkQWd4PnwUL29fzGETLuQXVEaARr+jIRlfrxTKc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
, dbusSupport ? true
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
pname = "baresip";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "baresip";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cp9aaOtvFl9RUHPQRMkSjPvf0fJ29Bclh4SKnAHo7fE=";
|
||||
hash = "sha256-A1S8pen0aPd3CmeRpttwivhwHnAv7Rk2lao8I/CWvo0=";
|
||||
};
|
||||
prePatch = lib.optionalString (!dbusSupport) ''
|
||||
substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wgcf";
|
||||
version = "2.2.19";
|
||||
version = "2.2.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ViRb3";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wEBPaqqpiQdFohlzpVDVMwYq8+NjSQrh58yWl/W+n8M=";
|
||||
hash = "sha256-k4oOejJiVZk9s4niG/r0mSoI363uuQh3C9OWVweELWc=";
|
||||
};
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
vendorHash = "sha256-i1CM0rG2DmgYMa+Na0In4fVJSGZlMTRajjLEZUvrmE8=";
|
||||
vendorHash = "sha256-U1VHbD2l5C5ws7Mt5a7PmtHQkZJ6hzDU1TyiEFqMYEM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform, unofficial CLI for Cloudflare Warp";
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ticktick";
|
||||
version = "1.0.80";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb";
|
||||
hash = "sha256-EK+8NFEim2gcFj9t6AGYdGVlyFj9Yq7NaOia3XKy3cc=";
|
||||
hash = "sha256-LOllYdte+Y+pbjXI2zOQrwptmUo4Ck6OyYoEX6suY08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
maintainers = [ lib.maintainers.cge ];
|
||||
broken = true; # Build error: h5py-3.9.0 not supported for interpreter python2.7
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
funding from the DOE. It is an open-source code, distributed freely
|
||||
under the terms of the GNU Public License (GPL).
|
||||
'';
|
||||
homepage = "https://lammps.sandia.gov";
|
||||
license = licenses.gpl2Plus;
|
||||
homepage = "https://www.lammps.org";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
# compiling lammps with 64 bit support blas and lapack might cause runtime
|
||||
# segfaults. In anycase both blas and lapack should have the same #bits
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, go
|
||||
, pkg-config
|
||||
, libX11
|
||||
, libXcursor
|
||||
@ -12,20 +11,23 @@
|
||||
, libXxf86vm
|
||||
, libGL
|
||||
, nixosTests
|
||||
, buildGoModule
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
buildGoModule rec {
|
||||
pname = "darktile";
|
||||
version = "0.0.10";
|
||||
version = "0.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liamg";
|
||||
repo = "darktile";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pdj4yv3qrq56gb67p85ara3g8qrzw5ha787bl2ls4vcx85q7303";
|
||||
hash = "sha256-M3vySAyYwqscR9n0GGXp1ttO/mhdSCponZNYJRBBI18=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go pkg-config ];
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
@ -38,25 +40,6 @@ stdenv.mkDerivation rec {
|
||||
libGL
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/build.sh \
|
||||
--replace "bash" "sh"
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
export GOPATH=$TMP/go
|
||||
'';
|
||||
|
||||
makeFlags = [ "HOME=$TMP" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 darktile -t $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.darktile;
|
||||
|
||||
meta = with lib; {
|
||||
@ -65,7 +48,9 @@ stdenv.mkDerivation rec {
|
||||
downloadPage = "https://github.com/liamg/darktile/releases";
|
||||
changelog = "https://github.com/liamg/darktile/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ flexagoon ];
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ mikaelfangel ];
|
||||
mainProgram = "darktile";
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,13 +10,13 @@ in
|
||||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-adaptive";
|
||||
namespace = "inputstream.adaptive";
|
||||
version = "20.3.13";
|
||||
version = "20.3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.adaptive";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "sha256-xvU+DcVEaQ/1sm6o21/6N1znCtzrct0qDhMxXGFZjL4=";
|
||||
sha256 = "sha256-9S98LgeXq2Wc5CLd5WGo7iNM9ZkSuDBO/O35wf0SjZY=";
|
||||
};
|
||||
|
||||
extraCMakeFlags = [
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "netflix";
|
||||
namespace = "plugin.video.netflix";
|
||||
version = "1.22.3";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CastagnaIT";
|
||||
repo = namespace;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8NGj8n1p8euqYYdPDSeFh2ZE9lly5ThSmg69yXY3Te8=";
|
||||
sha256 = "sha256-ZY59I3RR/gl24XqZiBkenHM/D4tW/5ZyE4UngtvODYQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, callPackage
|
||||
, pkg-config
|
||||
, gcc13Stdenv
|
||||
, hyprland
|
||||
}:
|
||||
let
|
||||
mkHyprlandPlugin =
|
||||
args@{ pluginName, ... }:
|
||||
gcc13Stdenv.mkDerivation (args // {
|
||||
pname = "${pluginName}";
|
||||
nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ];
|
||||
buildInputs = [ hyprland ]
|
||||
++ hyprland.buildInputs
|
||||
++ (args.buildInputs or [ ]);
|
||||
meta = args.meta // {
|
||||
description = (args.meta.description or "");
|
||||
longDescription = (args.meta.lonqDescription or "") +
|
||||
"\n\nPlugins can be installed via a plugin entry in the Hyprland NixOS or Home Manager options.";
|
||||
};
|
||||
});
|
||||
|
||||
plugins = {
|
||||
hy3 = { fetchFromGitHub, cmake, hyprland }:
|
||||
mkHyprlandPlugin rec {
|
||||
pluginName = "hy3";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "outfoxxed";
|
||||
repo = "hy3";
|
||||
rev = "hl${version}";
|
||||
hash = "sha256-j49bEOLjBa1CH2gTwM+A2Edrw/GspE2m8q1teAn6SuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/outfoxxed/hy3";
|
||||
description = "Hyprland plugin for an i3 / sway like manual tiling layout";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.aacebedo ];
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.mapAttrs (name: plugin: callPackage plugin { }) plugins
|
||||
|
||||
@ -178,7 +178,11 @@ let
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
dart pub deps --json | jq .packages > $out
|
||||
if [ -e ${dart}/bin/flutter ]; then
|
||||
flutter pub deps --json | jq .packages > $out
|
||||
else
|
||||
dart pub deps --json | jq .packages > $out
|
||||
fi
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
||||
@ -6,20 +6,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "c2FmZQ";
|
||||
version = "0.4.15";
|
||||
version = "0.4.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c2FmZQ";
|
||||
repo = "c2FmZQ";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xQOzuJfGmnmOJqHCm5xUNuLHQO4UVRMu1vABsuUbv60=";
|
||||
hash = "sha256-DJvcWUPIEu3zCVIVB/mUBqbOzHwUI+01gMQUdYk4qm4=";
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
sourceRoot = "source/c2FmZQ";
|
||||
|
||||
vendorHash = "sha256-aG1YPg8jeBJShICujUgrcvgAlb7ySdwjc+x6jEUYHXA=";
|
||||
vendorHash = "sha256-lnoEh6etfVLx+GYWNCvra40qOYtzTIH3SC28T6mXC2U=";
|
||||
|
||||
subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ];
|
||||
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-xwin";
|
||||
version = "0.16.2";
|
||||
version = "0.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-cross";
|
||||
repo = "cargo-xwin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EZM1TeWUnoRcsF6m6mDNCoUR2WWe7ohqT3wNWnq0kQY=";
|
||||
hash = "sha256-3i/XlCuHjVBSH4XZR5M457H+kheKZoJXlwqRwPhSnCM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MEBMXP7a/w2aN6RuWrm16PsnIPw6+8k5jI2yRnwBy0s=";
|
||||
cargoHash = "sha256-yKoUcrAZy66qahDvRgOnbJmXuUXDjDBTGt2p5gXjVyI=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@ -14,7 +14,7 @@ buildGoModule rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
repo = "hugo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XNOp0k2t5Tv4HKKz3ZqL/sAdiYedOACaZ/1T7t7/Q1A=";
|
||||
};
|
||||
@ -48,10 +48,12 @@ buildGoModule rec {
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/gohugoio/hugo/releases/tag/v${version}";
|
||||
description = "A fast and modern static website engine";
|
||||
homepage = "https://gohugo.io";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ schneefux Br1ght0ne Frostman ];
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "hugo";
|
||||
maintainers = with lib.maintainers; [ schneefux Br1ght0ne Frostman ];
|
||||
};
|
||||
}
|
||||
@ -16,16 +16,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "incus-unwrapped";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "incus";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk=";
|
||||
hash = "sha256-crWepf5j3Gd1lhya2DGIh/to7l+AnjKJPR+qUd9WOzw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TwrHWjBd6Hn7CQMxFhHobopeefCvYeDz8fAPYmTKV9M=";
|
||||
vendorHash = "sha256-YfUvkN1qUS3FFKb1wysg40WcJA8fT9SGDChSdT+xnkc=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace internal/usbid/load.go \
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
assert lib.assertOneOf "graphicsLibrary" graphicsLibrary [ "SDL2" "GLFW" ];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jazz2";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deathkiller";
|
||||
repo = "jazz2-native";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-oBDBq2SToab94mK0kIB0H53jJMFZrHvsdPmfAd5ZjCY=";
|
||||
hash = "sha256-Rv+fU2SGxdmxfDANX+HpZDZBm9HYzSvAQDqPSQ8WJps=";
|
||||
};
|
||||
|
||||
patches = [ ./nocontent.patch ];
|
||||
|
||||
@ -4,23 +4,24 @@
|
||||
, cmake
|
||||
, pkg-config
|
||||
, openssl
|
||||
, samba
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "legba";
|
||||
version = "0.6.1";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evilsocket";
|
||||
repo = "legba";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/ASjvlsPQAPNZpzdTTyZYrcYImV2GS+SSfhSQP0K2n0=";
|
||||
hash = "sha256-7HDW5M0lsKbcQw3p/CYmUeX2xE4BZXUSNqa9Ab/ZP0I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QgnJ/oUpW4o2Hi2+xKfprxjCw4sho8kIyW+AUJ9pwuU=";
|
||||
cargoHash = "sha256-rkqwc8BILW/OIHa95skkG4IDlBfH3qX1ROJgcn8f2W0=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ openssl.dev ];
|
||||
buildInputs = [ openssl.dev samba ];
|
||||
|
||||
# Paho C test fails due to permission issue
|
||||
doCheck = false;
|
||||
|
||||
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lxd-to-incus";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "incus";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk=";
|
||||
hash = "sha256-crWepf5j3Gd1lhya2DGIh/to7l+AnjKJPR+qUd9WOzw=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/lxd-to-incus";
|
||||
|
||||
vendorHash = "sha256-/ONflpW1HGvXooPF+Xui8q4xFu/Zq5br+Vjm9d2gm5U=";
|
||||
vendorHash = "sha256-cBAqJz3Y4CqyxTt7u/4mXoQPKmKgQ3gYJV1NiC/H+TA=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyprland";
|
||||
version = "1.6.0";
|
||||
version = "1.6.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.10";
|
||||
@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "hyprland-community";
|
||||
repo = "pyprland";
|
||||
rev = version;
|
||||
hash = "sha256-QbbBpaBIlU4IoU/NM7igDap8TxOKePQ8JI3ZlH944Bs=";
|
||||
hash = "sha256-qmITBg9csfCIcyTADUOfEo/Nrou01bXHORQ66+Jvodo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
|
||||
@ -2,20 +2,20 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vieb";
|
||||
version = "10.6.0";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jelmerro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-WVG30wkyGiqd3uEhk2h2MHu4L0yE6DRP6NAKMExjuOs=";
|
||||
hash = "sha256-OBOxT2leZYD3td1+PJdLv7Nph/gY6U9tVC7b/fUmUJw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/"electron"/d' package.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-kvC1+odojkSFWqcyNUg2SbeEn1EkA+EdfaVWY9QmPz4=";
|
||||
npmDepsHash = "sha256-vgp20qVT4JZ7U24uu9ZPkveXchMNcdbljodALAMAu9s=";
|
||||
makeCacheWritable = true;
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@ -23,13 +23,13 @@ in
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "where-is-my-sddm-theme";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepanzubkov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T6b+rxjlxZCQ/KDaxBM8ZryA3n6a+3jo+J2nETBYslM=";
|
||||
hash = "sha256-EK0bB2dRXNtDKFiyf+nMoDq9XK2f3PFwoNbQDZamB3Y=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ qtgraphicaleffects ];
|
||||
|
||||
@ -0,0 +1,76 @@
|
||||
From 174d14edcbb401aa2bfb77932b214512befb486c Mon Sep 17 00:00:00 2001
|
||||
From: Bobby Rong <rjl931189261@126.com>
|
||||
Date: Sat, 23 Dec 2023 23:24:59 +0800
|
||||
Subject: [PATCH] cinnamon-session: make sure wayland sessions get a login
|
||||
shell
|
||||
|
||||
Users expect their shell profiles to get sourced at startup, which
|
||||
doesn't happen with wayland sessions.
|
||||
|
||||
This commit brings back that feature, by making the cinnamon-session
|
||||
wrapper script run a login shell.
|
||||
|
||||
ref: https://gitlab.gnome.org/GNOME/gnome-session/-/commit/7e307f8ddb91db5d4051c4c792519a660ba67f35
|
||||
---
|
||||
cinnamon-session/cinnamon-session.in | 16 ++++++++++++++++
|
||||
cinnamon-session/meson.build | 14 +++++++++++++-
|
||||
2 files changed, 29 insertions(+), 1 deletion(-)
|
||||
create mode 100755 cinnamon-session/cinnamon-session.in
|
||||
|
||||
diff --git a/cinnamon-session/cinnamon-session.in b/cinnamon-session/cinnamon-session.in
|
||||
new file mode 100755
|
||||
index 0000000..d9d7cb2
|
||||
--- /dev/null
|
||||
+++ b/cinnamon-session/cinnamon-session.in
|
||||
@@ -0,0 +1,16 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
+if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
|
||||
+ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
|
||||
+ [ -n "$SHELL" ] &&
|
||||
+ grep -q "$SHELL" /etc/shells &&
|
||||
+ ! (echo "$SHELL" | grep -q "false") &&
|
||||
+ ! (echo "$SHELL" | grep -q "nologin"); then
|
||||
+ if [ "$1" != '-l' ]; then
|
||||
+ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
|
||||
+ else
|
||||
+ shift
|
||||
+ fi
|
||||
+fi
|
||||
+
|
||||
+exec @libexecdir@/cinnamon-session-binary "$@"
|
||||
diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
|
||||
index 10092ee..3d32fdc 100644
|
||||
--- a/cinnamon-session/meson.build
|
||||
+++ b/cinnamon-session/meson.build
|
||||
@@ -54,7 +54,7 @@ cinnamon_session_sources = [
|
||||
]
|
||||
|
||||
dbus_glib = dependency('dbus-glib-1')
|
||||
-executable('cinnamon-session',
|
||||
+executable('cinnamon-session-binary',
|
||||
cinnamon_session_sources,
|
||||
dependencies: [
|
||||
cinnamon_desktop,
|
||||
@@ -76,6 +76,18 @@ executable('cinnamon-session',
|
||||
],
|
||||
include_directories: [ rootInclude ],
|
||||
install: true,
|
||||
+ install_dir: get_option('libexecdir'),
|
||||
+)
|
||||
+
|
||||
+script_conf = configuration_data()
|
||||
+script_conf.set('libexecdir', get_option('prefix') / get_option('libexecdir'))
|
||||
+
|
||||
+configure_file(
|
||||
+ input: 'cinnamon-session.in',
|
||||
+ output: 'cinnamon-session',
|
||||
+ install: true,
|
||||
+ install_dir: get_option('bindir'),
|
||||
+ configuration: script_conf
|
||||
)
|
||||
|
||||
units = [
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./0001-Use-dbus_glib-instead-of-elogind.patch
|
||||
./0002-Use-login-shell-for-wayland-session.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, rsync
|
||||
, pkg-config
|
||||
, glib
|
||||
, itstool
|
||||
@ -70,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rsync
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
@ -131,33 +129,36 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
install -D ${override} $DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override
|
||||
install -D ${override} "$DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Move stuff from DESTDIR to proper location.
|
||||
# We use rsync to merge the directories.
|
||||
rsync --archive "$DESTDIR/etc" "$out"
|
||||
rm --recursive "$DESTDIR/etc"
|
||||
for o in $(getAllOutputNames); do
|
||||
# debug is created later by _separateDebugInfo hook.
|
||||
if [[ "$o" = "debug" ]]; then continue; fi
|
||||
rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")"
|
||||
rm --recursive "$DESTDIR/''${!o}"
|
||||
mv "$DESTDIR''${!o}" "$(dirname "''${!o}")"
|
||||
done
|
||||
# Ensure the DESTDIR is removed.
|
||||
rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR"
|
||||
|
||||
mv "$DESTDIR/etc" "$out"
|
||||
|
||||
# Ensure we did not forget to install anything.
|
||||
rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}"
|
||||
! test -e "$DESTDIR"
|
||||
|
||||
# We are setting DESTDIR so the post-install script does not compile the schemas.
|
||||
glib-compile-schemas "$out/share/glib-2.0/schemas"
|
||||
'';
|
||||
|
||||
# HACK: We want to install configuration files to $out/etc
|
||||
# but GDM should read them from /etc on a NixOS system.
|
||||
# With autotools, it was possible to override Make variables
|
||||
# at install time but Meson does not support this
|
||||
# so we need to convince it to install all files to a temporary
|
||||
# location using DESTDIR and then move it to proper one in postInstall.
|
||||
DESTDIR = "${placeholder "out"}/dest";
|
||||
env = {
|
||||
# HACK: We want to install configuration files to $out/etc
|
||||
# but GDM should read them from /etc on a NixOS system.
|
||||
# With autotools, it was possible to override Make variables
|
||||
# at install time but Meson does not support this
|
||||
# so we need to convince it to install all files to a temporary
|
||||
# location using DESTDIR and then move it to proper one in postInstall.
|
||||
DESTDIR = "dest";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
|
||||
@ -26,7 +26,8 @@ rec {
|
||||
inherit src;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.rust-lang.org/";
|
||||
homepage = "https://www.rust-lang.org/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
description = "A safe, concurrent, practical language";
|
||||
maintainers = with maintainers; [ qknight ];
|
||||
license = [ licenses.mit licenses.asl20 ];
|
||||
@ -70,8 +71,9 @@ rec {
|
||||
inherit src;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.rust-lang.org/";
|
||||
description = "A safe, concurrent, practical language";
|
||||
homepage = "https://doc.rust-lang.org/cargo/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
description = "The Rust package manager";
|
||||
maintainers = with maintainers; [ qknight ];
|
||||
license = [ licenses.mit licenses.asl20 ];
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{cudaVersion, lib}:
|
||||
{cudaVersion, lib, addDriverRunpath}:
|
||||
let
|
||||
inherit (lib) attrsets lists strings;
|
||||
# cudaVersionOlder : Version -> Boolean
|
||||
@ -42,6 +42,21 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) {
|
||||
lists.optionals (cudaVersionAtLeast "12.0") [final.libnvjitlink.lib]
|
||||
);
|
||||
|
||||
cuda_cudart = prev.cuda_cudart.overrideAttrs (
|
||||
prevAttrs: {
|
||||
allowFHSReferences = false;
|
||||
|
||||
# The libcuda stub's pkg-config doesn't follow the general pattern:
|
||||
postPatch = prevAttrs.postPatch or "" + ''
|
||||
while IFS= read -r -d $'\0' path ; do
|
||||
sed -i \
|
||||
-e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib/stubs|" \
|
||||
-e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \
|
||||
"$path"
|
||||
done < <(find -iname 'cuda-*.pc' -print0)
|
||||
'';
|
||||
});
|
||||
|
||||
cuda_compat = prev.cuda_compat.overrideAttrs (
|
||||
prevAttrs: {
|
||||
env.autoPatchelfIgnoreMissingDeps =
|
||||
@ -115,7 +130,10 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) {
|
||||
moveToOutput "nvvm" "''${!outputBin}"
|
||||
'';
|
||||
|
||||
meta = (oldAttrs.meta or {}) // {
|
||||
# The nvcc and cicc binaries contain hard-coded references to /usr
|
||||
allowFHSReferences = true;
|
||||
|
||||
meta = (oldAttrs.meta or { }) // {
|
||||
mainProgram = "nvcc";
|
||||
};
|
||||
}
|
||||
|
||||
@ -94,7 +94,12 @@ backendStdenv.mkDerivation (
|
||||
# Traversed in the order of the outputs speficied in outputs;
|
||||
# entries are skipped if they don't exist in outputs.
|
||||
outputToPatterns = {
|
||||
bin = ["bin"];
|
||||
bin = [ "bin" ];
|
||||
dev = [
|
||||
"share/pkg-config"
|
||||
"**/*.pc"
|
||||
"**/*.cmake"
|
||||
];
|
||||
lib = [
|
||||
"lib"
|
||||
"lib64"
|
||||
@ -116,6 +121,22 @@ backendStdenv.mkDerivation (
|
||||
inherit (redistribRelease.${redistArch}) sha256;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
if [[ -d pkg-config ]] ; then
|
||||
mkdir -p share/pkg-config
|
||||
mv pkg-config/* share/pkg-config/
|
||||
rmdir pkg-config
|
||||
fi
|
||||
|
||||
for pc in share/pkg-config/*.pc ; do
|
||||
sed -i \
|
||||
-e "s|^cudaroot\s*=.*\$|cudaroot=''${!outputDev}|" \
|
||||
-e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib|" \
|
||||
-e "s|^includedir\s*=.*/include\$|includedir=''${!outputDev}/include|" \
|
||||
"$pc"
|
||||
done
|
||||
'';
|
||||
|
||||
# We do need some other phases, like configurePhase, so the multiple-output setup hook works.
|
||||
dontBuild = true;
|
||||
|
||||
@ -197,6 +218,20 @@ backendStdenv.mkDerivation (
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
allowFHSReferences = true; # TODO: Default to `false`
|
||||
postInstallCheck = ''
|
||||
echo "Executing postInstallCheck"
|
||||
|
||||
if [[ -z "''${allowFHSReferences-}" ]] ; then
|
||||
mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "''${!o}"; done)
|
||||
if grep --max-count=5 --recursive --exclude=LICENSE /usr/ "''${outputPaths[@]}" ; then
|
||||
echo "Detected references to /usr" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
'';
|
||||
|
||||
# libcuda needs to be resolved during runtime
|
||||
# NOTE: Due to the use of __structuredAttrs, we can't use a list for autoPatchelfIgnoreMissingDeps, since it
|
||||
# will take only the first value. Instead, we produce a string with the values separated by spaces.
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svdtools";
|
||||
version = "0.3.6";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
hash = "sha256-bk6kv13HMDSRBjShWnRZJzb0YX0zKljPoEC6tebkVKI=";
|
||||
hash = "sha256-daATz1bd5fwfYnfVbweJd/I6SsQyg2CC+MEZ5WLyZBw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MdYzYmbI7ZNLeLZdnLIVo9y2rvmGevEGy7t+2FFu5yo=";
|
||||
cargoHash = "sha256-TSLUBkPRab6cwlXJw8tHpqYjhLtVa+QJZq13Qj/0UzU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools to handle vendor-supplied, often buggy SVD files";
|
||||
|
||||
@ -2,10 +2,9 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.26";
|
||||
hash = "sha256-g73iSchKoaBDqMjQ7qCTRcLK5puXhM3wIin8kW+7nqA=";
|
||||
version = "8.1.27";
|
||||
hash = "sha256-oV/XPqRPLfMLB9JHhuB9GUiw6j7tC4uEVzXVANwov/E=";
|
||||
});
|
||||
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
bcmath
|
||||
|
||||
@ -2,10 +2,9 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.13";
|
||||
hash = "sha256-ZlKfQ7ITEx5rJTxWAr7wXwSUWNISknMPzNY7SKBtZ7o=";
|
||||
version = "8.2.14";
|
||||
hash = "sha256-+HHhMTM9YK5sU3sa3dvCrqVMQ2xWKvmG+4MJwGAEC54=";
|
||||
});
|
||||
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
bcmath
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ callPackage, fetchurl, ... }@_args:
|
||||
{ callPackage, ... }@_args:
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.3.0";
|
||||
hash = "sha256-3mfQgz1CsZblpm+hozL0Xilsvo6UcuklayoHHDTcXtY=";
|
||||
version = "8.3.1";
|
||||
hash = "sha256-xA+ukZf6aKUy9qBiwxba/jsExUUTa1S56tSTL8JsauE=";
|
||||
});
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zef";
|
||||
version = "0.21.1";
|
||||
version = "0.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ugexe";
|
||||
repo = "zef";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ji+KTxAOPZhuGryK0+svsVkU+HC1egKZWOboSBUON+s=";
|
||||
hash = "sha256-7mqKcioMal4OR/xlzQ/EgGICau7Ijc13j4pSfu4/74E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -333,8 +333,8 @@ in {
|
||||
};
|
||||
|
||||
ruby_3_3 = generic {
|
||||
version = rubyVersion "3" "3" "0" "rc1";
|
||||
hash = "sha256-xP+COVqQ73bH+Qa3aHAm4KuWsJTc86Uy2auXeEoHMiI=";
|
||||
version = rubyVersion "3" "3" "0" "";
|
||||
hash = "sha256-llGIFNmDK+zpKoVBWoGdSJOzB9tZIa4fD3Uamomla30=";
|
||||
cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amf-headers";
|
||||
version = "1.4.30";
|
||||
version = "1.4.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GPUOpen-LibrariesAndSDKs";
|
||||
repo = "AMF";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eShqo5EBbhl2Us4feFjiX+NfEl1OQ2jPQUC+Hlm+yFs=";
|
||||
sha256 = "sha256-3CdC/9o6ur2CeVLImz2QfaZAH2+KtDdxs5zRF7W5/oo=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,13 +1,22 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, bison
|
||||
, flex
|
||||
, bluez
|
||||
, pkg-config
|
||||
, gtk2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cwiid";
|
||||
version = "unstable-2010-02-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abstrakraft";
|
||||
repo = "cwiid";
|
||||
rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
|
||||
owner = "abstrakraft";
|
||||
repo = "cwiid";
|
||||
rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
|
||||
sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h";
|
||||
};
|
||||
|
||||
@ -19,9 +28,21 @@ stdenv.mkDerivation rec {
|
||||
sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in
|
||||
'';
|
||||
|
||||
buildInputs = [ bison flex bluez gtk2 ];
|
||||
patches = [
|
||||
./fix-ar.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [
|
||||
bluez
|
||||
gtk2
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
bison
|
||||
flex
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lbluetooth";
|
||||
|
||||
@ -32,9 +53,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux Nintendo Wiimote interface";
|
||||
homepage = "http://cwiid.org";
|
||||
license = licenses.gpl2Plus;
|
||||
homepage = "http://cwiid.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
26
pkgs/development/libraries/cwiid/fix-ar.diff
Normal file
26
pkgs/development/libraries/cwiid/fix-ar.diff
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in
|
||||
index 3afbb14..b8df9d9 100644
|
||||
--- a/common/include/lib.mak.in
|
||||
+++ b/common/include/lib.mak.in
|
||||
@@ -22,7 +22,7 @@ static: $(STATIC_LIB)
|
||||
shared: $(SHARED_LIB)
|
||||
|
||||
$(STATIC_LIB): $(OBJECTS)
|
||||
- ar rcs $(STATIC_LIB) $(OBJECTS)
|
||||
+ $(AR) rcs $(STATIC_LIB) $(OBJECTS)
|
||||
|
||||
$(SHARED_LIB): $(OBJECTS)
|
||||
$(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 82ca3e1..0a78283 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then
|
||||
AC_MSG_ERROR([bison not found])
|
||||
fi
|
||||
|
||||
+AC_CHECK_TOOL([AR], [ar], [:])
|
||||
+
|
||||
AC_ARG_WITH(
|
||||
[python],
|
||||
[AS_HELP_STRING([--without-python],[compile without python support])],
|
||||
@ -29,7 +29,11 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ udev libcec_platform ] ++
|
||||
lib.optional withLibraspberrypi libraspberrypi;
|
||||
|
||||
cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ];
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=1"
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
"-DHAVE_LINUX_API=1"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling";
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "toml-f";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sCU0uMdcXIA5O964hlK37cOrLTlk1CJeTcWD9FhevOs=";
|
||||
hash = "sha256-+cac4rUNpd2w3yBdH1XoCKdJ9IgOHZioZg8AhzGY0FE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gfortran cmake ];
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zint";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zint";
|
||||
repo = "zint";
|
||||
rev = version;
|
||||
hash = "sha256-Ay6smir6zUpadmw1WpU+F7e9t7Gk3JNVtf2VVu92bDk=";
|
||||
hash = "sha256-/ILq/7A8Lffe2NuiABiV3KeYXapuL1SO55Qk3wXfC/8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -13,13 +13,6 @@ in buildPecl {
|
||||
sha256 = "sha256-UDKLLCCnYJj/lCD8ZkkDf2WYZMoIbcP75+0/IXo4vdQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (lib.versionAtLeast php.version "8.3") [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/krakjoe/apcu/commit/c9a29161c68c0faf71046e8f03f6a90900023ded.patch";
|
||||
hash = "sha256-B0ZKk9TJy2+sYGs7TEX2KxUiOVawIb+RXNgToU1Fz5I=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
@ -30,8 +23,8 @@ in buildPecl {
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}";
|
||||
description = "Userland cache for PHP";
|
||||
license = licenses.php301;
|
||||
homepage = "https://pecl.php.net/package/APCu";
|
||||
license = licenses.php301;
|
||||
maintainers = teams.php.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioguardian";
|
||||
version = "2023.11.0";
|
||||
version = "2023.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = "aioguardian";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hTV6P9J7SS5lnV/9eFUCFPZu1GIeshytWQvNTbGs52w=";
|
||||
hash = "sha256-7fY8+aAxlDtOBLu8SadY5qiH6+RvxnFpOw1RXTonP2o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, cpufeature
|
||||
@ -34,9 +35,8 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
cpufeature
|
||||
zlib-ng
|
||||
];
|
||||
] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform cpufeature) cpufeature;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.2";
|
||||
version = "1.34.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-+2DKdWGyqdHdq9xe65YRKy+Xjd+mopS74x0r/1pOZYo=";
|
||||
hash = "sha256-iPbp3F0ZeZ9KWBO/aTMezo8ze6zziLO5YV+lfAXtJDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -46,5 +46,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/robbmcleod/cpufeature";
|
||||
license = licenses.cc0;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
platforms = [ "x86_64-linux" "x86_64-windows" ];
|
||||
};
|
||||
}
|
||||
|
||||
33
pkgs/development/python-modules/django-mdeditor/default.nix
Normal file
33
pkgs/development/python-modules/django-mdeditor/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, django
|
||||
}:
|
||||
let
|
||||
version = "0.1.20";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "django-mdeditor";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pylixm";
|
||||
repo = "django-mdeditor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "mdeditor" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Markdown Editor plugin application for django based on Editor.md";
|
||||
homepage = "https://github.com/pylixm/django-mdeditor";
|
||||
changelog = "https://github.com/pylixm/django-mdeditor/releases";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ augustebaum ];
|
||||
};
|
||||
}
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flet-core";
|
||||
version = "0.15.0";
|
||||
version = "0.17.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "flet_core";
|
||||
inherit version;
|
||||
hash = "sha256-nmQHWyLlyo6CVzn+dlTSnA10XRoSFBLEeYdcWpfoGBo=";
|
||||
hash = "sha256-LYCbZKxHXrUUs3f3M2pGxz51R2dMet7/fYr9MZ10cgI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flet-runtime";
|
||||
version = "0.15.0";
|
||||
version = "0.17.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "flet_runtime";
|
||||
inherit version;
|
||||
hash = "sha256-CRrAz1V6bISgL2MU7ibhhNEB5IdiQKjRdIt2dmZh0h4=";
|
||||
hash = "sha256-BhVle4Mpx+0YcAaTWk1AvYGuyPFPju1iuF6SLs2uAzU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -21,12 +21,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flet";
|
||||
version = "0.15.0";
|
||||
version = "0.17.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NnozZX8i5QsnVRW5cyIvKxYuHf9EoR6owWSQw6Y4dwQ=";
|
||||
hash = "sha256-YNa1JDoGqtpzjx+3E1Ycz2E5yZ5MVzooPo9PgHFll9s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hachoir";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "vstinner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BRrb6bnPSDVjZF1cOA9NlUYd2HrtqZEAVhHgkjmE0Xg=";
|
||||
hash = "sha256-sTUJx8Xyhw4Z6juRtREw/okuVjSTSVWpSLKeZ7T8IR8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.11.4";
|
||||
version = "2023.12.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LB0BGj/DWjHGAFkyACkkzGY1oYNc7hJ2BeT1lHlNjqU=";
|
||||
hash = "sha256-IsRHJyFgoS7vfr/QcfzplsmFHMRRtLXVqU7bhL/fFto=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoutbreaksnearme";
|
||||
version = "2023.10.0";
|
||||
version = "2023.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = "pyoutbreaksnearme";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-G+/ooNhiYOaV0kjfr8Z1d31XxRYFArQnt1oIuMQfXdY=";
|
||||
hash = "sha256-oR/DApOxNSSczrBeH4sytd/vasbD4rA1poW4zNoeAnU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysml";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "mtdcr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BtOx/kqPuvaaIyh/2/X5pW5BRvpsnMUMr1u6iZzbkt4=";
|
||||
hash = "sha256-TLIpc0bVx1As2oLyYD+BBMalwJiKdvBCcrd1tUNyh6Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "regenmaschine";
|
||||
version = "2023.11.0";
|
||||
version = "2023.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = "regenmaschine";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FRfw3B2zHEspKf1LENrB3Ayu6/t3hyS8sjuwoBC5Lfk=";
|
||||
hash = "sha256-9VBqLmbWJCrfDw9T1qmE9KkdlS+MDnvoG8O9dPCuJDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,16 +19,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2023.10.0";
|
||||
format = "pyproject";
|
||||
version = "2023.12.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = "simplisafe-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-U3SbaR8PTTvoAMu65+LAHSwTmR7iwqiidbefW8bNSCo=";
|
||||
hash = "sha256-Nr4HvjIOLk/WMKCjj/ZX67OBSImRhs9SfZtLjFs81Sk=";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "temperusb";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-enYhqtJnORKhBoZkZPISLCt9Ec5SN6txD3z0SXuPrQo=";
|
||||
hash = "sha256-PwKHT1zzVn+nmxO/R+aK+029WaaHBo7FyVV4eQtHhbM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "algolia-cli";
|
||||
version = "1.4.3";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algolia";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tKLFJSlViiryH9j4ZaOtj6gA69fp//cG/ftBe2J2R+I=";
|
||||
hash = "sha256-iaqr8/jPYEnOhGoiUC5lmd7l+AAOFh3iYVW+mbBV/V8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk=";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "1.59.2";
|
||||
version = "1.60.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tgDrzYaomB0Pj7JQmvp+8G25CBDxGiMYCUnbm8vRkDU=";
|
||||
hash = "sha256-3uxPHSmIFrkAm82sqQxWKzJwU3cFhTDVsJYp8cENaRg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-egAZ4CeSSStfkN2mGgzGHTBojHKHoVEf3o0oi+OpMkw=";
|
||||
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
"-w"
|
||||
];
|
||||
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.59.2/.github/workflows/release.yaml#L76
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.60.0/.github/workflows/release.yaml#L76
|
||||
preBuild = ''
|
||||
cat > cmd/api-linter/version.go <<EOF
|
||||
package main
|
||||
|
||||
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "azure-storage-azcopy";
|
||||
version = "10.22.0";
|
||||
version = "10.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-storage-azcopy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-njDC1KxxWaeCxALF5MRE/6+z6bcEQt/PTjN29hEg4Hw=";
|
||||
hash = "sha256-WS8h4WRiCTthZOT3NQE8h7BihpaHFfCe39XoGvnDZ1k=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-vHHUbXpO4Z2VKSyA8itywx5oei9bFuSmvW1d7KENeUM=";
|
||||
vendorHash = "sha256-afqDnrmbTR6yZHT7NysysORci4b0Oh0sjpftgAXJ5Uk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, python3Packages, fetchPypi, installShellFiles }:
|
||||
{ lib, python3Packages, fetchPypi, installShellFiles, testers, backblaze-b2 }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "backblaze-b2";
|
||||
@ -36,6 +36,7 @@ python3Packages.buildPythonApplication rec {
|
||||
tqdm
|
||||
platformdirs
|
||||
packaging
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
@ -75,6 +76,15 @@ python3Packages.buildPythonApplication rec {
|
||||
--zsh <(${python3Packages.argcomplete}/bin/register-python-argcomplete backblaze-b2)
|
||||
'';
|
||||
|
||||
passthru.tests.version = (testers.testVersion {
|
||||
package = backblaze-b2;
|
||||
command = "backblaze-b2 version --short";
|
||||
}).overrideAttrs (old: {
|
||||
# workaround the error: Permission denied: '/homeless-shelter'
|
||||
# backblaze-b2 fails to create a 'b2' directory under the XDG config path
|
||||
HOME = "$(mktemp -d)";
|
||||
});
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line tool for accessing the Backblaze B2 storage service";
|
||||
homepage = "https://github.com/Backblaze/B2_Command_Line_Tool";
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bearer";
|
||||
version = "1.33.0";
|
||||
version = "1.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bearer";
|
||||
repo = "bearer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sdtZOj3jksXDVVYi+Uy/zXgZoqlhGlPKjokXNErBe9k=";
|
||||
hash = "sha256-cdD4LYQZwkS5dRhmvyHkio7TXPDgfDo7kutVAGJCitc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u3pqG74o8xRxxepS5u3lTo4rPgbFABDC/dLWD1JAyxA=";
|
||||
vendorHash = "sha256-nh2hkwscb4EYEfumBXPFrLgxIxRlkVqBCnQZ4eMZbgg=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/bearer"
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "changie";
|
||||
version = "1.16.1";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miniscruff";
|
||||
repo = "changie";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NN/ohZPwgvl1ZUqFI06vKfUYs4KG9dtBKSz76+FR6pM=";
|
||||
hash = "sha256-IS4KKvAi4VutJADSpst56ZdeqoqVkSMQ1TyQR12pqNg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40=";
|
||||
|
||||
@ -7,17 +7,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "forgejo-actions-runner";
|
||||
version = "3.0.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
domain = "code.forgejo.org";
|
||||
owner = "forgejo";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-idA74R6kbI7Bk0XvT7BOyctT0IKymsJoFCWgYrtZstU=";
|
||||
hash = "sha256-ZpsHytsIp+ZW4DI7X9MmI7nZRnXVHvx905YdZGS6WMY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HE//SD/doMf42y2KF10JAuUe86hpFhCUM61da2NC5CE=";
|
||||
vendorHash = "sha256-5GnGXpMy1D7KpVAVroX07Vw5QKYYtwdIhQsk23WCLgc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "woodpecker-plugin-git";
|
||||
version = "2.2.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woodpecker-ci";
|
||||
repo = "plugin-git";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BQG1+icfV21qZCwgNvLQm8+1f5WF8owKnQKTIF7O80A=";
|
||||
hash = "sha256-9aK6c2uUBhTzBni6S4XwevdVRxswiMYGJKwmKOGHIbg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ol5k37gGFsyeEnGOVcJaerkIejShHyNCBu4RZ8WyHvU=";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "eask";
|
||||
version = "0.8.1";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eask";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-NoYWRIkJEOUsHsjBYTtCNrCmAGG0pqaAHDOc9VcaRwk=";
|
||||
hash = "sha256-uQHYVhoa0wkpqV3ScQKT1XnMhJQYs/KiFUMkUG2/ll0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ctIVBrx9fagSX3f2/wn5wWkReOYK0nldFoxTJWVsx0g=";
|
||||
npmDepsHash = "sha256-IfuBxU4CNpMUdbGwqykoG7H9LMzrfNbmTN/8VU83ArM=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "just";
|
||||
version = "1.17.0";
|
||||
version = "1.18.1";
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tT8WNenYTLL5dGrRbhfASRMEcyuoHS7RNXpMX/GG+wE=";
|
||||
hash = "sha256-jmTSTx2WSLOtxy0gPCTonjcoy4o9FKA5aiQW3+wPrZQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1R2kl5E5OU3U38LfcBzlvth4bBpVVnbXiet2N5LNNZk=";
|
||||
cargoHash = "sha256-4kbvtmXkU5bhuC079K5NOGKVdqYvTileVNXSNLIV0ok=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles mdbook ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff --git a/go.mod b/go.mod
|
||||
index c523783..1ef8d00 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -9,6 +9,7 @@ require (
|
||||
github.com/imdario/mergo v0.3.9 // indirect
|
||||
github.com/mattn/go-isatty v0.0.12
|
||||
github.com/pkg/errors v0.9.1
|
||||
+ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
|
||||
k8s.io/apimachinery v0.21.0-alpha.1
|
||||
k8s.io/client-go v0.21.0-alpha.1
|
||||
diff --git a/go.sum b/go.sum
|
||||
index 8f16b5a..7426c68 100644
|
||||
--- a/go.sum
|
||||
+++ b/go.sum
|
||||
@@ -293,6 +293,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
|
||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
|
||||
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
+golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80=
|
||||
+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
@ -2,20 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectx";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahmetb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM=";
|
||||
hash = "sha256-HVmtUhdMjbkyMpTgbsr5Mm286F9Q7zbc5rOxi7OBZEg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./bump-golang-x-sys.patch
|
||||
];
|
||||
|
||||
vendorHash = "sha256-p4KUBmJw6hWG1J2qwg4QBbh6Vo1cr/HQz0IqytIDJjU=";
|
||||
vendorHash = "sha256-3xetjviMuH+Nev12DB2WN2Wnmw1biIDAckUSGVRHQwM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vhdl-ls";
|
||||
version = "0.67.0";
|
||||
version = "0.77.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VHDL-LS";
|
||||
repo = "rust_hdl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3ixU1OWRgDNG4aFAZTqqTSt1Hw41mB+mScVsozA01gM=";
|
||||
hash = "sha256-IAe4m/GC6ubCcZZESC6fToWVQT73XrhjJOiGCGzNxnQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SDXWFb0SDMqAmKrPOUryiMgPxv0yffcrqFVvFt4VPS4=";
|
||||
cargoHash = "sha256-p7BL8WuQiB1KihwAl5aeO6Fa9INYRTQgoQPHcSMnaiQ=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vhdl_lang/src/config.rs \
|
||||
|
||||
@ -85,7 +85,7 @@ let
|
||||
extraOutputsToInstall = [ "lib" "out" ];
|
||||
};
|
||||
|
||||
version = "0.82.0";
|
||||
version = "0.83.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "nwjs";
|
||||
@ -96,10 +96,10 @@ stdenv.mkDerivation {
|
||||
in fetchurl {
|
||||
url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz";
|
||||
hash = {
|
||||
"sdk-ia32" = "sha256-aIRnZDslOhoD5F0coX43VNFWGEImPU5oq9Roc4jYfsY=";
|
||||
"sdk-x64" = "sha256-rKbnNAq9AVjSUjTipYze2VHiVi0RnZZsdQj1725DPd0=";
|
||||
"ia32" = "sha256-pA53+A+EtS7m6026jPlC3vFxb2iheS4peDJFNkQAf/s=";
|
||||
"x64" = "sha256-hRih8o8hBbYBEes3Z62PSMIC720SLRa3t2rL/5LaJAE=";
|
||||
"sdk-ia32" = "sha256-Sps0XFOnnJIkDRPI+PJSjseF8cyaYvXXs4ZeVI8mcm8=";
|
||||
"sdk-x64" = "sha256-qsNPfmDQK/BZzMTlX9MDaV7KZsU32YQ1B/Qh/EHIZrQ=";
|
||||
"ia32" = "sha256-99+EU4Kg8lH8facRmIl2SV3GyWUw46rGYpso5QSP//k=";
|
||||
"x64" = "sha256-y0oBVvVguRDe391EsQs6qYqkTRPzUfm50m6NDOZh+7o=";
|
||||
}."${flavor + bits}";
|
||||
};
|
||||
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-mutants";
|
||||
version = "23.12.0";
|
||||
version = "23.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcefrog";
|
||||
repo = "cargo-mutants";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6p+ri6An0rQTPSFUSE4MBNP5dFiVFsS0UDXUoWJoY20=";
|
||||
hash = "sha256-TFVk8uq+wBfCmwU5klqapxp6IeJNnvoH6pDKC8NJuao=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4ej0Pl8n1Z001IdiM1u+/Z7ZTi9hwuoJLA4gHheQOsA=";
|
||||
cargoHash = "sha256-cN7mgyKzuYZT+g8j04Ncqb4s2mwyTsNib5RssrEa2F8=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-run-bin";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-PB44m39TDH1z8N3DrxAlZ/FKOdZmpe+U84tbmBBP9VQ=";
|
||||
hash = "sha256-B4tkP2QuL3MFQn3iAPg4TMJfFbn1D8w/C1OX+TbpgSE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FMlirUr3c8QhnTmTHvfNPff7PYlWSl83vCGLOLbyaR4=";
|
||||
cargoHash = "sha256-tn+NqugSK5R/lIQVF1URWoDbdsSCvi5tjdjOlT293tg=";
|
||||
|
||||
# multiple impurities in tests
|
||||
doCheck = false;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule {
|
||||
pname = "txtpbfmt";
|
||||
version = "unstable-2023-03-28";
|
||||
version = "unstable-2023-10-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protocolbuffers";
|
||||
repo = "txtpbfmt";
|
||||
rev = "3462fbc510c07c0844c2e370719c9c18302f476f";
|
||||
hash = "sha256-vvkZWDGrId164K6jhMXNa5BtOxQSgFDhMACGAH+9F08=";
|
||||
rev = "084445ff1adf0d8a27429bba65dbde5663f02d26";
|
||||
hash = "sha256-SoU1GON9avesty6FSZ+z6o2JHInUtwv+PVOzqCu+8L8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vendir";
|
||||
version = "0.37.0";
|
||||
version = "0.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-vendir";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AxHVr6XryTXqm+iL54eqxIRE2MfxLbwFz7+aCauP0x8=";
|
||||
sha256 = "sha256-H5SeDZzl2KdVp3KsRpsmp6/ZOxLq+3y9Coe1NIEi5YQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "web-ext";
|
||||
version = "7.6.2";
|
||||
version = "7.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "web-ext";
|
||||
rev = version;
|
||||
hash = "sha256-tFMngcoHFA3QmR0AK68elUVpli37PsVlcL978o7DQCs=";
|
||||
hash = "sha256-7fBUWQFUsIGQnyNhZISvdtAQMAMZ38mbzGuC+6Cwu1Y=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-KPBKUjCxva11w/E+Qhlx+1vikpCL7Hr9MiKenYHEVSU=";
|
||||
npmDepsHash = "sha256-3Dq4sNPZm9fDxPxOZL+rDxFA/FEs2/+zdz8sF3JFJ3s=";
|
||||
|
||||
npmBuildFlags = [ "--production" ];
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, zlib }:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.5.1";
|
||||
version = "0.5.3";
|
||||
pname = "wiiload";
|
||||
|
||||
nativeBuildInputs = [ autoconf automake ];
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "devkitPro";
|
||||
repo = "wiiload";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dffy603zggkqv7g1a2jninmi64vy519gpgkdfhjnijhdm9gs5m3";
|
||||
sha256 = "sha256-pZdZzCAPfAVucuiV/q/ROY3cz/wxQWep6dCTGNn2fSo=";
|
||||
};
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ytt";
|
||||
version = "0.46.2";
|
||||
version = "0.46.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-ytt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r9LQMQffnc/g1WFJU8m+Oy0hD+DudCNiVAcbAAPy1vI=";
|
||||
sha256 = "sha256-K2+5NplyQuvc78NnNDiQhfrewqn84jDbiAyN8J9iTm0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -57,7 +57,7 @@ buildGoModule rec {
|
||||
downloadPage = "https://github.com/superfly/flyctl";
|
||||
homepage = "https://fly.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ aaronjanse adtya jsierles techknowlogick viraptor ];
|
||||
maintainers = with maintainers; [ adtya jsierles techknowlogick viraptor ];
|
||||
mainProgram = "flyctl";
|
||||
};
|
||||
}
|
||||
|
||||
@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vcmi";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vcmi";
|
||||
repo = "vcmi";
|
||||
rev = version;
|
||||
hash = "sha256-MhY3tpKlrIgq6QXZwAkMnObYYpUxsPcysTR5CZH1rhE=";
|
||||
hash = "sha256-5G6qmn2b1/0h7aGNNx4t38Akzg2bZFKubOp3FLqSi+I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -66,6 +66,8 @@ python3Packages.buildPythonApplication {
|
||||
perl
|
||||
zlib
|
||||
avahi
|
||||
] ++ lib.optionals withQt5 [
|
||||
qt5.qtwayland
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -237,6 +239,8 @@ python3Packages.buildPythonApplication {
|
||||
# 1. Calling patchPythonProgram on the original script in $out/share/hplip
|
||||
# 2. Making our own wrapper pointing directly to the original script.
|
||||
dontWrapPythonPrograms = true;
|
||||
# We also avoid double wrapping in case we add qt5 support
|
||||
dontWrapQtApps = true;
|
||||
preFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
|
||||
@ -246,7 +250,7 @@ python3Packages.buildPythonApplication {
|
||||
echo "patching \`$py'..."
|
||||
patchPythonScript "$py"
|
||||
echo "wrapping \`$bin'..."
|
||||
makeWrapper "$py" "$bin" \
|
||||
${if withQt5 then "makeQtWrapper" else "makeWrapper"} "$py" "$bin" \
|
||||
--prefix PATH ':' "$program_PATH" \
|
||||
--set PYTHONNOUSERSITE "true" \
|
||||
$makeWrapperArgs
|
||||
@ -264,10 +268,6 @@ python3Packages.buildPythonApplication {
|
||||
--replace {,${util-linux}/bin/}logger \
|
||||
--replace {/usr,$out}/bin
|
||||
remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so)
|
||||
'' + lib.optionalString withQt5 ''
|
||||
for f in $out/bin/hp-*;do
|
||||
wrapQtApp $f
|
||||
done
|
||||
'';
|
||||
|
||||
# There are some binaries there, which reference gcc-unwrapped otherwise.
|
||||
|
||||
@ -1,41 +1,58 @@
|
||||
{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, fuse
|
||||
, util-linux, makeWrapper
|
||||
, enableDebugBuild ? config.lxcfs.enableDebugBuild or false }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fuse3,
|
||||
help2man,
|
||||
makeWrapper,
|
||||
meson,
|
||||
ninja,
|
||||
nixosTests,
|
||||
pkg-config,
|
||||
python3,
|
||||
util-linux,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxcfs";
|
||||
version = "4.0.12";
|
||||
version = "5.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "lxcfs";
|
||||
rev = "lxcfs-${version}";
|
||||
sha256 = "sha256-+wp29GD+toXGfQbPGYbDJ7/P+FY1uQY4uK3OQxTE9GM=";
|
||||
sha256 = "sha256-vusxbFV7cnQVBOOo7E+fSyaE63f5QiE2xZhYavc8jJU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '1i #include <sys/pidfd.h>' src/bindings.c
|
||||
'';
|
||||
patches = [
|
||||
# skip RPM spec generation
|
||||
./no-spec.patch
|
||||
|
||||
nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ];
|
||||
buildInputs = [ fuse ];
|
||||
# skip installing systemd files
|
||||
./skip-init.patch
|
||||
|
||||
preConfigure = lib.optionalString enableDebugBuild ''
|
||||
sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-init-script=systemd"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
# fix pidfd checks and include
|
||||
./pidfd.patch
|
||||
];
|
||||
|
||||
installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
help2man
|
||||
makeWrapper
|
||||
ninja
|
||||
(python3.withPackages (p: [ p.jinja2 ]))
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [ fuse3 ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs tools/
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# `mount` hook requires access to the `mount` command from `util-linux`:
|
||||
wrapProgram "$out/share/lxcfs/lxc.mount.hook" \
|
||||
--prefix PATH : "${util-linux}/bin"
|
||||
wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : "${util-linux}/bin"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
@ -43,6 +60,10 @@ stdenv.mkDerivation rec {
|
||||
patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
incus-container = nixosTests.incus.container;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "FUSE filesystem for LXC";
|
||||
homepage = "https://linuxcontainers.org/lxcfs";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user