swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-10-05 12:01:39 +00:00 committed by GitHub
parent f202da9cb7 80e10e2d5e
commit 0b1fa10263
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
68 changed files with 606 additions and 363 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -11,15 +11,7 @@
lib = import ./lib; lib = import ./lib;
systems = [ systems = lib.systems.supported.hydra;
"x86_64-linux"
"i686-linux"
"x86_64-darwin"
"aarch64-linux"
"armv6l-linux"
"armv7l-linux"
"aarch64-darwin"
];
forAllSystems = f: lib.genAttrs systems (system: f system); forAllSystems = f: lib.genAttrs systems (system: f system);

1
lib/systems/default.nix
View file

@ -8,6 +8,7 @@ rec {
platforms = import ./platforms.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; };
examples = import ./examples.nix { inherit lib; }; examples = import ./examples.nix { inherit lib; };
architectures = import ./architectures.nix { inherit lib; }; architectures = import ./architectures.nix { inherit lib; };
supported = import ./supported.nix { inherit lib; };
# Elaborate a `localSystem` or `crossSystem` so that it contains everything # Elaborate a `localSystem` or `crossSystem` so that it contains everything
# necessary. # necessary.

24
lib/systems/supported.nix Normal file
View file

@ -0,0 +1,24 @@
# Supported systems according to RFC0046's definition.
#
# https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
{ lib }:
rec {
# List of systems that are built by Hydra.
hydra = tier1 ++ tier2 ++ tier3;
tier1 = [
"x86_64-linux"
];
tier2 = [
"aarch64-linux"
"x86_64-darwin"
];
tier3 = [
"armv6l-linux"
"armv7l-linux"
"i686-linux"
"mipsel-linux"
];
}

4
lib/tests/modules.sh
View file

@ -254,8 +254,10 @@ checkConfigOutput / config.value.path ./types-anything/equal-atoms.nix
checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix
checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix
# Functions can't be merged together # Functions can't be merged together
checkConfigError "The option .* has conflicting definition values" config.value.multiple-lambdas ./types-anything/functions.nix checkConfigError "The option .value.multiple-lambdas.<function body>. has conflicting option types" config.applied.multiple-lambdas ./types-anything/functions.nix
checkConfigOutput '<LAMBDA>' config.value.single-lambda ./types-anything/functions.nix checkConfigOutput '<LAMBDA>' config.value.single-lambda ./types-anything/functions.nix
checkConfigOutput 'null' config.applied.merging-lambdas.x ./types-anything/functions.nix
checkConfigOutput 'null' config.applied.merging-lambdas.y ./types-anything/functions.nix
# Check that all mk* modifiers are applied # Check that all mk* modifiers are applied
checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix
checkConfigOutput '{ }' config.value.mkiftrue ./types-anything/mk-mods.nix checkConfigOutput '{ }' config.value.mkiftrue ./types-anything/mk-mods.nix

12
lib/tests/modules/types-anything/functions.nix
View file

@ -1,16 +1,22 @@
{ lib, ... }: { { lib, config, ... }: {
options.value = lib.mkOption { options.value = lib.mkOption {
type = lib.types.anything; type = lib.types.anything;
}; };
options.applied = lib.mkOption {
default = lib.mapAttrs (name: fun: fun null) config.value;
};
config = lib.mkMerge [ config = lib.mkMerge [
{ {
value.single-lambda = x: x; value.single-lambda = x: x;
value.multiple-lambdas = x: x; value.multiple-lambdas = x: { inherit x; };
value.merging-lambdas = x: { inherit x; };
} }
{ {
value.multiple-lambdas = x: x; value.multiple-lambdas = x: [ x ];
value.merging-lambdas = y: { inherit y; };
} }
]; ];

6
lib/types.nix
View file

@ -192,6 +192,12 @@ rec {
else (listOf anything).merge; else (listOf anything).merge;
# This is the type of packages, only accept a single definition # This is the type of packages, only accept a single definition
stringCoercibleSet = mergeOneOption; stringCoercibleSet = mergeOneOption;
lambda = loc: defs: arg: anything.merge
(loc ++ [ "<function body>" ])
(map (def: {
file = def.file;
value = def.value arg;
}) defs);
# Otherwise fall back to only allowing all equal definitions # Otherwise fall back to only allowing all equal definitions
}.${commonType} or mergeEqualOption; }.${commonType} or mergeEqualOption;
in mergeFunction loc defs; in mergeFunction loc defs;

9
nixos/modules/programs/command-not-found/command-not-found.pl
View file

@ -25,14 +25,7 @@ if (!defined $res || scalar @$res == 0) {
print STDERR "$program: command not found\n"; print STDERR "$program: command not found\n";
} elsif (scalar @$res == 1) { } elsif (scalar @$res == 1) {
my $package = @$res[0]->{package}; my $package = @$res[0]->{package};
if ($ENV{"NIX_AUTO_INSTALL"} // "") { if ($ENV{"NIX_AUTO_RUN"} // "") {
print STDERR <<EOF;
The program '$program' is currently not installed. It is provided by
the package '$package', which I will now install for you.
EOF
;
exit 126 if system("nix-env", "-iA", "nixos.$package") == 0;
} elsif ($ENV{"NIX_AUTO_RUN"} // "") {
exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV)); exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV));
} else { } else {
print STDERR <<EOF; print STDERR <<EOF;

6
nixos/modules/programs/environment.nix
View file

@ -18,12 +18,16 @@ in
environment.variables = environment.variables =
{ NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
# note: many programs exec() this directly, so default options for less must not
# be specified here; do so in the default value of programs.less.envVariables instead
PAGER = mkDefault "less"; PAGER = mkDefault "less";
LESS = mkDefault "-R";
EDITOR = mkDefault "nano"; EDITOR = mkDefault "nano";
XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
}; };
# since we set PAGER to this above, make sure it's installed
programs.less.enable = true;
environment.profiles = mkAfter environment.profiles = mkAfter
[ "/nix/var/nix/profiles/default" [ "/nix/var/nix/profiles/default"
"/run/current-system/sw" "/run/current-system/sw"

12
nixos/modules/programs/less.nix
View file

@ -24,9 +24,7 @@ let
} }
''; '';
lessKey = pkgs.runCommand "lesskey" lessKey = pkgs.writeText "lessconfig" configText;
{ src = pkgs.writeText "lessconfig" configText; preferLocalBuild = true; }
"${pkgs.less}/bin/lesskey -o $out $src";
in in
@ -35,6 +33,8 @@ in
programs.less = { programs.less = {
# note that environment.nix sets PAGER=less, and
# therefore also enables this module
enable = mkEnableOption "less"; enable = mkEnableOption "less";
configFile = mkOption { configFile = mkOption {
@ -81,7 +81,9 @@ in
envVariables = mkOption { envVariables = mkOption {
type = types.attrsOf types.str; type = types.attrsOf types.str;
default = {}; default = {
LESS = "-R";
};
example = { example = {
LESS = "--quit-if-one-screen"; LESS = "--quit-if-one-screen";
}; };
@ -112,7 +114,7 @@ in
environment.systemPackages = [ pkgs.less ]; environment.systemPackages = [ pkgs.less ];
environment.variables = { environment.variables = {
LESSKEY_SYSTEM = toString lessKey; LESSKEYIN_SYSTEM = toString lessKey;
} // optionalAttrs (cfg.lessopen != null) { } // optionalAttrs (cfg.lessopen != null) {
LESSOPEN = cfg.lessopen; LESSOPEN = cfg.lessopen;
} // optionalAttrs (cfg.lessclose != null) { } // optionalAttrs (cfg.lessclose != null) {

2
nixos/modules/services/misc/gitea.nix
View file

@ -349,7 +349,7 @@ in
server = mkMerge [ server = mkMerge [
{ {
DOMAIN = cfg.domain; DOMAIN = cfg.domain;
STATIC_ROOT_PATH = cfg.staticRootPath; STATIC_ROOT_PATH = toString cfg.staticRootPath;
LFS_JWT_SECRET = "#lfsjwtsecret#"; LFS_JWT_SECRET = "#lfsjwtsecret#";
ROOT_URL = cfg.rootUrl; ROOT_URL = cfg.rootUrl;
} }

4
nixos/modules/system/boot/networkd.nix
View file

@ -668,6 +668,9 @@ let
"SendOption" "SendOption"
"UserClass" "UserClass"
"VendorClass" "VendorClass"
"DUIDType"
"DUIDRawData"
"IAID"
]) ])
(assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseAddress" boolValues)
(assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDNS" boolValues)
@ -677,6 +680,7 @@ let
(assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues)
(assertValueOneOf "WithoutRA" ["solicit" "information-request"]) (assertValueOneOf "WithoutRA" ["solicit" "information-request"])
(assertRange "SendOption" 1 65536) (assertRange "SendOption" 1 65536)
(assertInt "IAID")
]; ];
sectionDHCPv6PrefixDelegation = checkUnitConfig "DHCPv6PrefixDelegation" [ sectionDHCPv6PrefixDelegation = checkUnitConfig "DHCPv6PrefixDelegation" [

4
pkgs/applications/editors/android-studio/default.nix
View file

@ -17,8 +17,8 @@ let
sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f";
}; };
latestVersion = { # canary & dev latestVersion = { # canary & dev
version = "2021.1.1.12"; # "Android Studio Bumblebee (2021.1.1) Canary 12" version = "2021.1.1.13"; # "Android Studio Bumblebee (2021.1.1) Canary 13"
sha256Hash = "1dyn9435s0xbxwj28b0cciz6ry58pgfgba4rbny3jszxi5j3j0r1"; sha256Hash = "04w5jw79fkxk4gy1n9iy8kjxg6k3zcl59z76f04rh556n12f01gm";
}; };
in { in {
# Attributes are named by their corresponding release channels # Attributes are named by their corresponding release channels

4
pkgs/applications/misc/clight/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clight"; pname = "clight";
version = "4.6"; version = "4.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FedeDP"; owner = "FedeDP";
repo = "Clight"; repo = "Clight";
rev = version; rev = version;
sha256 = "sha256-5kFzVHxoiZi8tz42eUprm49JHCeuA4GPwtHvdiS2RJY="; sha256 = "sha256-+u50XorUyeDsn4FaKdD0wEtQHkwtiyVDY0IAi0vehEQ=";
}; };
# dbus-1.pc has datadir=/etc # dbus-1.pc has datadir=/etc

19
pkgs/applications/misc/solaar/default.nix
View file

@ -1,4 +1,13 @@
{ fetchFromGitHub, lib, gobject-introspection, gtk3, python3Packages }: { fetchFromGitHub
, lib
, gobject-introspection
, gtk3
, python3Packages
, wrapGAppsHook
, gdk-pixbuf
, libappindicator
, librsvg
}:
# Although we copy in the udev rules here, you probably just want to use # Although we copy in the udev rules here, you probably just want to use
# logitech-udev-rules instead of adding this to services.udev.packages on NixOS # logitech-udev-rules instead of adding this to services.udev.packages on NixOS
@ -13,6 +22,9 @@ python3Packages.buildPythonApplication rec {
sha256 = "sha256-Ys0005hIQ+fT4oMeU5iFtbLNqn1WM6iLdIKGwdyn7BM="; sha256 = "sha256-Ys0005hIQ+fT4oMeU5iFtbLNqn1WM6iLdIKGwdyn7BM=";
}; };
nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
buildInputs = [ libappindicator librsvg ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
gobject-introspection gobject-introspection
gtk3 gtk3
@ -23,11 +35,6 @@ python3Packages.buildPythonApplication rec {
xlib xlib
]; ];
makeWrapperArgs = [
"--prefix PYTHONPATH : $PYTHONPATH"
"--prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH"
];
# the -cli symlink is just to maintain compabilility with older versions where # the -cli symlink is just to maintain compabilility with older versions where
# there was a difference between the GUI and CLI versions. # there was a difference between the GUI and CLI versions.
postInstall = '' postInstall = ''

14
pkgs/applications/networking/instant-messengers/slack/default.nix
View file

@ -44,14 +44,14 @@ let
pname = "slack"; pname = "slack";
x86_64-darwin-version = "4.19.0"; x86_64-darwin-version = "4.20.0";
x86_64-darwin-sha256 = "0dj51lhxiba69as6x76ni8h20d36bcpf2xz3rxr1s8881mprpfsg"; x86_64-darwin-sha256 = "1argl690i4dgz5ih02zg9v4zrlzm282wmibnc6p7xy5jisd5g79w";
x86_64-linux-version = "4.19.2"; x86_64-linux-version = "4.20.0";
x86_64-linux-sha256 = "02npmprwl1h7c2y03khvx8ifhk1gj1axbvlwigp2hkkjdw7y4b5a"; x86_64-linux-sha256 = "1r8w8s3y74lh4klsmzq2d3f0h721b3a2b53nx8v7b0s6j8w0g0mh";
aarch64-darwin-version = "4.19.0"; aarch64-darwin-version = "4.20.0";
aarch64-darwin-sha256 = "1mvs1bdyyyrpqmrbqg4sxpy6ylgchwz39nr232s441iqdz45p87v"; aarch64-darwin-sha256 = "1argl690i4dgz5ih02zg9v4zrlzm282wmibnc6p7xy5jisd5g79w";
version = { version = {
x86_64-darwin = x86_64-darwin-version; x86_64-darwin = x86_64-darwin-version;
@ -73,7 +73,7 @@ let
sha256 = aarch64-darwin-sha256; sha256 = aarch64-darwin-sha256;
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb";
sha256 = x86_64-linux-sha256; sha256 = x86_64-linux-sha256;
}; };
}.${system} or throwSystem; }.${system} or throwSystem;

12
pkgs/applications/networking/remote/citrix-workspace/sources.nix
View file

@ -100,6 +100,7 @@ let
x86suffix = "28"; x86suffix = "28";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
}; };
"21.08.0" = { "21.08.0" = {
major = "21"; major = "21";
minor = "8"; minor = "8";
@ -110,6 +111,17 @@ let
x86suffix = "40"; x86suffix = "40";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
}; };
"21.09.0" = {
major = "21";
minor = "9";
patch = "0";
x64hash = "d58d5cbbcb5ace95b75b1400061d475b8e72dbdf5f03abacea6d39686991f848";
x86hash = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51";
x64suffix = "25";
x86suffix = "25";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
}; };
# Retain attribute-names for abandoned versions of Citrix workspace to # Retain attribute-names for abandoned versions of Citrix workspace to

6
pkgs/applications/office/trilium/default.nix
View file

@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ]; maintainers = with maintainers; [ fliegendewurst ];
}; };
version = "0.47.7"; version = "0.47.8";
desktopSource = { desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "1fcrc01wr8ln1i77q9h89i90wwyijpfp58fa717wbdvyly4860sh"; sha256 = "1vnwjiv4bidw5xspcd7d7fn8dbhvgia9ws363fs5zs48c9k2hwwz";
}; };
serverSource = { serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "0qp37y3xgbhl6vj2bkwz1lfylkn82kx7n0lcfr58wxwkn00149ry"; sha256 = "1clgw0i3vbl8lrsjdjbn71yhim6356gm8h24831mnksb4sawhh7f";
}; };
in { in {

6
pkgs/applications/version-management/git-and-tools/git-cliff/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "git-cliff"; pname = "git-cliff";
version = "0.3.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "orhun"; owner = "orhun";
repo = "git-cliff"; repo = "git-cliff";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-d0qY0yGvFf1V8NhS9cHEawkTqMAN6roReAHJ6FT9qJ4="; sha256 = "sha256-9F15XHyFxcE48/ePwjvB7lLkw9FxoQd49G758nupRuk=";
}; };
cargoSha256 = "sha256-UxV9trTm4vZ/boWB7Sl6Dbwhjk8jQnB0QT6bC+aCL+A="; cargoSha256 = "sha256-gPf4sGDbZzfzVJy+9k3FSOdJ5b8Xci1LTjIrCmP9bW8=";
# attempts to run the program on .git in src which is not deterministic # attempts to run the program on .git in src which is not deterministic
doCheck = false; doCheck = false;

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{ {
"commit": "85edb79d7ee62685f6ccc57b932ff3920affcb77", "commit": "b208fab03edb012b7005c6d4e30d0f4ddaf29434",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/85edb79d7ee62685f6ccc57b932ff3920affcb77.tar.gz", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b208fab03edb012b7005c6d4e30d0f4ddaf29434.tar.gz",
"sha256": "13yxypamp0pwx8mcslg4mgq5599cldhmfss881m22zqjkbqvi8sj", "sha256": "08lg2b3hv0pcznzpvhp86qmgkasg9k9grrjzndpmr0qv60nk7lzn",
"msg": "Update from Hackage at 2021-09-29T20:58:23Z" "msg": "Update from Hackage at 2021-10-02T21:03:40Z"
} }

56
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1142,6 +1142,11 @@ self: super: {
# https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/ # https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/
# Therefore we jailbreak it. # Therefore we jailbreak it.
hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation;
# 2021-10-04: too strict upper bound on Hakyll
hakyll-filestore = doJailbreak super.hakyll-filestore;
# https://github.com/LaurentRDC/hakyll-images/issues/10, fixed in 1.1.1
hakyll-images = assert super.hakyll-images.version == "1.1.0";
dontCheck super.hakyll-images;
# 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71
nixfmt = doJailbreak super.nixfmt; nixfmt = doJailbreak super.nixfmt;
@ -1475,7 +1480,11 @@ self: super: {
hercules-ci-cli = generateOptparseApplicativeCompletion "hci" ( hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
# See hercules-ci-optparse-applicative in non-hackage-packages.nix. # See hercules-ci-optparse-applicative in non-hackage-packages.nix.
addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative addBuildDepend
(overrideCabal
(unmarkBroken super.hercules-ci-cli)
(drv: { hydraPlatforms = [ super.hercules-ci-cli.meta.platforms ]; }))
super.hercules-ci-optparse-applicative
); );
# Readline uses Distribution.Simple from Cabal 2, in a way that is not # Readline uses Distribution.Simple from Cabal 2, in a way that is not
@ -1913,9 +1922,34 @@ EOT
# https://github.com/Porges/email-validate-hs/issues/58 # https://github.com/Porges/email-validate-hs/issues/58
email-validate = doJailbreak super.email-validate; email-validate = doJailbreak super.email-validate;
# 2021-06-20: Outdated upper bounds # 2021-10-02: Make optics 0.4 packages work together
# https://github.com/Porges/email-validate-hs/issues/58 optics-th_0_4 = super.optics-th_0_4.override {
ghcup = doJailbreak super.ghcup; optics-core = self.optics-core_0_4;
};
optics-extra_0_4 = super.optics-extra_0_4.override {
optics-core = self.optics-core_0_4;
};
optics_0_4 = super.optics_0_4.override {
optics-core = self.optics-core_0_4;
optics-extra = self.optics-extra_0_4;
optics-th = self.optics-th_0_4;
};
# https://github.com/plow-technologies/hspec-golden-aeson/issues/17
hspec-golden-aeson_0_9_0_0 = dontCheck super.hspec-golden-aeson_0_9_0_0;
# 2021-10-02: Doesn't compile with optics < 0.4
ghcup = overrideCabal (super.ghcup.override {
hspec-golden-aeson = self.hspec-golden-aeson_0_9_0_0;
optics = self.optics_0_4;
}) (drv: {
# golden files are not shipped with the hackage tarball and hspec-golden-aeson
# needs some encouraging to create the missing files after version 0.8.0.0.
# See: https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/255
preCheck = assert drv.version == "0.1.17.2"; ''
export CREATE_MISSING_GOLDEN=yes
'' + (drv.preCheck or "");
});
# Break out of "Cabal < 3.2" constraint. # Break out of "Cabal < 3.2" constraint.
stylish-haskell = doJailbreak super.stylish-haskell; stylish-haskell = doJailbreak super.stylish-haskell;
@ -1992,19 +2026,13 @@ EOT
hw-xml = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0"; hw-xml = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0";
doJailbreak super.hw-xml; doJailbreak super.hw-xml;
# doctests fail due to deprecation warnings in 0.2
candid = assert pkgs.lib.versionOlder super.candid.version "0.3";
overrideCabal super.candid (drv: {
version = "0.3";
sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x";
libraryHaskellDepends = drv.libraryHaskellDepends ++ [
self.file-embed
];
});
# Needs network >= 3.1.2 # Needs network >= 3.1.2
quic = super.quic.overrideScope (self: super: { quic = super.quic.overrideScope (self: super: {
network = self.network_3_1_2_2; network = self.network_3_1_2_2;
}); });
http3 = super.http3.overrideScope (self: super: {
network = self.network_3_1_2_2;
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

16
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -708,14 +708,7 @@ self: super: builtins.intersectAttrs super {
}; };
haskell-language-server = overrideCabal super.haskell-language-server (drv: { haskell-language-server = overrideCabal super.haskell-language-server (drv: {
postInstall = let postInstall = "ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${self.ghc.version}";
inherit (pkgs.lib) concatStringsSep take splitString;
ghc_version = self.ghc.version;
ghc_major_version = concatStringsSep "." (take 2 (splitString "." ghc_version));
in ''
ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_version}
ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_major_version}
'';
testToolDepends = [ self.cabal-install pkgs.git ]; testToolDepends = [ self.cabal-install pkgs.git ];
testTarget = "func-test"; # wrapper test accesses internet testTarget = "func-test"; # wrapper test accesses internet
preCheck = '' preCheck = ''
@ -980,4 +973,11 @@ self: super: builtins.intersectAttrs super {
# Test suite is just the default example executable which doesn't work if not # Test suite is just the default example executable which doesn't work if not
# executed by Setup.hs, but works if started on a proper TTY # executed by Setup.hs, but works if started on a proper TTY
isocline = dontCheck super.isocline; isocline = dontCheck super.isocline;
# Some hash implementations are x86 only, but part of the test suite.
# So executing and building it on non-x86 platforms will always fail.
hashes = overrideCabal super.hashes {
doCheck = with pkgs.stdenv; hostPlatform == buildPlatform
&& buildPlatform.isx86;
};
} }

412
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -1304,6 +1304,35 @@ self: {
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
}) {}; }) {};
"BNFC_2_9_3" = callPackage
({ mkDerivation, alex, array, base, Cabal, cabal-doctest
, containers, deepseq, directory, doctest, filepath, happy, hspec
, hspec-discover, HUnit, mtl, pretty, process, QuickCheck
, string-qq, temporary, time
}:
mkDerivation {
pname = "BNFC";
version = "2.9.3";
sha256 = "1b2cgnr7c8ndk9jmfr0x905d72wgk0cc9ngbrw9f1q6fbm3mbcgp";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
array base containers deepseq directory filepath mtl pretty process
string-qq time
];
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [ base ];
testHaskellDepends = [
array base containers deepseq directory doctest filepath hspec
HUnit mtl pretty process QuickCheck string-qq temporary time
];
testToolDepends = [ alex happy hspec-discover ];
description = "A compiler front-end generator";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"BNFC-meta" = callPackage "BNFC-meta" = callPackage
({ mkDerivation, alex-meta, array, base, fail, happy-meta ({ mkDerivation, alex-meta, array, base, fail, happy-meta
, haskell-src-meta, syb, template-haskell , haskell-src-meta, syb, template-haskell
@ -10742,10 +10771,10 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "HsHTSLib"; pname = "HsHTSLib";
version = "1.9.2"; version = "1.9.2.2";
sha256 = "077j64jpq64bw9bjy0n2qmar6dc768lrn62cpkwl0cl5sygpd005"; sha256 = "11jy5xv58x379gmzgd4whgjba58syxlagggc6v77w4n3l86wrdxm";
libraryHaskellDepends = [ libraryHaskellDepends = [
base bytestring bytestring-lexing conduit containers base bytestring bytestring-lexing conduit containers vector
]; ];
librarySystemDepends = [ zlib ]; librarySystemDepends = [ zlib ];
libraryToolDepends = [ c2hs ]; libraryToolDepends = [ c2hs ];
@ -20525,8 +20554,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "Unique"; pname = "Unique";
version = "0.4.7.8"; version = "0.4.7.9";
sha256 = "0w82pa6r2a6969w251fbrx0sr1ws8mkg2lwdyjl4qjhl5s28k43i"; sha256 = "14f1qnmhdmbam8qis725dhwq1mk9h86fsnzhkwhsx73ny9z29s1l";
libraryHaskellDepends = [ libraryHaskellDepends = [
base containers extra hashable unordered-containers base containers extra hashable unordered-containers
]; ];
@ -30487,8 +30516,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "ansi-terminal-game"; pname = "ansi-terminal-game";
version = "1.1.0.0"; version = "1.1.1.0";
sha256 = "08sy50yicjgcxmnpq2828xggmvxc5yjp3xp03nd0bq4ykyr4za80"; sha256 = "07b4sxx36r604j2q3xyk1y962c6fgy091ly4gc27v49zhmfrmypr";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
@ -42839,8 +42868,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "bishbosh"; pname = "bishbosh";
version = "0.1.0.0"; version = "0.1.1.0";
sha256 = "0hri2bkydcffs2d9xjsr1gc16rl75g4vymjvgd8gr35p01zdc9mq"; sha256 = "0raryshzgahldn03dzpin6hi9vyq4w81dxgmgcq34z7h2salia5m";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
enableSeparateDataOutput = true; enableSeparateDataOutput = true;
@ -42850,14 +42879,14 @@ self: {
]; ];
executableHaskellDepends = [ executableHaskellDepends = [
array base containers data-default deepseq directory extra factory array base containers data-default deepseq directory extra factory
filepath hxt hxt-relaxng mtl process random time toolshed unix filepath hxt hxt-relaxng mtl process random toolshed unix
]; ];
testHaskellDepends = [ testHaskellDepends = [
array base containers data-default deepseq extra filepath HUnit hxt array base containers data-default deepseq extra filepath HUnit hxt
mtl polyparse QuickCheck random toolshed mtl polyparse QuickCheck random toolshed
]; ];
description = "Plays chess"; description = "Plays chess";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Plus;
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
broken = true; broken = true;
}) {}; }) {};
@ -51174,8 +51203,8 @@ self: {
"candid" = callPackage "candid" = callPackage
({ mkDerivation, base, base32, bytestring, cereal, constraints ({ mkDerivation, base, base32, bytestring, cereal, constraints
, containers, crc, directory, dlist, doctest, filepath, hex-text , containers, crc, directory, dlist, doctest, file-embed, filepath
, leb128-cereal, megaparsec, mtl, optparse-applicative , hex-text, leb128-cereal, megaparsec, mtl, optparse-applicative
, parser-combinators, prettyprinter, row-types, scientific , parser-combinators, prettyprinter, row-types, scientific
, smallcheck, split, tasty, tasty-hunit, tasty-quickcheck , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck
, tasty-rerun, tasty-smallcheck, template-haskell, text , tasty-rerun, tasty-smallcheck, template-haskell, text
@ -51183,13 +51212,13 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "candid"; pname = "candid";
version = "0.2"; version = "0.3";
sha256 = "0cif618n6m9cvlcvr7hk3gnypv2vxaz1qaa63jrxakmkcr1lm028"; sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
base base32 bytestring cereal constraints containers crc dlist base base32 bytestring cereal constraints containers crc dlist
hex-text leb128-cereal megaparsec mtl parser-combinators file-embed hex-text leb128-cereal megaparsec mtl parser-combinators
prettyprinter row-types scientific split template-haskell text prettyprinter row-types scientific split template-haskell text
transformers unordered-containers vector transformers unordered-containers vector
]; ];
@ -68226,21 +68255,21 @@ self: {
}) {}; }) {};
"cuckoo" = callPackage "cuckoo" = callPackage
({ mkDerivation, base, bytestring, criterion, cryptonite, doctest ({ mkDerivation, base, blake2, bytestring, criterion, doctest
, hashable, memory, primitive, QuickCheck, random, stopwatch , hashable, hashes, primitive, QuickCheck, random, stopwatch
, vector
}: }:
mkDerivation { mkDerivation {
pname = "cuckoo"; pname = "cuckoo";
version = "0.2.2"; version = "0.3.0";
sha256 = "1wm81a5fsq0wdvx3ayxfrljya7rm9c0vfmy5dhxa6h9zxnqrkvav"; sha256 = "11p7f1br9jyjdwaviy94xwq1jg3kgq5q1pqls20sakgm1f71axls";
libraryHaskellDepends = [ base memory primitive random vector ]; libraryHaskellDepends = [
base bytestring hashes primitive random
];
testHaskellDepends = [ testHaskellDepends = [
base bytestring cryptonite doctest hashable memory primitive base blake2 bytestring doctest hashable stopwatch
stopwatch
]; ];
benchmarkHaskellDepends = [ benchmarkHaskellDepends = [
base bytestring criterion memory QuickCheck stopwatch base bytestring criterion QuickCheck stopwatch
]; ];
doHaddock = false; doHaddock = false;
description = "Haskell Implementation of Cuckoo Filters"; description = "Haskell Implementation of Cuckoo Filters";
@ -75752,8 +75781,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "diagrams"; pname = "diagrams";
version = "1.4"; version = "1.4.0.1";
sha256 = "0fcik4vwm2zah5m3yf6p1dlf0vbs7h1jri77zfwl731bd3xgc246"; sha256 = "1y3yij2k2bpvmfxykr2s0hadbcprl1yi6z3pz4yjzqkib5s7y1mq";
libraryHaskellDepends = [ libraryHaskellDepends = [
diagrams-contrib diagrams-core diagrams-lib diagrams-svg diagrams-contrib diagrams-core diagrams-lib diagrams-svg
]; ];
@ -75971,8 +76000,8 @@ self: {
pname = "diagrams-gtk"; pname = "diagrams-gtk";
version = "1.4"; version = "1.4";
sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn"; sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn";
revision = "3"; revision = "4";
editedCabalFile = "0k0i3nm5zpdmrqh8wmd8y5xhw7drd67hifdva5a7dih8w5sab4ra"; editedCabalFile = "1w6xykrsfmhanzy7rdrnfzsc3ny9d28kqz9sla4dygm3gay5509q";
libraryHaskellDepends = [ libraryHaskellDepends = [
base cairo diagrams-cairo diagrams-lib gtk base cairo diagrams-cairo diagrams-lib gtk
]; ];
@ -78960,6 +78989,29 @@ self: {
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
}) {}; }) {};
"dl-fedora_0_9_2" = callPackage
({ mkDerivation, base, bytestring, directory, extra, filepath
, http-client, http-client-tls, http-directory, http-types
, optparse-applicative, regex-posix, simple-cmd, simple-cmd-args
, text, time, unix, xdg-userdirs
}:
mkDerivation {
pname = "dl-fedora";
version = "0.9.2";
sha256 = "1x48nrgz34a3kyfkv126jscbjv5yra8h0csrb6sw8f9jw5x3spss";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base bytestring directory extra filepath http-client
http-client-tls http-directory http-types optparse-applicative
regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs
];
testHaskellDepends = [ base simple-cmd ];
description = "Fedora image download tool";
license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
"dlist" = callPackage "dlist" = callPackage
({ mkDerivation, base, deepseq, QuickCheck }: ({ mkDerivation, base, deepseq, QuickCheck }:
mkDerivation { mkDerivation {
@ -81963,6 +82015,8 @@ self: {
pname = "dwarf-el"; pname = "dwarf-el";
version = "0.3"; version = "0.3";
sha256 = "177y84zgl215jivbxifn09w8mdv0k65bxyky0l1hadd64hgp2nq7"; sha256 = "177y84zgl215jivbxifn09w8mdv0k65bxyky0l1hadd64hgp2nq7";
revision = "1";
editedCabalFile = "134jqfl7zrk1l6jcv3ws4511x1097yzhn2gi0vcn0bkz6qc8lr3s";
libraryHaskellDepends = [ libraryHaskellDepends = [
base binary bytestring containers text text-show transformers base binary bytestring containers text text-show transformers
]; ];
@ -81978,6 +82032,8 @@ self: {
pname = "dwarfadt"; pname = "dwarfadt";
version = "0.6"; version = "0.6";
sha256 = "1fzkigzrm6s9060vmxsgw4bwzpfvcxc510ghb1rkqh5gslqszcb0"; sha256 = "1fzkigzrm6s9060vmxsgw4bwzpfvcxc510ghb1rkqh5gslqszcb0";
revision = "1";
editedCabalFile = "0rdydzqy6g24jgddc4sgg1244l9mdkhp1zyjnvjfg0jbrkgqcy73";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
@ -84174,6 +84230,8 @@ self: {
pname = "elf"; pname = "elf";
version = "0.30"; version = "0.30";
sha256 = "16gfpqsqfwlq4qprh0nswa4br1rz7rj7in7v803cqggkxz7s5c4p"; sha256 = "16gfpqsqfwlq4qprh0nswa4br1rz7rj7in7v803cqggkxz7s5c4p";
revision = "1";
editedCabalFile = "08krv9xws8gr8s5k6796y7yzng22gf4m1a4mv5g57j3yjldwkds2";
libraryHaskellDepends = [ base binary bytestring ]; libraryHaskellDepends = [ base binary bytestring ];
testHaskellDepends = [ base bytestring containers hspec ]; testHaskellDepends = [ base bytestring containers hspec ];
description = "An Elf parser"; description = "An Elf parser";
@ -87137,6 +87195,35 @@ self: {
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
}) {}; }) {};
"esqueleto_3_5_3_0" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
, conduit, containers, exceptions, hspec, hspec-core, monad-logger
, mtl, mysql, mysql-simple, persistent, persistent-mysql
, persistent-postgresql, persistent-sqlite, postgresql-simple
, QuickCheck, resourcet, tagged, text, time, transformers, unliftio
, unordered-containers
}:
mkDerivation {
pname = "esqueleto";
version = "3.5.3.0";
sha256 = "0z3cf49sha6q965qw2m08jfmb91ki2rsdpnr7l39lka5b4ffxjlz";
libraryHaskellDepends = [
aeson attoparsec base blaze-html bytestring conduit containers
monad-logger persistent resourcet tagged text time transformers
unliftio unordered-containers
];
testHaskellDepends = [
aeson attoparsec base blaze-html bytestring conduit containers
exceptions hspec hspec-core monad-logger mtl mysql mysql-simple
persistent persistent-mysql persistent-postgresql persistent-sqlite
postgresql-simple QuickCheck resourcet tagged text time
transformers unliftio unordered-containers
];
description = "Type-safe EDSL for SQL queries on persistent backends";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"ess" = callPackage "ess" = callPackage
({ mkDerivation, base }: ({ mkDerivation, base }:
mkDerivation { mkDerivation {
@ -89500,8 +89587,8 @@ self: {
({ mkDerivation, base, containers, fgl, mtl, transformers }: ({ mkDerivation, base, containers, fgl, mtl, transformers }:
mkDerivation { mkDerivation {
pname = "exploring-interpreters"; pname = "exploring-interpreters";
version = "0.3.2.0"; version = "0.4.0.0";
sha256 = "0wf35nnqqlvmzn8l3dxrvnr1w9clrzvmpw2vls2zyxnh9dsvrhf7"; sha256 = "07q4cjk2sqp471w0rgygf1x2c91vyajh93s8xzi3j09wdb23v9l3";
libraryHaskellDepends = [ base containers fgl mtl transformers ]; libraryHaskellDepends = [ base containers fgl mtl transformers ];
description = "A generic exploring interpreter for exploratory programming"; description = "A generic exploring interpreter for exploratory programming";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
@ -98838,24 +98925,25 @@ self: {
broken = true; broken = true;
}) {}; }) {};
"functor-combinators_0_4_0_0" = callPackage "functor-combinators_0_4_1_0" = callPackage
({ mkDerivation, assoc, base, bifunctors, comonad, constraints ({ mkDerivation, assoc, base, bifunctors, comonad, constraints
, containers, contravariant, dependent-sum, deriving-compat, free , containers, contravariant, dependent-sum, deriving-compat, free
, hedgehog, invariant, kan-extensions, mmorph, mtl , hashable, hedgehog, invariant, kan-extensions, mmorph, mtl
, natural-transformation, nonempty-containers, pointed, profunctors , natural-transformation, nonempty-containers, pointed, profunctors
, semigroupoids, sop-core, tagged, tasty, tasty-hedgehog, these , semigroupoids, sop-core, StateVar, tagged, tasty, tasty-hedgehog
, transformers, trivial-constraint, vinyl , these, transformers, trivial-constraint, unordered-containers
, vinyl
}: }:
mkDerivation { mkDerivation {
pname = "functor-combinators"; pname = "functor-combinators";
version = "0.4.0.0"; version = "0.4.1.0";
sha256 = "1kikldm7ih7r5ydyq26fkp01025dnwrafipsw9qv897k887b8gvg"; sha256 = "1b7324ia810i1rjn2z4q3h7rcbbvmfh3nl8vxswgnkglhrkcmg49";
libraryHaskellDepends = [ libraryHaskellDepends = [
assoc base bifunctors comonad constraints containers contravariant assoc base bifunctors comonad constraints containers contravariant
deriving-compat free invariant kan-extensions mmorph mtl deriving-compat free hashable invariant kan-extensions mmorph mtl
natural-transformation nonempty-containers pointed profunctors natural-transformation nonempty-containers pointed profunctors
semigroupoids sop-core tagged these transformers trivial-constraint semigroupoids sop-core StateVar tagged these transformers
vinyl trivial-constraint unordered-containers vinyl
]; ];
testHaskellDepends = [ testHaskellDepends = [
base bifunctors dependent-sum free hedgehog nonempty-containers base bifunctors dependent-sum free hedgehog nonempty-containers
@ -99404,8 +99492,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "futhark-server"; pname = "futhark-server";
version = "1.1.0.0"; version = "1.1.1.0";
sha256 = "0mv3q4a6l3xp0qjlhh9f8bvgbmrmr4hypnkapb2wsn0fvb0iw2kb"; sha256 = "1iqrpvh79y6a3b56ybafyxc98mlilnx928aqclx6h78hs10qlysy";
libraryHaskellDepends = [ libraryHaskellDepends = [
base binary bytestring directory futhark-data mtl process temporary base binary bytestring directory futhark-data mtl process temporary
text text
@ -101018,6 +101106,30 @@ self: {
license = lib.licenses.mit; license = lib.licenses.mit;
}) {}; }) {};
"generic-data_0_9_2_1" = callPackage
({ mkDerivation, ap-normalize, base, base-orphans, contravariant
, criterion, deepseq, generic-lens, ghc-boot-th, inspection-testing
, one-liner, show-combinators, tasty, tasty-hunit, template-haskell
, unordered-containers
}:
mkDerivation {
pname = "generic-data";
version = "0.9.2.1";
sha256 = "0hs5ahl1nx61kw5j0pnwgjrph7jgqq0djma956ksz6aivzldjf7q";
libraryHaskellDepends = [
ap-normalize base base-orphans contravariant ghc-boot-th
show-combinators
];
testHaskellDepends = [
base generic-lens inspection-testing one-liner show-combinators
tasty tasty-hunit template-haskell unordered-containers
];
benchmarkHaskellDepends = [ base criterion deepseq ];
description = "Deriving instances with GHC.Generics and related utilities";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
}) {};
"generic-data-surgery" = callPackage "generic-data-surgery" = callPackage
({ mkDerivation, base, first-class-families, generic-data ({ mkDerivation, base, first-class-families, generic-data
, show-combinators, tasty, tasty-hunit , show-combinators, tasty, tasty-hunit
@ -104924,53 +105036,47 @@ self: {
"ghcup" = callPackage "ghcup" = callPackage
({ mkDerivation, aeson, aeson-pretty, async, base ({ mkDerivation, aeson, aeson-pretty, async, base
, base16-bytestring, binary, bytestring, bz2, case-insensitive , base16-bytestring, binary, bytestring, bz2, Cabal, cabal-plan
, casing, concurrent-output, containers, cryptohash-sha256 , case-insensitive, casing, containers, cryptohash-sha256, deepseq
, generic-arbitrary, generics-sop, haskus-utils-types , directory, disk-free-space, filepath, generic-arbitrary
, haskus-utils-variant, hpath, hpath-directory, hpath-filepath , haskus-utils-types, haskus-utils-variant, hspec, hspec-discover
, hpath-io, hpath-posix, hspec, hspec-golden-aeson, libarchive , hspec-golden-aeson, HsYAML-aeson, libarchive, lzma-static
, lzma-static, megaparsec, monad-logger, mtl, optics, optics-vl , megaparsec, mtl, optics, optparse-applicative, os-release, pretty
, optparse-applicative, os-release, parsec, pretty, pretty-terminal , pretty-terminal, QuickCheck, quickcheck-arbitrary-adt
, QuickCheck, quickcheck-arbitrary-adt, regex-posix, resourcet , regex-posix, resourcet, safe, safe-exceptions, split, strict-base
, safe, safe-exceptions, split, streamly, streamly-bytestring , template-haskell, temporary, text, time, transformers, unix
, streamly-posix, strict-base, string-interpolate, template-haskell , unix-bytestring, unliftio-core, unordered-containers
, text, time, transformers, unix, unix-bytestring , uri-bytestring, utf8-string, vector, versions, word8, zlib
, unordered-containers, uri-bytestring, utf8-string, vector
, versions, vty, word8, yaml, zlib
}: }:
mkDerivation { mkDerivation {
pname = "ghcup"; pname = "ghcup";
version = "0.1.14.2"; version = "0.1.17.2";
sha256 = "1k18ira2i2ja4hd65fdxk3ab21xzh4fvd982q2rfjshzkds1a3hv"; sha256 = "0ggajcaxbr71npn6ihmlw954aj8lmdlwq3k22n9cnf23gg8s0yfv";
revision = "1";
editedCabalFile = "1vy71ly44jibq8bil0ns80m2zn9gcpnz8f9w2mn4j404gajpqagk";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
aeson async base base16-bytestring binary bytestring bz2 aeson async base base16-bytestring binary bytestring bz2 Cabal
case-insensitive casing concurrent-output containers case-insensitive casing containers cryptohash-sha256 deepseq
cryptohash-sha256 generics-sop haskus-utils-types directory disk-free-space filepath haskus-utils-types
haskus-utils-variant hpath hpath-directory hpath-filepath hpath-io haskus-utils-variant HsYAML-aeson libarchive lzma-static megaparsec
hpath-posix libarchive lzma-static megaparsec monad-logger mtl mtl optics os-release pretty pretty-terminal regex-posix resourcet
optics optics-vl os-release parsec pretty pretty-terminal safe safe-exceptions split strict-base template-haskell temporary
regex-posix resourcet safe safe-exceptions split streamly text time transformers unix unix-bytestring unliftio-core
streamly-bytestring streamly-posix strict-base string-interpolate unordered-containers uri-bytestring vector versions word8 zlib
template-haskell text time transformers unix unix-bytestring
unordered-containers uri-bytestring utf8-string vector versions vty
word8 yaml zlib
]; ];
executableHaskellDepends = [ executableHaskellDepends = [
aeson aeson-pretty base bytestring containers haskus-utils-variant aeson aeson-pretty async base bytestring cabal-plan containers
hpath hpath-filepath hpath-io libarchive megaparsec monad-logger deepseq filepath haskus-utils-variant HsYAML-aeson libarchive
mtl optics optparse-applicative pretty pretty-terminal regex-posix megaparsec mtl optics optparse-applicative pretty pretty-terminal
resourcet safe safe-exceptions string-interpolate template-haskell regex-posix resourcet safe safe-exceptions template-haskell text
text transformers uri-bytestring utf8-string versions yaml transformers uri-bytestring utf8-string versions
]; ];
testHaskellDepends = [ testHaskellDepends = [
base bytestring containers generic-arbitrary hpath hspec base bytestring containers generic-arbitrary hspec
hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt text hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt text
uri-bytestring versions uri-bytestring versions
]; ];
testToolDepends = [ hspec-discover ];
description = "ghc toolchain installer"; description = "ghc toolchain installer";
license = lib.licenses.lgpl3Only; license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ maralorn ]; maintainers = with lib.maintainers; [ maralorn ];
@ -117207,9 +117313,9 @@ self: {
}) {}; }) {};
"hakyll" = callPackage "hakyll" = callPackage
({ mkDerivation, aeson, array, base, binary, blaze-html ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup
, blaze-markup, bytestring, containers, data-default, deepseq , bytestring, containers, data-default, deepseq, directory
, directory, file-embed, filepath, fsnotify, hashable, http-conduit , file-embed, filepath, fsnotify, hashable, http-conduit
, http-types, lifted-async, lrucache, mtl, network-uri , http-types, lifted-async, lrucache, mtl, network-uri
, optparse-applicative, pandoc, parsec, process, QuickCheck, random , optparse-applicative, pandoc, parsec, process, QuickCheck, random
, regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-golden , regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-golden
@ -117219,15 +117325,15 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "hakyll"; pname = "hakyll";
version = "4.14.1.0"; version = "4.15.0.1";
sha256 = "1s0y7fc48zw0dkk4m9gv53mmklk1zfk4rkf7r6xawnkg5cj6sjpc"; sha256 = "09arikf44i4llffhi948fy2zdj76zym7z9swjx5p5axc7qvc4sqh";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
enableSeparateDataOutput = true; enableSeparateDataOutput = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
aeson array base binary blaze-html blaze-markup bytestring aeson base binary blaze-html blaze-markup bytestring containers
containers data-default deepseq directory file-embed filepath data-default deepseq directory file-embed filepath fsnotify
fsnotify hashable http-conduit http-types lifted-async lrucache mtl hashable http-conduit http-types lifted-async lrucache mtl
network-uri optparse-applicative pandoc parsec process random network-uri optparse-applicative pandoc parsec process random
regex-tdfa resourcet scientific tagsoup template-haskell text time regex-tdfa resourcet scientific tagsoup template-haskell text time
time-locale-compat unordered-containers vector wai wai-app-static time-locale-compat unordered-containers vector wai wai-app-static
@ -119921,17 +120027,17 @@ self: {
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
}) {}; }) {};
"hashable_1_3_3_0" = callPackage "hashable_1_3_4_0" = callPackage
({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim
, integer-gmp, QuickCheck, random, test-framework , HUnit, integer-gmp, QuickCheck, random, test-framework
, test-framework-hunit, test-framework-quickcheck2, text, unix , test-framework-hunit, test-framework-quickcheck2, text, unix
}: }:
mkDerivation { mkDerivation {
pname = "hashable"; pname = "hashable";
version = "1.3.3.0"; version = "1.3.4.0";
sha256 = "1p45rck6avm0ng963mmhphhwjljv9wcb7r2171cnka5nizjpi9cr"; sha256 = "0f796cs8mmk370c26qwc6g9wgx3r74m4p6m8909j1kdl5hj1sr86";
libraryHaskellDepends = [ libraryHaskellDepends = [
base bytestring deepseq ghc-prim integer-gmp text base bytestring containers deepseq ghc-prim integer-gmp text
]; ];
testHaskellDepends = [ testHaskellDepends = [
base bytestring ghc-prim HUnit QuickCheck random test-framework base bytestring ghc-prim HUnit QuickCheck random test-framework
@ -120076,6 +120182,21 @@ self: {
broken = true; broken = true;
}) {}; }) {};
"hashes" = callPackage
({ mkDerivation, base, bytestring, criterion, memory, QuickCheck }:
mkDerivation {
pname = "hashes";
version = "0.1.0.1";
sha256 = "0r686g8ksgl680s11m433z0d5b9hq8dz7k2as31qm2r2b6rvg7yd";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [ base bytestring QuickCheck ];
benchmarkHaskellDepends = [
base bytestring criterion memory QuickCheck
];
description = "Hash functions";
license = lib.licenses.mit;
}) {};
"hashflare" = callPackage "hashflare" = callPackage
({ mkDerivation, base, containers, simple-money }: ({ mkDerivation, base, containers, simple-money }:
mkDerivation { mkDerivation {
@ -141084,8 +141205,8 @@ self: {
({ mkDerivation, base, hspec, tmp-proc }: ({ mkDerivation, base, hspec, tmp-proc }:
mkDerivation { mkDerivation {
pname = "hspec-tmp-proc"; pname = "hspec-tmp-proc";
version = "0.5.0.0"; version = "0.5.0.1";
sha256 = "00w5rly9a4pkr3qmj3924md4nlkn55jwl8a4dnnmpzbinhz4mav1"; sha256 = "0zn0q3cvszpnb0lqlnizfh8v0z2kasjl414ny4pzni6yf13m2jfh";
libraryHaskellDepends = [ base hspec tmp-proc ]; libraryHaskellDepends = [ base hspec tmp-proc ];
description = "Simplify use of tmp-proc from hspec tests"; description = "Simplify use of tmp-proc from hspec tests";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
@ -158373,19 +158494,19 @@ self: {
, cryptohash-md5, derive-storable, derive-storable-plugin , cryptohash-md5, derive-storable, derive-storable-plugin
, distributive, file-embed, foldl, geomancy, GLFW-b, ktx-codec , distributive, file-embed, foldl, geomancy, GLFW-b, ktx-codec
, neat-interpolation, optparse-applicative, optparse-simple , neat-interpolation, optparse-applicative, optparse-simple
, resourcet, rio, rio-app, StateVar, tagged, template-haskell, text , resourcet, rio, rio-app, serialise, StateVar, tagged
, transformers, unagi-chan, unliftio, vector, vulkan, vulkan-utils , template-haskell, text, transformers, unagi-chan, unliftio
, VulkanMemoryAllocator, zstd , vector, vulkan, vulkan-utils, VulkanMemoryAllocator, zstd
}: }:
mkDerivation { mkDerivation {
pname = "keid-core"; pname = "keid-core";
version = "0.1.2.0"; version = "0.1.3.0";
sha256 = "07l493nn691bn6b2c4z684cjfj589vkip6068szc8j2j9pwqgr23"; sha256 = "0nvrspga2s0w8yydk3m3vn1c9dv40zk66bbsfmskxck950n5qw6k";
libraryHaskellDepends = [ libraryHaskellDepends = [
adjunctions base binary bytestring cryptohash-md5 derive-storable adjunctions base binary bytestring cryptohash-md5 derive-storable
derive-storable-plugin distributive file-embed foldl geomancy derive-storable-plugin distributive file-embed foldl geomancy
GLFW-b ktx-codec neat-interpolation optparse-applicative GLFW-b ktx-codec neat-interpolation optparse-applicative
optparse-simple resourcet rio rio-app StateVar tagged optparse-simple resourcet rio rio-app serialise StateVar tagged
template-haskell text transformers unagi-chan unliftio vector template-haskell text transformers unagi-chan unliftio vector
vulkan vulkan-utils VulkanMemoryAllocator zstd vulkan vulkan-utils VulkanMemoryAllocator zstd
]; ];
@ -158418,8 +158539,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "keid-render-basic"; pname = "keid-render-basic";
version = "0.1.2.1"; version = "0.1.3.0";
sha256 = "0dij5rnzzcbggc1mvsg123aynx1s337vv1a4px965aj0ny3lfn0k"; sha256 = "15cp34k0kmis9wf5r8x2pfihl263fjwmwfkpi9fn7p5snn36pc28";
enableSeparateDataOutput = true; enableSeparateDataOutput = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
adjunctions aeson base bytestring derive-storable adjunctions aeson base bytestring derive-storable
@ -190421,18 +190542,19 @@ self: {
({ mkDerivation, aeson, array, base, base64, binary, bytestring ({ mkDerivation, aeson, array, base, base64, binary, bytestring
, case-insensitive, containers, ede, enclosed-exceptions , case-insensitive, containers, ede, enclosed-exceptions
, http-client, http-types, network, ngx-export, ngx-export-tools , http-client, http-types, network, ngx-export, ngx-export-tools
, prettyprinter, safe, snap-core, snap-server, template-haskell , pcre-heavy, pcre-light, prettyprinter, safe, snap-core
, text, time, trifecta, unordered-containers , snap-server, template-haskell, text, time, trifecta
, unordered-containers
}: }:
mkDerivation { mkDerivation {
pname = "ngx-export-tools-extra"; pname = "ngx-export-tools-extra";
version = "0.7.0.0"; version = "0.8.0.0";
sha256 = "0d7p227s33sg5g1ck5s9pmcwnwvvpanbzyq2qc54bzpawpvn5kwi"; sha256 = "03s47hzw82w2wgyffdqvgcf4i0nz1vmaim7f3j8pniaa2b3xj3gv";
libraryHaskellDepends = [ libraryHaskellDepends = [
aeson array base base64 binary bytestring case-insensitive aeson array base base64 binary bytestring case-insensitive
containers ede enclosed-exceptions http-client http-types network containers ede enclosed-exceptions http-client http-types network
ngx-export ngx-export-tools prettyprinter safe snap-core ngx-export ngx-export-tools pcre-heavy pcre-light prettyprinter
snap-server template-haskell text time trifecta safe snap-core snap-server template-haskell text time trifecta
unordered-containers unordered-containers
]; ];
description = "More extra tools for Nginx haskell module"; description = "More extra tools for Nginx haskell module";
@ -196195,6 +196317,21 @@ self: {
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
}) {}; }) {};
"operational_0_2_4_0" = callPackage
({ mkDerivation, base, mtl, random }:
mkDerivation {
pname = "operational";
version = "0.2.4.0";
sha256 = "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl ];
executableHaskellDepends = [ base mtl random ];
description = "Implementation of difficult monads made easy with operational semantics";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"operational-alacarte" = callPackage "operational-alacarte" = callPackage
({ mkDerivation, base, mtl }: ({ mkDerivation, base, mtl }:
mkDerivation { mkDerivation {
@ -199992,21 +200129,24 @@ self: {
"parameterized-utils" = callPackage "parameterized-utils" = callPackage
({ mkDerivation, base, base-orphans, constraints, containers ({ mkDerivation, base, base-orphans, constraints, containers
, deepseq, ghc-prim, hashable, hashtables, hedgehog, lens, mtl , deepseq, ghc-prim, hashable, hashtables, hedgehog
, hedgehog-classes, indexed-traversable, lens, mtl, profunctors
, tasty, tasty-ant-xml, tasty-hedgehog, tasty-hunit , tasty, tasty-ant-xml, tasty-hedgehog, tasty-hunit
, template-haskell, text, th-abstraction, vector , template-haskell, text, th-abstraction, vector
}: }:
mkDerivation { mkDerivation {
pname = "parameterized-utils"; pname = "parameterized-utils";
version = "2.1.3.0"; version = "2.1.4.0";
sha256 = "1222lsdf4jbxwinv88g0sdnmbfyyxjmhfiinmasi5qbgkay4907l"; sha256 = "16hdmlpyjg9gbal195wpglb11i9qbaw8khp3c1433kgdlqz56hj7";
libraryHaskellDepends = [ libraryHaskellDepends = [
base base-orphans constraints containers deepseq ghc-prim hashable base base-orphans constraints containers deepseq ghc-prim hashable
hashtables lens mtl template-haskell text th-abstraction vector hashtables indexed-traversable lens mtl profunctors
template-haskell text th-abstraction vector
]; ];
testHaskellDepends = [ testHaskellDepends = [
base ghc-prim hashable hashtables hedgehog lens mtl tasty base ghc-prim hashable hashtables hedgehog hedgehog-classes
tasty-ant-xml tasty-hedgehog tasty-hunit indexed-traversable lens mtl tasty tasty-ant-xml tasty-hedgehog
tasty-hunit
]; ];
description = "Classes and data structures for working with data-kind indexed types"; description = "Classes and data structures for working with data-kind indexed types";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
@ -202230,15 +202370,15 @@ self: {
license = lib.licenses.asl20; license = lib.licenses.asl20;
}) {}; }) {};
"pcre2_2_0_1" = callPackage "pcre2_2_0_2" = callPackage
({ mkDerivation, base, containers, criterion, hspec, microlens ({ mkDerivation, base, containers, criterion, hspec, microlens
, microlens-platform, mtl, pcre-light, regex-pcre-builtin , microlens-platform, mtl, pcre-light, regex-pcre-builtin
, template-haskell, text , template-haskell, text
}: }:
mkDerivation { mkDerivation {
pname = "pcre2"; pname = "pcre2";
version = "2.0.1"; version = "2.0.2";
sha256 = "0f93z99qhlhyvq7xsfn0nap9cxpxg2hs7790jqc5hi5kmqxlwvmy"; sha256 = "0v96cxkx1c9x9n5z2fh1xawgrnaz00pf7ip76my8r92rzayzy0kw";
libraryHaskellDepends = [ libraryHaskellDepends = [
base containers microlens mtl template-haskell text base containers microlens mtl template-haskell text
]; ];
@ -204938,8 +205078,8 @@ self: {
({ mkDerivation, base, subG }: ({ mkDerivation, base, subG }:
mkDerivation { mkDerivation {
pname = "phonetic-languages-permutations-array"; pname = "phonetic-languages-permutations-array";
version = "0.1.0.0"; version = "0.2.0.0";
sha256 = "1r8fwdphn3h9zpbrdbbgmqjwv6gwcl205ahr3kqwz6sfg78bflj4"; sha256 = "0czrkhiplkblgsf6gq17m4hrwas4j4gj1hlq9zab8dcak39qkmc8";
libraryHaskellDepends = [ base subG ]; libraryHaskellDepends = [ base subG ];
description = "Permutations and universal set related functions for the phonetic-languages series"; description = "Permutations and universal set related functions for the phonetic-languages series";
license = lib.licenses.mit; license = lib.licenses.mit;
@ -248716,8 +248856,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "souffle-haskell"; pname = "souffle-haskell";
version = "3.0.0"; version = "3.1.0";
sha256 = "0zwz28w8fmz8lfwd5bzhysc43y5gfsa1px2xhlkxg5psy0j1935q"; sha256 = "1sjdfrhvncsz5lg3bv29x4j2dk0dn7c5mcaj61al8ksh9r51y05l";
libraryHaskellDepends = [ libraryHaskellDepends = [
array base bytestring containers deepseq directory filepath mtl array base bytestring containers deepseq directory filepath mtl
process template-haskell temporary text text-short process template-haskell temporary text text-short
@ -251321,8 +251461,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "stack-clean-old"; pname = "stack-clean-old";
version = "0.3.1"; version = "0.4";
sha256 = "034y2a8zhfjrf2wjqhsvkxycwypyykyq9abq2ir33nadgxlshfk4"; sha256 = "180jpmdvc0lkzb4fcr88y370j150vr74ih4hsypjydn0x3khx3f1";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
executableHaskellDepends = [ executableHaskellDepends = [
@ -255563,8 +255703,8 @@ self: {
({ mkDerivation, base }: ({ mkDerivation, base }:
mkDerivation { mkDerivation {
pname = "string-interpreter"; pname = "string-interpreter";
version = "0.5.2.0"; version = "0.5.3.0";
sha256 = "1i6y41kyhbarwsppm55rlb1ddqihnpcc89yfgsd8mjgmbrmpsr3l"; sha256 = "0ny0py7fhcbv1zkr96ngypb9mf241avds0i77lynnpig96j1ay14";
libraryHaskellDepends = [ base ]; libraryHaskellDepends = [ base ];
description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; description = "Is used in the phonetic languages approach (e. g. in the recursive mode).";
license = lib.licenses.mit; license = lib.licenses.mit;
@ -269438,19 +269578,22 @@ self: {
"tmp-proc" = callPackage "tmp-proc" = callPackage
({ mkDerivation, async, base, bytestring, connection, data-default ({ mkDerivation, async, base, bytestring, connection, data-default
, doctest, hspec, http-client, http-client-tls, http-types, mtl , hspec, http-client, http-client-tls, http-types, mtl, network
, network, process, req, text, unliftio, wai, warp, warp-tls , process, req, text, unliftio, wai, warp, warp-tls
}: }:
mkDerivation { mkDerivation {
pname = "tmp-proc"; pname = "tmp-proc";
version = "0.5.0.0"; version = "0.5.0.1";
sha256 = "0vqmi5dpq7b8yn1djlpg662nwwjqzhqblz85f83qvlhiyikqkhdp"; sha256 = "11mh34jirabrdx9jbai42r0pgbx2q2v6028zigjznvhrsc7lkk4l";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
async base bytestring mtl network process text unliftio wai warp async base bytestring mtl network process text unliftio wai warp
warp-tls warp-tls
]; ];
testHaskellDepends = [ testHaskellDepends = [
base bytestring connection data-default doctest hspec http-client base bytestring connection data-default hspec http-client
http-client-tls http-types req text wai warp warp-tls http-client-tls http-types req text wai warp warp-tls
]; ];
description = "Run 'tmp' processes in integration tests"; description = "Run 'tmp' processes in integration tests";
@ -284452,8 +284595,9 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "wai-middleware-delegate"; pname = "wai-middleware-delegate";
version = "0.1.2.2"; version = "0.1.2.4";
sha256 = "0g2zbvzi3d3pd3b4a2lrhp3vxk93agcg236yif0wghw3d0rqv1mr"; sha256 = "17r2qay83xnsg6f61bxpy7kvjw73827hdl8srxiwqirw6zzc1pha";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
async base blaze-builder bytestring case-insensitive conduit async base blaze-builder bytestring case-insensitive conduit
conduit-extra data-default http-client http-conduit http-types conduit-extra data-default http-client http-conduit http-types
@ -290195,8 +290339,8 @@ self: {
({ mkDerivation, base, containers, mtl, pretty, xml }: ({ mkDerivation, base, containers, mtl, pretty, xml }:
mkDerivation { mkDerivation {
pname = "xcb-types"; pname = "xcb-types";
version = "0.10.0"; version = "0.11.0";
sha256 = "1168vg2f3qd5yiwg2fcps0ciqpwns6scyk89bd07ws3qh6kayqfr"; sha256 = "1yhf1gh23ccvhkx8xbmiaa24r1mrilyvq3fwa15h8imf7qfvmr6x";
libraryHaskellDepends = [ base containers mtl pretty xml ]; libraryHaskellDepends = [ base containers mtl pretty xml ];
description = "Parses XML files used by the XCB project"; description = "Parses XML files used by the XCB project";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
@ -293340,8 +293484,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "yapb"; pname = "yapb";
version = "0.1.3"; version = "0.1.3.1";
sha256 = "11p3ygnfpsh9dqlnpppi02baa5bk86pw6w6f1gawdd848qh7q9if"; sha256 = "1jscmf1rm6fknsd4088ij0nsldgrz14v4xwfkbc5500hg81ikpqv";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [

4
pkgs/development/libraries/intel-gmmlib/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "gmmlib"; repo = "gmmlib";
rev = "${pname}-${version}"; rev = "intel-gmmlib-${version}";
sha256 = "0dzqfgbd0fxl8rxgf5nmj1jd4izzaqfb0s53l96qwz1j57q5ybj5"; sha256 = "0dzqfgbd0fxl8rxgf5nmj1jd4izzaqfb0s53l96qwz1j57q5ybj5";
}; };
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
OpenCL(TM) and the Intel(R) Media Driver for VAAPI. OpenCL(TM) and the Intel(R) Media Driver for VAAPI.
''; '';
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ primeos ]; maintainers = with maintainers; [ primeos SuperSandro2000 ];
}; };
} }

33
pkgs/development/libraries/intel-media-driver/default.nix
View file

@ -1,7 +1,14 @@
{ lib, stdenv, fetchFromGitHub { lib
, cmake, pkg-config , stdenv
, libva, libpciaccess, intel-gmmlib , fetchFromGitHub
, enableX11 ? stdenv.isLinux, libX11 , fetchpatch
, cmake
, pkg-config
, libva
, libpciaccess
, intel-gmmlib
, enableX11 ? stdenv.isLinux
, libX11
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,12 +18,20 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "intel"; owner = "intel";
repo = "media-driver"; repo = "media-driver";
rev = "intel-media-${version}"; rev = "intel-media-${version}";
sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr"; sha256 = "1ch1bvqg6p0i7ahblhy0h9c43y2mfhqb25v1s344iqsrywwcpzzr";
}; };
patches = [
# fix platform detection
(fetchpatch {
url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch";
sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0=";
})
];
cmakeFlags = [ cmakeFlags = [
"-DINSTALL_DRIVER_SYSCONF=OFF" "-DINSTALL_DRIVER_SYSCONF=OFF"
"-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri" "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri"
@ -24,6 +39,8 @@ stdenv.mkDerivation rec {
"-DMEDIA_RUN_TEST_SUITE=OFF" "-DMEDIA_RUN_TEST_SUITE=OFF"
]; ];
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libva libpciaccess intel-gmmlib ] buildInputs = [ libva libpciaccess intel-gmmlib ]
@ -45,6 +62,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}";
license = with licenses; [ bsd3 mit ]; license = with licenses; [ bsd3 mit ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ primeos jfrankenau ]; maintainers = with maintainers; [ primeos jfrankenau SuperSandro2000 ];
}; };
} }

4
pkgs/development/libraries/openexr/3.nix
View file

@ -8,7 +8,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openexr"; pname = "openexr";
version = "3.1.1"; version = "3.1.2";
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "doc" ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "AcademySoftwareFoundation"; owner = "AcademySoftwareFoundation";
repo = "openexr"; repo = "openexr";
rev = "v${version}"; rev = "v${version}";
sha256 = "1p0l07vfpb25fx6jcgk1747v8x9xgpifx4cvvgi3g2473wlx6pyb"; sha256 = "0vyclrrikphwkkpyjg8kzh3qzflzk3d6xsidgqllgfdgllr9wmgv";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/ucx/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ucx"; pname = "ucx";
version = "1.11.1"; version = "1.11.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openucx"; owner = "openucx";
repo = "ucx"; repo = "ucx";
rev = "v${version}"; rev = "v${version}";
sha256 = "07yyvb87i2f4w9rlvkracwzm133phwjw4zv9rs7xw6ql4pkrhrr3"; sha256 = "0a4rbgr3hn3h42krb7lasfidhqcavacbpp1pv66l4lvfc0gkwi2i";
}; };
nativeBuildInputs = [ autoreconfHook doxygen ]; nativeBuildInputs = [ autoreconfHook doxygen ];

7
pkgs/development/ocaml-modules/twt/default.nix
View file

@ -10,10 +10,9 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ];
createFindlibDestdir = true; preInstall = ''
mkdir -p $out/bin
configurePhase = '' mkdir -p $OCAMLFIND_DESTDIR
mkdir $out/bin
''; '';
dontBuild = true; dontBuild = true;

4
pkgs/development/php-packages/composer/default.nix
View file

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let let
pname = "composer"; pname = "composer";
version = "2.1.5"; version = "2.1.8";
in in
mkDerivation { mkDerivation {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar"; url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "1v4hjwbv1y5jvj91i2fj8bvmfsymp9ls8h231zd85svfqdy5b5dy"; sha256 = "141myfivdjnkx8myvkgl2sclhvx9z1c6a1my4xzscx0injhsrf3p";
}; };
dontUnpack = true; dontUnpack = true;

26
pkgs/development/python-modules/ansible-lint/default.nix
View file

@ -18,13 +18,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-lint"; pname = "ansible-lint";
version = "5.0.8"; version = "5.2.0";
disabled = isPy27; disabled = isPy27;
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-tnuWKEB66bwVuwu3H3mHG99ZP+/msGhMDMRL5fyQgD8="; sha256 = "sha256-eQIDVtk/UD0syGmnJw48BDFtUQ4ztiZO3AjH0NsOgGE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -52,18 +52,6 @@ buildPythonPackage rec {
"--numprocesses" "auto" "--numprocesses" "auto"
]; ];
postPatch = ''
# Both patches are addressed in https://github.com/ansible-community/ansible-lint/pull/1549
# and should be removed once merged upstream
# fixes test_get_yaml_files_umlaut and test_run_inside_role_dir
substituteInPlace src/ansiblelint/file_utils.py \
--replace 'os.path.join(root, name)' 'os.path.normpath(os.path.join(root, name))'
# fixes test_custom_kinds
substituteInPlace src/ansiblelint/file_utils.py \
--replace "if name.endswith('.yaml') or name.endswith('.yml')" ""
'';
preCheck = '' preCheck = ''
# ansible wants to write to $HOME and crashes if it can't # ansible wants to write to $HOME and crashes if it can't
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
@ -80,8 +68,18 @@ buildPythonPackage rec {
disabledTests = [ disabledTests = [
# requires network # requires network
"test_cli_auto_detect"
"test_install_collection"
"test_prerun_reqs_v1" "test_prerun_reqs_v1"
"test_prerun_reqs_v2" "test_prerun_reqs_v2"
"test_require_collection_wrong_version"
# re-execs ansible-lint which does not works correct
"test_custom_kinds"
"test_run_inside_role_dir"
"test_run_multiple_role_path_no_trailing_slash"
"test_runner_exclude_globs"
"test_discover_lintables_umlaut"
]; ];
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-base ]}" ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-base ]}" ];

4
pkgs/development/python-modules/emoji/default.nix
View file

@ -6,13 +6,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "emoji"; pname = "emoji";
version = "1.5.2"; version = "1.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "carpedm20"; owner = "carpedm20";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "11v8zqz183vpiyg2cp0fghb1hxqsn3yaydm1d97nqd9g2mfy37s1"; sha256 = "0sxqw1y070cpg7102a6a1bha8s25vwdgfcjp9nzlrzgd2p6pav41";
}; };
checkInputs = [ checkInputs = [

4
pkgs/development/python-modules/exchangelib/default.nix
View file

@ -27,14 +27,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "exchangelib"; pname = "exchangelib";
version = "4.5.1"; version = "4.5.2";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ecederstrand"; owner = "ecederstrand";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0pj6rcink4awjyq1v30camilqr03kd0sb2p03fk9v4lm63d8w28f"; sha256 = "1zz4p13ww9y5x0ifvcj652hgfbjqbnmr3snwrs0p315sc3y47ggm";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

3
pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
View file

@ -6,6 +6,7 @@
, proto-plus , proto-plus
, pytestCheckHook , pytestCheckHook
, pytest-asyncio , pytest-asyncio
, pytz
, mock , mock
}: }:
@ -18,7 +19,7 @@ buildPythonPackage rec {
sha256 = "fcb71ebe5c5b232d24fe7d666b65709e4fc8db43263c8182e5ed8e5a52abefec"; sha256 = "fcb71ebe5c5b232d24fe7d666b65709e4fc8db43263c8182e5ed8e5a52abefec";
}; };
propagatedBuildInputs = [ google-api-core libcst proto-plus ]; propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
checkInputs = [ mock pytestCheckHook pytest-asyncio ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ];
pythonImportsCheck = [ pythonImportsCheck = [

4
pkgs/development/python-modules/proto-plus/default.nix
View file

@ -10,12 +10,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "proto-plus"; pname = "proto-plus";
version = "1.19.0"; version = "1.19.2";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-zmaVzoBDg61vOSxLsYdMMjiWKQofZWVg3jZBa6gy2R4="; sha256 = "sha256-ylMLBxjGJbpj8VGrP83INrWTQ9FJt9/RXsLc6zhEwi0=";
}; };
propagatedBuildInputs = [ protobuf ]; propagatedBuildInputs = [ protobuf ];

6
pkgs/development/python-modules/pydaikin/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydaikin"; pname = "pydaikin";
version = "2.4.4"; version = "2.6.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromBitbucket { src = fetchFromBitbucket {
owner = "mustang51"; owner = "mustang51";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-G7SShq2zjd9KGM7t1KsAMehqm2onB5cYdcOO3k8Sb30="; sha256 = "sha256-Fk6zMWgvhKp+7BMDGw89Akb4fgK6+xi+AyvEY3pdTQQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -28,7 +28,7 @@ buildPythonPackage rec {
urllib3 urllib3
]; ];
# while they have tests, they do not run them in their CI and they fail as of 2.4.4 # while they have tests, they do not run them in their CI and they fail as of 2.6.0
# AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption'
doCheck = false; doCheck = false;

4
pkgs/development/python-modules/pylast/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylast"; pname = "pylast";
version = "4.2.1"; version = "4.3.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-R1enQk6luuBiobMPDn5x1SXx7zUI/5c8dPtyWkmG/18="; sha256 = "71fd876e3753009bd10ea55b3f8f7c5d68591ee18a4127d257fc4a418010aa5c";
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];

4
pkgs/development/python-modules/regenmaschine/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "regenmaschine"; pname = "regenmaschine";
version = "3.1.5"; version = "3.2.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bachya"; owner = "bachya";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0jm4x66kk7aa19hablkij43vsnsyy85a638zjfjsqghwqppwklgw"; sha256 = "sha256-H3ZTts9tk0D53IcnmROCgylhVerctUg/AQCjFo5iJZY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/stestr/default.nix
View file

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "stestr"; pname = "stestr";
version = "3.2.0"; version = "3.2.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "fb492cbdf3d3fdd6812645804efc84a99a68bb60dd7705f15c1a2949c8172bc4"; sha256 = "sha256-wj7nq0QSKNiDZZBKIk+4RC2gwCifkBz0qUIukpt76c0=";
}; };
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/testfixtures/default.nix
View file

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "testfixtures"; pname = "testfixtures";
version = "6.18.1"; version = "6.18.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-CmQic39tibRc3vHi31V29SrQ9QeVYALOECDaqfRCEdY="; sha256 = "sha256-JgAQCulv/QgjNLN441VVD++LSlKab6TDT0cTCQXHQm0=";
}; };
checkInputs = [ checkInputs = [

4
pkgs/development/python-modules/vt-py/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "vt-py"; pname = "vt-py";
version = "0.7.4"; version = "0.7.5";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "VirusTotal"; owner = "VirusTotal";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "149fgrqnwf8nyv3msj6p614zbdi7m7s785y3fvh8fm8k7lmgqk8w"; sha256 = "sha256-vC2teem231Lw7cglVc+0M+QbgMgZ23JzTYy7wvnhFI4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

1
pkgs/development/python-modules/werkzeug/1.nix
View file

@ -39,6 +39,7 @@ buildPythonPackage rec {
# E return Headers(result) # E return Headers(result)
# E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True> # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True>
"TestMultiPart" "TestMultiPart"
"TestHTTPUtility"
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
"test_get_machine_id" "test_get_machine_id"
]; ];

4
pkgs/development/python-modules/yeelight/default.nix
View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "yeelight"; pname = "yeelight";
version = "0.7.5"; version = "0.7.6";
disabled = pythonOlder "3.4"; disabled = pythonOlder "3.4";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "stavros"; owner = "stavros";
repo = "python-yeelight"; repo = "python-yeelight";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-lEroQ2Gy1ldeIkkSMYcXJk6j6Ls2zigImrIWOPq70D0="; sha256 = "sha256-inp6JKHA1ZgYPNMcQbL/tXOfhBDeMycIycLr69cOEGE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

3
pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
View file

@ -10,8 +10,6 @@
let let
inherit (lib) concatStringsSep concatMapStringsSep take splitString; inherit (lib) concatStringsSep concatMapStringsSep take splitString;
getPackages = version: haskell.packages."ghc${version}"; getPackages = version: haskell.packages."ghc${version}";
getMajorVersion = packages:
concatStringsSep "." (take 2 (splitString "." packages.ghc.version));
tunedHls = hsPkgs: tunedHls = hsPkgs:
haskell.lib.justStaticExecutables haskell.lib.justStaticExecutables
(haskell.lib.overrideCabal hsPkgs.haskell-language-server (old: { (haskell.lib.overrideCabal hsPkgs.haskell-language-server (old: {
@ -27,7 +25,6 @@ let
let packages = getPackages version; let packages = getPackages version;
in [ in [
"haskell-language-server-${packages.ghc.version}" "haskell-language-server-${packages.ghc.version}"
"haskell-language-server-${getMajorVersion packages}"
]; ];
makeSymlinks = version: makeSymlinks = version:
concatMapStringsSep "\n" (x: concatMapStringsSep "\n" (x:

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp", "url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
"rev": "c9e1952d311cf87762a42a79cb801c7bef1af815", "rev": "52ad1d506debcd4623d641339f8f452e6ea8f10c",
"date": "2021-09-09T23:38:47+01:00", "date": "2021-09-23T08:24:24+01:00",
"path": "/nix/store/cl05d3zpbbkhms5fmd6wc4jhasjhg12l-tree-sitter-c-sharp", "path": "/nix/store/ag2r3d659gj14hgfgdf0nv5dwcihxy3w-tree-sitter-c-sharp",
"sha256": "0kn7p203ij8vz1cdxmxvn85mf3hpmz08l5psza96xxif2lcz8li8", "sha256": "1n8jnw2yp966svkcyh68wwwbqjhrvhykzxilj6k8rn5yx9lpymz5",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/tree-sitter/tree-sitter-c", "url": "https://github.com/tree-sitter/tree-sitter-c",
"rev": "f71e80b9f20c3968c131518ae8d272a3cf81a60b", "rev": "e348e8ec5efd3aac020020e4af53d2ff18f393a9",
"date": "2021-09-18T14:26:00-05:00", "date": "2021-09-20T10:21:48-07:00",
"path": "/nix/store/22iw8rdpmvxmyrsmxxbyx8yi44jq05qd-tree-sitter-c", "path": "/nix/store/bnc2zml2igbpprx4i0h053inv023z6nj-tree-sitter-c",
"sha256": "13qr8ms8w7y92a33p0wisg4kzj4q3dzi2bn7wd6x815j8hfz627q", "sha256": "0fmh8b94ra5fi0j9by9yqbc1pf9sh9pjwc3symrslg855w8a0yx7",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/stsewd/tree-sitter-comment", "url": "https://github.com/stsewd/tree-sitter-comment",
"rev": "8d480c0a86e3b95812252d29292b2686eb92418d", "rev": "5dd3c62f1bbe378b220fe16b317b85247898639e",
"date": "2021-08-13T15:03:50-05:00", "date": "2021-10-01T17:13:56-05:00",
"path": "/nix/store/4aqsac34f0pzpa889067dqci743axrmx-tree-sitter-comment", "path": "/nix/store/isrc5wlyxvcawfj35yi4nmblshy69b1j-tree-sitter-comment",
"sha256": "0fqhgvpd391nxrpyhxcp674h8qph280ax6rm6dz1pj3lqs3grdka", "sha256": "1wk6lxzndaikbrn72pa54y59qs0xnfaffc8mxmm6c5v5x16l8vb3",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/tree-sitter/tree-sitter-cpp", "url": "https://github.com/tree-sitter/tree-sitter-cpp",
"rev": "8b112a131b910ec009853fc9dd1c27eae267a7a6", "rev": "a7652fce5943c9d5d9c49dd8e3256a699aa33bf5",
"date": "2021-09-18T10:53:12-05:00", "date": "2021-09-24T15:54:22-05:00",
"path": "/nix/store/bpfw6wckk0yfpr99nrv473g3r3b84vbv-tree-sitter-cpp", "path": "/nix/store/9q4xnklmv1220yjgwdz96qf0l8swx2j6-tree-sitter-cpp",
"sha256": "0rskvx5krakfkkcmiv9qd0zf8rf63iaigv76x3dq7v00sj8m0xsn", "sha256": "10dbif87axvban83mglvh81gjckbp7qya0rf525s10h8ihy7rbpm",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/rydesun/tree-sitter-dot", "url": "https://github.com/rydesun/tree-sitter-dot",
"rev": "e6f55c43b87b81cc982e38d414f0147fefa2515c", "rev": "3a32e207e126a7f1cdd17de2473db1f03e6a3dac",
"date": "2021-09-01T14:36:57+08:00", "date": "2021-10-05T10:30:04+08:00",
"path": "/nix/store/n5a6bzh8rf35865wvcr3cis9r0fn2047-tree-sitter-dot", "path": "/nix/store/zz4sj2r6jyl7k4l7g8qggr0gv4wh5nx7-tree-sitter-dot",
"sha256": "1s3fpd0lnbm3gk9nbskdkdjlmdm7kz0l0g2zipv1m7qkc05nnkfy", "sha256": "17j8spga68y40fy2yizpkx7bmxp7h5p9l334w2b0685w2mnvrlgg",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/wilfred/tree-sitter-elisp", "url": "https://github.com/wilfred/tree-sitter-elisp",
"rev": "166777abacfe5821d3b7b6873e6d2fd70a99f348", "rev": "4b0e4a3891337514126ec72c7af394c0ff2cf48c",
"date": "2021-09-05T23:34:46-07:00", "date": "2021-10-02T12:14:40-07:00",
"path": "/nix/store/gfyr8hl9pj2i0dj0qqpwh53jphff2bcd-tree-sitter-elisp", "path": "/nix/store/1g3q3xzv5n9wzi84awrlbxwm6q3zh8qz-tree-sitter-elisp",
"sha256": "18798jb3cisrvhkmzhq2qxly19hxvznf9k1n5pzl8l1dhw1yvl2a", "sha256": "1g6qmpxn1y9hzk2kkpp9gpkphaq9j7vvm4nl5zv8a4wzy3w8p1wv",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/travonted/tree-sitter-fennel", "url": "https://github.com/travonted/tree-sitter-fennel",
"rev": "42823442a18dd2aa7b0b22dc719abb54abb3fe2e", "rev": "fce4331731a960077ff5f98939bc675179f1908a",
"date": "2021-09-08T19:22:08-04:00", "date": "2021-09-30T09:09:52-04:00",
"path": "/nix/store/2v174r3fc3cqsy8yanq2kdcjqvzl1jx9-tree-sitter-fennel", "path": "/nix/store/mhpkw4gl6lzi306q21kckafqcdc0a715-tree-sitter-fennel",
"sha256": "0a59hgx7mmdicw9fq2q8dcd2ffmcgjdkk3rpwj84ya1qiyvs5x5s", "sha256": "1k8acyav26248liz0psk2r9dl7472mqgdyrjwg3pfxx94jgqjcik",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/tree-sitter/tree-sitter-go", "url": "https://github.com/tree-sitter/tree-sitter-go",
"rev": "42b1e657c3a394c01df51dd3eadc8b214274a73c", "rev": "7f6bfd0161b2fe97f03564edad3287ebea0494a3",
"date": "2021-08-16T18:29:17+02:00", "date": "2021-10-04T13:10:27-04:00",
"path": "/nix/store/a1crqhfrd8v9g9w0565aca7nc9k2x7a0-tree-sitter-go", "path": "/nix/store/64xzxzc8z4fmwhfb7wbdkcxlk7r3bia2-tree-sitter-go",
"sha256": "1khsl8qz6r4dqw7h43m3jw3iqhh79sgpnsps0jy95f165iy496z3", "sha256": "12naks95vzb0sf219i39myvfpkycr2dh3lv7i7i6kwddmlhqsjnl",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/tree-sitter/tree-sitter-javascript", "url": "https://github.com/tree-sitter/tree-sitter-javascript",
"rev": "435db852fbeff8fe298e25ad967c634d9698eec0", "rev": "fdeb68ac8d2bd5a78b943528bb68ceda3aade2eb",
"date": "2021-09-13T13:32:20-07:00", "date": "2021-10-04T13:07:24-04:00",
"path": "/nix/store/idvb37g3nqpidw0jviiw4b71sqpihhs0-tree-sitter-javascript", "path": "/nix/store/psmsgqhg4di7mkkd6sgyvcs41jvvq2c3-tree-sitter-javascript",
"sha256": "0plc5jxxh1bm1dig6gsk1ma7gp29ad3p0169jd9xlagc4vysfgc3", "sha256": "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/tree-sitter/tree-sitter-php", "url": "https://github.com/tree-sitter/tree-sitter-php",
"rev": "d1bdb1e535d39d4f93f7373f406e1837c8a7bb25", "rev": "31550c1506b2033c5631cd18886edd600b67861e",
"date": "2021-09-10T08:16:50+02:00", "date": "2021-09-27T11:44:23-07:00",
"path": "/nix/store/4zzs4f1hz5il35pqyf355aps6k4a83i8-tree-sitter-php", "path": "/nix/store/bls6gpbwqacgz7hr900khlfhbal29y27-tree-sitter-php",
"sha256": "0ymkwlh1japlwsajxd06254qadzq9bvm5db02cg4n3zv0pkvyrzz", "sha256": "1qykyziapwmw5qhd5svawzksp4w9hjdql84d7lqs3w0dfa60bjax",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/tree-sitter/tree-sitter-python", "url": "https://github.com/tree-sitter/tree-sitter-python",
"rev": "9b84b7fd9da1aa74c8a8afae58b7dcc4c109cda4", "rev": "8600d7fadf5a51b9396eacbc6d105d0649b4c6f6",
"date": "2021-09-16T13:02:06+02:00", "date": "2021-09-30T09:07:59-07:00",
"path": "/nix/store/vxh1bdkdqj3n6knlz6bbdyl5l4qj2a2v-tree-sitter-python", "path": "/nix/store/0m86a8y8p8cxq616gacd5wydhayl8g70-tree-sitter-python",
"sha256": "0r5daw3pbqcaf08gnhghjr15n7vv43njvh4ky6vz985sjzdnjz02", "sha256": "0ydiizy1jhmfv0kr7xw9k57jgfpkda95nc1rawzqmsxd7nixnrkp",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/stsewd/tree-sitter-rst", "url": "https://github.com/stsewd/tree-sitter-rst",
"rev": "a9281c2250e0d32750de159413cdd87120407389", "rev": "632596b1fe5816315cafa90cdf8f8000e30c93e4",
"date": "2021-09-17T19:21:59-05:00", "date": "2021-10-01T17:00:56-05:00",
"path": "/nix/store/3cnj1q9xfl0yh096pahqvlrf66azyhsr-tree-sitter-rst", "path": "/nix/store/pnbw1j9ynj4zgjqxjnhq9hgqp3nxm77j-tree-sitter-rst",
"sha256": "1fxknsmkn3pz1km77mii3w917fdl6h57h4mnw20b0syn4v1ag07d", "sha256": "1l831aw4a080qin7dkq04b28nnyxs1r8zqrbp92d7j4y2lz31dla",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/tree-sitter/tree-sitter-typescript", "url": "https://github.com/tree-sitter/tree-sitter-typescript",
"rev": "3383cebec9c9546587d9fe00c2e565d91163014a", "rev": "ef6ee5b39d6c4660809a61c1c8556fb547283864",
"date": "2021-09-16T13:01:51-07:00", "date": "2021-10-04T11:58:33-05:00",
"path": "/nix/store/ml188xckf51g1r6gw380svxsg639kjgc-tree-sitter-typescript", "path": "/nix/store/ny8gc7l6hpa4snhccyw3149f7s92071l-tree-sitter-typescript",
"sha256": "0vgkhn36cyg134ygx5wzld3ic9rd4lq9s2rp2dkxh0zg610ilcms", "sha256": "1gyim8yackz9pq6s62wrywr3gsgwa68jwvd0s6i28xxvln2r7wlb",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/tree-sitter/tree-sitter-verilog", "url": "https://github.com/tree-sitter/tree-sitter-verilog",
"rev": "1b624ab8b3f8d54ecc37847aa04512844f0226ac", "rev": "6fae7414fa854b5052bee9111b200e9137797f3d",
"date": "2021-03-31T21:27:26-07:00", "date": "2021-10-04T10:25:49-07:00",
"path": "/nix/store/4j6hrf8bc8zjd7r9xnna9njpw0i4z817-tree-sitter-verilog", "path": "/nix/store/aklrgpy0si72r8vac5fqjbzvcpqiy5lk-tree-sitter-verilog",
"sha256": "0ygm6bdxqzpl3qn5l58mnqyj730db0mbasj373bbsx81qmmzkgzz", "sha256": "0yjhb2rp7drwkwfp35fgwnp6d7qf6k1k6zlf0dfxygjywnjy0bfs",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/vigoux/tree-sitter-viml", "url": "https://github.com/vigoux/tree-sitter-viml",
"rev": "59595443fb486449f42db839934117221358a85f", "rev": "fd7bc35927ab44670e02d5ad035e0363f4ffde2b",
"date": "2021-08-31T08:57:29+02:00", "date": "2021-09-27T15:41:51+02:00",
"path": "/nix/store/9sixkkk37c2bl09aik32cd1jd322ywri-tree-sitter-viml", "path": "/nix/store/q2z07daw81cgn15z79qsfdqc2jc8ib9l-tree-sitter-viml",
"sha256": "1kh3il5vwlz5qxi9553ks7a0dpwx1n7wnqkv5v8jhslhn7w1c1l1", "sha256": "0s1bp1c8p2ify67x49fv9wh0brn98lix3742zlds892985xl9zrj",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
View file

@ -1,9 +1,9 @@
{ {
"url": "https://github.com/maxxnino/tree-sitter-zig", "url": "https://github.com/maxxnino/tree-sitter-zig",
"rev": "5ca53bb7bd649069a6af48f4dfd32f3187491db1", "rev": "1f27fd1dfe7f352408f01b4894c7825f3a1d6c47",
"date": "2021-09-06T21:30:14+09:00", "date": "2021-09-20T17:51:34+09:00",
"path": "/nix/store/x2dfgc97jmvyq5fnbyg9w7rsjz8cknj6-tree-sitter-zig", "path": "/nix/store/c4slv3kpl9dxi2fn6nbhar098ikpfivf-tree-sitter-zig",
"sha256": "1c50pvza6l4snmvgj3by053j4z7asy828i9pi1zwm6121sl7ffpd", "sha256": "1sbxvn400wizwwgjw7qcxb0z9gazvzcp3z2986lblff2xw8759vw",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

6
pkgs/development/web/deno/default.nix
View file

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "deno"; pname = "deno";
version = "1.14.2"; version = "1.14.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7FcGwmJKKOmpuCJgHl65+EnwOWQAbmq6X1lZMhTlDaE="; sha256 = "sha256-Ersfn69vRGKzJ4LV7qLI2orLftHz7tuI8+/zUEPctAE=";
}; };
cargoSha256 = "sha256-mPxPieatGuROIwLGuQHBrZ8VTGd8c/6bKA+tt3Iv3OI="; cargoSha256 = "sha256-BnJH/jbNiPyRmNjvfE5bNQX58iuAFFaQ93bZsXooTfI=";
# Install completions post-install # Install completions post-install
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

10
pkgs/development/web/deno/librusty_v8.nix
View file

@ -11,11 +11,11 @@ let
}; };
in in
fetch_librusty_v8 { fetch_librusty_v8 {
version = "0.30.0"; version = "0.31.0";
shas = { shas = {
x86_64-linux = "sha256-p5Vbt2fQPFR9SfLJ03f62/a8o9QIJOTXbA1s2liwNXY="; x86_64-linux = "sha256-KPoxq6rZnwghcDR5cMexN8EMeCfyuKoBcTZ3bv1mEpw=";
aarch64-linux = "sha256-j12KjdnL19d5U/QRfB/7ahUzcYnUddItp29bLM/mWzs="; aarch64-linux = "sha256-S+lHGwbnCu2uNCIE+R5MljltOIqXpFAxvx0cglV8ZNI=";
x86_64-darwin = "sha256-w3k9oj+mP+i/hSf+ZjYLF+zsAcyLezbxhWXYoaPpn+U="; x86_64-darwin = "sha256-o8O+X4SEXP7eY/dfHqe8NT7johtnPJQTBOgApFqOOhY=";
aarch64-darwin = "sha256-bOtZoG8vXnSBNTPJDkyW0xbMEbmGNtq+mEPKoP78Yew="; aarch64-darwin = "sha256-OQNQh6byNn9R0a6madgUMdUxbUv/R9psnwtTSr3BfzE=";
}; };
} }

4
pkgs/games/crispy-doom/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "crispy-doom"; pname = "crispy-doom";
version = "5.10.2"; version = "5.10.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fabiangreffrath"; owner = "fabiangreffrath";
repo = pname; repo = pname;
rev = "${pname}-${version}"; rev = "${pname}-${version}";
sha256 = "sha256-NUBodIojvlw46yLZ9Bn2pCpBwyVW8noOHQMM4uGmO3U="; sha256 = "sha256-F1cK8qusxOHM0DkLEYV5i2ixP3II8ZttwKxd8htd0+A=";
}; };
postPatch = '' postPatch = ''

10
pkgs/misc/vscode-extensions/vscode-utils.nix
View file

@ -6,8 +6,14 @@ let
# Same as "Unique Identifier" on the extension's web page. # Same as "Unique Identifier" on the extension's web page.
# For the moment, only serve as unique extension dir. # For the moment, only serve as unique extension dir.
vscodeExtUniqueId, vscodeExtUniqueId,
configurePhase ? ":", configurePhase ? ''
buildPhase ? ":", runHook preConfigure
runHook postConfigure
'',
buildPhase ?''
runHook preBuild
runHook postBuild
'',
dontPatchELF ? true, dontPatchELF ? true,
dontStrip ? true, dontStrip ? true,
buildInputs ? [], buildInputs ? [],

8
pkgs/os-specific/linux/rdma-core/default.nix
View file

@ -2,18 +2,16 @@
, pandoc, ethtool, iproute2, libnl, udev, python3, perl , pandoc, ethtool, iproute2, libnl, udev, python3, perl
} : } :
let
version = "36.0";
in stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "rdma-core"; pname = "rdma-core";
inherit version; version = "37.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linux-rdma"; owner = "linux-rdma";
repo = "rdma-core"; repo = "rdma-core";
rev = "v${version}"; rev = "v${version}";
sha256 = "0x3mpwmhln6brwrwix9abdq1bs9zi4qnr3r64vwqk7l6f43mqd30"; sha256 = "0cz6dq34w0zxm1c6xk4pqascvvppa1b0m8jfnpncg5a68day8x65";
}; };
nativeBuildInputs = [ cmake pkg-config pandoc docutils ]; nativeBuildInputs = [ cmake pkg-config pandoc docutils ];

6
pkgs/servers/monitoring/unifi-poller/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "unifi-poller"; pname = "unifi-poller";
version = "2.1.0"; version = "2.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unifi-poller"; owner = "unifi-poller";
repo = "unifi-poller"; repo = "unifi-poller";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-C7QjMzmy2CMCk2oqRiThUQBKgltT0PzZArvZ+gOmJ2I="; sha256 = "sha256-xh9s1xAhIeEmeDprl7iPdE6pxmxZjzgMvilobiIoJp0=";
}; };
vendorSha256 = "sha256-LOBkdyfsw7ua6TsLglO5jdR9NWo5Df8rnQ8MH+eIz4g="; vendorSha256 = "sha256-HoYgBKTl9HIMVzzzNYtRrfmqb7HCpPHVPeR4gUXneWk=";
ldflags = [ ldflags = [
"-w" "-s" "-w" "-s"

8
pkgs/servers/ums/default.nix
View file

@ -4,16 +4,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ums"; pname = "ums";
version = "9.4.2"; version = "10.12.0";
src = { src = {
i686-linux = fetchurl { i686-linux = fetchurl {
url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86.tgz"; url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86.tgz";
sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j"; sha256 = "0j3d5zcwwswlcr2vicmvnnr7n8cg3q46svz0mbmga4j3da4473i6";
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86_64.tgz";
sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3"; sha256 = "06f96vkf593aasyfw458fa4x3rnai2k83vpgzc83hlwr0rw70qfn";
}; };
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
# ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh` # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh`
# script will correctly fall back to the JRE specified by JAVA_HOME # script will correctly fall back to the JRE specified by JAVA_HOME
rm -rf $out/jre rm -rf $out/jre8
makeWrapper "$out/UMS.sh" "$out/bin/ums" \ makeWrapper "$out/UMS.sh" "$out/bin/ums" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath [ libzen libmediainfo] }" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath [ libzen libmediainfo] }" \

4
pkgs/shells/oil/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "oil"; pname = "oil";
version = "0.9.2"; version = "0.9.3";
src = fetchurl { src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
sha256 = "sha256-msPRus7J/qMfFFaayQfrjFFqhSvPuwpr6EaobOCBaUE="; sha256 = "sha256-YvNgcvafM3jgO3nY1SVcHRNglOwRQQ208W7oLxZg79o=";
}; };
postPatch = '' postPatch = ''

4
pkgs/tools/misc/yle-dl/default.nix
View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "yle-dl"; pname = "yle-dl";
version = "20210808"; version = "20210917";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aajanki"; owner = "aajanki";
repo = "yle-dl"; repo = "yle-dl";
rev = version; rev = version;
sha256 = "sha256-pHre4R0zVML1Stp0H4E3ee9Xbb3KNLgZFWOJPC5KTA8="; sha256 = "sha256-l8Wv15DLWRvJ+I6KeTNbIjp+S5EgoqhLOWd0wEyXckk=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

3
pkgs/top-level/all-packages.nix
View file

@ -3832,7 +3832,7 @@ with pkgs;
circus = callPackage ../tools/networking/circus { }; circus = callPackage ../tools/networking/circus { };
citrix_workspace = citrix_workspace_21_08_0; citrix_workspace = citrix_workspace_21_09_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { }) inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_20_04_0 citrix_workspace_20_04_0
@ -3844,6 +3844,7 @@ with pkgs;
citrix_workspace_21_03_0 citrix_workspace_21_03_0
citrix_workspace_21_06_0 citrix_workspace_21_06_0
citrix_workspace_21_08_0 citrix_workspace_21_08_0
citrix_workspace_21_09_0
; ;
citra = libsForQt5.callPackage ../misc/emulators/citra { }; citra = libsForQt5.callPackage ../misc/emulators/citra { };