Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
301289d29b
|
|
@ -4643,6 +4643,12 @@
|
|||
githubId = 6874204;
|
||||
name = "Jason Carr";
|
||||
};
|
||||
j-brn = {
|
||||
email = "me@bricker.io";
|
||||
github = "j-brn";
|
||||
githubId = 40566146;
|
||||
name = "Jonas Braun";
|
||||
};
|
||||
j-keck = {
|
||||
email = "jhyphenkeck@gmail.com";
|
||||
github = "j-keck";
|
||||
|
|
|
|||
|
|
@ -14,15 +14,21 @@ let
|
|||
|
||||
requires = [ "postgresql.service" ];
|
||||
|
||||
path = [ pkgs.coreutils pkgs.gzip config.services.postgresql.package ];
|
||||
|
||||
script = ''
|
||||
set -e -o pipefail
|
||||
|
||||
umask 0077 # ensure backup is only readable by postgres user
|
||||
|
||||
if [ -e ${cfg.location}/${db}.sql.gz ]; then
|
||||
${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
|
||||
mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
|
||||
fi
|
||||
|
||||
${dumpCmd} | \
|
||||
${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz
|
||||
gzip -c > ${cfg.location}/${db}.in-progress.sql.gz
|
||||
|
||||
mv ${cfg.location}/${db}.in-progress.sql.gz ${cfg.location}/${db}.sql.gz
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
|
@ -113,12 +119,12 @@ in {
|
|||
})
|
||||
(mkIf (cfg.enable && cfg.backupAll) {
|
||||
systemd.services.postgresqlBackup =
|
||||
postgresqlBackupService "all" "${config.services.postgresql.package}/bin/pg_dumpall";
|
||||
postgresqlBackupService "all" "pg_dumpall";
|
||||
})
|
||||
(mkIf (cfg.enable && !cfg.backupAll) {
|
||||
systemd.services = listToAttrs (map (db:
|
||||
let
|
||||
cmd = "${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db}";
|
||||
cmd = "pg_dump ${cfg.pgdumpOptions} ${db}";
|
||||
in {
|
||||
name = "postgresqlBackup-${db}";
|
||||
value = postgresqlBackupService db cmd;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,197 @@
|
|||
{
|
||||
"bluez5.features.device": [
|
||||
{
|
||||
"name": "Air 1 Plus",
|
||||
"no-features": [
|
||||
"hw-volume-mic"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "AirPods",
|
||||
"no-features": [
|
||||
"msbc-alt1",
|
||||
"msbc-alt1-rtl"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "AirPods Pro",
|
||||
"no-features": [
|
||||
"msbc-alt1",
|
||||
"msbc-alt1-rtl"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "AXLOIE Goin",
|
||||
"no-features": [
|
||||
"msbc-alt1",
|
||||
"msbc-alt1-rtl"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "JBL Endurance RUN BT",
|
||||
"no-features": [
|
||||
"msbc-alt1",
|
||||
"msbc-alt1-rtl",
|
||||
"sbc-xq"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "JBL LIVE650BTNC"
|
||||
},
|
||||
{
|
||||
"name": "Soundcore Life P2-L",
|
||||
"no-features": [
|
||||
"msbc-alt1",
|
||||
"msbc-alt1-rtl"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Urbanista Stockholm Plus",
|
||||
"no-features": [
|
||||
"msbc-alt1",
|
||||
"msbc-alt1-rtl"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^94:16:25:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^9c:64:8b:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^a0:e9:db:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^0c:a6:94:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^00:14:02:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^44:5e:f3:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^d4:9c:28:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^00:18:6b:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^b8:ad:3e:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^a0:e9:db:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^00:24:1c:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^00:11:b1:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^a4:15:66:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^00:14:f1:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^00:26:7e:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
},
|
||||
{
|
||||
"address": "~^90:03:b7:",
|
||||
"no-features": [
|
||||
"hw-volume"
|
||||
]
|
||||
}
|
||||
],
|
||||
"bluez5.features.adapter": [
|
||||
{
|
||||
"bus-type": "usb",
|
||||
"vendor-id": "usb:0bda"
|
||||
},
|
||||
{
|
||||
"bus-type": "usb",
|
||||
"no-features": [
|
||||
"msbc-alt1-rtl"
|
||||
]
|
||||
},
|
||||
{
|
||||
"no-features": [
|
||||
"msbc-alt1-rtl"
|
||||
]
|
||||
}
|
||||
],
|
||||
"bluez5.features.kernel": [
|
||||
{
|
||||
"sysname": "Linux",
|
||||
"release": "~^[0-4]\\.",
|
||||
"no-features": [
|
||||
"msbc-alt1",
|
||||
"msbc-alt1-rtl"
|
||||
]
|
||||
},
|
||||
{
|
||||
"sysname": "Linux",
|
||||
"release": "~^5\\.[1-7]\\.",
|
||||
"no-features": [
|
||||
"msbc-alt1",
|
||||
"msbc-alt1-rtl"
|
||||
]
|
||||
},
|
||||
{
|
||||
"sysname": "Linux",
|
||||
"release": "~^5\\.(8|9|10)\\.",
|
||||
"no-features": [
|
||||
"msbc-alt1"
|
||||
]
|
||||
},
|
||||
{
|
||||
"no-features": []
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
},
|
||||
"context.modules": [
|
||||
{
|
||||
"name": "libpipewire-module-rtkit",
|
||||
"name": "libpipewire-module-rt",
|
||||
"args": {},
|
||||
"flags": [
|
||||
"ifexists",
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ let
|
|||
defaults = {
|
||||
alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json));
|
||||
bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json));
|
||||
bluez-hardware = (builtins.fromJSON (builtins.readFile ./bluez-hardware.conf.json));
|
||||
media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json));
|
||||
v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));
|
||||
};
|
||||
|
|
@ -22,6 +23,7 @@ let
|
|||
configs = {
|
||||
alsa-monitor = recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor;
|
||||
bluez-monitor = recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor;
|
||||
bluez-hardware = defaults.bluez-hardware;
|
||||
media-session = recursiveUpdate defaults.media-session cfg.config.media-session;
|
||||
v4l2-monitor = recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor;
|
||||
};
|
||||
|
|
@ -120,6 +122,10 @@ in {
|
|||
mkIf config.services.pipewire.pulse.enable {
|
||||
source = json.generate "bluez-monitor.conf" configs.bluez-monitor;
|
||||
};
|
||||
environment.etc."pipewire/media-session.d/bluez-hardware.conf" =
|
||||
mkIf config.services.pipewire.pulse.enable {
|
||||
source = json.generate "bluez-hardware.conf" configs.bluez-hardware;
|
||||
};
|
||||
|
||||
environment.etc."pipewire/media-session.d/with-jack" =
|
||||
mkIf config.services.pipewire.jack.enable {
|
||||
|
|
|
|||
|
|
@ -73,8 +73,30 @@ let
|
|||
machine.succeed(
|
||||
"systemctl start ${backupService}.service",
|
||||
"zcat /var/backup/postgresql/${backupName}.sql.gz | grep '<test>ok</test>'",
|
||||
"ls -hal /var/backup/postgresql/ >/dev/console",
|
||||
"stat -c '%a' /var/backup/postgresql/${backupName}.sql.gz | grep 600",
|
||||
)
|
||||
with subtest("Backup service fails gracefully"):
|
||||
# Sabotage the backup process
|
||||
machine.succeed("rm /run/postgresql/.s.PGSQL.5432")
|
||||
machine.fail(
|
||||
"systemctl start ${backupService}.service",
|
||||
)
|
||||
machine.succeed(
|
||||
"ls -hal /var/backup/postgresql/ >/dev/console",
|
||||
"zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'",
|
||||
"stat /var/backup/postgresql/${backupName}.in-progress.sql.gz",
|
||||
)
|
||||
# In a previous version, the second run would overwrite prev.sql.gz,
|
||||
# so we test a second run as well.
|
||||
machine.fail(
|
||||
"systemctl start ${backupService}.service",
|
||||
)
|
||||
machine.succeed(
|
||||
"stat /var/backup/postgresql/${backupName}.in-progress.sql.gz",
|
||||
"zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'",
|
||||
)
|
||||
|
||||
|
||||
with subtest("Initdb works"):
|
||||
machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2")
|
||||
|
|
|
|||
|
|
@ -162,20 +162,20 @@ in {
|
|||
# TODO currently can't install more than one because `lame` clashes
|
||||
stage-trial = mkPianoteq rec {
|
||||
name = "stage-trial";
|
||||
version = "7.3.0";
|
||||
version = "7.4.1";
|
||||
archdir = "x86-64bit";
|
||||
src = fetchPianoteqTrial {
|
||||
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
|
||||
sha256 = "12zbr54ng7cb4ngl1qrf5h0gs8c42d6d3j08492xr14m9x9y132k";
|
||||
sha256 = "14mbaz6i1rxqayrjjkck9yx8iijkm4q1qz29ymkd7sz2gpk7fcpa";
|
||||
};
|
||||
};
|
||||
standard-trial = mkPianoteq rec {
|
||||
name = "standard-trial";
|
||||
version = "7.3.0";
|
||||
version = "7.4.1";
|
||||
archdir = "x86-64bit";
|
||||
src = fetchPianoteqTrial {
|
||||
name = "pianoteq_linux_trial_v${versionForFile version}.7z";
|
||||
sha256 = "04sh45hm3y3y6kfj3p32fi6p95r9fc6xf4r5i74laylms4f6gr6d";
|
||||
sha256 = "01xh4n0h7dd3xqhm0bx0a62mqmfvxvmr5cm5r2g249c9wqg5i32a";
|
||||
};
|
||||
};
|
||||
stage-6 = mkPianoteq rec {
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cCm4CZdVtjO2nj69CgRCrcwO0lAbiQVD6KocOj4CSdY=";
|
||||
sha256 = "sha256-A9XIKCw1dL4vUQYSu6WdmpR82dAbtKVTyjllquyRGgs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -6,20 +6,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "electrs";
|
||||
version = "0.8.9";
|
||||
version = "0.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romanz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "01fli2k5yh4iwlds97p5c36q19s3zxrqhkzp9dsjbgsf7sv35r3y";
|
||||
sha256 = "0q7mvpflnzzm88jbsdxgvhk9jr5mvn23hhj2iwy2grnfngxsmz3y";
|
||||
};
|
||||
|
||||
# needed for librocksdb-sys
|
||||
nativeBuildInputs = [ llvmPackages.clang ];
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
cargoSha256 = "1rqpadlr9r4z2z825li6vi5a21hivc3bsn5ibxshrdrwiycyyxz8";
|
||||
cargoSha256 = "0i8npa840g4kz50n6x40z22x9apq8snw6xgjz4vn2kh67xc4c738";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An efficient re-implementation of Electrum Server in Rust";
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nbxplorer";
|
||||
version = "2.1.51";
|
||||
version = "2.1.52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgarage";
|
||||
repo = "NBXplorer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tvuuoDZCSDFa8gAVyH+EP1DLtdPfbkr+w5lSxZkzZXg=";
|
||||
sha256 = "sha256-+BP71TQ8BTGZ/SbS7CrI4D7hcQaVLt+hCpInbOdU5GY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
|
||||
|
|
|
|||
16
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
16
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
|
|
@ -181,23 +181,23 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin.Altcoins";
|
||||
version = "2.0.31";
|
||||
sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm";
|
||||
version = "2.0.33";
|
||||
sha256 = "12r4w89247xzrl2g01iv13kg1wl7gzfz1zikimx6dyhr4iipbmgf";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin.TestFramework";
|
||||
version = "2.0.22";
|
||||
sha256 = "1zwhjy6xppl01jhkgl7lqjsmi8crny4qq22ml20cz8l437j1zi4n";
|
||||
version = "2.0.23";
|
||||
sha256 = "03jw3gay7brm7s7jwn4zbk1n1sq7gck523cx3ckx87v3wi2062lx";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "5.0.76";
|
||||
sha256 = "0q3ilmsrw9ip1s38qmfs4qi02xvccmy1naafffn5yxj08q0n1p79";
|
||||
version = "5.0.78";
|
||||
sha256 = "1mfn045l489bm2xgjhvddhfy4xxcy42q6jhq4nyd6fnxg4scxyg9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "5.0.77";
|
||||
sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb";
|
||||
version = "5.0.81";
|
||||
sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NETStandard.Library";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-swPLJIcm8XD0+/e9pGK2bDqUb7AS/5FdQ3A7Ceh5dZc=";
|
||||
sha256 = "sha256-5PNogoahAZUjIlQsVXwm7j5OmP3/uEEdV0vrIDXXBx8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4njx8T3kzyN63Jo0aHee5ImqcObiADvi+dHKWcRmbQw=";
|
||||
cargoSha256 = "0iikys90flzmnnb6l2wzag8mp91p6z9y7rjzym2sd6m7xhgbc1x6";
|
||||
|
||||
nativeBuildInputs = [ clang ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
|
||||
|
||||
let
|
||||
humioCtlVersion = "0.28.4";
|
||||
sha256 = "sha256-X2pc15InfCzVbZ2fmBdr+GKgOySIruA1yD61HcLO164=";
|
||||
humioCtlVersion = "0.28.5";
|
||||
sha256 = "sha256-h6zQG9jjHpAxaJUaFoVmRyR1A/bk57CKBIkOGPcdJP0=";
|
||||
vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo=";
|
||||
in buildGoModule {
|
||||
name = "humioctl-${humioCtlVersion}";
|
||||
|
|
|
|||
|
|
@ -1,24 +1,45 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }:
|
||||
{ lib
|
||||
, autoreconfHook
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, ncurses
|
||||
, readline
|
||||
, stdenv
|
||||
, texinfo
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pinfo-0.6.10";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pinfo";
|
||||
version = "0.6.13";
|
||||
|
||||
src = fetchurl {
|
||||
# homepage needed you to login to download the tarball
|
||||
url = "https://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2"
|
||||
+ "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2";
|
||||
sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baszoetekouw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ gettext texinfo ncurses readline ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ];
|
||||
buildInputs = [
|
||||
gettext
|
||||
texinfo
|
||||
ncurses
|
||||
readline
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-curses=${ncurses.dev}"
|
||||
"--with-readline=${readline.dev}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A viewer for info files";
|
||||
homepage = "https://github.com/baszoetekouw/pinfo";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.24.12";
|
||||
version = "0.24.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GuN+OAzuNus1B32ZSsnrJPrE7MQ0ZqNKDmoNe7Sa7Zs=";
|
||||
sha256 = "sha256-5gMRjnrk1FyTj3Lzp+6scLuqfP8rCUvDDBK33/RzG28=";
|
||||
};
|
||||
|
||||
buildFlagsArray = ''
|
||||
|
|
|
|||
|
|
@ -175,11 +175,13 @@
|
|||
"version": "0.1.0"
|
||||
},
|
||||
"cloudflare": {
|
||||
"owner": "terraform-providers",
|
||||
"owner": "cloudflare",
|
||||
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v2.7.0",
|
||||
"sha256": "1r18lxhfi2sd42ja4bzxbkf5bli8iljrpqbgdcn1a7rcf44vnxa2",
|
||||
"version": "2.7.0"
|
||||
"rev": "v2.23.0",
|
||||
"sha256": "0cyw6lddw3pj5lqra78qn0nd16ffay86vc8sqa68grx7ik9jgn7l",
|
||||
"vendorSha256": "19fdwif81lqp848jhawd09b0lalslrwadd519vsdw03v2wp4p962",
|
||||
"version": "2.23.0"
|
||||
},
|
||||
"cloudinit": {
|
||||
"owner": "hashicorp",
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zeek";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.zeek.org/zeek-${version}.tar.gz";
|
||||
sha256 = "15gxxgg7nmfmswlbxhvcp6alq5k9wpvrm5cwyf1qfd7xsfli61sm";
|
||||
sha256 = "1nrkwaj0dilyzhfl6yma214vyakvpi97acyffdr7n4kdm4m6pvik";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison file ];
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "maestral-qt";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
disabled = python3.pkgs.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SamSchott";
|
||||
repo = "maestral-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HaEQTmpyM1r/+rTkki93aStdzdnhNmkfNJTZRTPehTw=";
|
||||
sha256 = "sha256-Y4n67LJyNUsLmGMu7B73n888qmCQ9HjxCSM1MlfTbqQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ with lib;
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.14.3";
|
||||
version = "1.14.4";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "sha256-ieQxqZO84sYBcCzWYn40tRGLgSs2PpLlcNkI4vFq+wE=";
|
||||
sha256 = "sha256-sl/Vml8QmwZEAd2PIYWQcP7s6NYeomGJQGKhRiddtoo=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,21 +1,19 @@
|
|||
{ lib, stdenv, fetchurl, python2Packages, makeWrapper
|
||||
, guiSupport ? false, tk ? null
|
||||
, ApplicationServices
|
||||
, mercurialSrc ? fetchurl rec {
|
||||
meta.name = "mercurial-${meta.version}";
|
||||
meta.version = "4.9.1";
|
||||
url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
|
||||
sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
|
||||
}
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python2Packages) docutils hg-git dulwich python;
|
||||
|
||||
in python2Packages.buildPythonApplication {
|
||||
in python2Packages.buildPythonApplication rec {
|
||||
pname = "mercurial";
|
||||
version = "4.9.1";
|
||||
|
||||
inherit (mercurialSrc.meta) name version;
|
||||
src = mercurialSrc;
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -59,7 +57,6 @@ in python2Packages.buildPythonApplication {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit (mercurialSrc.meta) version;
|
||||
description = "A fast, lightweight SCM system for very large distributed projects";
|
||||
homepage = "https://www.mercurial-scm.org";
|
||||
downloadPage = "https://www.mercurial-scm.org/release/";
|
||||
|
|
@ -69,4 +66,3 @@ in python2Packages.buildPythonApplication {
|
|||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,18 @@
|
|||
{ lib, fetchurl, python3Packages
|
||||
, mercurial, qt5
|
||||
}:
|
||||
let
|
||||
tortoisehgSrc = fetchurl rec {
|
||||
meta.name = "tortoisehg-${meta.version}";
|
||||
meta.version = "5.8";
|
||||
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz";
|
||||
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
|
||||
};
|
||||
|
||||
# Extension point for when thg's mercurial is lagging behind mainline.
|
||||
tortoiseMercurial = mercurial;
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tortoisehg";
|
||||
version = "5.8";
|
||||
|
||||
in python3Packages.buildPythonApplication {
|
||||
inherit (tortoisehgSrc.meta) name version;
|
||||
src = tortoisehgSrc;
|
||||
src = fetchurl {
|
||||
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
|
||||
sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3";
|
||||
};
|
||||
|
||||
# Extension point for when thg's mercurial is lagging behind mainline.
|
||||
tortoiseMercurial = mercurial;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
tortoiseMercurial qscintilla-qt5 iniparse
|
||||
|
|
|
|||
|
|
@ -6,4 +6,5 @@
|
|||
obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix {};
|
||||
obs-ndi = libsForQt5.callPackage ./obs-ndi.nix {};
|
||||
wlrobs = callPackage ./wlrobs.nix {};
|
||||
looking-glass-obs = callPackage ./looking-glass-obs.nix {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, libbfd, SDL2, obs-studio
|
||||
, looking-glass-client }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "looking-glass-obs";
|
||||
version = looking-glass-client.version;
|
||||
|
||||
src = looking-glass-client.src;
|
||||
|
||||
sourceRoot = "source/obs";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ obs-studio libbfd SDL2 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-mavx";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/obs-plugins/
|
||||
mv liblooking-glass-obs.so $out/lib/obs-plugins/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin for OBS Studio for efficient capturing of looking-glass";
|
||||
homepage = "https://looking-glass.io/docs/stable/obs/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ babbaj ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
|
|||
in
|
||||
lib.optionalString (conf != null) "cp ${configFile} config.def.h";
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dwm.suckless.org/";
|
||||
description = "An extremely fast, small, and dynamic window manager for X";
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "canta-theme";
|
||||
version = "2020-05-17";
|
||||
version = "2021-07-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0b9ffkw611xxb2wh43sjqla195jp0ygxph5a8dvifkxdw6nxc2y0";
|
||||
sha256 = "sha256-dz78h9Qq25+/i6fmw/zGlPq3DVQB3ADYwehgaWReMQ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jrsonnet";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "CertainLach";
|
||||
repo = "jrsonnet";
|
||||
sha256 = "sha256-+kvdbUw+lQ/BKJwcBzho1OWg/6y0YDRkLE+SAe8hLQQ=";
|
||||
sha256 = "sha256-vDZpb5Z8XOVc6EJ1Nul07kC8ppqcGzKPb4DEarqq2yg=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/bin/jrsonnet $out/bin/jsonnet
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-0soXOxp4Kr1DdmVERl8/sqwltqYLDwkVJZHFnYeHs+c=";
|
||||
cargoSha256 = "sha256-SR3m2meW8mTaxiYgeY/m7HFPrHGVtium/VRU6vWKxys=";
|
||||
|
||||
meta = {
|
||||
description = "Purely-functional configuration language that helps you define JSON data";
|
||||
|
|
|
|||
|
|
@ -18,19 +18,19 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "purescript";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src =
|
||||
if stdenv.isDarwin
|
||||
then
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
|
||||
sha256 = "1ga2hn9br71dyzn3p9jvjiksvnq21p6i5hp1z1j5fpz9la28nqzf";
|
||||
sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
|
||||
sha256 = "1kv7dm1nw85lw3brrclkj7xc9p021jx3n8wgp2fg3572s86ypskw";
|
||||
sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0";
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-cal";
|
||||
version = "0.4.5";
|
||||
version = "0.5.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04acra1mnzw9q7jycs5966akfbgnx96hkrq90nq0dhw8pvarlyv6";
|
||||
sha256 = "sha256-rmEsDsY50IKpCpQTvAFEkgCtuHwwgwMwcRpBUyyZGGc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcft";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz";
|
||||
sha256 = "sha256-QxAp6pnZPLPwarurbKovz0BVOO4XdckBzjB65XCBPAM=";
|
||||
sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
|
||||
buildInputs = [ freetype fontconfig pixman tllist ]
|
||||
++ lib.optional withHarfBuzz harfbuzz;
|
||||
|
|
|
|||
|
|
@ -47,4 +47,9 @@ in
|
|||
version = "7.1.3";
|
||||
sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29";
|
||||
};
|
||||
|
||||
fmt_8 = generic {
|
||||
version = "8.0.1";
|
||||
sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcyaml";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlsa";
|
||||
repo = "libcyaml";
|
||||
rev = "v${version}";
|
||||
sha256 = "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93";
|
||||
sha256 = "sha256-LtU1r95YoLuQ2JCphxbMojxKyXnt50XEARGUPftLgsU=";
|
||||
};
|
||||
|
||||
buildInputs = [ libyaml ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,13 @@ diff --git a/meson_options.txt b/meson_options.txt
|
|||
index 93b5e2a9..1b915ac3 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -13,6 +13,9 @@ option('media-session',
|
||||
description: 'Build and install pipewire-media-session',
|
||||
@@ -200,3 +200,6 @@ option('media-session',
|
||||
type: 'feature',
|
||||
value: 'auto')
|
||||
+option('media-session-prefix',
|
||||
+ description: 'Install directory for pipewire-media-session and its support files',
|
||||
+ type: 'string')
|
||||
option('man',
|
||||
description: 'Build manpages',
|
||||
type: 'feature',
|
||||
option('session-managers',
|
||||
diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
|
||||
index 1edebb2d..251270eb 100644
|
||||
--- a/src/daemon/systemd/user/meson.build
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ index bbafa134..227d3e06 100644
|
|||
# access.allowed to list an array of paths of allowed
|
||||
# apps.
|
||||
#access.allowed = [
|
||||
- # @media_session_path@
|
||||
+ # <media_session_path>
|
||||
- # @session_manager_path@
|
||||
+ # <session_manager_path>
|
||||
#]
|
||||
|
||||
# An array of rejected paths.
|
||||
|
|
@ -15,8 +15,8 @@ index bbafa134..227d3e06 100644
|
|||
# but it is better to start it as a systemd service.
|
||||
# Run the session manager with -h for options.
|
||||
#
|
||||
- @comment@{ path = "@media_session_path@" args = "" }
|
||||
+ @comment@{ path = "<media_session_path>" args = "" }
|
||||
- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
|
||||
+ @comment@{ path = "<session_manager_path>" args = "@session_manager_args@" }
|
||||
#
|
||||
# You can optionally start the pulseaudio-server here as well
|
||||
# but it is better to start it as a systemd service.
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
, dbus
|
||||
, alsa-lib
|
||||
, libjack2
|
||||
, libusb1
|
||||
, udev
|
||||
, libva
|
||||
, libsndfile
|
||||
|
|
@ -43,10 +44,11 @@ let
|
|||
};
|
||||
|
||||
mesonEnable = b: if b then "enabled" else "disabled";
|
||||
mesonList = l: "[" + lib.concatStringsSep "," l + "]";
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "pipewire";
|
||||
version = "0.3.30";
|
||||
version = "0.3.31";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -64,7 +66,7 @@ let
|
|||
owner = "pipewire";
|
||||
repo = "pipewire";
|
||||
rev = version;
|
||||
sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE=";
|
||||
sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -96,6 +98,7 @@ let
|
|||
dbus
|
||||
glib
|
||||
libjack2
|
||||
libusb1
|
||||
libsndfile
|
||||
ncurses
|
||||
udev
|
||||
|
|
@ -122,6 +125,7 @@ let
|
|||
"-Dmedia-session-prefix=${placeholder "mediaSession"}"
|
||||
"-Dlibjack-path=${placeholder "jack"}/lib"
|
||||
"-Dlibcamera=disabled"
|
||||
"-Droc=disabled"
|
||||
"-Dlibpulse=${mesonEnable pulseTunnelSupport}"
|
||||
"-Davahi=${mesonEnable zeroconfSupport}"
|
||||
"-Dgstreamer=${mesonEnable gstreamerSupport}"
|
||||
|
|
@ -133,6 +137,7 @@ let
|
|||
"-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}"
|
||||
"-Dsysconfdir=/etc"
|
||||
"-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire"
|
||||
"-Dsession-managers=${mesonList (lib.optional withMediaSession "media-session")}"
|
||||
];
|
||||
|
||||
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
|
||||
|
|
@ -187,6 +192,7 @@ let
|
|||
paths-out-media-session = [
|
||||
"nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"
|
||||
"nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"
|
||||
"nix-support/etc/pipewire/media-session.d/bluez-hardware.conf.json"
|
||||
"nix-support/etc/pipewire/media-session.d/media-session.conf.json"
|
||||
"nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"
|
||||
];
|
||||
|
|
|
|||
27
pkgs/development/ocaml-modules/lwt-canceler/default.nix
Normal file
27
pkgs/development/ocaml-modules/lwt-canceler/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, fetchFromGitLab, buildDunePackage, lwt }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "lwt-canceler";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = "lwt-canceler";
|
||||
rev = "v${version}";
|
||||
sha256 = "07931486vg83sl1c268i0vyw61l8n8xs2krjsj43070zljqi8rf1";
|
||||
};
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lwt
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/nomadic-labs/lwt-canceler";
|
||||
description = "Cancellation synchronization object";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.0.8021";
|
||||
version = "9.0.8761";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DeQvYuVRYOxyVPqHzTSNtEUUN4tHhSVMZoex6SUWik8=";
|
||||
sha256 = "sha256-UAtVWh3BBZZmU5+BR0+2B+rivzR4E7bZK1ro1uKngtE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyvex ];
|
||||
|
|
|
|||
|
|
@ -4,20 +4,25 @@
|
|||
, nose
|
||||
, coverage
|
||||
, isPy27
|
||||
, wrapt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounittest";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kwarunek";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0mlic2q49cb0vv62mixy4i4x8c91qb6jlji7khiamcxcg676nasl";
|
||||
sha256 = "sha256-GbGApY4pQoFpP3RTCLdjjTnJbdz9wEXXzZRRYXgtFEM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
wrapt
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
coverage
|
||||
|
|
@ -27,6 +32,8 @@ buildPythonPackage rec {
|
|||
nosetests
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aiounittest" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Test asyncio code more easily";
|
||||
homepage = "https://github.com/kwarunek/aiounittest";
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.0.8021";
|
||||
version = "9.0.8761";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-brX/HdeZSPOnZKuD1v086GwyWSV8yA/FaMC3CbeI4Xk=";
|
||||
sha256 = "sha256-vPqCezHYJP3ue3/J/Pni9jPvSJ+om7nAVgPTU6z5xBE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrop";
|
||||
version = "9.0.8021";
|
||||
version = "9.0.8761";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wkCgVVHulu1hGdbUSEi38aMWy2UfR3g/7jj+o+NLI44=";
|
||||
sha256 = "sha256-M/4kEESL9OH4KyPgsrlVzm54OtU28pDox5qtV7Up2ew=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,33 +1,36 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pyserial
|
||||
, pytestCheckHook
|
||||
, websockets
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aqualogic";
|
||||
version = "2.6";
|
||||
version = "3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swilson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dAC/0OjvrC8J/5pu5vcOKV/WqgkAlz0LuFl0up6FQRM=";
|
||||
sha256 = "sha256-6YvkSUtBc3Nl/Ap3LjU0IKY2bE4k86XdSoLo+/c8dDs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "allow-iobase-objects.patch";
|
||||
url = "https://github.com/swilson/aqualogic/commit/185fe25a86c82c497a55c78914b55ed39f5ca339.patch";
|
||||
sha256 = "072jrrsqv86bn3skibjc57111jlpm8pq2503997fl3h4v6ziwdxg";
|
||||
})
|
||||
propagatedBuildInputs = [
|
||||
pyserial
|
||||
websockets
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pyserial ];
|
||||
checkInputs = [
|
||||
aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
# With 3.3 the event loop is not terminated after the first test
|
||||
# https://github.com/swilson/aqualogic/issues/9
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aqualogic" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.0.8021";
|
||||
version = "9.0.8761";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j8sPrSaKam5gv1ZlTA3fF1u3UMei9jy843O0n8Hsibc=";
|
||||
sha256 = "sha256-mdry5JQIW1b2p9a+c6RfHE6HYs54WKFofPkzFCgpUXg=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, aiodns
|
||||
, aiohttp
|
||||
, flask
|
||||
, mock
|
||||
, msrest
|
||||
, pytest
|
||||
|
|
@ -14,14 +15,14 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
pname = "azure-core";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "197917b98fec661c35392e32abec4f690ac2117371a814e25e57c224ce23cf1f";
|
||||
sha256 = "b1c7d2e01846074f258c8b2e592239aef836a2b1c27d8d0e8491a2c7e2906ef4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -32,6 +33,7 @@ buildPythonPackage rec {
|
|||
checkInputs = [
|
||||
aiodns
|
||||
aiohttp
|
||||
flask
|
||||
mock
|
||||
msrest
|
||||
pytest
|
||||
|
|
@ -51,6 +53,8 @@ buildPythonPackage rec {
|
|||
# wants network
|
||||
"tests/async_tests/test_streaming_async.py"
|
||||
"tests/test_streaming.py"
|
||||
# testserver tests require being in a very specific working directory to make it work
|
||||
"tests/testserver_tests/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-administration";
|
||||
version = "4.0.0b1";
|
||||
version = "4.0.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5";
|
||||
sha256 = "b05a0372f35921cedb7a231426077745eee9a65881088de6d4d8b73d9709a6cb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-certificates";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "ea651883ad00d0a9a25b38e51feff7111f6c7099c6fb2597598da5bb21d3451c";
|
||||
sha256 = "4e0a9bae9fd4c222617fbce6b31f97e2e0622774479de3c387239cbfbb828d87";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-keys";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "fbf67bca913ebf68b9075ee9d2e2b899dc3c7892cc40abfe1b08220a382f6ed9";
|
||||
sha256 = "7792ad0d5e63ad9eafa68bdce5de91b3ffcc7ca7a6afdc576785e6a2793caed0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-secrets";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1083ab900da5ec63c518ffef49d9fdca02c81ddffdf80c52c03cd9da479e021f";
|
||||
sha256 = "26279ba3a6c727deba1fb61f549496867baddffbf062bd579d6fd2bc04e95276";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.1";
|
||||
version = "2.0.0";
|
||||
pname = "azure-mgmt-appconfiguration";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f";
|
||||
sha256 = "97e990ec6a5a3acafc7fc1add8ff1a160ebb2052792931352fd7cf1d90f1f956";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-containerservice";
|
||||
version = "15.1.0";
|
||||
version = "16.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "51c64e01e614c9b88723b86b36b48f8417171610a098bf4690e39e71cefc32d9";
|
||||
sha256 = "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.2.2";
|
||||
version = "1.3.0";
|
||||
pname = "azure-mgmt-core";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312";
|
||||
sha256 = "3ffb7352b39e5495dccc2d2b47254f4d82747aff4735e8bf3267c335b0c9bb40";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-cosmosdb";
|
||||
version = "6.3.0";
|
||||
version = "6.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d";
|
||||
sha256 = "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
pname = "azure-mgmt-netapp";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5a293118c5089c4ec81f676b76aa95c60408a3443a46131d22978ffb81fe4605";
|
||||
sha256 = "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-rdbms";
|
||||
version = "8.1.0";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "b30003a94c306533ebfb741b824dd1cc6c0a1810200926675e6b808bd0459d19";
|
||||
sha256 = "36a508fe40f904723485586e9088092e6f65cdb82bc86efc42d615499c256829";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-sql";
|
||||
version = "2.1.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "5474387ec3417b0a277de2b42c6d1992256a6a9717ca1ada0e8dad01238b9919";
|
||||
sha256 = "e2fe427ed8f6e368de7176696b38910a16b307dd9c2e1d2144d643a1c0f38e21";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitarray";
|
||||
version = "2.1.3";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a24aff72a7f1b09571b5daf9dbfcffd98481be1fe085ae5ef662cf11452a97e0";
|
||||
sha256 = "sha256-MbQNcWofBkLqnidBwpt1YpkHXbLh0evnUOPiwUafWJ0=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.0.8021";
|
||||
version = "9.0.8761";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-btV6J5r4ogb4yC0G3lyXXkCTnx55nfBkWFH1wgiWtjs=";
|
||||
sha256 = "sha256-MEG6J7FBjufFqvmfV+LTtgDJb8eZuUrDq4am/mnYCZI=";
|
||||
};
|
||||
|
||||
# Use upstream z3 implementation
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.0.8021";
|
||||
version = "9.0.8761";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pgOeNAzAq2x7MEnheV6txmXISFY/0sWw4cVzs51k4eM=";
|
||||
sha256 = "sha256-cJpwtAX2cck/SoTfm8G93Imyyqn1B2Izkxk9O7WtRrk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dependency-injector";
|
||||
version = "4.32.2";
|
||||
version = "4.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ets-labs";
|
||||
repo = "python-dependency-injector";
|
||||
rev = version;
|
||||
sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg";
|
||||
sha256 = "sha256-MI0+saRe4Zi77otVPGYxrX9z8Jc5K1A1sCxHBS0uta0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -42,6 +42,11 @@ buildPythonPackage rec {
|
|||
pyyaml
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "six>=1.7.0,<=1.15.0" "six"
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# There is no unique identifier to disable the one failing test
|
||||
"tests/unit/ext/test_aiohttp_py35.py"
|
||||
|
|
|
|||
|
|
@ -2,39 +2,48 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, mock
|
||||
, twisted
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
, service-identity
|
||||
, twisted
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "foolscap";
|
||||
version = "20.4.0";
|
||||
version = "21.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0rbw9makjmawkcxnkkngybj3n14s0dnzn9gkqqq2krcm514kmlb9";
|
||||
sha256 = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mock twisted pyopenssl service-identity ];
|
||||
propagatedBuildInputs = [
|
||||
mock
|
||||
twisted
|
||||
pyopenssl
|
||||
service-identity
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
# Either uncomment this, or remove this custom check phase entirely, if
|
||||
# you wish to do battle with the foolscap tests. ~ C.
|
||||
# trial foolscap
|
||||
'';
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Not all dependencies are present
|
||||
"src/foolscap/test/test_connection.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "foolscap" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://foolscap.lothar.com/";
|
||||
description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model";
|
||||
description = "RPC protocol for Python that follows the distributed object-capability model";
|
||||
longDescription = ''
|
||||
"Foolscap" is the name for the next-generation RPC protocol,
|
||||
intended to replace Perspective Broker (part of Twisted).
|
||||
Foolscap is a protocol to implement a distributed
|
||||
object-capabilities model in Python.
|
||||
"Foolscap" is the name for the next-generation RPC protocol, intended to
|
||||
replace Perspective Broker (part of Twisted). Foolscap is a protocol to
|
||||
implement a distributed object-capabilities model in Python.
|
||||
'';
|
||||
# See http://foolscap.lothar.com/trac/browser/LICENSE.
|
||||
homepage = "https://github.com/warner/foolscap";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,9 +25,8 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338=";
|
||||
};
|
||||
|
||||
# Allow later aniso8601 releases
|
||||
# https://github.com/graphql-python/graphene/pull/1331
|
||||
patches = [ (fetchpatch {
|
||||
# Allow later aniso8601 releases, https://github.com/graphql-python/graphene/pull/1331
|
||||
url = "https://github.com/graphql-python/graphene/commit/26b16f75b125e35eeb2274b7be503ec29f2e8a45.patch";
|
||||
sha256 = "qm96pNOoxPieEy1CFZpa2Mx010pY3QU/vRyuL0qO3Tk=";
|
||||
}) ];
|
||||
|
|
@ -50,6 +49,11 @@ buildPythonPackage rec {
|
|||
|
||||
pytestFlagsArray = [ "--benchmark-disable" ];
|
||||
|
||||
disabledTests = [
|
||||
# TypeError: Failed: DID NOT RAISE <class...
|
||||
"test_unexpected_error"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "graphene" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hstspreload";
|
||||
version = "2021.6.28";
|
||||
version = "2021.7.5";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sethmlarson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-SZGyn79R3+IwtoZ+khgFnl0WosRoCcKNk8efGxbOugc=";
|
||||
sha256 = "sha256-/89K41MrTdF68+BVkfnv+0d+6rBHdRGKpN2Psfr2Wog=";
|
||||
};
|
||||
|
||||
# tests require network connection
|
||||
|
|
|
|||
|
|
@ -1,22 +1,34 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, requests }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "httmock";
|
||||
version = "1.3.0";
|
||||
pname = "httmock";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patrys";
|
||||
repo = "httmock";
|
||||
rev = version;
|
||||
sha256 = "1dy7pjq4gz476jcnbbpzk8w8qxr9l8wwgw9x2c7lf6fzsgnf404q";
|
||||
sha256 = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I=";
|
||||
};
|
||||
|
||||
checkInputs = [ requests ];
|
||||
checkInputs = [
|
||||
requests
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests.py" ];
|
||||
|
||||
pythonImportsCheck = [ "httmock" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A mocking library for requests";
|
||||
homepage = "https://github.com/patrys/httmock";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/patrys/httmock";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nyanloutre ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "maestral";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SamSchott";
|
||||
repo = "maestral";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kyOBF+qsl/+9u0P+EmfxbuJNGMqPSLCWJUlcZMyKJH4=";
|
||||
sha256 = "sha256-kaRcM8Z0xeDp3JYputKZmzTfYYq2oKpF7AM6ciFF7I4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, pythonOlder
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, flake8
|
||||
, flake8-polyfill
|
||||
, importlib-metadata
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -12,10 +16,27 @@ buildPythonPackage rec {
|
|||
sha256 = "0937rnk3c2z1jkdmbw9hfm80p5k467q7rqhn6slfiprs4kflgpd1";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix tests by setting extended-default-ignore to an empty list
|
||||
url = "https://github.com/PyCQA/pep8-naming/commit/6d62db81d7967e123e29673a4796fefec6f06d26.patch";
|
||||
sha256 = "1jpr2dga8sphksik3izyzq9hiszyki691mwnh2rjzd2vpgnv8cxf";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flake8
|
||||
flake8-polyfill
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} run_tests.py
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pep8ext_naming"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pg8000";
|
||||
version = "1.19.5";
|
||||
version = "1.20.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3LmvucuHrMeTiK5jPEXPf4Bqq+O7XYzxVFcraZOT+Tc=";
|
||||
sha256 = "sha256-SQ7CKpJgHwRUs+1MjU7N3DD2bA4/eD8OzFgQN3SajFU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymetar";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f9a8caa21eff5367427da55a469ef396293ae4cc93797ab2f1a66a2924fbdc68";
|
||||
sha256 = "sha256-zhuXOZIIzh5p0CDOsiUNTqeXDoHFcf1BPg868fc7CIg=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A command-line tool to show the weather report by a given station ID";
|
||||
homepage = "http://www.schwarzvogel.de/software/pymetar.html";
|
||||
homepage = "https://github.com/klausman/pymetar";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ erosennin ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,46 +1,50 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
, future, six, ecdsa, rsa
|
||||
, pycrypto, pytestcov, pytestrunner, cryptography
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ecdsa
|
||||
, rsa
|
||||
, pycrypto
|
||||
, pyasn1
|
||||
, pycryptodome
|
||||
, cryptography
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-jose";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpdavis";
|
||||
repo = "python-jose";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "cSPIZrps0xFd4pPcQ4w/jFWOk2XYgd3mtE/sDzlytvY=";
|
||||
sha256 = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
ecdsa
|
||||
pyasn1
|
||||
pycrypto
|
||||
pytestCheckHook
|
||||
pytestcov
|
||||
pytestrunner
|
||||
cryptography # optional dependency, but needed in tests
|
||||
pycryptodome
|
||||
rsa
|
||||
];
|
||||
|
||||
# relax ecdsa deps
|
||||
patchPhase = ''
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'ecdsa<0.15' 'ecdsa' \
|
||||
--replace 'ecdsa <0.15' 'ecdsa'
|
||||
--replace '"pytest-runner",' ""
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/mpdavis/python-jose/issues/176
|
||||
"test_key_too_short"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ future six ecdsa rsa ];
|
||||
pythonImportsCheck = [ "jose" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mpdavis/python-jose";
|
||||
description = "A JOSE implementation in Python";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jhhuh ];
|
||||
maintainers = with maintainers; [ jhhuh ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchurl, fetchFromGitHub, buildPythonPackage, isPy3k,
|
||||
{ lib, fetchpatch, fetchFromGitHub, buildPythonPackage, isPy3k,
|
||||
isodate, lxml, xmlsec, freezegun }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -13,14 +13,21 @@ buildPythonPackage rec {
|
|||
sha256 = "1yk02xq90bm7p6k091av6gapb5h2ccxzgrbm03sj2x8h0wff9s8k";
|
||||
};
|
||||
|
||||
# Remove both patches on update
|
||||
patches = [
|
||||
# Remove the dependency on defusedxml
|
||||
#
|
||||
# This patch is already merged upstream and does not introduce any
|
||||
# functionality changes.
|
||||
(fetchurl {
|
||||
(fetchpatch {
|
||||
url = "https://github.com/onelogin/python3-saml/commit/4b6c4b1f2ed3f6eab70ff4391e595b808ace168c.patch";
|
||||
sha256 = "11gqn7ib2hmlx5wp4xhi375v5ajapwmj4lpw0y44bh5ww8cypvqy";
|
||||
sha256 = "sha256-KHyAoX3our3Rz2z4xo0lTBB1XOGuC3Pe+lUDCzK5WQI=";
|
||||
})
|
||||
|
||||
# Update expiry dates for test response XMLs
|
||||
(fetchpatch {
|
||||
url = "https://github.com/onelogin/python3-saml/commit/05611bbf6d7d8313adb9c77ff88a9210333ccc38.patch";
|
||||
sha256 = "sha256-62TwgCXDFYsZIAeqAysJRziMvhUVhGzta/C2wS3v4HY=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.0.8021";
|
||||
version = "9.0.8761";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Bx6A258LgmmRBbrwY2pgf0DXdMwh9QjaA4sVbxj+kBo=";
|
||||
sha256 = "sha256-3aLpMiOJfgELfnpqTyXAL6Uofbm4UW4VRRsYzTTAofg=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
|||
|
|
@ -53,9 +53,13 @@ buildPythonPackage rec {
|
|||
typing-extensions
|
||||
];
|
||||
|
||||
# fails to import graphql, but integrated graphql support is about to
|
||||
# be removed in 0.15, see https://github.com/encode/starlette/pull/1135.
|
||||
disabledTestPaths = [ "tests/test_graphql.py" ];
|
||||
disabledTestPaths = [
|
||||
# fails to import graphql, but integrated graphql support is about to
|
||||
# be removed in 0.15, see https://github.com/encode/starlette/pull/1135.
|
||||
"tests/test_graphql.py"
|
||||
# contextfunction was removed in Jinja 3.1
|
||||
"tests/test_templates.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "starlette" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.5.6";
|
||||
version = "2.5.7";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
sha256 = "sha256-YBGKIfBTU7MRm1Om4Jknd5Nu77qJftCgjuohcO/9X/w=";
|
||||
sha256 = "sha256-dKJQv/omXT/L5dWYkveXodNNt5Q3i1WDIA9nwmo0Sfc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
# This is a temporary copy of the default.nix in this folder, with the version updated to the current tip of rr's master branch.
|
||||
# This exists because rr has not had a release in a long time, but there have been a lot of improvements including UX.
|
||||
# Some of the UX improvements help prevent foot shooting.
|
||||
# Upstream has stated that it should be fine to use master.
|
||||
# This file, and its attribute in all-packages, can be removed once rr makes a release.
|
||||
# For further information, please see https://github.com/NixOS/nixpkgs/issues/99535 "Improve support for the rr debugger in nixos containers"
|
||||
# This is a temporary copy of the default.nix in this folder, with the version
|
||||
# updated to the current tip of rr's master branch. This exists because rr has
|
||||
# not had a release in a long time. Upstream has stated that it should be fine
|
||||
# to use master. This file, and its attribute in all-packages, can be removed
|
||||
# once rr makes a release.
|
||||
|
||||
{ callPackage, fetchFromGitHub }:
|
||||
|
||||
|
|
@ -12,12 +11,12 @@ let
|
|||
in
|
||||
|
||||
rr.overrideAttrs (old: {
|
||||
version = "unstable-2020-10-04";
|
||||
version = "unstable-2021-07-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "rr";
|
||||
rev = "9ff375813a740a0a6ebcdfcebc58bd61ab68c667";
|
||||
sha256 = "0raifs6cg5ckpi2445inhy3hfhp4p89s1lkx9z17mcc2g1c1phf5";
|
||||
rev = "0fc21a8d654dabc7fb1991d76343824cb7951ea0";
|
||||
sha256 = "0s851rflxmvxcfw97zmplcwzhv86xmd3my78pi4c7gkj18d621i5";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.12.12";
|
||||
version = "0.12.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4Ooadv8r6GUBiayiv4WKVurUeRPIv6LPlMhieH4VL8o=";
|
||||
sha256 = "sha256-+qFR5XGV1LSCY8AR7gd269UcOwlL5hkvKiQEhdsqIJc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "just";
|
||||
version = "0.9.6";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FWJ7fSJysT5LVFio49nbN0T0b+zWwiV7NvEJlojbNKs=";
|
||||
sha256 = "sha256-WT3r6qw/lCZy6hdfAJmoAgUqjSLPVT8fKX4DnqDnhOs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-/VmCuHPURQTyeIumMaWVrFu18ZgVR0klpc/bO1f1w4o=";
|
||||
cargoSha256 = "sha256-0R/9VndP/Oh5/yP7NsBC25jiCSRVNEXhbVksElLXeEc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "funnelweb";
|
||||
version = "3.20";
|
||||
|
||||
name = "funnelweb-${meta.version}";
|
||||
src = fetchurl {
|
||||
url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz";
|
||||
sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchgit, cmake, pcre, doxygen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "editorconfig-core-c-${meta.version}";
|
||||
pname = "editorconfig-core-c";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/editorconfig/editorconfig-core-c.git";
|
||||
rev = "v${meta.version}";
|
||||
rev = "v${version}";
|
||||
sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4";
|
||||
fetchSubmodules = true;
|
||||
inherit name;
|
||||
};
|
||||
|
||||
buildInputs = [ pcre ];
|
||||
|
|
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
downloadPage = "https://github.com/editorconfig/editorconfig-core-c";
|
||||
license = with licenses; [ bsd2 bsd3 ];
|
||||
version = "0.12.1";
|
||||
maintainers = with maintainers; [ dochang ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "rolespec-${meta.version}";
|
||||
pname = "rolespec";
|
||||
version = "20161104";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickjj";
|
||||
repo = "rolespec";
|
||||
rev = "d9ee530cd709168882059776c482fc37f46cb743";
|
||||
sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl";
|
||||
inherit name;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -41,9 +40,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
downloadPage = "https://github.com/nickjj/rolespec";
|
||||
license = licenses.gpl3;
|
||||
version = "20161104";
|
||||
maintainers = [ maintainers.dochang ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cypress";
|
||||
version = "7.5.0";
|
||||
version = "7.7.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
|
||||
sha256 = "07i475b17v8qazdq6qzjqsdfpvhg1b8x1p5a51hwhcxaym3p5njj";
|
||||
sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897";
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildEnv, callPackage, makeWrapper, Cocoa }:
|
||||
|
||||
buildEnv {
|
||||
name = "flare-1.11";
|
||||
name = "flare-1.12rc1";
|
||||
|
||||
paths = [
|
||||
(callPackage ./engine.nix { inherit Cocoa; })
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flare-engine";
|
||||
version = "1.11";
|
||||
version = "1.12rc1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flareteam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1j6raymz128miq517h9drks4gj79dajw3lsr0msqxz0z3zm6cc4n";
|
||||
sha256 = "0bl5vayf87y2jd6b1w4nn7pbrhix6dj86xv5kzqxz6b2y65lq73p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flare-game";
|
||||
version = "1.11";
|
||||
version = "1.12rc1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flareteam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "18m2qfbbaqklm20gnr7wzrwbmylp1jh781a4p1dq0hymqcg92x5l";
|
||||
sha256 = "1i2fa2hds5ph8gf5b9647vrn7ycz2fl9xaaaybz8yrjmnpx27bzc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ let
|
|||
in env.mkDerivation rec {
|
||||
pname = "katago";
|
||||
version = "1.9.1";
|
||||
githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362";
|
||||
githash = "c3220a5a404af835792c476f3f24904e4b799444";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightvector";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mfcl2700dncupswrapper-${meta.version}";
|
||||
pname = "mfcl2700dncupswrapper";
|
||||
version = "3.2.0-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf102086/${name}.i386.deb";
|
||||
url = "https://download.brother.com/welcome/dlf102086/mfcl2700dncupswrapper-${version}.i386.deb";
|
||||
sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1";
|
||||
};
|
||||
|
||||
|
|
@ -39,6 +40,5 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.tv ];
|
||||
platforms = lib.platforms.linux;
|
||||
version = "3.2.0-1";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1326,6 +1326,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/direnv/direnv.vim/";
|
||||
};
|
||||
|
||||
doki-theme-vim = buildVimPluginFrom2Nix {
|
||||
pname = "doki-theme-vim";
|
||||
version = "2021-06-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "doki-theme";
|
||||
repo = "doki-theme-vim";
|
||||
rev = "8a3a7b64d5509f87564d846faae5ef0b2b77d2a6";
|
||||
sha256 = "05s7fph5bm9gz2b0biqrpsvvh8ccfxh5csxya3rkja86ppz6wawr";
|
||||
};
|
||||
meta.homepage = "https://github.com/doki-theme/doki-theme-vim/";
|
||||
};
|
||||
|
||||
DoxygenToolkit-vim = buildVimPluginFrom2Nix {
|
||||
pname = "DoxygenToolkit-vim";
|
||||
version = "2010-11-06";
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ digitaltoad/vim-pug
|
|||
direnv/direnv.vim
|
||||
dleonard0/pony-vim-syntax
|
||||
dmix/elvish.vim
|
||||
doki-theme/doki-theme-vim
|
||||
dominikduda/vim_current_word
|
||||
dpelle/vim-LanguageTool
|
||||
dracula/vim as dracula-vim
|
||||
|
|
|
|||
|
|
@ -2,15 +2,28 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evdi";
|
||||
version = "unstable-20210401";
|
||||
version = "unstable-2021-06-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DisplayLink";
|
||||
repo = pname;
|
||||
rev = "b0b3d131b26df62664ca33775679eea7b70c47b1";
|
||||
sha256 = "09apbvdc78bbqzja9z3b1wrwmqkv3k7cn3lll5gsskxjnqbhxk9y";
|
||||
rev = "65e12fca334f2f42396f4e8d16592d53cab34dd6";
|
||||
sha256 = "sha256-81IfdYKadKT7vRdkmxzfGo4KHa4UJ8uJ0K6djQCr22U=";
|
||||
};
|
||||
|
||||
# Linux 5.13 support
|
||||
# The patches break compilation for older kernels
|
||||
patches = lib.optional (kernel.kernelAtLeast "5.13") [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/DisplayLink/evdi/commit/c5f5441d0a115d2cfc8125b8bafaa05b2edc7938.patch";
|
||||
sha256 = "sha256-tWYgBrRh3mXPebhUygOvJ07V87g9JU66hREriACfEVI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/DisplayLink/evdi/commit/5f04d2e2df4cfd21dc15d31f1152c6a66fa48a78.patch";
|
||||
sha256 = "sha256-690/eUiEVWvnT/YAVgKcLo86dgolF9giWRuPxXpL+eQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
buildInputs = [ kernel libdrm ];
|
||||
|
|
@ -31,8 +44,8 @@ stdenv.mkDerivation rec {
|
|||
description = "Extensible Virtual Display Interface";
|
||||
maintainers = with maintainers; [ eyjhb ];
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ lgpl21 gpl2 ];
|
||||
license = with licenses; [ lgpl21Only gpl2Only ];
|
||||
homepage = "https://www.displaylink.com/";
|
||||
broken = versionOlder kernel.version "4.19" || stdenv.isAarch64;
|
||||
broken = kernel.kernelOlder "4.19" || stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
25
pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix
Normal file
25
pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenvNoCC, lib, linuxPackages }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "rtw89-firmware";
|
||||
inherit (linuxPackages.rtw89) version src;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/firmware/rtw89
|
||||
cp *.bin $out/lib/firmware/rtw89
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Driver for Realtek 8852AE, an 802.11ax device";
|
||||
homepage = "https://github.com/lwfinger/rtw89";
|
||||
license = licenses.unfreeRedistributableFirmware;
|
||||
maintainers = with maintainers; [ tvorog ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -844,6 +844,7 @@ let
|
|||
PREEMPT_VOLUNTARY = yes;
|
||||
|
||||
X86_AMD_PLATFORM_DEVICE = yes;
|
||||
X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes;
|
||||
|
||||
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
|
||||
# Enable CPU/memory hotplug support
|
||||
|
|
|
|||
32
pkgs/os-specific/linux/kvmfr/default.nix
Normal file
32
pkgs/os-specific/linux/kvmfr/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kvmfr";
|
||||
version = looking-glass-client.version;
|
||||
|
||||
src = looking-glass-client.src;
|
||||
sourceRoot = "source/module";
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
makeFlags = [
|
||||
"KVER=${kernel.modDirVersion}"
|
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -D kvmfr.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Optional kernel module for LookingGlass";
|
||||
longDescription = ''
|
||||
This kernel module implements a basic interface to the IVSHMEM device for LookingGlass when using LookingGlass in VM->VM mode
|
||||
Additionally, in VM->host mode, it can be used to generate a shared memory device on the host machine that supports dmabuf
|
||||
'';
|
||||
homepage = "https://github.com/gnif/LookingGlass";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ j-brn ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
40
pkgs/os-specific/linux/rtw89/default.nix
Normal file
40
pkgs/os-specific/linux/rtw89/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ stdenv, lib, fetchFromGitHub, kernel }:
|
||||
|
||||
let
|
||||
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtw89";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "rtw89";
|
||||
version = "unstable-2021-07-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lwfinger";
|
||||
repo = "rtw89";
|
||||
rev = "cebafc6dc839e66c725b92c0fabf131bc908f607";
|
||||
sha256 = "1vw67a423gajpzd5d51bxnja1qpppx9x5ii2vcfkj6cbnqwr83af";
|
||||
};
|
||||
|
||||
makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p ${modDestDir}
|
||||
find . -name '*.ko' -exec cp --parents {} ${modDestDir} \;
|
||||
find ${modDestDir} -name '*.ko' -exec xz -f {} \;
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = " Driver for Realtek 8852AE, an 802.11ax device";
|
||||
homepage = "https://github.com/lwfinger/rtw89";
|
||||
license = with licenses; [ gpl2Only ];
|
||||
maintainers = with maintainers; [ tvorog ];
|
||||
platforms = platforms.linux;
|
||||
broken = kernel.kernelOlder "5.4";
|
||||
priority = -1;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdns-recursor";
|
||||
version = "4.5.2";
|
||||
version = "4.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
|
||||
sha256 = "1101izvyknxqhzz987j3acsa221ymgrnmyciaz8v7jziai9ksa5i";
|
||||
sha256 = "0sl98ykk2bh0v2aw2hyak7wk9k3pbhvmfkb3i4a72jlsixm60p81";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@
|
|||
, zlib
|
||||
}: stdenv.mkDerivation rec {
|
||||
pname = "roon-server";
|
||||
version = "1.8-795";
|
||||
version = "1.8-806";
|
||||
|
||||
# N.B. The URL is unstable. I've asked for them to provide a stable URL but
|
||||
# they have ignored me. If this package fails to build for you, you may need
|
||||
# to update the version and sha256.
|
||||
# c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20210610060249/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2";
|
||||
sha256 = "sha256-gC+UquDMyDpgCEYKPp2RRIkHD/4itJssl0hcSEQO5Rc=";
|
||||
url = "https://web.archive.org/web/20210707070319/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2";
|
||||
sha256 = "sha256-TRgsHR71wNz2MoH+RZrIaWEzQSAbo+q8ICKfmmCFy5Y=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -161,6 +161,11 @@ server = stdenv.mkDerivation (common // {
|
|||
|
||||
patches = common.patches;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/galera_new_cluster.sh \
|
||||
--replace ":-mariadb" ":-mysql"
|
||||
'';
|
||||
|
||||
cmakeFlags = common.cmakeFlags ++ [
|
||||
"-DMYSQL_DATADIR=/var/lib/mysql"
|
||||
"-DENABLED_LOCAL_INFILE=OFF"
|
||||
|
|
@ -202,7 +207,6 @@ server = stdenv.mkDerivation (common // {
|
|||
mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security
|
||||
mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security
|
||||
rm -r "$out"/OFF
|
||||
sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster
|
||||
'';
|
||||
|
||||
# perlPackages.DBDmysql is broken on darwin
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ let
|
|||
|
||||
fish = stdenv.mkDerivation rec {
|
||||
pname = "fish";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
# There are differences between the release tarball and the tarball GitHub
|
||||
|
|
@ -144,7 +144,7 @@ let
|
|||
# --version`), as well as the local documentation for all builtins (and
|
||||
# maybe other things).
|
||||
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-pCFeTKsqWxAbC4hDcgvaPH65jooU3KCVC47xfpQoL6o=";
|
||||
sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok=";
|
||||
};
|
||||
|
||||
# Fix FHS paths in tests
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oil";
|
||||
version = "0.8.11";
|
||||
version = "0.8.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||
sha256 = "sha256-GVV+532dPrXkQ3X2+wa4u6aCPBvQAIiypeoqzJqvk9Y=";
|
||||
sha256 = "sha256-M8JdMru2DDcPWa7qQq9m1NQwjI7kVkHvK5I4W5U1XPU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -24,6 +24,11 @@ let
|
|||
sha256 = "0viiwimnk26jfi4ypkvclqqxw8anlmch10zscjw69d8x1pyqczcd";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
url = "${baseUrl}/${name}-darwin-arm.tar.gz";
|
||||
sha256 = "sha256-EZbJgMzEZScvaqSKay5aDuayVaIK1zZUzqAHgT0czZk=";
|
||||
};
|
||||
|
||||
x86_64-linux = {
|
||||
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
|
||||
sha256 = "11113l8pyhq6vbsh79m5anh6ljss94zhnp33ghds9rn1gxa83hnb";
|
||||
|
|
@ -109,6 +114,6 @@ in stdenv.mkDerivation rec {
|
|||
license = licenses.free;
|
||||
homepage = "https://cloud.google.com/sdk/";
|
||||
maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "3.5.1";
|
||||
version = "3.6.0";
|
||||
pulumiPkgs = {
|
||||
x86_64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.5.1-linux-x64.tar.gz";
|
||||
sha256 = "1wdkwifn1p0m98dmn0g2kcwnllqilfwzkyyg2sg1pfdmk3da9bi3";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-linux-x64.tar.gz";
|
||||
sha256 = "1phj65y1l6pllq5fyrxm7hrwg44jpzq1skq6dw7x6zrs8prnlj52";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.8.0-linux-amd64.tar.gz";
|
||||
sha256 = "14r2akgfrs512h9g6lx9scl0bph3qmw3j113shwg2nhqbmwvvh3z";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-linux-amd64.tar.gz";
|
||||
sha256 = "12fj43pcs64s0i6h05q94abbxi0r1rlh8qgycmmydr8wajsn2a54";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-linux-amd64.tar.gz";
|
||||
|
|
@ -41,8 +41,8 @@
|
|||
sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.9.0-linux-amd64.tar.gz";
|
||||
sha256 = "0w28ikwna057dbhsvidkd5sp2v0frih6n4an1cl3gx51yhqsxzap";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-linux-amd64.tar.gz";
|
||||
sha256 = "0h0dpbdc9rcagw0wgz5l6jjc8wl1hj5ki5shi44jyf4hz7l0yl9y";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-linux-amd64.tar.gz";
|
||||
|
|
@ -53,16 +53,16 @@
|
|||
sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.1-linux-amd64.tar.gz";
|
||||
sha256 = "1jk3al4mnk6cblaf56yyx0anv3kp3vyr6fqglsinkzaayaswx63z";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-linux-amd64.tar.gz";
|
||||
sha256 = "0al3578g7l9rvhkswlm56wpkybj6njj39a3g56in9882lhpqixsy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.4.0-linux-amd64.tar.gz";
|
||||
sha256 = "1dpd6m5w6fnxrspig4s2vcd4hxy720gcrdrxakn1mvz29k4s0zv3";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-linux-amd64.tar.gz";
|
||||
sha256 = "1zi6r1g7l56ra506hxkj8p9wlkgbmry7ir48v8wwdsfvplryj4sf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-linux-amd64.tar.gz";
|
||||
sha256 = "0q1bi1a80jwgx52m9hy0vp67hdv3nbhd0gqxj3jaf5w4dnh48dca";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "1lvb3vs2yp0ybz2xn2za5f0nfipiisrpzwzfn0wgl9arh17v0phc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-amd64.tar.gz";
|
||||
|
|
@ -99,16 +99,16 @@
|
|||
];
|
||||
x86_64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.5.1-darwin-x64.tar.gz";
|
||||
sha256 = "0q2617vg53ib65vlj09z78lqqg4dz5ymcjn9kablkm5a6s1sfh5s";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.6.0-darwin-x64.tar.gz";
|
||||
sha256 = "0yql94y78q0hfsxfsgvkxs7dv2lgrkv4ypm59qjr8l04krcknbmm";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.8.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0qhpzvfv67fn2n1x3h7znqiw7wxz526iw1a41q8v8jalkahfa2rb";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.10.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0zv4b7nyvz7h0h0jxndd7dxzf4risgqyl7f20cbbcsixxk90sz38";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.2.0-darwin-amd64.tar.gz";
|
||||
|
|
@ -135,8 +135,8 @@
|
|||
sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.9.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1y4pjx260dlh7yi0skd5n2ixlqzi6b9lp5h77qaq1b9h3n4xybfh";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.11.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1k7yxajx3157qdanw1y11053k74rwlcvh828xrpwkzqszmzizxp9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.2.0-darwin-amd64.tar.gz";
|
||||
|
|
@ -147,16 +147,16 @@
|
|||
sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1ddkzwwr2vc0sp1q3r510rpjqj5dl1dn8ax938874jnflcbcwng6";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.1.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1fgh7q7sivip212q2zgvrgg3lwxrzasm9vpa858168fvjv67ylbc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.4.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1x6fqa643n731cadb02288kc2z321gjjldkvi8wvjjy2dm0lfp72";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.5.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0cl8wg5g78c147pqy5q52qq9bd7hw8zgvfmdafszwzwz6xh1051b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-darwin-amd64.tar.gz";
|
||||
sha256 = "13rq01ylrqp48n62cp640a4mdqbrqnibb0xaw9pcpddl3a3nnck0";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "008jqnrl08g3gd38vg2yjwxdn288z75sbp3ghl2cbncfah2lwwja";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-amd64.tar.gz";
|
||||
|
|
|
|||
|
|
@ -3,25 +3,25 @@
|
|||
|
||||
# Version of Pulumi from
|
||||
# https://www.pulumi.com/docs/get-started/install/versions/
|
||||
VERSION="3.5.1"
|
||||
VERSION="3.6.0"
|
||||
|
||||
# Grab latest release ${VERSION} from
|
||||
# https://github.com/pulumi/pulumi-${NAME}/releases
|
||||
plugins=(
|
||||
"auth0=2.2.0"
|
||||
"aws=4.8.0"
|
||||
"aws=4.10.0"
|
||||
"cloudflare=3.2.0"
|
||||
"consul=3.2.0"
|
||||
"datadog=3.3.0"
|
||||
"digitalocean=4.4.1"
|
||||
"docker=3.0.0"
|
||||
"equinix-metal=2.0.0"
|
||||
"gcp=5.9.0"
|
||||
"gcp=5.11.0"
|
||||
"github=4.2.0"
|
||||
"gitlab=4.1.0"
|
||||
"hcloud=1.0.1"
|
||||
"kubernetes=3.4.0"
|
||||
"linode=3.1.0"
|
||||
"hcloud=1.1.0"
|
||||
"kubernetes=3.5.0"
|
||||
"linode=3.2.0"
|
||||
"mailgun=3.1.0"
|
||||
"mysql=3.0.0"
|
||||
"openstack=3.2.0"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
{ fetchFromGitHub, perl, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sec-${meta.version}";
|
||||
pname = "sec";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simple-evcorr";
|
||||
repo = "sec";
|
||||
rev = meta.version;
|
||||
rev = version;
|
||||
sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83";
|
||||
};
|
||||
|
||||
|
|
@ -27,6 +28,5 @@ stdenv.mkDerivation rec {
|
|||
description = "Simple Event Correlator";
|
||||
maintainers = [ lib.maintainers.tv ];
|
||||
platforms = lib.platforms.all;
|
||||
version = "2.8.3";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, pkg-config, libX11, libXcursor, libxcb, python3 }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, libX11, libXcursor, libxcb, python3 }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xcolor";
|
||||
|
|
@ -11,7 +11,15 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-rHqK05dN5lrvDNbRCWGghI7KJwWzNCuRDEThEeMzmio=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-lHOT/P1Sh1b53EkPIQM3l9Tozdqh60qlUDdjthj32jM=";
|
||||
cargoPatches = [
|
||||
# Update Cargo.lock, lexical_core doesn't build on Rust 1.52.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Soft/xcolor/commit/324d80a18a39a11f2f7141b226f492e2a862d2ce.patch";
|
||||
sha256 = "sha256-5VzXitpl/gMef40UQBh1EoHezXPyB08aflqp0mSMAVI=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-yD4pX+dCJvbDecsdB8tNt1VsEcyAJxNrB5WsZUhPGII=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config python3 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "0.172.1";
|
||||
version = "0.173.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xTLNAcqvk5GDs9HsNvL+4SPeT8baFMg7J0yW+E8x+Gc=";
|
||||
sha256 = "sha256-v3Sln1qtYDdWCWJSKErxUoPAUzwWrTYM0j5X+mz+1xo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Zd48I7e5zCbSXz5RVckMXQMpqvf6gAoajx5yLk2ODmU=";
|
||||
vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM=";
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user