Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
39c5241474
@ -2477,6 +2477,12 @@
|
||||
githubId = 50839;
|
||||
name = "Brian Jones";
|
||||
};
|
||||
boltzmannrain = {
|
||||
email = "boltzmannrain@gmail.com";
|
||||
github = "boltzmannrain";
|
||||
githubId = 150560585;
|
||||
name = "Dmitry Ivankov";
|
||||
};
|
||||
booklearner = {
|
||||
name = "booklearner";
|
||||
email = "booklearner@proton.me";
|
||||
@ -10968,6 +10974,12 @@
|
||||
githubId = 1651325;
|
||||
name = "maralorn";
|
||||
};
|
||||
marcovergueira = {
|
||||
email = "vergueira.marco@gmail.com";
|
||||
github = "marcovergueira";
|
||||
githubId = 929114;
|
||||
name = "Marco Vergueira";
|
||||
};
|
||||
marcus7070 = {
|
||||
email = "marcus@geosol.com.au";
|
||||
github = "marcus7070";
|
||||
|
||||
@ -68,7 +68,7 @@ services.forgejo = {
|
||||
database.user = "gitea";
|
||||
};
|
||||
|
||||
users.users,gitea = {
|
||||
users.users.gitea = {
|
||||
home = "/var/lib/gitea";
|
||||
useDefaultShell = true;
|
||||
group = "gitea";
|
||||
|
||||
@ -277,7 +277,7 @@ def install_bootloader(args: argparse.Namespace) -> None:
|
||||
|
||||
if installed_version < available_version:
|
||||
print("updating systemd-boot from %s to %s" % (installed_version, available_version))
|
||||
subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"])
|
||||
subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"])
|
||||
|
||||
os.makedirs("@efiSysMountPoint@/efi/nixos", exist_ok=True)
|
||||
os.makedirs("@efiSysMountPoint@/loader/entries", exist_ok=True)
|
||||
|
||||
@ -1293,6 +1293,7 @@ let
|
||||
"FirewallMark"
|
||||
"Wash"
|
||||
"SplitGSO"
|
||||
"AckFilter"
|
||||
])
|
||||
(assertValueOneOf "AutoRateIngress" boolValues)
|
||||
(assertInt "OverheadBytes")
|
||||
@ -1325,6 +1326,7 @@ let
|
||||
(assertRange "FirewallMark" 1 4294967295)
|
||||
(assertValueOneOf "Wash" boolValues)
|
||||
(assertValueOneOf "SplitGSO" boolValues)
|
||||
(assertValueOneOf "AckFilter" (boolValues ++ ["aggressive"]))
|
||||
];
|
||||
|
||||
sectionControlledDelay = checkUnitConfig "ControlledDelay" [
|
||||
|
||||
@ -56,6 +56,11 @@ in
|
||||
efiInstallAsRemovable = true;
|
||||
};
|
||||
|
||||
fileSystems."/boot" = mkIf cfg.efi {
|
||||
device = "/dev/disk/by-label/ESP";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
|
||||
name = "google-compute-image";
|
||||
postVM = ''
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{
|
||||
"version": "3.178.4",
|
||||
"version": "3.181.23",
|
||||
"deb": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-amd64.deb",
|
||||
"hash": "sha512-6er/a9PqhKU4aagAxsbVdoXbRBNUr3Fa8BPWfuQ74Q4ai+iYlPjd4q50cTJQ4wJ5ucGyopgBEJq4/xYNunw6Ig=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.181.23/standard-notes-3.181.23-linux-amd64.deb",
|
||||
"hash": "sha512-zWjST3guI0qifvZIwSLJ0nIpU12Mu3+m25Xdoqv0BQC7tscChEdCGUAJRUKHEf0b8l4uvp8qBGHiBOfbrIi//w=="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-arm64.deb",
|
||||
"hash": "sha512-lvvXCK3XOIH9HS1EU5eVBo4W8VoE4iM1Ve1XkZ/CysYBYLaXojXyybeN5Iw1Rmuk3trq/7RebjkNx/rxhsU0LQ=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.181.23/standard-notes-3.181.23-linux-arm64.deb",
|
||||
"hash": "sha512-7R5Ym44mrVgUiqdt6NL8F9uUUOroQRxwn30xKThyIQm2HGRUJivRfOws98El9zV8bKG1khk4DZaMiLQSMjrtaQ=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,25 +9,25 @@
|
||||
let
|
||||
|
||||
pname = "1password";
|
||||
version = if channel == "stable" then "8.10.18" else "8.10.20-1.BETA";
|
||||
version = if channel == "stable" then "8.10.20" else "8.10.20-1.BETA";
|
||||
|
||||
sources = {
|
||||
stable = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
hash = "sha256-3oK8Jzz4+TY4IW8oAenzHo7KQeP58iZ+on5PNliBn7I=";
|
||||
hash = "sha256-KOKqI64uI454ryLy/zdD0jxgY3GekBFoh028ftt1Twg=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
|
||||
hash = "sha256-OsmgHPlAt9K7ytXMM8BANGcKcD3U1OLd2MLfOS4lc6Q=";
|
||||
hash = "sha256-8MDJFG5d81Alxs1hqLw7DP+Pte+haGKfiZ/erGvks5A=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
hash = "sha256-wozym2QOLLUf4F+MwdIZfwN+VHkNewB+ZJZEkVNnb/c=";
|
||||
hash = "sha256-T+f19Q/pzsC6lh8OF/w/pzRLBfAdlk1gwQz8funkx8Q=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
hash = "sha256-v1FZIsvFyIx81BORgDtZBP9jTRY6/0p537trOGf8mcM=";
|
||||
hash = "sha256-kmal5wfqCKAlg7c+xVHM39qrucr+Kaxr4pNBYwKfs5g=";
|
||||
};
|
||||
};
|
||||
beta = {
|
||||
|
||||
@ -12,12 +12,12 @@ let
|
||||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
pname = "1password-cli";
|
||||
version = "2.22.0";
|
||||
version = "2.23.0";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-MWNbwCJ5ltAV1qmy8LPYkb6VTH0UVi2S5QEZZfpcnGM=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-lqwEm7fCiM2WNZvlAt/HeqI2zxnal/OMbTMGvvmXkvY=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-GfQ441a5mIgCTtxnk6L9UXodNGXek7f/jxJXWYJUb+0=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-yF0dy4MUgvSJUremXFfxCIHcGmYrCcjofcv1sBD9qyI=" "pkg";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-WBUHS1qoKHGJb6ktw8BD3V0H0419BO3EyTh675UnZRA=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-pulMvdE8COwRBk3IBBXqYPk2+A1XuCN9TxtGqm1HFeM=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-w0ieg9MxjmkABc4LRZIGyfDjbOter0pKRigLZBhosz4=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-fRkvkLnhr0oZCcCGhQd53Oj8uTxsgaSUkxD7p7CPOwI=" "pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
platforms = builtins.attrNames sources;
|
||||
|
||||
@ -18,17 +18,10 @@ let
|
||||
maintainers = with maintainers; [ mjanczyk svsdep mgregoire ];
|
||||
};
|
||||
|
||||
pluginFilename = "KeePassRPC.plgx";
|
||||
|
||||
unpackCmd = ''
|
||||
mkdir deps/
|
||||
cp -p $src deps/$pluginFilename
|
||||
'';
|
||||
sourceRoot = "deps";
|
||||
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/dotnet/keepass/
|
||||
cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename
|
||||
cp $src $out/lib/dotnet/keepass/
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.28.3";
|
||||
version = "1.28.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lb9FAk3b6J92viyHzLCzbYRxhQS94/FQvDr1m1kdTq8=";
|
||||
hash = "sha256-aaGcAIyy0hFJGFfOq5FaF0qAlygXcs2WcwgvMe5dkbo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.11.3";
|
||||
version = "1.11.4";
|
||||
pname = "session-desktop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
hash = "sha256-HdgW7Ls0h75BXKXGzzf37K9w4bgkfA9eAUEmBrSDT+U=";
|
||||
hash = "sha256-fSa113BYpTZ4jvxroQsoslAkWfQr4/ROkgVOFyiVsKQ=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||
signal-desktop = {
|
||||
dir = "Signal";
|
||||
version = "6.38.0";
|
||||
hash = "sha256-y2mwO7Qc01vuIeJUcAxYDD97DXOwXCd8wNZmkG4maF0=";
|
||||
version = "6.39.0";
|
||||
hash = "sha256-cG8ZFWpx92haTgMkpMMcFDV0OB7lmU540g9fNj4ofy8=";
|
||||
};
|
||||
signal-desktop-beta = {
|
||||
dir = "Signal Beta";
|
||||
version = "6.39.0-beta.2";
|
||||
hash = "sha256-1+1wvkMtEovBBs2bS9zUV5kpSxkPy0EqBAU01el8uko=";
|
||||
version = "6.40.0-beta.1";
|
||||
hash = "sha256-daXh1Uh2lHw0NA/j7qhQK7nrVljbr/fP2iLjcqnuvns=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pan";
|
||||
version = "0.154";
|
||||
version = "0.155";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-o+JFUraSoQ0HDmldHvTX+X7rl2L4n4lJmI4UFZrsfkQ=";
|
||||
hash = "sha256-DsoTqZLcZOc3HlpCC8rmu/rcFeHkb9IWd4PSLwxKqJI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ];
|
||||
|
||||
@ -8,6 +8,8 @@
|
||||
, flask
|
||||
, flask-httpauth
|
||||
, flask-socketio
|
||||
, gevent-socketio
|
||||
, gevent-websocket
|
||||
, cepa
|
||||
, psutil
|
||||
, pyqt5
|
||||
@ -80,6 +82,8 @@ rec {
|
||||
flask
|
||||
flask-httpauth
|
||||
flask-socketio
|
||||
gevent-socketio
|
||||
gevent-websocket
|
||||
cepa
|
||||
psutil
|
||||
pycrypto
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.9.4";
|
||||
version = "1.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3SQ3a1gg4/cXy8BJXazTgh6nkS/KQpM0fCA6JcbHOPc=";
|
||||
hash = "sha256-uCWdDmHzNx1vkZFttQZLD4YfXoXz5VZQfir9sGOoDhw=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
--replace "-Wl,-ld_classic" ""
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler"
|
||||
sed -i "/hdiutil/d" src/CMakeLists.txt
|
||||
sed -i "/codesign/d;/hdiutil/d" src/CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,69 +1,69 @@
|
||||
{
|
||||
"x86_64-linux": {
|
||||
"libpicocv": {
|
||||
"sha256": "feddc1cb9082005e80c4e2c2732ee4c537915c463ea327aa53a642aab95b8691",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.33-beta2r167_amd64.deb",
|
||||
"version": "1.1.33-beta2r167"
|
||||
"sha256": "c0c5bec33c2c7fdd0f26b035ed942175f87012e33d6764c3abf1da31b5626037",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.34-beta2r172_amd64.deb",
|
||||
"version": "1.1.34-beta2r172"
|
||||
},
|
||||
"libpicoipp": {
|
||||
"sha256": "2d749b8fd5dbd811c270e4aa78c5ee9cd33832b90d089ae386b0f85aed2d0204",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r136_amd64.deb",
|
||||
"version": "1.4.0-4r136"
|
||||
"sha256": "4a84f0af7f4e8cba91fad620eac0cd23c36b2fdda4637904be564286b10ffe1d",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r161_amd64.deb",
|
||||
"version": "1.4.0-4r161"
|
||||
},
|
||||
"libps2000": {
|
||||
"sha256": "d306890d1e87651ae83ef00143c8e62b82fae2be39886b6884408751cb910fa4",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.89-3r3163_amd64.deb",
|
||||
"version": "3.0.89-3r3163"
|
||||
"sha256": "473b065e79a7414c1e2b8c8468c8d2654333ac28f3a8c33b535626b33c60d2ca",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.127-3r5552_amd64.deb",
|
||||
"version": "3.0.127-3r5552"
|
||||
},
|
||||
"libps2000a": {
|
||||
"sha256": "38391dfbe6c6c04ba5b5c99bd53404d5342e40c9eca703e3d95cbc6302114270",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.89-5r3163_amd64.deb",
|
||||
"version": "2.1.89-5r3163"
|
||||
"sha256": "8eba0052f9c7ef327710f2fba5aa11bec0c20225b39d77bb7b69cf80055c039c",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.127-5r5552_amd64.deb",
|
||||
"version": "2.1.127-5r5552"
|
||||
},
|
||||
"libps3000": {
|
||||
"sha256": "39b4b56a839eb5d7abcf1de2bab472c2de2d8aa5ffc3ba445e99d5aa8178ba07",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.89-3r3163_amd64.deb",
|
||||
"version": "4.0.89-3r3163"
|
||||
"sha256": "4e786036b8de0dd0f922aed947f30a53d31bed46b2df5132e8c9480c8a5d93e9",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.127-3r5552_amd64.deb",
|
||||
"version": "4.0.127-3r5552"
|
||||
},
|
||||
"libps3000a": {
|
||||
"sha256": "ea96735b90d02c72c9c7b517413fed0d366ac634100e22467a39c780985669e4",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.89-6r3163_amd64.deb",
|
||||
"version": "2.1.89-6r3163"
|
||||
"sha256": "d2bb1e5bb151b0953ed30ca5421bb93d05dab898c33cdc89927e943ea991867a",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.127-6r5552_amd64.deb",
|
||||
"version": "2.1.127-6r5552"
|
||||
},
|
||||
"libps4000": {
|
||||
"sha256": "7177cd4debf811fa7d7105703a4fc546fe1a79fc3275e3f36326b014c1334f55",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.89-2r3163_amd64.deb",
|
||||
"version": "2.1.89-2r3163"
|
||||
"sha256": "4c127e67949835b5ab5c5c8caa55f73c69df354d761aa53d6df99c8f8ac39009",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.127-2r5552_amd64.deb",
|
||||
"version": "2.1.127-2r5552"
|
||||
},
|
||||
"libps4000a": {
|
||||
"sha256": "ebe94d6d9f349e5082dcbed55d059ac77c0129b967467786d1cef3f662ebac99",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.89-2r3163_amd64.deb",
|
||||
"version": "2.1.89-2r3163"
|
||||
"sha256": "26df82bc946e5bb30d599c4c365247bdbaa01e830d4d00630b46a6abcc1eef04",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.127-2r5552_amd64.deb",
|
||||
"version": "2.1.127-2r5552"
|
||||
},
|
||||
"libps5000": {
|
||||
"sha256": "732164658acb4bdfdbf3fc785419ea6a4944ed2892be9dde134b345a976c3318",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.89-3r3163_amd64.deb",
|
||||
"version": "2.1.89-3r3163"
|
||||
"sha256": "106ef17862e98c3621f95c377f271c843664f481f84ef918d9eadd013561cd1b",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.127-3r5552_amd64.deb",
|
||||
"version": "2.1.127-3r5552"
|
||||
},
|
||||
"libps5000a": {
|
||||
"sha256": "3438f51c8646e3ac5a479c88aa7a89b3dfcce2090720317b4efb8db538372cdb",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.89-5r3163_amd64.deb",
|
||||
"version": "2.1.89-5r3163"
|
||||
"sha256": "fe9def134ef9df6654485911f14ece7b2ee3d79113aeee7826dd6e36bb5de3b4",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.127-5r5552_amd64.deb",
|
||||
"version": "2.1.127-5r5552"
|
||||
},
|
||||
"libps6000": {
|
||||
"sha256": "fe4165ab0d323728b473347b61439b074486809d673e47f169d0062cf917191c",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.89-6r3163_amd64.deb",
|
||||
"version": "2.1.89-6r3163"
|
||||
"sha256": "9b08c5b7fb2d34b0e2e98f2e0452a59105f612cd445a9e45d3cac14d931d18f2",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.127-6r5552_amd64.deb",
|
||||
"version": "2.1.127-6r5552"
|
||||
},
|
||||
"libps6000a": {
|
||||
"sha256": "0552811f92a015ef47b09947631f5f5d8c30b122425de083bea79df88957a9c7",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.89-0r3163_amd64.deb",
|
||||
"version": "1.0.89-0r3163"
|
||||
"sha256": "2a23ccad72b9be83b87d449b6bb8ded23fd29c85ec9f78a45b6d45b38ccf335b",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.127-0r5552_amd64.deb",
|
||||
"version": "1.0.127-0r5552"
|
||||
},
|
||||
"picoscope": {
|
||||
"sha256": "b060edb02bc2de5d10a45d31d4b7f9c767d18511e2f65a1ebdd70cc3e8780262",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.100-1r11387_amd64.deb",
|
||||
"version": "7.0.100-1r11387"
|
||||
"sha256": "d95f269171da7273b596dae95452789e889f12ef0f15c3baea26dd1b3a8117fc",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.1.17-1r17318_amd64.deb",
|
||||
"version": "7.1.17-1r17318"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, darwin
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, nixosTests
|
||||
@ -14,18 +16,21 @@
|
||||
, vulkan-loader
|
||||
, libxkbcommon
|
||||
|
||||
, withX11 ? true
|
||||
, withX11 ? !stdenv.isDarwin
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXi
|
||||
, libXrandr
|
||||
, libxcb
|
||||
|
||||
, withWayland ? true
|
||||
, withWayland ? !stdenv.isDarwin
|
||||
, wayland
|
||||
}:
|
||||
let
|
||||
rlinkLibs = [
|
||||
rlinkLibs = if stdenv.isDarwin then [
|
||||
darwin.libobjc
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
] else [
|
||||
(lib.getLib gcc-unwrapped)
|
||||
fontconfig
|
||||
libGL
|
||||
@ -55,9 +60,10 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoHash = "sha256-XD+/DaaJEJ9jHZITTUma/wfsbduPUTc/SralPOx46Yo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
ncurses
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
runtimeDependencies = rlinkLibs;
|
||||
@ -67,10 +73,9 @@ rustPlatform.buildRustPackage rec {
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
(lib.optionalString withX11 "x11")
|
||||
(lib.optionalString withWayland "wayland")
|
||||
];
|
||||
buildFeatures = [ ]
|
||||
++ lib.optional withX11 "x11"
|
||||
++ lib.optional withWayland "wayland";
|
||||
|
||||
checkFlags = [
|
||||
# Fail to run in sandbox environment.
|
||||
@ -86,6 +91,11 @@ rustPlatform.buildRustPackage rec {
|
||||
tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo
|
||||
mkdir -p $out/nix-support
|
||||
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir $out/Applications/
|
||||
mv misc/osx/Rio.app/ $out/Applications/
|
||||
mkdir $out/Applications/Rio.app/Contents/MacOS/
|
||||
ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -7,19 +7,20 @@
|
||||
, json-glib
|
||||
, libinput
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, wrapGAppsHook4
|
||||
, libxkbcommon
|
||||
, pkg-config
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "showmethekey";
|
||||
version = "1.8.1";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlynxZhou";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IfegYHHFbZbMTA8JWXAun9Gl3BpykH/5RqUIrlYlLhk=";
|
||||
hash = "sha256-eeObomb4Gv/vpvViHsi3+O0JR/rYamrlZNZaXKL6KJw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
libadwaita
|
||||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.7.8";
|
||||
version = "1.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-p16qHJD0i0ZNEFGEbfmbxiedX9/uHkZxhCeB3x/5iLM=";
|
||||
hash = "sha256-/kCnzOL8CJuJJglHzmev3alt8cMwTUbIiZhNft9zwps=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, libevdev
|
||||
, libinput
|
||||
, libxkbcommon
|
||||
, xcbutilwm
|
||||
, makeWrapper
|
||||
, mesa
|
||||
, meson
|
||||
@ -24,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cagebreak";
|
||||
version = "1.9.1";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-repo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-pU1QHYOqnkb3L4iSKbZY9Vo60Z6EaX9mp2Nw48NSPic=";
|
||||
hash = "sha256-cJEJ8V9lDbNb07eY3nWmNcT7ULGlcmOeyb9UDOLGWfI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
|
||||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
xcbutilwm
|
||||
mesa # for libEGL headers
|
||||
pango
|
||||
pixman
|
||||
@ -69,6 +71,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Patch cagebreak to read its default configuration from $out/share/cagebreak
|
||||
sed -i "s|/etc/xdg/cagebreak|$out/share/cagebreak|" meson.build cagebreak.c
|
||||
substituteInPlace meson.build \
|
||||
--replace "/usr/share/licenses" "$out/share/licenses"
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString withXwayland ''
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.163.0";
|
||||
version = "0.164.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rpyLjoHMSgEHTILeEQpUKD7BOJHn/uT3GK6Fquirzdk=";
|
||||
hash = "sha256-ENlMcwk4bMbIzV353vt+EG776+/ajrg5la3JeA81QS4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NOhssVWEkvoXpmnsCVVT7Li0ePGWDSGIlB2MyFtMnpI=";
|
||||
|
||||
40
pkgs/by-name/ho/hof/package.nix
Normal file
40
pkgs/by-name/ho/hof/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hof";
|
||||
version = "0.6.9-beta.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hofstadter-io";
|
||||
repo = "hof";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4yVP6DRHrsp52VxBhr7qppPhInYEsvPbIfxxQcRwHTw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-cDUcYwcxPn+9TEP5lhVJXofijCZX94Is+Qt41PqUgjI=";
|
||||
|
||||
subPackages = [ "./cmd/hof/main.go" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/main $out/bin/hof
|
||||
local INSTALL="$out/bin/hof"
|
||||
installShellCompletion --cmd hof \
|
||||
--bash <($out/bin/hof completion bash) \
|
||||
--fish <($out/bin/hof completion fish) \
|
||||
--zsh <($out/bin/hof completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/hofstadter-io/hof";
|
||||
description = "Framework that joins data models, schemas, code generation, and a task engine. Language and technology agnostic";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jfvillablanca ];
|
||||
mainProgram = "hof";
|
||||
};
|
||||
}
|
||||
@ -8,7 +8,6 @@
|
||||
, flatpak
|
||||
, fwupd
|
||||
, ostree
|
||||
, packagekit-qt
|
||||
, pcre
|
||||
, util-linux
|
||||
, qtquickcontrols2
|
||||
@ -42,7 +41,6 @@ mkDerivation {
|
||||
flatpak
|
||||
fwupd
|
||||
ostree
|
||||
packagekit-qt
|
||||
pcre
|
||||
util-linux
|
||||
qtquickcontrols2
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmlada";
|
||||
version = "23.0.0";
|
||||
version = "24.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "xmlada-${version}-src";
|
||||
owner = "AdaCore";
|
||||
repo = "xmlada";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-covcSwlQQjRKTv0DdMEgahXXlch0TeKnvSyOsGO9+e0=";
|
||||
sha256 = "sha256-vvM7bdf3dAa3zKgxbGeAGlBT6fvafzmleimJHyRdlvc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imgui";
|
||||
version = "1.89.9";
|
||||
version = "1.90";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocornut";
|
||||
repo = "imgui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU=";
|
||||
sha256 = "sha256-rJMWCPVhho34NcPvJZaB5d6EbZkJyLXEfeotplOOaiA=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchNpmDeps
|
||||
, buildPythonPackage
|
||||
, nix-update-script
|
||||
|
||||
# build-system
|
||||
, gettext
|
||||
@ -19,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-hijack";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-hijack";
|
||||
repo = "django-hijack";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-y8KT/Fbk2eQDbGzcJtLdwS6jPCNoTWXousvqY+GlFnQ=";
|
||||
hash = "sha256-E5gM/5MIB65gdyv/I+Kuw8rbjPvtUnbCPXpasaIDzyo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -39,7 +40,7 @@ buildPythonPackage rec {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-FLfMCn2jsLlTTsC+LRMX0dmVCCbNAr2pQUsSQRKgo6E=";
|
||||
hash = "sha256-4ZVb+V/oYfflIZdme6hbpoSBFVV7lk5wLfEzzBqZv/Y=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@ -67,6 +68,9 @@ buildPythonPackage rec {
|
||||
"-W" "ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
# needed for npmDeps update
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows superusers to hijack (=login as) and work on behalf of another user";
|
||||
homepage = "https://github.com/arteria/django-hijack";
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lightning-utilities";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lightning-AI";
|
||||
repo = "utilities";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vSeHtvsIt4L4qJCVlTPVjIjd62+08JWBnr9+9+ujOfw=";
|
||||
hash = "sha256-lp/+ArgoMIa7Q2ufWghr8OYUMlFcj8123Et73ORNI5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
33
pkgs/development/python-modules/mitmproxy-macos/default.nix
Normal file
33
pkgs/development/python-modules/mitmproxy-macos/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy-macos";
|
||||
version = "0.3.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitmproxy";
|
||||
repo = "mitmproxy_rs";
|
||||
rev = version;
|
||||
hash = "sha256-V6LUr1jJiTo0+53jipkTyzG5JSw6uHaS6ziyBaFbETw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/mitmproxy-macos";
|
||||
pythonImportsCheck = [ "mitmproxy_macos" ];
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The MacOS Rust bits in mitmproxy";
|
||||
homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-macos";
|
||||
changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ boltzmannrain ];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -4,6 +4,8 @@
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, darwin
|
||||
, libiconv
|
||||
, mitmproxy-macos
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -34,13 +36,15 @@ buildPythonPackage rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
libiconv
|
||||
mitmproxy-macos
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mitmproxy_rs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Rust bits in mitmproxy";
|
||||
homepage = " https://github.com/mitmproxy/mitmproxy_rs";
|
||||
homepage = "https://github.com/mitmproxy/mitmproxy_rs";
|
||||
changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, stdenv
|
||||
# Mitmproxy requirements
|
||||
, aioquic
|
||||
, asgiref
|
||||
@ -15,6 +16,7 @@
|
||||
, hyperframe
|
||||
, kaitaistruct
|
||||
, ldap3
|
||||
, mitmproxy-macos
|
||||
, mitmproxy-rs
|
||||
, msgpack
|
||||
, passlib
|
||||
@ -81,6 +83,8 @@ buildPythonPackage rec {
|
||||
urwid
|
||||
wsproto
|
||||
zstandard
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
mitmproxy-macos
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "siobrultech-protocols";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "sdwilsh";
|
||||
repo = "siobrultech-protocols";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-71iFZS5CLYXNw57psLXswNJKfvbeKOqSncLoSsNXqjc=";
|
||||
hash = "sha256-6BGhelyv0FoPyGwzgIX5Gbbu9Ks19MtL1AZQRZWKzhM=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -1,23 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "7.4.0";
|
||||
format = "setuptools";
|
||||
version = "7.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Pcfdgjk20yYt1DCr5XQ4rzLokQNS27NOspa/21nvCuw=";
|
||||
hash = "sha256-duDfcHHaXvORNNkpuMf6zxMZqkfCIr8ScrSKxVq/PW8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
typing-extensions
|
||||
|
||||
@ -1,29 +1,44 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, responses
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "testrail-api";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tolstislon";
|
||||
repo = "testrail-api";
|
||||
rev = version;
|
||||
sha256 = "sha256-VuAW5Dl3pkA6mtn/mbzxTFoavO5jPoqFSFVlrxc7KRk=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-lIlTrAdNtBJdwiSFwpcHA2e+fRC+MbHS0PX7prAN+RY=";
|
||||
};
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
responses
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
pythonImportsCheck = [
|
||||
"testrail_api"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xlsxwriter";
|
||||
version = "3.1.7";
|
||||
version = "3.1.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "jmcnamara";
|
||||
repo = "XlsxWriter";
|
||||
rev = "RELEASE_${version}";
|
||||
hash = "sha256-ZOKS9sTZvlopfIYOEhOk/rq4qtcMrNQ4Bwb8lDtKfxs=";
|
||||
hash = "sha256-FkSInLinyn/eXBMSuivzFxCTZijOKdSG4l+gHyKENuY=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -30,6 +30,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Module for creating Excel XLSX files";
|
||||
homepage = "https://xlsxwriter.readthedocs.io/";
|
||||
changelog = "https://xlsxwriter.readthedocs.io/changes.html";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "sigma67";
|
||||
repo = "ytmusicapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6dsMOFyZ8cX2zKXX682b5znJvXYTeKt99Wafz7RkfQw=";
|
||||
hash = "sha256-vDkrKVqyisPkswvfb+UPH95mehwNgyFxRmeT+1UHvXs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazelisk";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NZDdSIXNQFSCoav+YN1VLFrHQSKZfoZDp2TWXtmQC6o=";
|
||||
sha256 = "sha256-no1+sQ+8Ead1diCYytC3MXVA68SuWWxt40OFVrGWYdQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oYagIEb/u/XCTbZkvynxcOtORhW75hReinrVAkdOApM=";
|
||||
vendorHash = "sha256-hjV7Pc3DFExSCsA0jKVxb1GxoXQ7LRFGuot3V0IHG58=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sqlcmd";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "go-sqlcmd";
|
||||
owner = "microsoft";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SSt3QOc8eKpcCHxfOuY+eAkH/xiFBUp2bJ9QXP9pq9M=";
|
||||
sha256 = "sha256-T7Jfxup3yTh0YhalUO/wxyAT4209BhZkUTbCGZggcJ0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ODIDlP0w3t1t7H5jevXkKmFpWVSJFUwmT66LOS+ySI4=";
|
||||
vendorHash = "sha256-NYWmTXGxt2ko/puNiY2Z0K6gFZW4IC//iT6xQcqSVsQ=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kafkactl";
|
||||
version = "3.4.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deviceinsight";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8/MqcJ7kxlmVkZCa7PWZ6kzo6D/9Zwx2rOJs675mJUE=";
|
||||
hash = "sha256-HGOLPns7kBq02hF5TVs0DdTdJ+16JGs996JZ66k83Os=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5LHL0L7xTmy3yBs7rtrC1uvUjLKBU8LpjQaHyeRyFhw=";
|
||||
vendorHash = "sha256-jUuJBGEb4pSdyuRd3qHINyC8aRwqyJnsb/raM9nEh84=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubepug";
|
||||
version = "1.5.1";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rikatz";
|
||||
owner = "kubepug";
|
||||
repo = "kubepug";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HjnkGEzTobtILqML5xcjpYVtg6a5PqMKYyaGTYrqEDo=";
|
||||
hash = "sha256-VNxaYQy81U0JWd6KS0jCvMexpyWL4v1cKpjxLRkxBLE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w2WwJa8qaXmgFwZJo2r2TowcTehgQY0nGY4u1UROaxM=";
|
||||
vendorHash = "sha256-HVsaQBd7fSZp2fOpOOmlDhYrHcHqWKiYWPFLQX0azEw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@ -19,13 +19,9 @@ buildGoModule rec {
|
||||
"-X sigs.k8s.io/release-utils/version.gitVersion=${version}"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./skip-external-network-tests.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Checks a Kubernetes cluster for objects using deprecated API versions";
|
||||
homepage = "https://github.com/rikatz/kubepug";
|
||||
homepage = "https://github.com/kubepug/kubepug";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mausch ];
|
||||
};
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/pkg/utils/downloader_test.go b/pkg/utils/downloader_test.go
|
||||
index b227760..b72dee9 100644
|
||||
--- a/pkg/utils/downloader_test.go
|
||||
+++ b/pkg/utils/downloader_test.go
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
)
|
||||
|
||||
func TestDownloadSwaggerFile(t *testing.T) {
|
||||
+ t.Skipf("Nix sandbox does not have networking")
|
||||
var tmpdir string
|
||||
// Github actions does not have a temporary dir :/
|
||||
tmpdir = os.Getenv("RUNNER_TEMP")
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-show-asm";
|
||||
version = "0.2.21";
|
||||
version = "0.2.22";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-0Fj+yC464XdqeMWBgBj5g6ZQGrurFM5LbqSe9GSgbGg=";
|
||||
hash = "sha256-yj895sAjTQAUmhU38nv9ea6r7lIwqjZFBEeGSHd0J98=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fW+WvsZv34ZpwaRCs6Uom7t0cV+9yPIlN5pbRea9YEk=";
|
||||
cargoHash = "sha256-JbS72/sE2vCocC7o4X6vZfqGz0Tb0FvO/omzj0LhnHQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
97
pkgs/misc/cups/drivers/brother/dcp375cw/default.nix
Normal file
97
pkgs/misc/cups/drivers/brother/dcp375cw/default.nix
Normal file
@ -0,0 +1,97 @@
|
||||
{ lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file
|
||||
, a2ps, coreutils, gnugrep, which, gawk }:
|
||||
|
||||
let
|
||||
version = "1.1.3";
|
||||
model = "dcp375cw";
|
||||
in rec {
|
||||
driver = stdenv.mkDerivation {
|
||||
pname = "${model}-lpr";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://download.brother.com/welcome/dlf005427/dcp375cwlpr-${version}-1.i386.deb";
|
||||
sha256 =
|
||||
"6daf0144b5802ea8da394ca14db0e6f0200d4049545649283791f899b7f7bd26";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
buildInputs = [ cups ghostscript a2ps gawk ];
|
||||
unpackPhase = "dpkg-deb -x $src $out";
|
||||
|
||||
installPhase = ''
|
||||
substituteInPlace $out/opt/brother/Printers/${model}/lpd/filter${model} \
|
||||
--replace /opt "$out/opt"
|
||||
|
||||
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
$out/opt/brother/Printers/${model}/lpd/br${model}filter
|
||||
|
||||
mkdir -p $out/lib/cups/filter/
|
||||
ln -s $out/opt/brother/Printers/${model}/lpd/filter${model} $out/lib/cups/filter/brlpdwrapper${model}
|
||||
|
||||
wrapProgram $out/opt/brother/Printers/${model}/lpd/filter${model} \
|
||||
--prefix PATH ":" ${
|
||||
lib.makeBinPath [
|
||||
gawk
|
||||
ghostscript
|
||||
a2ps
|
||||
file
|
||||
gnused
|
||||
gnugrep
|
||||
coreutils
|
||||
which
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother ${model} printer driver";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
downloadPage =
|
||||
"https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_all&os=128";
|
||||
maintainers = with maintainers; [ marcovergueira ];
|
||||
};
|
||||
};
|
||||
|
||||
cupswrapper = stdenv.mkDerivation {
|
||||
pname = "${model}-cupswrapper";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://download.brother.com/welcome/dlf005429/dcp375cwcupswrapper-${version}-1.i386.deb";
|
||||
sha256 =
|
||||
"9a255728b595d2667b2caf9d0d332b677e1a6829a3ec1ed6d4e900a44069cf2d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
buildInputs = [ cups ghostscript a2ps gawk ];
|
||||
unpackPhase = "dpkg-deb -x $src $out";
|
||||
|
||||
installPhase = ''
|
||||
for f in $out/opt/brother/Printers/${model}/cupswrapper/cupswrapper${model}; do
|
||||
wrapProgram $f --prefix PATH : ${
|
||||
lib.makeBinPath [ coreutils ghostscript gnugrep gnused ]
|
||||
}
|
||||
done
|
||||
|
||||
mkdir -p $out/share/cups/model
|
||||
ln -s $out/opt/brother/Printers/${model}/cupswrapper/brother_${model}_printer_en.ppd $out/share/cups/model/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother ${model} printer CUPS wrapper driver";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
downloadPage =
|
||||
"https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_all&os=128";
|
||||
maintainers = with maintainers; [ marcovergueira ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -22,13 +22,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sketchybar";
|
||||
version = "2.19.3";
|
||||
version = "2.19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FelixKratz";
|
||||
repo = "SketchyBar";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-QT926AnV9jLc1KvYks6ukIAcMbVHOupTJWQ6vBHpcxc=";
|
||||
hash = "sha256-6MqTyCqFv5suQgQ5a9t1mDA2njjFFgk67Kp7xO5OXoA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From 3b047ab4271919856ae0a3dee3a03a24045c0016 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
|
||||
Date: Mon, 13 Nov 2023 20:24:54 +0000
|
||||
Subject: [PATCH] don't sanatize the environment
|
||||
|
||||
---
|
||||
checksec | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/checksec b/checksec
|
||||
index 4fc3c31..135223a 100755
|
||||
--- a/checksec
|
||||
+++ b/checksec
|
||||
@@ -2,9 +2,6 @@
|
||||
# Do not edit this file directly, this file is generated from the files
|
||||
# in the src directory. Any updates to this file will be overwritten when generated
|
||||
|
||||
-# sanitize the environment before run
|
||||
-[[ "$(env | /bin/sed -r -e '/^(PWD|SHLVL|_)=/d')" ]] && exec -c "$0" "$@"
|
||||
-
|
||||
# --- Modified Version ---
|
||||
# Name : checksec.sh
|
||||
# Version : 1.7.0
|
||||
--
|
||||
2.42.0
|
||||
@ -1,14 +1,30 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, testers
|
||||
, runCommand
|
||||
|
||||
# dependencies
|
||||
, binutils
|
||||
, coreutils
|
||||
, curl
|
||||
, elfutils
|
||||
, file
|
||||
, findutils
|
||||
, binutils-unwrapped
|
||||
, gawk
|
||||
, glibc
|
||||
, coreutils
|
||||
, sysctl
|
||||
, gnugrep
|
||||
, gnused
|
||||
, openssl
|
||||
, procps
|
||||
, sysctl
|
||||
, wget
|
||||
, which
|
||||
|
||||
# tests
|
||||
, checksec
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -24,6 +40,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./0001-attempt-to-modprobe-config-before-checking-kernel.patch
|
||||
# Tool would sanitize the environment, removing the PATH set by our wrapper.
|
||||
./0002-don-t-sanatize-the-environment.patch
|
||||
# Fix the exit code of debug_report command. Check if PR 226 was merged when upgrading version.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/slimm609/checksec.sh/commit/851ebff6972f122fde5507f1883e268bbff1f23d.patch";
|
||||
hash = "sha256-DOcVF+oPGIR9VSbqE+EqWlcNANEvou1gV8qBvJLGLBE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -33,22 +56,45 @@ stdenv.mkDerivation rec {
|
||||
installPhase =
|
||||
let
|
||||
path = lib.makeBinPath [
|
||||
findutils
|
||||
binutils
|
||||
coreutils
|
||||
curl
|
||||
elfutils
|
||||
file
|
||||
binutils-unwrapped
|
||||
sysctl
|
||||
findutils
|
||||
gawk
|
||||
gnugrep
|
||||
gnused
|
||||
openssl
|
||||
procps
|
||||
sysctl
|
||||
wget
|
||||
which
|
||||
];
|
||||
in
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
install checksec $out/bin
|
||||
substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6
|
||||
substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
|
||||
substituteInPlace $out/bin/checksec \
|
||||
--replace "/bin/sed" "${gnused}/bin/sed" \
|
||||
--replace "/usr/bin/id" "${coreutils}/bin/id" \
|
||||
--replace "/lib/libc.so.6" "${glibc}/lib/libc.so.6"
|
||||
wrapProgram $out/bin/checksec \
|
||||
--prefix PATH : ${path}
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = checksec;
|
||||
version = "v${version}";
|
||||
};
|
||||
debug-report = runCommand "debug-report" { buildInputs = [ checksec ]; } ''
|
||||
checksec --debug_report || exit 1
|
||||
echo "OK"
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for checking security bits on executables";
|
||||
homepage = "https://www.trapkit.de/tools/checksec/";
|
||||
|
||||
@ -34,6 +34,12 @@ let
|
||||
hash = "sha256-r4yv2qImIlNMPJagz5i1sxqBDnFAucc2kDUmjGktM6A=";
|
||||
};
|
||||
|
||||
env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
|
||||
# Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin.
|
||||
# Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+.
|
||||
NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ];
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lBseLxxk+3/eoJMdq4muOrA0TgEhwIReGtQO1OzqBFc=";
|
||||
hash = "sha256-uouxOXvVbUNRHM83JearPhMTZQtMPEBfWvsVb7QJSO8=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorHash = "sha256-QUZ9x9BDlhoWLvdt8BTIKxHcsclT6arGICeJnOafs1g=";
|
||||
vendorHash = "sha256-dgaI/gpngCcVRVK8SK6ac1hmc7/aYLJCnW2CCYRDXy0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "1.21.4";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pa9xsbO/d5/3wCx2XKn4dzlqPlO3Ie/cGJiwfWTEUKc=";
|
||||
sha256 = "sha256-bft4fa/ZABodrm7uwl7o2whqWhxuL7l3nLqCuTv4V0k=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-1Cy0PmDmMPpPZ2PLDP6sywb39MuExv2yabqSeP3Of9M=";
|
||||
vendorHash = "sha256-0UNIPwFiQisWDRFaCA3JuS9R0byhWcCDQb54DZXQJ2w=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -66,8 +66,7 @@ in rec {
|
||||
};
|
||||
|
||||
unifi7 = generic {
|
||||
version = "7.5.176";
|
||||
suffix = "-1136930355";
|
||||
sha256 = "sha256-prsFq09zYrB74p/MGKjwvZftw78k9wbIva5xFdk+Ztw=";
|
||||
version = "7.5.187";
|
||||
sha256 = "sha256-a5kl8gZbRnhS/p1imPl7soM0/QSFHdM0+2bNmDfc1mY=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-11-11";
|
||||
version = "2023-11-18";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oB28qKIvGHh/h726Wsy8C/zt3rFLBHcP5iRZe3U76U0=";
|
||||
hash = "sha256-7W7HwHvRfm+nRms4H4TgB1la5OhGHv5lRHwbvjwRTMw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nitrokey-app2";
|
||||
version = "2.1.2";
|
||||
version = "2.1.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3.pythonOlder "3.9";
|
||||
@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "Nitrokey";
|
||||
repo = "nitrokey-app2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VyhIFNXxH/FohgjhBeZXoQYppP7PEz+ei0qzsWz1xhk=";
|
||||
hash = "sha256-loOCa6XlLx1YEfqR0SUUalVIEPCoYsNEHFo2MIKexeA=";
|
||||
};
|
||||
|
||||
# https://github.com/Nitrokey/nitrokey-app2/issues/152
|
||||
@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
homepage = "https://github.com/Nitrokey/nitrokey-app2";
|
||||
changelog = "https://github.com/Nitrokey/nitrokey-app2/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ _999eagle ];
|
||||
maintainers = with maintainers; [ _999eagle panicgh ];
|
||||
mainProgram = "nitrokeyapp";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zps";
|
||||
version = "1.2.8";
|
||||
version = "1.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "zps";
|
||||
rev = version;
|
||||
hash = "sha256-t0kVMrJn+eqUUD98pp3iIK28MoLwOplLk0sYgRJkO4c=";
|
||||
hash = "sha256-+evCYiTiH8tRmhvsse+49WlKGRP5XQtep7wGoCySvJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "invoice2data";
|
||||
version = "0.4.2";
|
||||
version = "0.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "invoice-x";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ss2h8cg0sga+lzJyQHckrZB/Eb63Oj3FkqmGqWCzCQ8=";
|
||||
hash = "sha256-pAvkp8xkHYi/7ymbxaT7/Jhu44j2P8emm8GyXC6IBnI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -38,6 +38,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pdfminer-six
|
||||
pillow
|
||||
pyyaml
|
||||
setuptools
|
||||
];
|
||||
|
||||
makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [
|
||||
|
||||
@ -19837,8 +19837,7 @@ with pkgs;
|
||||
|
||||
qtcreator = qt6Packages.callPackage ../development/tools/qtcreator {
|
||||
inherit (linuxPackages) perf;
|
||||
stdenv = llvmPackages_14.stdenv;
|
||||
llvmPackages = llvmPackages_14;
|
||||
stdenv = llvmPackages.stdenv;
|
||||
};
|
||||
|
||||
qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ;
|
||||
@ -40210,6 +40209,10 @@ with pkgs;
|
||||
|
||||
cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
|
||||
|
||||
dcp375cwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp375cw { }).driver;
|
||||
|
||||
dcp375cw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp375cw { }).cupswrapper;
|
||||
|
||||
dcp9020cdwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).driver;
|
||||
|
||||
dcp9020cdw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).cupswrapper;
|
||||
@ -41966,7 +41969,7 @@ with pkgs;
|
||||
bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { };
|
||||
|
||||
cagebreak = callPackage ../applications/window-managers/cagebreak {
|
||||
wlroots = wlroots_0_15;
|
||||
wlroots = wlroots_0_16;
|
||||
};
|
||||
|
||||
psftools = callPackage ../os-specific/linux/psftools { };
|
||||
|
||||
@ -6887,6 +6887,8 @@ self: super: with self; {
|
||||
|
||||
mitmproxy = callPackage ../development/python-modules/mitmproxy { };
|
||||
|
||||
mitmproxy-macos = callPackage ../development/python-modules/mitmproxy-macos { };
|
||||
|
||||
mitmproxy-rs = callPackage ../development/python-modules/mitmproxy-rs { };
|
||||
|
||||
mitmproxy-wireguard = callPackage ../development/python-modules/mitmproxy-wireguard { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user