Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d1b1f7fda7
|
|
@ -264,6 +264,7 @@
|
|||
./programs/wayland/river.nix
|
||||
./programs/wayland/sway.nix
|
||||
./programs/wayland/waybar.nix
|
||||
./programs/wayland/wayfire.nix
|
||||
./programs/weylus.nix
|
||||
./programs/wireshark.nix
|
||||
./programs/xastir.nix
|
||||
|
|
|
|||
48
nixos/modules/programs/wayland/wayfire.nix
Normal file
48
nixos/modules/programs/wayland/wayfire.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ config, lib, pkgs, ...}:
|
||||
let
|
||||
cfg = config.programs.wayfire;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ rewine ];
|
||||
|
||||
options.programs.wayfire = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "Wayfire, a wayland compositor based on wlroots.");
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "wayfire" { };
|
||||
|
||||
plugins = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = with pkgs.wayfirePlugins; [ wcm wf-shell ];
|
||||
defaultText = lib.literalExpression "with pkgs.wayfirePlugins; [ wcm wf-shell ]";
|
||||
example = lib.literalExpression ''
|
||||
with pkgs.wayfirePlugins; [
|
||||
wcm
|
||||
wf-shell
|
||||
wayfire-plugins-extra
|
||||
];
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
Additional plugins to use with the wayfire window manager.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = let
|
||||
finalPackage = pkgs.wayfire-with-plugins.override {
|
||||
wayfire = cfg.package;
|
||||
plugins = cfg.plugins;
|
||||
};
|
||||
in
|
||||
lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
finalPackage
|
||||
];
|
||||
|
||||
services.xserver.displayManager.sessionPackages = [ finalPackage ];
|
||||
|
||||
xdg.portal = {
|
||||
enable = lib.mkDefault true;
|
||||
wlr.enable = lib.mkDefault true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -62,14 +62,14 @@ in
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "azuredatastudio";
|
||||
version = "1.35.1";
|
||||
version = "1.44.1";
|
||||
|
||||
desktopItems = [ desktopItem urlHandlerDesktopItem ];
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable";
|
||||
sha256 = "sha256-b/ha+81TlffnvSENzaePvfFugcKJffvjRU7y+x60OuQ=";
|
||||
sha256 = "sha256-6kEV331kt+/7/uWKZmTTkJX4P06CfxC8Ogq052qlUEg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
# this will most likely need to be updated when azuredatastudio's version changes
|
||||
sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.215";
|
||||
sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6";
|
||||
|
||||
rpath = lib.concatStringsSep ":" [
|
||||
atomEnv.libPath
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgmodeler";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmodeler";
|
||||
repo = "pgmodeler";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1d+zox46h22ox9zC+SvN3w3LkpHmN1jpf/tDPD5D80s=";
|
||||
sha256 = "sha256-Wl4MKsZhn5FKEhsezt+j8qpZs+KNHaQrWQ8x7y51MNE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k8sgpt";
|
||||
version = "0.3.9";
|
||||
version = "0.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k8sgpt-ai";
|
||||
repo = "k8sgpt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nTGAYsw4R4ANAV8V3QdNpwXKWxdcAfXfUOUJJTkBD4k=";
|
||||
hash = "sha256-JXKM39tODHg5jRE5p0u5xETPFDZrQgFri3FrYJFVUZU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XHhk9JG9U4bz67pcNohAZJULIjmSPYBybYi3z6aPwi4=";
|
||||
vendorHash = "sha256-L8/GLhjCI93R9S1fE+wgXyPObIXRMkj5MF71iWAZVQk=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeconform";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yannh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TPT+zO5WHW/D04dLMJLJ7uAYoDLky75kWqaN7PsyzEo=";
|
||||
sha256 = "sha256-Tu1hAWAqnTGq9NL0kjG2VGzSKDh55HyAoa0nhsJdNLw=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nova";
|
||||
version = "3.6.4";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6gTrBogMvM7X6PFthG+c8N9wXoNHwp0wHjGVKjiHJJY=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-K4D8vCZxOPRalSDlAmva7Qm72EJ2Xdz20oqKKqkD6iA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YvYfSb2ZC86S2osFRG7Ep9nrgYJV0tB8fBgZQZ07t2U=";
|
||||
vendorHash = "sha256-c30B8Wjvwp4NnB1P8h4/raGiGAX/cbTZ/KQqh/qeNhA=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -73,13 +73,13 @@
|
|||
"vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4="
|
||||
},
|
||||
"argocd": {
|
||||
"hash": "sha256-S7Za9V18clq3Kb3pIQxUZpt8d51Dht76e+ypdAZB3VA=",
|
||||
"hash": "sha256-pEcByit+xTBuJXCqhDOgHoc4lmCpbDptVocylcTqgz4=",
|
||||
"homepage": "https://registry.terraform.io/providers/oboukili/argocd",
|
||||
"owner": "oboukili",
|
||||
"repo": "terraform-provider-argocd",
|
||||
"rev": "v5.6.0",
|
||||
"rev": "v6.0.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-4gVJ5j2pdrtZYmatsO5N+IwVbNCJfqMlizDI7UhgiOU="
|
||||
"vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo="
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-QljqPcupvU7AgVSuarpd0FwLuAPJI9umgsgMXc2/v6w=",
|
||||
|
|
@ -182,13 +182,13 @@
|
|||
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
|
||||
},
|
||||
"buildkite": {
|
||||
"hash": "sha256-1cKRsOuwYu3DV8uArrrf1hJdJ+C54D2awKmJm5ECEG4=",
|
||||
"hash": "sha256-2nJXniJfOHuHaEEue0rugq5RRnThcFMh7MWYGE/AzmA=",
|
||||
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
|
||||
"owner": "buildkite",
|
||||
"repo": "terraform-provider-buildkite",
|
||||
"rev": "v0.20.0",
|
||||
"rev": "v0.21.2",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-QJ8bZU6K0UAduUjFmyGHjsaHm2e5U8rlPqlK6xM8m3I="
|
||||
"vendorHash": "sha256-xxuF4LVDkFkHT42plP+Mv8GFdBrrZZVUm6vErjpho3I="
|
||||
},
|
||||
"checkly": {
|
||||
"hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=",
|
||||
|
|
@ -218,13 +218,13 @@
|
|||
"vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q="
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-Zj8CC+Xiej+gz9V/9IeIGaWP2cjIg6jboXN5jrBCosM=",
|
||||
"hash": "sha256-vC3uvv04an6KhXT1FECiB2LQMxJbiYhULNuiXoCRhnY=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
|
||||
"owner": "cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v4.10.0",
|
||||
"rev": "v4.11.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-hxD+0OrCdyYn/9nvz5fd/54YiaZyZMOfsIa7lqZhCHE="
|
||||
"vendorHash": "sha256-m+tQeOUbJ+bnVYl4FcBSTHKYuSGtznCqRQ/CR204WkE="
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-hoX2KNUzC7G+bFxReTN/6IG8/P4rczHAYn2QQ2iOioc=",
|
||||
|
|
@ -354,13 +354,13 @@
|
|||
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
|
||||
},
|
||||
"equinix": {
|
||||
"hash": "sha256-mS2o0AyOG2Z3tadv036we2J10S1JvNz3gdoykIjCSq0=",
|
||||
"hash": "sha256-fTzo4vgUwq9k5BhlAEAjMbu3O+jGtIumvzT0xYox6fg=",
|
||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||
"owner": "equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v1.14.3",
|
||||
"rev": "v1.14.4",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM="
|
||||
"vendorHash": "sha256-7a90fzAU76QRXkSa+G/N3kMPP8jy68i72i2JSlUrvfc="
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-dLA9BWW4ghD1OSZaZtFfv8ipS+2lTeNRr1YD3E8ewpI=",
|
||||
|
|
@ -510,11 +510,11 @@
|
|||
"vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE="
|
||||
},
|
||||
"heroku": {
|
||||
"hash": "sha256-zxX7cro1hAtgABlDsKQHxJJH9BrOlJHKFFwL5gGrmU0=",
|
||||
"hash": "sha256-tdaj6ZbVCvQTYblgpRC5GFoW8fbzTSHf0j6BM1tOlik=",
|
||||
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
|
||||
"owner": "heroku",
|
||||
"repo": "terraform-provider-heroku",
|
||||
"rev": "v5.2.4",
|
||||
"rev": "v5.2.5",
|
||||
"spdx": null,
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -655,11 +655,11 @@
|
|||
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
|
||||
},
|
||||
"launchdarkly": {
|
||||
"hash": "sha256-RNLWcABBoTDY541og/euj4CLhK6t58wck9rpdedwRJM=",
|
||||
"hash": "sha256-I4d/REcXlyFX+LztvpkWjXjlWZD2JL//mewvgNdw2Rc=",
|
||||
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
|
||||
"owner": "launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.13.2",
|
||||
"rev": "v2.13.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA="
|
||||
},
|
||||
|
|
@ -772,13 +772,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-cKwefGAx4VIdupCOb6XLQaiy+Na7XyFJ7yjZCiJO224=",
|
||||
"hash": "sha256-6dQ0oJeYBmMhpldt8SyPL0VY4IM4n3Dpg62SYvCjigI=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.25.2",
|
||||
"rev": "v3.26.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-zp4gqpbJ6avIjV/cvomgqZsdk8XgweWQ6mIX4RlIo7c="
|
||||
"vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw="
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=",
|
||||
|
|
@ -818,11 +818,11 @@
|
|||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-kGz6lginz3cZOYcfh21pBe+wAQ1slbsIz02sc1fNJ0E=",
|
||||
"hash": "sha256-GH8y9NkoNydzEpwl6wxmHIpaq6IfRv8cOz/NidiT488=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v5.5.0",
|
||||
"rev": "v5.6.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -935,13 +935,13 @@
|
|||
"vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
|
||||
},
|
||||
"rancher2": {
|
||||
"hash": "sha256-hzcJOWbOh/HKYl9mKpo59/Mw2tjnfs36fQzSyFdKfFw=",
|
||||
"hash": "sha256-/BAaOZM9SZA0crEEB0+UlCzDo2d4RfNdDQe04pCTCdE=",
|
||||
"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
|
||||
"owner": "rancher",
|
||||
"repo": "terraform-provider-rancher2",
|
||||
"rev": "v3.0.2",
|
||||
"rev": "v3.1.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-RSHI994zW7rzA/SJ/Ioilg7mQB/VbDInSeZ9IaEYVIc="
|
||||
"vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc="
|
||||
},
|
||||
"random": {
|
||||
"hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=",
|
||||
|
|
@ -1052,11 +1052,11 @@
|
|||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-3NxeqlcodW6n7RbLferdGKMf2iXEEcMtmQgaMa/J4lU=",
|
||||
"hash": "sha256-PxjZ6PBGLuV4x5ImSnYO4JuezNfgDXaCxrRUioDxdCg=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.128.0",
|
||||
"rev": "v1.129.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-0rWVOVRndC/Y0gSfJoqd65rvBqUnNQb47S6RiBw7q+4="
|
||||
},
|
||||
|
|
|
|||
|
|
@ -166,8 +166,8 @@ rec {
|
|||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.5.3";
|
||||
hash = "sha256-4TnTYzjy8v5+mcV/JIiMPLCTPSanfmbTGzwlMovwlOo=";
|
||||
version = "1.5.4";
|
||||
hash = "sha256-MvN4gSJcPORD0wj6ixc3gUXPISGvAKSJPA6bS/SmDOY=";
|
||||
vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "timoni";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stefanprodan";
|
||||
repo = "timoni";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D49jpwldmtS7/+++4avqAGOhILaHmlUvnfjoV45KVc4=";
|
||||
hash = "sha256-1l+PEG3ptlWmM48v9K7Rm090WF8cv+e2ezYFN2JRK/o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QWNYBHxcKyAexnD6bHfJIDSOEST2J/09YKC/kDsXKHU=";
|
||||
vendorHash = "sha256-Mgo6Q3P8Piv5uLgyXDGpRI4CgbZn1DUcM7XhVZxl8EE=";
|
||||
|
||||
subPackages = [ "cmd/timoni" ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "morgen";
|
||||
version = "2.7.4";
|
||||
version = "2.7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
|
||||
sha256 = "sha256-jrDu4tXuYl2ttTRHpKHZDucqWO4mYc6zwAdRd0rQht4=";
|
||||
sha256 = "sha256-gsH+KJt0d1Xe1JhgXuqot/vrMw9eBzIpCGlGeaeVJ+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-07-16";
|
||||
version = "unstable-2023-07-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "95709ed796bc1df558aa7ba3728b6eb9b6385fea";
|
||||
sha256 = "wNGVvIQkAburH37GumSZX09V++MVCNvXee5Gw7YQHtc=";
|
||||
rev = "24a80b0468d9abf15207dcb962d9e14a544d53a3";
|
||||
sha256 = "D9bLsxQ/52ziIlm0A9/be8KmcqZ+xr8ZygCCG2mgGJw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "git-lfs";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-lfs";
|
||||
repo = "git-lfs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r1z97sgqo1IyR0oW5b3bMGTUHGE8U+hrWgQ0Su9FRrw=";
|
||||
hash = "sha256-lZx+sJQttclZPET0jkv3dmpQysCpsYani+La7yfSUlI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-did6qAUawmQ/juLzJWIXGzmErj9tBKgM7HROTezX+tw=";
|
||||
vendorHash = "sha256-VmPeQYWOHFqFLHKcKH3WHz50yx7GMHVIDPzqiVwwjSg=";
|
||||
|
||||
nativeBuildInputs = [ asciidoctor installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iina";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg";
|
||||
hash = "sha256-rF5yv2QHWVUUsyf/u78jWRn4C629GBJgB/i8YnaKHBk=";
|
||||
hash = "sha256-Sz9sS+07t32+KcEr9tXQlZKEr7Ace1mjX9caOicIiZE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
|
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
|||
description = "The modern media player for macOS";
|
||||
platforms = platforms.darwin;
|
||||
license = licenses.gpl3;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ arkivm stepbrobd ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
{ lib, newScope, wayfirePlugins }:
|
||||
|
||||
lib.makeExtensible (self: with self; {
|
||||
inherit wayfirePlugins;
|
||||
|
||||
callPackage = newScope self;
|
||||
|
||||
wayfire = callPackage ./. { };
|
||||
|
||||
wcm = callPackage ./wcm.nix {
|
||||
inherit (wayfirePlugins) wf-shell;
|
||||
};
|
||||
|
||||
wrapWayfireApplication = callPackage ./wrapper.nix { };
|
||||
|
||||
withPlugins = selector: self // {
|
||||
wayfire = wrapWayfireApplication wayfire selector;
|
||||
wcm = wrapWayfireApplication wcm selector;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
{ newScope, wayfire }:
|
||||
|
||||
let
|
||||
self = with self; {
|
||||
inherit wayfire;
|
||||
|
||||
callPackage = newScope self;
|
||||
{ lib, pkgs }:
|
||||
|
||||
lib.makeScope pkgs.newScope (self:
|
||||
let
|
||||
inherit (self) callPackage;
|
||||
in {
|
||||
wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { };
|
||||
wcm = callPackage ./wcm.nix { };
|
||||
wf-shell = callPackage ./wf-shell.nix { };
|
||||
};
|
||||
in
|
||||
self
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wayfire
|
||||
, wf-config
|
||||
, gtkmm3
|
||||
, gtk-layer-shell
|
||||
, libxkbcommon
|
||||
, xcbutilwm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wayfire-plugins-extra";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wayfire-plugins-extra";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-hnsRwIrl0+pRKhRlrF/Wdlu6HkzLfYukGk4Hzx3wNeo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace metadata/meson.build \
|
||||
--replace "wayfire.get_variable(pkgconfig: 'metadatadir')" "join_paths(get_option('prefix'), 'share/wayfire/metadata')"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wayfire
|
||||
wf-config
|
||||
libxkbcommon
|
||||
xcbutilwm
|
||||
gtkmm3
|
||||
gtk-layer-shell
|
||||
];
|
||||
|
||||
mesonFlags = [ "--sysconfdir /etc" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/WayfireWM/wayfire-plugins-extra";
|
||||
description = "Additional plugins for Wayfire";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ rewine ];
|
||||
inherit (wayfire.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,39 +1,32 @@
|
|||
{ runCommand, lib, makeWrapper, wayfirePlugins }:
|
||||
{ symlinkJoin, lib, makeWrapper, wayfire, plugins ? [ ] }:
|
||||
|
||||
let
|
||||
inherit (lib) escapeShellArg makeBinPath;
|
||||
symlinkJoin {
|
||||
name = "wayfire-wrapped-${lib.getVersion wayfire}";
|
||||
|
||||
xmlPath = plugin: "${plugin}/share/wayfire/metadata/wf-shell";
|
||||
|
||||
makePluginPath = lib.makeLibraryPath;
|
||||
makePluginXMLPath = lib.concatMapStringsSep ":" xmlPath;
|
||||
in
|
||||
|
||||
application:
|
||||
|
||||
choosePlugins:
|
||||
|
||||
let
|
||||
plugins = choosePlugins wayfirePlugins;
|
||||
in
|
||||
|
||||
runCommand "${application.name}-wrapped" {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
passthru = application.passthru // {
|
||||
unwrapped = application;
|
||||
paths = [
|
||||
wayfire
|
||||
] ++ plugins;
|
||||
|
||||
postBuild = ''
|
||||
for binary in $out/bin/*; do
|
||||
wrapProgram $binary \
|
||||
--prefix WAYFIRE_PLUGIN_PATH : $out/lib/wayfire \
|
||||
--prefix WAYFIRE_PLUGIN_XML_PATH : $out/share/wayfire/metadata
|
||||
done
|
||||
'';
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
passthru = wayfire.passthru // {
|
||||
unwrapped = wayfire;
|
||||
};
|
||||
|
||||
inherit (application) meta;
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
for bin in ${application}/bin/*
|
||||
do
|
||||
makeWrapper "$bin" $out/bin/''${bin##*/} \
|
||||
--suffix PATH : ${escapeShellArg (makeBinPath plugins)} \
|
||||
--suffix WAYFIRE_PLUGIN_PATH : ${escapeShellArg (makePluginPath plugins)} \
|
||||
--suffix WAYFIRE_PLUGIN_XML_PATH : ${escapeShellArg (makePluginXMLPath plugins)}
|
||||
done
|
||||
find ${application} -mindepth 1 -maxdepth 1 -not -name bin \
|
||||
-exec ln -s '{}' $out ';'
|
||||
''
|
||||
meta = wayfire.meta // {
|
||||
# To prevent builds on hydra
|
||||
hydraPlatforms = [];
|
||||
# prefer wrapper over the package
|
||||
priority = (wayfire.meta.priority or 0) - 1;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,15 +3,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-volumed-pulse";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
sha256 = "sha256-EgmTk19p9OBmz3rWQB0LoPhhoDm4u1V6/vvgitOzUuc=";
|
||||
|
||||
# https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/merge_requests/3
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac.in \
|
||||
--replace "2.16" "2.26"
|
||||
'';
|
||||
sha256 = "sha256-NDIJRjKV5aoM2sLhZ6WmoynOc4yz55KpuiTJDMLMA5Y=";
|
||||
|
||||
buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null, testers }:
|
||||
|
||||
let
|
||||
platform = with stdenv;
|
||||
|
|
@ -8,30 +8,41 @@ let
|
|||
else if isSunOS then "solaris"
|
||||
else "linux"; # Should be a sane default
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chicken";
|
||||
version = "5.3.0";
|
||||
|
||||
binaryVersion = 11;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
|
||||
url = "https://code.call-cc.org/releases/${finalAttrs.version}/chicken-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=";
|
||||
};
|
||||
|
||||
# Disable two broken tests: "static link" and "linking tests"
|
||||
postPatch = ''
|
||||
sed -i tests/runtests.sh -e "/static link/,+4 { s/^/# / }"
|
||||
sed -i tests/runtests.sh -e "/linking tests/,+11 { s/^/# / }"
|
||||
'';
|
||||
|
||||
setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh;
|
||||
|
||||
# -fno-strict-overflow is not a supported argument in clang on darwin
|
||||
hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"];
|
||||
# -fno-strict-overflow is not a supported argument in clang
|
||||
hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ];
|
||||
|
||||
makeFlags = [
|
||||
"PLATFORM=${platform}" "PREFIX=$(out)"
|
||||
] ++ (lib.optionals stdenv.isDarwin [
|
||||
"XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
|
||||
"PLATFORM=${platform}"
|
||||
"PREFIX=$(out)"
|
||||
"C_COMPILER=$(CC)"
|
||||
"CXX_COMPILER=$(CXX)"
|
||||
"TARGET_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
|
||||
"TARGET_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"
|
||||
] ++ (lib.optionals stdenv.isDarwin [
|
||||
"XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin"
|
||||
"LINKER_OPTIONS=-headerpad_max_install_names"
|
||||
"POSTINSTALL_PROGRAM=install_name_tool"
|
||||
]) ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"HOSTSYSTEM=${stdenv.hostPlatform.config}"
|
||||
]);
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -44,24 +55,16 @@ stdenv.mkDerivation rec {
|
|||
bootstrap-chicken
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for f in $out/bin/*
|
||||
do
|
||||
wrapProgram $f \
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
|
||||
done
|
||||
'';
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
postCheck = ''
|
||||
./csi -R chicken.pathname -R chicken.platform \
|
||||
-p "(assert (equal? \"${toString binaryVersion}\" (pathname-file (car (repository-path)))))"
|
||||
-p "(assert (equal? \"${toString finalAttrs.binaryVersion}\" (pathname-file (car (repository-path)))))"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/chicken -version
|
||||
'';
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "csi -version";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://call-cc.org/";
|
||||
|
|
@ -77,4 +80,4 @@ stdenv.mkDerivation rec {
|
|||
Windows, and many Unix flavours.
|
||||
'';
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,14 +17,16 @@ in
|
|||
(stdenv.mkDerivation ({
|
||||
name = "chicken-${name}";
|
||||
propagatedBuildInputs = buildInputs;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ chicken makeWrapper ];
|
||||
buildInputs = [ chicken ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
chicken-install -cached -no-install ${lib.escapeShellArgs chickenInstallFlags}
|
||||
chicken-install -cached -no-install -host ${lib.escapeShellArgs chickenInstallFlags}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
|
@ -33,7 +35,7 @@ in
|
|||
|
||||
export CHICKEN_INSTALL_PREFIX=$out
|
||||
export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion}
|
||||
chicken-install -cached ${lib.escapeShellArgs chickenInstallFlags}
|
||||
chicken-install -cached -host ${lib.escapeShellArgs chickenInstallFlags}
|
||||
|
||||
for f in $out/bin/*
|
||||
do
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ mkCoqDerivation rec {
|
|||
owner = "coq-ext-lib";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.11" "8.17"; out = "0.11.7"; }
|
||||
{ case = range "8.11" "8.17"; out = "0.11.8"; }
|
||||
{ case = range "8.8" "8.16"; out = "0.11.6"; }
|
||||
{ case = range "8.8" "8.14"; out = "0.11.4"; }
|
||||
{ case = range "8.8" "8.13"; out = "0.11.3"; }
|
||||
|
|
@ -13,6 +13,7 @@ mkCoqDerivation rec {
|
|||
{ case = "8.6"; out = "0.9.5"; }
|
||||
{ case = "8.5"; out = "0.9.4"; }
|
||||
] null;
|
||||
release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k=";
|
||||
release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY=";
|
||||
release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7";
|
||||
release."0.11.4".sha256 = "0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
self: dontUse: with self;
|
||||
self: super: with self;
|
||||
|
||||
let
|
||||
pythonInterpreter = python.pythonForBuild.interpreter;
|
||||
pythonSitePackages = python.sitePackages;
|
||||
pythonCheckInterpreter = python.interpreter;
|
||||
pythonInterpreter = super.python.pythonForBuild.interpreter;
|
||||
pythonSitePackages = super.python.sitePackages;
|
||||
pythonCheckInterpreter = super.python.interpreter;
|
||||
setuppy = ../run_setup.py;
|
||||
in {
|
||||
makePythonHook = args: pkgs.makeSetupHook ({passthru.provides.setupHook = true; } // args);
|
||||
|
|
|
|||
|
|
@ -47,13 +47,12 @@
|
|||
selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget.
|
||||
};
|
||||
hooks = import ./hooks/default.nix;
|
||||
keep = self: hooks self {};
|
||||
keep = lib.extends hooks pythonPackagesFun;
|
||||
extra = _: {};
|
||||
optionalExtensions = cond: as: lib.optionals cond as;
|
||||
pythonExtension = import ../../../top-level/python-packages.nix;
|
||||
python2Extension = import ../../../top-level/python2-packages.nix;
|
||||
extensions = lib.composeManyExtensions ([
|
||||
hooks
|
||||
pythonExtension
|
||||
] ++ (optionalExtensions (!self.isPy3k) [
|
||||
python2Extension
|
||||
|
|
@ -65,7 +64,7 @@
|
|||
otherSplices
|
||||
keep
|
||||
extra
|
||||
(lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun))
|
||||
(lib.extends (lib.composeExtensions aliases extensions) keep))
|
||||
{
|
||||
overrides = packageOverrides;
|
||||
python = self;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype
|
||||
|
||||
# dependence on harfbuzz is looser than the reverse dependence
|
||||
nativeBuildInputs = [ pkg-config which makeWrapper ]
|
||||
nativeBuildInputs = [ pkg-config which ]
|
||||
++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper
|
||||
# FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
|
||||
++ lib.optional (!stdenv.isLinux) gnumake;
|
||||
|
||||
|
|
@ -63,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postInstall = glib.flattenInclude + ''
|
||||
substituteInPlace $dev/bin/freetype-config \
|
||||
--replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config}
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
|
||||
wrapProgram "$dev/bin/freetype-config" \
|
||||
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.60";
|
||||
version = "9.2.61";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gai+o8XVcOj/HidvlictpnbHLUcGrNR+BLkCuEK8b7c=";
|
||||
hash = "sha256-QIYJ0Xp1MwCHN1LcpGXF+ZjzFV7dRP6faQy1nwBiMFM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.60";
|
||||
version = "9.2.61";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+LeJDSYtAdWyYu2wDm+r7nr1H+CKGxQI9CnmY/8lc/w=";
|
||||
hash = "sha256-8nGiGDohzxiFNyvMls9EeUxcV7iFIBS2YhaE6Hep0KU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.60";
|
||||
version = "9.2.61";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-w2dauzM7niQSbgLgSMXN5X2aU1Xj+9G/8Mah4CDMWGw=";
|
||||
hash = "sha256-ZTS+Z0PWcA/jhBx37SVZOZ+NjPyG2VaRYMmBg0BeCDI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-cognitiveservices";
|
||||
version = "13.4.0";
|
||||
version = "13.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-GQXDIWOiKGqZqrzpNfvDR8hTU4KnpjZQKrLivcD0tsA=";
|
||||
hash = "sha256-RK8LGbH4J+nN6gnGBUweZgkqUcMrwe9aVtvZtAvFeBU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
pname = "azure-mgmt-kusto";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dkuVCFR+w3Yr764izDqxGfKtDvgRmAuziSPpkKDWcxc=";
|
||||
hash = "sha256-zgkFMrufHoX3gq9QXo8SlJYZOfV5GlY3pVQXmIWyx7c=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.60";
|
||||
version = "9.2.61";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UpNnvHlsZkDltIDJAl8m1wx79MByRpBjUneiTW0PZr8=";
|
||||
hash = "sha256-ibxXVHVskDF0DcOWccNKQpWu2V50ZSLCoZHRo+XEZTM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.60";
|
||||
version = "9.2.61";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
|
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CpJiRcaZGM7AOzO1HqCmzWJAFhS2fHmSOJsRLs3VPFc=";
|
||||
hash = "sha256-iAKHNVAtUdm+ZTk5nXejI7WdEV9sTjLnfZ4B6Wxzk18=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonmerge";
|
||||
version = "1.9.0";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0=";
|
||||
hash = "sha256-xDdX4BgLDhm3rkwTCtQqB8xYDDGRL2H0gj6Ory+jlKM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jsonschema ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "kasa-crypt";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = "kasa-crypt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VAm/jHeG/LfLpouHc3mSX8Kr8u/keHY552dLzoGaPrQ=";
|
||||
hash = "sha256-w0LdGPVsxTi7jlfS/HSBEZdjL9ZKclucnBVViwrVC6Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -44,7 +44,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Fast kasa crypt";
|
||||
homepage = "https://github.com/bdraco/kasa-crypt";
|
||||
changelog = "https://github.com/bdraco/kasa-crypt/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/bdraco/kasa-crypt/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.60";
|
||||
version = "9.2.61";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gDkt+6fuQ3kHfjgy3VqYGZNM9mGyJdbkt6QzNpVHzYQ=";
|
||||
hash = "sha256-UbaaudnwsIXs/IsiZyCamnWjLndwrn244ZdbvZa7P0I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, asn1crypto
|
||||
, cffi
|
||||
|
|
@ -28,6 +29,19 @@ buildPythonPackage rec {
|
|||
hash = "sha256-W1tLFFb9wa7vPSw5cL6qB4yPfyZIyXppvPYMWi+VyJc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patches the call to the C preprocessor not to include types
|
||||
# pycparser does not handle.
|
||||
# `hardeningDisable = [ "fortify" ]` would have the same effect but
|
||||
# would also disable hardening from generated FFI objects.
|
||||
#
|
||||
# backport of https://github.com/tpm2-software/tpm2-pytss/pull/523
|
||||
(fetchpatch {
|
||||
url = "https://github.com/baloo/tpm2-pytss/commit/099c069f28cfcd0a3019adebfeafa976f9395221.patch";
|
||||
sha256 = "sha256-wU2WfLYFDmkhGzYornZ386tB3zb3GYfGOTc+/QOFb1o=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cffi
|
||||
pkgconfig # this is the Python module
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect-mqtt";
|
||||
version = "0.42.3";
|
||||
version = "0.45.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-mqtt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TEB2UtXH73CCJhbuQjnABcG3XLHB6VybDwjhixnpt0w=";
|
||||
hash = "sha256-lZa8HIGLSDd/avNuoYSUHJ0b3rSx8uHLuUz8lABQHO4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buf";
|
||||
version = "1.24.0";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DMZYjtIuN8b03UOAEtz32+Cj2MaE46v2k0IHT7YiZfk=";
|
||||
hash = "sha256-koYRJCO9G8McoFNe2P61y+q7T4gZ1MBNAy9jFC63kds=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uBM5r3cT0c4NUOfWaqkxRJ06p2GtOwvSOQfvP77ivTA=";
|
||||
vendorHash = "sha256-2UA8rp2ZHTUnYialFXrIlH+RzfZHtdKn0dc+Dfps8ow=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
|
|
|||
|
|
@ -10,13 +10,24 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bmake";
|
||||
version = "20230414";
|
||||
version = "20230711";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-KcsdJqrn3p3vkr2us6rUUg6JlRzpey518LibrhuVOZ8=";
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-CoFULAPxoObCe/UBXY+7xSY04RkIOOx9p2RYR9kzL+8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# make bootstrap script aware of the prefix in /nix/store
|
||||
./bootstrap-fix.patch
|
||||
# preserve PATH from build env in unit tests
|
||||
./fix-unexport-env-test.patch
|
||||
# Always enable ksh test since it checks in a impure location /bin/ksh
|
||||
./unconditional-ksh-test.patch
|
||||
# decouple tests from build phase
|
||||
./dont-test-while-installing.diff
|
||||
];
|
||||
|
||||
# Make tests work with musl
|
||||
# * Disable deptgt-delete_on_error test (alpine does this too)
|
||||
# * Disable shell-ksh test (ksh doesn't compile with musl)
|
||||
|
|
@ -30,27 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [ getopt ];
|
||||
|
||||
patches = [
|
||||
# make bootstrap script aware of the prefix in /nix/store
|
||||
./bootstrap-fix.patch
|
||||
# preserve PATH from build env in unit tests
|
||||
./fix-unexport-env-test.patch
|
||||
# Always enable ksh test since it checks in a impure location /bin/ksh
|
||||
./unconditional-ksh-test.patch
|
||||
# decouple tests from build phase
|
||||
(fetchpatch {
|
||||
name = "separate-tests.patch";
|
||||
url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch";
|
||||
hash = "sha256-KkmqASAl46/6Of7JLOQDFUqkOw3rGLxnNmyg7Lk0RwM=";
|
||||
})
|
||||
# add a shebang to bmake's install(1) replacement
|
||||
(fetchpatch {
|
||||
name = "install-sh.patch";
|
||||
url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch";
|
||||
hash = "sha256-RvFq5nsmDxq54UTnXGlfO6Rip/XQYj0ZySatqUxjEX0=";
|
||||
})
|
||||
];
|
||||
|
||||
# The generated makefile is a small wrapper for calling ./boot-strap with a
|
||||
# given op. On a case-insensitive filesystem this generated makefile clobbers
|
||||
# a distinct, shipped, Makefile and causes infinite recursion during tests
|
||||
|
|
@ -59,17 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"--without-makefile"
|
||||
];
|
||||
|
||||
# Disabled tests:
|
||||
# opt-chdir: ofborg complains about it somehow
|
||||
# opt-keep-going-indirect: not yet known
|
||||
# varmod-localtime: musl doesn't support TZDIR and this test relies on impure,
|
||||
# implicit paths
|
||||
BROKEN_TESTS = builtins.concatStringsSep " " [
|
||||
"opt-chdir"
|
||||
"opt-keep-going-indirect"
|
||||
"varmod-localtime"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
|
|
@ -94,6 +73,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
ksh
|
||||
];
|
||||
|
||||
# Disabled tests:
|
||||
# opt-chdir: ofborg complains about it somehow
|
||||
# opt-keep-going-indirect: not yet known
|
||||
# varmod-localtime: musl doesn't support TZDIR and this test relies on impure,
|
||||
# implicit paths
|
||||
env.BROKEN_TESTS = builtins.concatStringsSep " " [
|
||||
"opt-chdir"
|
||||
"opt-keep-going-indirect"
|
||||
"varmod-localtime"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
|
|
@ -104,14 +94,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
passthru.tests.bmakeMusl = pkgsMusl.bmake;
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.crufty.net/help/sjg/bmake.html";
|
||||
description = "Portable version of NetBSD 'make'";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ thoughtpolice AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.isAarch64; # failure on gnulib-tests
|
||||
};
|
||||
|
||||
passthru.tests.bmakeMusl = pkgsMusl.bmake;
|
||||
})
|
||||
# TODO: report the quirks and patches to bmake devteam (especially the Musl one)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
diff -Naur bmake-old/boot-strap bmake-new/boot-strap
|
||||
--- bmake-old/boot-strap 2023-06-27 18:02:19.000000000 -0300
|
||||
+++ bmake-new/boot-strap 2023-07-23 22:31:02.334720661 -0300
|
||||
@@ -413,9 +413,6 @@
|
||||
[ -s make-bootstrap.sh ] || op_configure
|
||||
chmod 755 make-bootstrap.sh || exit 1
|
||||
./make-bootstrap.sh || exit 1
|
||||
- case "$op" in
|
||||
- build) op_test;;
|
||||
- esac
|
||||
}
|
||||
|
||||
op_test() {
|
||||
@@ -434,7 +431,6 @@
|
||||
}
|
||||
|
||||
op_install() {
|
||||
- op_test
|
||||
case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in
|
||||
,$HOST_TARGET/bin,*/$HOST_TARGET)
|
||||
INSTALL_PREFIX=`dirname $prefix`
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
--- bmake/unit-tests/Makefile.orig 2021-05-30 14:24:38.822484317 +0200
|
||||
+++ bmake/unit-tests/Makefile 2021-05-31 13:25:21.645751428 +0200
|
||||
@@ -455,7 +455,8 @@
|
||||
ENV.varmisc= FROM_ENV=env
|
||||
ENV.varmisc+= FROM_ENV_BEFORE=env
|
||||
ENV.varmisc+= FROM_ENV_AFTER=env
|
||||
-ENV.varmod-localtime+= TZ=Europe/Berlin
|
||||
+# Set absolute path to tz file since musl doesn't support TZDIR
|
||||
+ENV.varmod-localtime+= TZDIR=${TZDIR} TZ=:${TZDIR}/Europe/Berlin
|
||||
ENV.varname-vpath+= VPATH=varname-vpath.dir:varname-vpath.dir2
|
||||
|
||||
# Override make flags for some of the tests; default is -k.
|
||||
--- bmake/unit-tests/varmod-localtime.mk.orig 2021-05-30 14:30:34.397986246 +0200
|
||||
+++ bmake/unit-tests/varmod-localtime.mk 2021-05-31 13:24:41.430906606 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
# Tests for the :localtime variable modifier, which formats a timestamp
|
||||
# using strftime(3) in local time.
|
||||
|
||||
-.if ${TZ} != "Europe/Berlin" # see unit-tests/Makefile
|
||||
+.if ${TZ} != ":${TZDIR}/Europe/Berlin" # see unit-tests/Makefile
|
||||
. error
|
||||
.endif
|
||||
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
# shellcheck shell=bash disable=SC2086,SC2154,SC2206
|
||||
|
||||
addMakeFlags() {
|
||||
export prefix="$out"
|
||||
export MANDIR="${!outputMan}/share/man"
|
||||
|
|
@ -6,48 +8,40 @@ addMakeFlags() {
|
|||
export STRIP_FLAG=
|
||||
}
|
||||
|
||||
preConfigureHooks+=(addMakeFlags)
|
||||
|
||||
bmakeBuildPhase() {
|
||||
runHook preBuild
|
||||
|
||||
local flagsArray=(
|
||||
${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
|
||||
SHELL=$SHELL
|
||||
SHELL="$SHELL"
|
||||
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
|
||||
$buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
|
||||
)
|
||||
|
||||
echoCmd 'build flags' "${flagsArray[@]}"
|
||||
bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
|
||||
unset flagsArray
|
||||
|
||||
runHook postBuild
|
||||
}
|
||||
|
||||
if [ -z "${dontUseBmakeBuild-}" -a -z "${buildPhase-}" ]; then
|
||||
buildPhase=bmakeBuildPhase
|
||||
fi
|
||||
|
||||
bmakeCheckPhase() {
|
||||
runHook preCheck
|
||||
|
||||
if [ -z "${checkTarget:-}" ]; then
|
||||
#TODO(@oxij): should flagsArray influence make -n?
|
||||
if bmake -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then
|
||||
checkTarget=check
|
||||
checkTarget="check"
|
||||
elif bmake -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then
|
||||
checkTarget=test
|
||||
checkTarget="test"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "${checkTarget:-}" ]; then
|
||||
echo "no test target found in bmake, doing nothing"
|
||||
else
|
||||
# shellcheck disable=SC2086
|
||||
local flagsArray=(
|
||||
${enableParallelChecking:+-j${NIX_BUILD_CORES}}
|
||||
SHELL=$SHELL
|
||||
SHELL="$SHELL"
|
||||
# Old bash empty array hack
|
||||
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
|
||||
${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
|
||||
|
|
@ -56,17 +50,11 @@ bmakeCheckPhase() {
|
|||
|
||||
echoCmd 'check flags' "${flagsArray[@]}"
|
||||
bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
|
||||
|
||||
unset flagsArray
|
||||
fi
|
||||
|
||||
runHook postCheck
|
||||
}
|
||||
|
||||
if [ -z "${dontUseBmakeCheck-}" -a -z "${checkPhase-}" ]; then
|
||||
checkPhase=bmakeCheckPhase
|
||||
fi
|
||||
|
||||
bmakeInstallPhase() {
|
||||
runHook preInstall
|
||||
|
||||
|
|
@ -74,10 +62,9 @@ bmakeInstallPhase() {
|
|||
mkdir -p "$prefix"
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
local flagsArray=(
|
||||
${enableParallelInstalling:+-j${NIX_BUILD_CORES}}
|
||||
SHELL=$SHELL
|
||||
SHELL="$SHELL"
|
||||
# Old bash empty array hack
|
||||
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
|
||||
$installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
|
||||
|
|
@ -86,15 +73,10 @@ bmakeInstallPhase() {
|
|||
|
||||
echoCmd 'install flags' "${flagsArray[@]}"
|
||||
bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
|
||||
unset flagsArray
|
||||
|
||||
runHook postInstall
|
||||
}
|
||||
|
||||
if [ -z "${dontUseBmakeInstall-}" -a -z "${installPhase-}" ]; then
|
||||
installPhase=bmakeInstallPhase
|
||||
fi
|
||||
|
||||
bmakeDistPhase() {
|
||||
runHook preDist
|
||||
|
||||
|
|
@ -103,7 +85,6 @@ bmakeDistPhase() {
|
|||
fi
|
||||
|
||||
# Old bash empty array hack
|
||||
# shellcheck disable=SC2086
|
||||
local flagsArray=(
|
||||
$distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist}
|
||||
)
|
||||
|
|
@ -116,13 +97,26 @@ bmakeDistPhase() {
|
|||
|
||||
# Note: don't quote $tarballs, since we explicitly permit
|
||||
# wildcards in there.
|
||||
# shellcheck disable=SC2086
|
||||
cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs"
|
||||
fi
|
||||
|
||||
runHook postDist
|
||||
}
|
||||
|
||||
if [ -z "${dontUseBmakeDist-}" -a -z "${distPhase-}" ]; then
|
||||
preConfigureHooks+=(addMakeFlags)
|
||||
|
||||
if [ -z "${dontUseBmakeBuild-}" ] && [ -z "${buildPhase-}" ]; then
|
||||
buildPhase=bmakeBuildPhase
|
||||
fi
|
||||
|
||||
if [ -z "${dontUseBmakeCheck-}" ] && [ -z "${checkPhase-}" ]; then
|
||||
checkPhase=bmakeCheckPhase
|
||||
fi
|
||||
|
||||
if [ -z "${dontUseBmakeInstall-}" ] && [ -z "${installPhase-}" ]; then
|
||||
installPhase=bmakeInstallPhase
|
||||
fi
|
||||
|
||||
if [ -z "${dontUseBmakeDist-}" ] && [ -z "${distPhase-}" ]; then
|
||||
distPhase=bmakeDistPhase
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -8,17 +8,18 @@
|
|||
, zlib
|
||||
, testers
|
||||
, mold
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mold";
|
||||
version = "1.11.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rui314";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dfdrXp05eJALTQnx2F3GxRWKMA+Icj0mRPcb72z7qMw=";
|
||||
hash = "sha256-dEmwVgo9XiU3WtObVL5VbFW7rEzdFfnRepcbyGxX1JM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -49,7 +50,10 @@ stdenv.mkDerivation rec {
|
|||
"-faligned-allocation"
|
||||
]);
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = mold; };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion { package = mold; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A faster drop-in replacement for existing Unix linkers";
|
||||
|
|
@ -61,7 +65,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://github.com/rui314/mold";
|
||||
changelog = "https://github.com/rui314/mold/releases/tag/v${version}";
|
||||
license = licenses.agpl3Plus;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ azahi nitsky ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
56
pkgs/games/hheretic/default.nix
Normal file
56
pkgs/games/hheretic/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL
|
||||
, SDL_mixer
|
||||
, autoreconfHook
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hheretic";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sezero";
|
||||
repo = "hheretic";
|
||||
rev = "hheretic-${finalAttrs.version}";
|
||||
hash = "sha256-e9N869W8STZdLUBSscxEnF2Z+SrdVv8ARDL8AMe1SJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
SDL.dev
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_mixer
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [ "--with-audio=sdlmixer" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 hheretic-gl -t $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "hheretic-";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Linux port of Raven Game's Heretic";
|
||||
homepage = "https://hhexen.sourceforge.net/hhexen.html";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "hheretic-gl";
|
||||
maintainers = with lib.maintainers; [ moody ];
|
||||
inherit (SDL.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,23 +1,56 @@
|
|||
{ lib, fetchurl, SDL, stdenv }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL
|
||||
, SDL_mixer
|
||||
, autoreconfHook
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hhexen";
|
||||
version = "1.6.3";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz";
|
||||
sha256 = "1jwccqawbdn0rjn5p59j21rjy460jdhps7zwn2z0gq9biggw325b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sezero";
|
||||
repo = "hhexen";
|
||||
rev = "hhexen-${finalAttrs.version}";
|
||||
hash = "sha256-y3jKfU4e8R2pJQN/FN7W6KQ7D/P+7pmQkdmZug15ApI=";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
SDL.dev
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_mixer
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [ "--with-audio=sdlmixer" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 hhexen-gl -t $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "hhexen-";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Linux port of Raven Game's Hexen";
|
||||
homepage = "https://hhexen.sourceforge.net/hhexen.html";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ djanatyn ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ moody djanatyn ];
|
||||
mainProgram = "hhexen-gl";
|
||||
inherit (SDL.meta) platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minesweep-rs";
|
||||
version = "6.0.16";
|
||||
version = "6.0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpcloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jA4NqLZw+JREj0UlEMjcatb6PeBHpiNKrFenpe3HyBw=";
|
||||
hash = "sha256-dFY+t6MVRdbp0z5mbnREd/t6v1D+7g/vD+K8mcJvn9E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wvN7aa4LjvYIJZtUedAscD2x8EKpdtzc5b1YI9MTeLY=";
|
||||
cargoHash = "sha256-mLRD5Z/ZzfT1BFFSyYmJkY98vMY/Elt3Gy0SboCpzec=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sweep some mines for fun, and probably not for profit";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, sunwait
|
||||
, wallutils
|
||||
, rPackages
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
|
|
@ -27,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
--replace "sunwait" "${sunwait}/bin/sunwait" \
|
||||
--replace "setwallpaper" "${wallutils}/bin/setwallpaper" \
|
||||
--replace '$HOME/sunpaper/images/' "$out/share/sunpaper/images/"
|
||||
'';
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin" "$out/share/sunpaper/images"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
|
||||
pyyaml = super.pyyaml.overridePythonAttrs rec {
|
||||
version = "5.4.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yaml";
|
||||
|
|
@ -21,7 +21,7 @@ let
|
|||
PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all
|
||||
runHook postCheck
|
||||
'';
|
||||
});
|
||||
};
|
||||
};
|
||||
self = py;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ let
|
|||
|
||||
# put packages that needs to be overridden in the py package scope
|
||||
py = import ./python-packages.nix {
|
||||
inherit stdenv lib src version python3 fetchPypi;
|
||||
inherit stdenv src version python3 fetchPypi;
|
||||
};
|
||||
in
|
||||
py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, python3, fetchPypi, lib, src, version }:
|
||||
{ stdenv, python3, fetchPypi, src, version }:
|
||||
|
||||
let
|
||||
buildAzureCliPackage = with py.pkgs; buildPythonPackage;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "credhub-cli";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib, stdenv }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cw";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
pyparsing = super.pyparsing.overridePythonAttrs (oldAttrs: rec {
|
||||
pyparsing = super.pyparsing.overridePythonAttrs rec {
|
||||
version = "2.4.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyparsing";
|
||||
|
|
@ -14,7 +14,7 @@ let
|
|||
nativeBuildInputs = [
|
||||
super.setuptools
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, google-cloud-sdk
|
||||
{ lib
|
||||
, stdenv
|
||||
, system
|
||||
, snapshotPath
|
||||
, autoPatchelfHook
|
||||
, python3
|
||||
, libxcrypt-legacy
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -143,7 +141,7 @@ let
|
|||
{
|
||||
url = src;
|
||||
inherit sha256;
|
||||
}) ;
|
||||
});
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/google-cloud-sdk/.install
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
# 3) used by `google-cloud-sdk` only on GCE guests
|
||||
#
|
||||
|
||||
{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, callPackage, with-gce ? false }:
|
||||
{ stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, with-gce ? false }:
|
||||
|
||||
let
|
||||
pythonEnv = python.withPackages (p: with p; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, google-cloud-sdk, callPackage, runCommand, components }:
|
||||
{ lib, google-cloud-sdk, runCommand, components }:
|
||||
|
||||
comps_:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, testers
|
||||
, kics
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs_18, jq, dos2unix }:
|
||||
{ lib, fetchzip, yarn2nix-moretea, nodejs_18, dos2unix }:
|
||||
|
||||
yarn2nix-moretea.mkYarnPackage {
|
||||
version = "1.1.6";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "1.7.16";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, xorg
|
||||
, xkeyboard_config
|
||||
, zlib
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3Packages
|
||||
, ffmpeg
|
||||
, makeWrapper
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3Packages }:
|
||||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "isrcsubmit";
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, cmake
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, python3
|
||||
, Accelerate
|
||||
, _experimental-update-script-combinators
|
||||
|
|
@ -88,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
updateSource
|
||||
updateOpenfst
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Speech Recognition Toolkit";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, zlib
|
||||
, fetchFromGitHub
|
||||
, gnumake
|
||||
, gcc
|
||||
|
|
@ -15,7 +13,7 @@
|
|||
, libevdev
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "midimonster";
|
||||
version = "0.6.0";
|
||||
|
||||
|
|
@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "cbdevnet";
|
||||
rev = "f16f7db86662fcdbf45b6373257c90c824b0b4b0";
|
||||
sha256 = "131zs4j9asq9xl72cbyi463xpkj064ca1s7i77q5jrwqysgy52sp";
|
||||
};
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, systemd
|
||||
, file
|
||||
, iniparser
|
||||
, ffmpeg
|
||||
|
|
@ -33,9 +32,9 @@ stdenv.mkDerivation rec {
|
|||
ffmpeg
|
||||
libmpdclient
|
||||
discount
|
||||
];
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
|
|
@ -48,10 +47,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace systemd/mpd-notification.service --replace /usr $out
|
||||
'';
|
||||
substituteInPlace systemd/mpd-notification.service --replace /usr $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = with lib; {
|
||||
description = "Notifications for mpd";
|
||||
homepage = "https://github.com/eworm-de/mpd-notification";
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
, cinnamon
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, intltool
|
||||
, libnotify
|
||||
, pavucontrol
|
||||
, python3Packages
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3
|
||||
, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2
|
||||
, obex_data_server, xdg-utils, dnsmasq, dhcp, iproute2
|
||||
, gnome, librsvg, wrapGAppsHook, gobject-introspection
|
||||
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib, stdenv }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bluetuith";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoPatchelfHook
|
||||
, bash
|
||||
, copyDesktopItems
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zopfli";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep
|
||||
, fixDarwinDylibNames
|
||||
, file
|
||||
, fetchpatch
|
||||
, legacySupport ? false
|
||||
, static ? stdenv.hostPlatform.isStatic
|
||||
# these need to be ran on the host, thus disable when cross-compiling
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@ in
|
|||
substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper
|
||||
chmod +x "$out"/bin/bees-service-wrapper
|
||||
ln -s ${bees}/bin/beesd "$out"/bin/beesd
|
||||
'').overrideAttrs (old: {
|
||||
'').overrideAttrs {
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.bees;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ let
|
|||
optZfs = shouldUsePkg zfs;
|
||||
|
||||
# Downgrade rocksdb, 7.10 breaks ceph
|
||||
rocksdb' = rocksdb.overrideAttrs (oldAttrs: {
|
||||
rocksdb' = rocksdb.overrideAttrs {
|
||||
version = "7.9.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
|
|
@ -115,7 +115,7 @@ let
|
|||
rev = "refs/tags/v7.9.2";
|
||||
hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
hasRadosgw = optExpat != null && optCurl != null && optLibedit != null;
|
||||
|
||||
|
|
@ -165,7 +165,7 @@ let
|
|||
# Watch out for python <> boost compatibility
|
||||
python = python310.override {
|
||||
packageOverrides = self: super: {
|
||||
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
|
||||
sqlalchemy = super.sqlalchemy.overridePythonAttrs rec {
|
||||
version = "1.4.46";
|
||||
src = fetchPypi {
|
||||
pname = "SQLAlchemy";
|
||||
|
|
@ -176,7 +176,7 @@ let
|
|||
"test/aaa_profiling"
|
||||
"test/ext/mypy"
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, neon
|
||||
, procps
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchpatch, fetchFromGitHub, btrfs-progs, python3 }:
|
||||
|
||||
let
|
||||
btrfsProgsPatched = btrfs-progs.overrideAttrs (oldAttrs: {
|
||||
btrfsProgsPatched = btrfs-progs.overrideAttrs {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "0001-Print-csum-for-a-given-file-on-stdout.patch";
|
||||
|
|
@ -9,7 +9,7 @@ let
|
|||
sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4=";
|
||||
})
|
||||
];
|
||||
});
|
||||
};
|
||||
py3 = python3.withPackages (ps: with ps; [
|
||||
prettytable
|
||||
numpy
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, runCommand }:
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dupe-krill";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
, double-conversion
|
||||
, fmt_8
|
||||
, fuse3
|
||||
, gflags
|
||||
, glog
|
||||
, gtest
|
||||
, jemalloc
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf
|
||||
, cacert, testers, Security, garage, nixosTests }:
|
||||
, cacert, Security, garage, nixosTests }:
|
||||
let
|
||||
generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
|
||||
pname = "garage";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fuse
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, makeWrapper
|
||||
, python3
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
|
||||
lib.mapAttrs (
|
||||
name: { CPPFLAGS }:
|
||||
mkspiffs.overrideAttrs (drv: {
|
||||
mkspiffs.overrideAttrs {
|
||||
inherit CPPFLAGS;
|
||||
BUILD_CONFIG_NAME = "-${name}";
|
||||
})
|
||||
}
|
||||
) {
|
||||
arduino-esp8266.CPPFLAGS = [
|
||||
"-DSPIFFS_USE_MAGIC_LENGTH=0"
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, acl
|
||||
, autoreconfHook
|
||||
, avahi
|
||||
, db
|
||||
, ed
|
||||
, libevent
|
||||
, libgcrypt
|
||||
, libiconv
|
||||
, libtirpc
|
||||
, openssl
|
||||
, pam
|
||||
, perl
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libuuid, libselinux
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libuuid, libselinux
|
||||
, e2fsprogs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, python3Packages }:
|
||||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "sdat2img";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, help2man
|
||||
, lz4
|
||||
, lzo
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tar2ext4";
|
||||
version = "0.9.8";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "hcsshim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CvXn5b1kEZ2gYqfKSFRNzqkyOAcfcI1/3etRJTKwqog=";
|
||||
sha256 = "sha256-+GhYeQ27uwg9JOv1qbf1+UbMd+vPXJ05nsXZD9OakzI=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/cmd/tar2ext4";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, python3, makeWrapper }:
|
||||
{ lib, fetchFromGitHub, python3 }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ stdenv
|
||||
, pkgs
|
||||
, lib
|
||||
, fetchurl
|
||||
, e2fsprogs
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ rustPlatform
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, cloud-utils
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, llvmPackages
|
||||
, pkg-config
|
||||
, util-linux
|
||||
, zfs
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wakapi";
|
||||
version = "2.7.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muety";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1EMSrHx6Tx58voz5veyNZg1gnubuGyg2K4dg2QdzmMw=";
|
||||
sha256 = "sha256-5EUXhKv4cLDaHr6Q2mel3YbVPAYRJd1JtHyWn7kQy8Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0wHXULDKyXYBTGxfSQXT/5NidPtSnx7ujb8vyczmE38=";
|
||||
vendorHash = "sha256-rwQeIHJAtnRm5nPQCvgoBabVeyLZyrY3yglCW9+NGwM=";
|
||||
|
||||
# Not a go module required by the project, contains development utilities
|
||||
excludedPackages = [ "scripts" ];
|
||||
|
|
|
|||
162
pkgs/tools/misc/wasm-tools/Cargo.lock
generated
162
pkgs/tools/misc/wasm-tools/Cargo.lock
generated
|
|
@ -235,9 +235,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.3.16"
|
||||
version = "4.3.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "74bb1b4028935821b2d6b439bba2e970bdcf740832732437ead910c632e30d7d"
|
||||
checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
|
|
@ -246,9 +246,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.3.16"
|
||||
version = "4.3.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5ae467cbb0111869b765e13882a1dbbd6cb52f58203d8b80c44f667d4dd19843"
|
||||
checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
|
|
@ -580,9 +580,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.8.1"
|
||||
version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
|
||||
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
|
||||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
|
|
@ -643,12 +643,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
|
|||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "1.9.0"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
|
||||
dependencies = [
|
||||
"instant",
|
||||
]
|
||||
checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
|
||||
|
||||
[[package]]
|
||||
name = "fixedbitset"
|
||||
|
|
@ -855,17 +852,6 @@ version = "0.7.5"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
|
||||
|
||||
[[package]]
|
||||
name = "io-lifetimes"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.2",
|
||||
"libc",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.9"
|
||||
|
|
@ -954,12 +940,6 @@ version = "0.0.46"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.3"
|
||||
|
|
@ -1025,9 +1005,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.15"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
|
||||
checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
|
@ -1174,9 +1154,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.31"
|
||||
version = "1.0.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
|
||||
checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
|
@ -1297,26 +1277,12 @@ checksum = "6380889b07a03b5ecf1d44dc9ede6fd2145d84b502a2a9ca0b03c48e0cc3220f"
|
|||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"errno 0.2.8",
|
||||
"io-lifetimes 0.7.5",
|
||||
"io-lifetimes",
|
||||
"libc",
|
||||
"linux-raw-sys 0.0.46",
|
||||
"windows-sys 0.42.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.37.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"errno 0.3.1",
|
||||
"io-lifetimes 1.0.11",
|
||||
"libc",
|
||||
"linux-raw-sys 0.3.8",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.4"
|
||||
|
|
@ -1370,9 +1336,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
|
|||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.171"
|
||||
version = "1.0.176"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
|
||||
checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
|
@ -1389,9 +1355,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.171"
|
||||
version = "1.0.176"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
|
||||
checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1400,9 +1366,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.103"
|
||||
version = "1.0.104"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
|
||||
checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
|
|
@ -1411,9 +1377,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_yaml"
|
||||
version = "0.9.24"
|
||||
version = "0.9.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd5f51e3fdb5b9cdd1577e1cb7a733474191b1aca6a72c2e50913241632c1180"
|
||||
checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
|
||||
dependencies = [
|
||||
"indexmap 2.0.0",
|
||||
"itoa",
|
||||
|
|
@ -1475,9 +1441,9 @@ checksum = "7c68d531d83ec6c531150584c42a4290911964d5f0d79132b193b67252a23b71"
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.26"
|
||||
version = "2.0.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"
|
||||
checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1492,15 +1458,14 @@ checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e"
|
|||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.6.0"
|
||||
version = "3.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
|
||||
checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cfg-if",
|
||||
"fastrand",
|
||||
"redox_syscall",
|
||||
"rustix 0.37.23",
|
||||
"rustix 0.38.4",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
|
|
@ -1524,18 +1489,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.43"
|
||||
version = "1.0.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
|
||||
checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.43"
|
||||
version = "1.0.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
|
||||
checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1726,10 +1691,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
|
|||
|
||||
[[package]]
|
||||
name = "wasm-compose"
|
||||
version = "0.3.1"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap 4.3.16",
|
||||
"glob",
|
||||
"heck",
|
||||
"indexmap 2.0.0",
|
||||
|
|
@ -1740,7 +1704,7 @@ dependencies = [
|
|||
"serde_yaml",
|
||||
"smallvec",
|
||||
"wasm-encoder",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wasmprinter",
|
||||
"wat",
|
||||
"wit-component",
|
||||
|
|
@ -1748,42 +1712,42 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-encoder"
|
||||
version = "0.31.0"
|
||||
version = "0.31.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"leb128",
|
||||
"tempfile",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-metadata"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap 4.3.16",
|
||||
"clap 4.3.19",
|
||||
"indexmap 2.0.0",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"spdx",
|
||||
"wasm-encoder",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wat",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-mutate"
|
||||
version = "0.2.29"
|
||||
version = "0.2.30"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap 4.3.16",
|
||||
"clap 4.3.19",
|
||||
"egg",
|
||||
"env_logger",
|
||||
"log",
|
||||
"rand",
|
||||
"thiserror",
|
||||
"wasm-encoder",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wasmprinter",
|
||||
"wat",
|
||||
]
|
||||
|
|
@ -1794,37 +1758,37 @@ version = "0.1.0"
|
|||
dependencies = [
|
||||
"anyhow",
|
||||
"arbitrary",
|
||||
"clap 4.3.16",
|
||||
"clap 4.3.19",
|
||||
"env_logger",
|
||||
"itertools",
|
||||
"log",
|
||||
"num_cpus",
|
||||
"rand",
|
||||
"wasm-mutate",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wasmprinter",
|
||||
"wasmtime",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-shrink"
|
||||
version = "0.1.30"
|
||||
version = "0.1.31"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"blake3",
|
||||
"clap 4.3.16",
|
||||
"clap 4.3.19",
|
||||
"env_logger",
|
||||
"log",
|
||||
"rand",
|
||||
"wasm-mutate",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wasmprinter",
|
||||
"wat",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-smith"
|
||||
version = "0.12.12"
|
||||
version = "0.12.13"
|
||||
dependencies = [
|
||||
"arbitrary",
|
||||
"criterion",
|
||||
|
|
@ -1835,19 +1799,19 @@ dependencies = [
|
|||
"rand",
|
||||
"serde",
|
||||
"wasm-encoder",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wasmprinter",
|
||||
"wat",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-tools"
|
||||
version = "1.0.37"
|
||||
version = "1.0.38"
|
||||
dependencies = [
|
||||
"addr2line 0.20.0",
|
||||
"anyhow",
|
||||
"arbitrary",
|
||||
"clap 4.3.16",
|
||||
"clap 4.3.19",
|
||||
"cpp_demangle 0.4.2",
|
||||
"diff",
|
||||
"env_logger",
|
||||
|
|
@ -1868,7 +1832,7 @@ dependencies = [
|
|||
"wasm-mutate",
|
||||
"wasm-shrink",
|
||||
"wasm-smith",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wasmprinter",
|
||||
"wast",
|
||||
"wat",
|
||||
|
|
@ -1885,7 +1849,7 @@ dependencies = [
|
|||
"wasm-mutate",
|
||||
"wasm-shrink",
|
||||
"wasm-smith",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wasmprinter",
|
||||
"wast",
|
||||
"wat",
|
||||
|
|
@ -1904,7 +1868,7 @@ dependencies = [
|
|||
"wasm-encoder",
|
||||
"wasm-mutate",
|
||||
"wasm-smith",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wasmprinter",
|
||||
"wasmtime",
|
||||
"wast",
|
||||
|
|
@ -1925,7 +1889,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasmparser"
|
||||
version = "0.109.0"
|
||||
version = "0.110.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"criterion",
|
||||
|
|
@ -1940,13 +1904,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasmprinter"
|
||||
version = "0.2.61"
|
||||
version = "0.2.62"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"diff",
|
||||
"rayon",
|
||||
"tempfile",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wast",
|
||||
"wat",
|
||||
]
|
||||
|
|
@ -2108,7 +2072,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wast"
|
||||
version = "62.0.0"
|
||||
version = "62.0.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"leb128",
|
||||
|
|
@ -2116,13 +2080,13 @@ dependencies = [
|
|||
"rayon",
|
||||
"unicode-width",
|
||||
"wasm-encoder",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wat",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wat"
|
||||
version = "1.0.68"
|
||||
version = "1.0.69"
|
||||
dependencies = [
|
||||
"wast",
|
||||
]
|
||||
|
|
@ -2336,7 +2300,7 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
|
|||
|
||||
[[package]]
|
||||
name = "wit-component"
|
||||
version = "0.13.0"
|
||||
version = "0.13.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bitflags 2.3.3",
|
||||
|
|
@ -2347,7 +2311,7 @@ dependencies = [
|
|||
"pretty_assertions",
|
||||
"wasm-encoder",
|
||||
"wasm-metadata",
|
||||
"wasmparser 0.109.0",
|
||||
"wasmparser 0.110.0",
|
||||
"wasmprinter",
|
||||
"wat",
|
||||
"wit-parser",
|
||||
|
|
@ -2355,7 +2319,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wit-parser"
|
||||
version = "0.9.1"
|
||||
version = "0.9.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
|
|
@ -2384,10 +2348,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wit-smith"
|
||||
version = "0.1.7"
|
||||
version = "0.1.8"
|
||||
dependencies = [
|
||||
"arbitrary",
|
||||
"clap 4.3.16",
|
||||
"clap 4.3.19",
|
||||
"indexmap 2.0.0",
|
||||
"log",
|
||||
"semver",
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-tools";
|
||||
version = "1.0.37";
|
||||
version = "1.0.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-3LswpSnXCRaDeoViEa/EnyB472g4TlLYc705rUmfN9M=";
|
||||
hash = "sha256-SGNIGOpkREGu/bmojOh+TPlg75rKoa04u+BDiida6dI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, buildPackages
|
||||
, coreutils
|
||||
, pam
|
||||
|
|
@ -14,13 +15,22 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sudo";
|
||||
version = "1.9.13p3";
|
||||
version = "1.9.14p3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-kjNKEruT4MBWsJ9T4lXMt9b2fGNQ4oE82Vk87sp4Vgs=";
|
||||
hash = "sha256-oIMYscS8hYLABNTNmuKQOrxUnn5GuoFeQf6B0cB4K2I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Extra bugfix not included in 1.9.14p3 to address a bug that impacts the
|
||||
# NixOS test suite for sudo.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sudo-project/sudo/commit/760c9c11074cb921ecc0da9fbb5f0a12afd46233.patch";
|
||||
hash = "sha256-smwyoYEkaqfQYz9C4VVz59YMtKabOPpwhS+RBwXbWuE=";
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
# do not set sticky bit in nix store
|
||||
substituteInPlace src/Makefile.in --replace 04755 0755
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "1.0.110";
|
||||
version = "1.0.116";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TIa4yGj3imDrWJ6U8Qyv84bAihhuFbQizXghJuEIc88=";
|
||||
sha256 = "sha256-BS44/bN76iD659j1ISMBBw0o2uwLasd7CDJMh8LDII4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0ORDDwb2wXdJXoesfcY98EgONWjovT/bE96qFVxDRcM=";
|
||||
cargoHash = "sha256-tscxMeSS0BGJT7HlMrDsd3zMZXE0nUtd5qSzsSE2o/s=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook
|
||||
, enableShared ? !(stdenv.hostPlatform.isStatic)
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
# for passthru.tests
|
||||
, nix
|
||||
|
|
@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall =
|
||||
let
|
||||
inherit (stdenv.hostPlatform.extensions) sharedLibrary;
|
||||
soVersion = "3";
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ruby, ocamlPackages
|
||||
{ lib, fetchFromGitHub, ocamlPackages
|
||||
, ipaexfont, junicode, lmodern, lmmath
|
||||
}:
|
||||
let
|
||||
camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: {
|
||||
camlpdf = ocamlPackages.camlpdf.overrideAttrs {
|
||||
src = fetchFromGitHub {
|
||||
owner = "gfngfn";
|
||||
repo = "camlpdf";
|
||||
rev = "v2.3.1+satysfi";
|
||||
sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k";
|
||||
};
|
||||
});
|
||||
};
|
||||
otfm = ocamlPackages.otfm.overrideAttrs (o: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "gfngfn";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, lib
|
||||
, makeWrapper
|
||||
, autoreconfHook
|
||||
, buildEnv
|
||||
, python3
|
||||
, fontforge
|
||||
, potrace
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "pgf-umlcd";
|
||||
version = "unstable-2020-05-28";
|
||||
|
||||
|
|
@ -30,4 +30,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue