diff options
105 files changed, 1153 insertions, 579 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 61ba7dad7cc7..b8d154ad635e 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -28,6 +28,7 @@ let "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" + "m68k-linux" # MMIXware "mmix-mmixware" @@ -39,7 +40,7 @@ let # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" - "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none" + "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none" "m68k-none" "x86_64-none" # OpenBSD @@ -74,6 +75,7 @@ in { riscv = filterDoubles predicates.isRiscV; vc4 = filterDoubles predicates.isVc4; or1k = filterDoubles predicates.isOr1k; + m68k = filterDoubles predicates.isM68k; js = filterDoubles predicates.isJavaScript; bigEndian = filterDoubles predicates.isBigEndian; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 6a8f4e091aae..ce7515bc9ccd 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -144,6 +144,10 @@ rec { libc = "newlib"; }; + m68k = { + config = "m68k-unknown-linux-gnu"; + }; + arm-embedded = { config = "arm-none-eabi"; libc = "newlib"; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index d2b7271210cd..a74847d43407 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -26,6 +26,7 @@ rec { isAvr = { cpu = { family = "avr"; }; }; isAlpha = { cpu = { family = "alpha"; }; }; isOr1k = { cpu = { family = "or1k"; }; }; + isM68k = { cpu = { family = "m68k"; }; }; isJavaScript = { cpu = cpuTypes.js; }; is32bit = { cpu = { bits = 32; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 2b789fd8ecb3..8a8b08881496 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -95,6 +95,8 @@ rec { mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; }; + m68k = { bits = 32; significantByte = bigEndian; family = "m68k"; }; + powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; }; powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 36f82b783b41..378dc5375988 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 3695997f7176..cc3b5cbd29eb 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -32,6 +32,11 @@ from Python 3.8. </para> </listitem> + <listitem> + <para> + PostgreSQL now defaults to major version 13. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-new-services"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index cc5b6bf81eec..5c27dba5fe07 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -11,6 +11,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `python3` now defaults to Python 3.9, updated from Python 3.8. +- PostgreSQL now defaults to major version 13. + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index b764db1f14e4..888ef20f642e 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -5,14 +5,15 @@ with lib; let cfg = config.services.syncoid; - # Extract pool names of local datasets (ones that don't contain "@") that - # have the specified type (either "source" or "target") - getPools = type: unique (map (d: head (builtins.match "([^/]+).*" d)) ( - # Filter local datasets - filter (d: !hasInfix "@" d) - # Get datasets of the specified type - (catAttrs type (attrValues cfg.commands)) - )); + # Extract the pool name of a local dataset (any dataset not containing "@") + localPoolName = d: optionals (d != null) ( + let m = builtins.match "([^/@]+)[^@]*" d; in + optionals (m != null) m); + + # Escape as required by: https://www.freedesktop.org/software/systemd/man/systemd.unit.html + escapeUnitName = name: + lib.concatMapStrings (s: if lib.isList s then "-" else s) + (builtins.split "[^a-zA-Z0-9_.\\-]+" name); in { # Interface @@ -77,6 +78,14 @@ in { ''; }; + service = mkOption { + type = types.attrs; + default = {}; + description = '' + Systemd configuration common to all syncoid services. + ''; + }; + commands = mkOption { type = types.attrsOf (types.submodule ({ name, ... }: { options = { @@ -99,13 +108,7 @@ in { ''; }; - recursive = mkOption { - type = types.bool; - default = false; - description = '' - Whether to also transfer child datasets. - ''; - }; + recursive = mkEnableOption ''the transfer of child datasets''; sshKey = mkOption { type = types.nullOr types.path; @@ -145,6 +148,14 @@ in { ''; }; + service = mkOption { + type = types.attrs; + default = {}; + description = '' + Systemd configuration specific to this syncoid service. + ''; + }; + extraArgs = mkOption { type = types.listOf types.str; default = []; @@ -170,11 +181,15 @@ in { # Implementation config = mkIf cfg.enable { - users = { + users = { users = mkIf (cfg.user == "syncoid") { syncoid = { group = cfg.group; isSystemUser = true; + # For syncoid to be able to create /var/lib/syncoid/.ssh/ + # and to use custom ssh_config or known_hosts. + home = "/var/lib/syncoid"; + createHome = false; }; }; groups = mkIf (cfg.group == "syncoid") { @@ -182,35 +197,99 @@ in { }; }; - systemd.services.syncoid = { - description = "Syncoid ZFS synchronization service"; - script = concatMapStringsSep "\n" (c: lib.escapeShellArgs - ([ "${pkgs.sanoid}/bin/syncoid" ] - ++ (optionals c.useCommonArgs cfg.commonArgs) - ++ (optional c.recursive "-r") - ++ (optionals (c.sshKey != null) [ "--sshkey" c.sshKey ]) - ++ c.extraArgs - ++ [ "--sendoptions" c.sendOptions - "--recvoptions" c.recvOptions - "--no-privilege-elevation" - c.source c.target - ])) (attrValues cfg.commands); - after = [ "zfs.target" ]; - serviceConfig = { - ExecStartPre = let - allowCmd = permissions: pool: lib.escapeShellArgs [ - "+/run/booted-system/sw/bin/zfs" "allow" - cfg.user (concatStringsSep "," permissions) pool - ]; - in - (map (allowCmd [ "hold" "send" "snapshot" "destroy" ]) (getPools "source")) ++ - (map (allowCmd [ "create" "mount" "receive" "rollback" ]) (getPools "target")); - User = cfg.user; - Group = cfg.group; - }; - startAt = cfg.interval; - }; + systemd.services = mapAttrs' (name: c: + nameValuePair "syncoid-${escapeUnitName name}" (mkMerge [ + { description = "Syncoid ZFS synchronization from ${c.source} to ${c.target}"; + after = [ "zfs.target" ]; + startAt = cfg.interval; + # syncoid may need zpool to get feature@extensible_dataset + path = [ "/run/booted-system/sw/bin/" ]; + serviceConfig = { + ExecStartPre = + map (pool: lib.escapeShellArgs [ + "+/run/booted-system/sw/bin/zfs" "allow" + cfg.user "bookmark,hold,send,snapshot,destroy" pool + # Permissions snapshot and destroy are in case --no-sync-snap is not used + ]) (localPoolName c.source) ++ + map (pool: lib.escapeShellArgs [ + "+/run/booted-system/sw/bin/zfs" "allow" + cfg.user "create,mount,receive,rollback" pool + ]) (localPoolName c.target); + ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ] + ++ optionals c.useCommonArgs cfg.commonArgs + ++ optional c.recursive "-r" + ++ optionals (c.sshKey != null) [ "--sshkey" c.sshKey ] + ++ c.extraArgs + ++ [ "--sendoptions" c.sendOptions + "--recvoptions" c.recvOptions + "--no-privilege-elevation" + c.source c.target + ]); + User = cfg.user; + Group = cfg.group; + StateDirectory = [ "syncoid" ]; + StateDirectoryMode = "700"; + # Prevent SSH control sockets of different syncoid services from interfering + PrivateTmp = true; + # Permissive access to /proc because syncoid + # calls ps(1) to detect ongoing `zfs receive`. + ProcSubset = "all"; + ProtectProc = "default"; + + # The following options are only for optimizing: + # systemd-analyze security | grep syncoid-'*' + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DeviceAllow = ["/dev/zfs"]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = mkDefault false; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RootDirectory = "/run/syncoid/${escapeUnitName name}"; + RootDirectoryStartOnly = true; + BindPaths = [ "/dev/zfs" ]; + BindReadOnlyPaths = [ builtins.storeDir "/etc" "/run" "/bin/sh" ]; + # Avoid useless mounting of RootDirectory= in the own RootDirectory= of ExecStart='s mount namespace. + InaccessiblePaths = ["-+/run/syncoid/${escapeUnitName name}"]; + MountAPIVFS = true; + # Create RootDirectory= in the host's mount namespace. + RuntimeDirectory = [ "syncoid/${escapeUnitName name}" ]; + RuntimeDirectoryMode = "700"; + SystemCallFilter = [ + "@system-service" + # Groups in @system-service which do not contain a syscall listed by: + # perf stat -x, 2>perf.log -e 'syscalls:sys_enter_*' syncoid … + # awk >perf.syscalls -F "," '$1 > 0 {sub("syscalls:sys_enter_","",$3); print $3}' perf.log + # systemd-analyze syscall-filter | grep -v -e '#' | sed -e ':loop; /^[^ ]/N; s/\n //; t loop' | grep $(printf ' -e \\<%s\\>' $(cat perf.syscalls)) | cut -f 1 -d ' ' + "~@aio" "~@chown" "~@keyring" "~@memlock" "~@privileged" + "~@resources" "~@setuid" "~@sync" "~@timer" + ]; + SystemCallArchitectures = "native"; + # This is for BindPaths= and BindReadOnlyPaths= + # to allow traversal of directories they create in RootDirectory=. + UMask = "0066"; + }; + } + cfg.service + c.service + ])) cfg.commands; }; - meta.maintainers = with maintainers; [ lopsided98 ]; + meta.maintainers = with maintainers; [ julm lopsided98 ]; } diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index effc9182472e..fd4a195787f3 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -293,7 +293,8 @@ in # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing # systems! - mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 + mkDefault (if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13 + else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 else throw "postgresql_9_5 was removed, please upgrade your postgresql version."); diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index 1983945915fe..7cef51e42010 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -44,7 +44,7 @@ in { # Sync snapshot taken by sanoid "pool/sanoid" = { target = "root@target:pool/sanoid"; - extraArgs = [ "--no-sync-snap" ]; + extraArgs = [ "--no-sync-snap" "--create-bookmark" ]; }; # Take snapshot and sync "pool/syncoid".target = "root@target:pool/syncoid"; @@ -92,8 +92,9 @@ in { # Sync snapshots target.wait_for_open_port(22) source.succeed("touch /mnt/pool/syncoid/test.txt") - source.systemctl("start --wait syncoid.service") + source.systemctl("start --wait syncoid-pool-sanoid.service") target.succeed("cat /mnt/pool/sanoid/test.txt") + source.systemctl("start --wait syncoid-pool-syncoid.service") target.succeed("cat /mnt/pool/syncoid/test.txt") ''; }) diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix index 141d51bed0f8..2de61c7e20f1 100644 --- a/pkgs/applications/editors/aseprite/skia.nix +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -16,7 +16,8 @@ let }); in stdenv.mkDerivation { - name = "skia-aseprite-m71"; + pname = "skia"; + version = "aseprite-m71"; src = fetchFromGitHub { owner = "aseprite"; @@ -73,4 +74,12 @@ stdenv.mkDerivation { third_party/externals/angle2/include \ third_party/skcms/**/*.h ''; + + meta = with lib; { + description = "Skia is a complete 2D graphic library for drawing Text, Geometries, and Images"; + homepage = "https://skia.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + platforms = platforms.all; + }; } diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index a3b043adbe5c..292c3cf21565 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -1,53 +1,56 @@ { lib , fetchFromGitHub -, xz , wrapQtAppsHook , miniupnpc_2 +, ffmpeg , enableSwftools ? false , swftools -, pythonPackages +, python3Packages }: -pythonPackages.buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "441"; + version = "447"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "13h4qcz0iqba4mwyvgmdqh99jy22x7kw20f3g43b5aq3qyk9ca2h"; + sha256 = "0a9nrsbw3w1229bm90xayixvkpvr6g338w64x4v75sqxvpbx84lz"; }; nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ beautifulsoup4 + chardet + cloudscraper html5lib lxml + lz4 + nose numpy opencv4 pillow psutil + pylzma pyopenssl + pyside2 + pysocks + pythonPackages.mpv pyyaml + qtpy requests send2trash service-identity + six twisted - lz4 - xz - pysocks - matplotlib - qtpy - pyside2 - mpv ]; - checkInputs = with pythonPackages; [ nose httmock ]; + checkInputs = with python3Packages; [ nose mock httmock ]; # most tests are failing, presumably because we are not using test.py checkPhase = '' @@ -77,37 +80,34 @@ pythonPackages.buildPythonPackage rec { outputs = [ "out" "doc" ]; - postPatch = '' - sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${miniupnpc_2}/bin/upnpc";' \ - -i ./hydrus/core/networking/HydrusNATPunch.py - '' + lib.optionalString enableSwftools '' - sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${swftools}/bin/swfrender";' \ - -i ./hydrus/core/HydrusFlashHandling.py - ''; - - #doCheck = true; - installPhase = '' # Move the hydrus module and related directories - mkdir -p $out/${pythonPackages.python.sitePackages} - mv {hydrus,static} $out/${pythonPackages.python.sitePackages} + mkdir -p $out/${python3Packages.python.sitePackages} + mv {hydrus,static} $out/${python3Packages.python.sitePackages} mv help $out/doc/ # install the hydrus binaries mkdir -p $out/bin install -m0755 server.py $out/bin/hydrus-server install -m0755 client.py $out/bin/hydrus-client + '' + lib.optionalString enableSwftools '' + mkdir -p $out/${python3Packages.python.sitePackages}/bin + # swfrender seems to have to be called sfwrender_linux + # not sure if it can be loaded through PATH, but this is simpler + # $out/python3Packages.python.sitePackages/bin is correct NOT .../hydrus/bin + ln -s ${swftools}/bin/swfrender $out/${python3Packages.python.sitePackages}/bin/swfrender_linux ''; dontWrapQtApps = true; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg miniupnpc_2 ]}) ''; meta = with lib; { description = "Danbooru-like image tagging and searching system for the desktop"; license = licenses.wtfpl; homepage = "https://hydrusnetwork.github.io/hydrus/"; - maintainers = [ maintainers.evanjs ]; + maintainers = with maintainers; [ dandellion evanjs ]; }; } diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 1810a6c6b8eb..16544c85650a 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -9,6 +9,7 @@ , glib , gsettings-desktop-schemas , gtk3 +, librsvg , libsndfile , libxml2 , libzip @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.20"; + version = "1.1.0"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "1c7n03xm3m4lwcwxgplkn25i8c6s3i7rijbkcx86br1j4jadcs3k"; + sha256 = "sha256-FIIpWgWvq1uo/lIQXpOkUTZ6YJPtOtxKF8VjXSgqrlE="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { [ glib gsettings-desktop-schemas gtk3 + librsvg libsndfile libxml2 libzip diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index e85ada2253fe..d92c4d049135 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "sha256-nshQxr6y3TxKsAVSA9mzL7LJfCtpv0QuuTTqk3/lENc="; + sha256 = "sha256-fcz1g17JR6jOpq5zOpCmnI00hyXSYYGHfoFRE8/c8dk="; }; - vendorSha256 = "sha256-fqQWFhFeyW4GntRBxEeN6WSOo0G+1hH9vSEZmBKglz8="; + vendorSha256 = "sha256-YawWlPZV4bBOsOFDo2nIXKWwcxb5hWy5OiB99MG0HcY="; doCheck = false; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a0491a09884d..e8c927b79a6f 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.85.0"; + version = "0.86.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IW41e4imaXKcXJKa7dAB60ulvRrk3qvF1//Lo55TLVI="; + sha256 = "sha256-1ELOQT4zLjtsLKyAsfSIUGGW4wH5+kpw33Fw5hCPR50="; }; vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk="; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 96ea01f53740..76af55c5082a 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "17919"; + version = "18004"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-Bj1s3vFSHPiZNTjp7hQhu1X2v8nlynC37Cm6sMNOi3g="; + sha256 = "sha256-Cd+/sE6A0MddHeAxy3gx7ev+9UR3ZNcR0tCTmdX2FtY="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "sha256-W+s6ARA5lyRwTuRD89wm4HChb2Up5AXQwh5uk0U7pQk="; + sha256 = "sha256-QSVh8043K/f7gPEjosGo/DNj1d75LUFwf6EMeHk68fM="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-IjCFngixh2+7SifrV3Ohi1BjIOP+QSWg/QjeqbbP7aw="; + sha256 = "sha256-Ic6RtQPqpQIci1IbKgTcFmLfMdPxSVybrEAk+ttM0j8="; }; }; in diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index d6b121081b42..159ecb9f5526 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "4.1.1"; + version = "4.2"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "09z37lv57nbp0l1ax28558jk5jv91lb22bgaclirvdyz2qp47xhj"; + sha256 = "sha256-ICUF/LJhsbzDz9xZig1VE6TdG3u0C6Jf/61RoAjx3KI="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/snixembed/default.nix b/pkgs/applications/misc/snixembed/default.nix new file mode 100644 index 000000000000..1a5391b132b6 --- /dev/null +++ b/pkgs/applications/misc/snixembed/default.nix @@ -0,0 +1,28 @@ +{ fetchFromSourcehut, gtk3, lib, libdbusmenu-gtk3, pkg-config, stdenv, vala }: + +stdenv.mkDerivation rec { + pname = "snixembed"; + version = "0.3.1"; + + src = fetchFromSourcehut { + owner = "~steef"; + repo = pname; + rev = version; + sha256 = "0yy1i4463q43aq98qk4nvvzpw4i6bid2bywwgf6iq545pr3glfj5"; + }; + + nativeBuildInputs = [ pkg-config vala ]; + + buildInputs = [ gtk3 libdbusmenu-gtk3 ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Proxy StatusNotifierItems as XEmbedded systemtray-spec icons"; + homepage = "https://git.sr.ht/~steef/snixembed"; + changelog = "https://git.sr.ht/~steef/snixembed/refs/${version}"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 883d16319b17..47c6cc5bcda2 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.7.3"; - sha256 = "sha256-fEkqZ/4BQVnmOKUrrLmi6DKlMVNeqvW95bxbZX0o7iI="; - vendorSha256 = "sha256-NqOmmeEGWvy/LYfSpIdnJZX4lGweCgiL008ed05XIFs="; + version = "21.7.4"; + sha256 = "sha256-yorxP4SQVV6MWlx8+8l0f7qOaF7aJ1XiPfnMqKC8m/o="; + vendorSha256 = "sha256-2ZDsBiIV9ng8P0cDURbqDqMTxFKUFcBxHsPGWp5WjPo="; }; } diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 55f1a5a2c09e..534a132af5a8 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-upoWftm82QBdax0lbeu+Nmwscsj/fsOzGUPI+fzcKUM="; + sha256 = "sha256-DskJtZGp8zmSWC5GJijNbhwKQF0Y0FXXh7wCzlbAgy8="; }; - vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI"; + vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI="; # Errors: # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cc46bf16ac7d..232ba03040a5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -375,19 +375,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "repo": "terraform-provider-google", - "rev": "v3.62.0", - "sha256": "0x0qp8nk88667hvlpgxrdjsgirw8iwv85gn3k9xb37a3lw7xs4qz", - "vendorSha256": "0w6aavj1c4blpvsy00vz4dcj8rnxx6a586b16lqp6s1flqmlqrbi", - "version": "3.62.0" + "rev": "v3.76.0", + "sha256": "1j3q07v4r0a3mlkmpqw8nav5z09fwyms9xmlyk6k6xkkzr520xcp", + "vendorSha256": "1ffxfracj4545fzh6p6b0wal0j07807qc2q83qzchbalqvi7yhky", + "version": "3.76.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "repo": "terraform-provider-google-beta", - "rev": "v3.47.0", - "sha256": "1nk0bg2q7dg65rn3j5pkdjv07x0gs7bkv1bpfvlhi9p4fzx9g4by", - "vendorSha256": "0c2q4d2khsi3v9b659q1kmncnlshv4px6ch99jpcymwqg3xrxda2", - "version": "3.47.0" + "rev": "v3.76.0", + "sha256": "1bdhk4vfn8pn7ql5q8m4r8js8d73zyp3dbhrmh4p07g7i5z57pjq", + "vendorSha256": "0cwvkzw45b057gwbj24z9gyldjpyfgv3fyr5x160spj0ksfn0ki0", + "version": "3.76.0" }, "grafana": { "owner": "grafana", diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index adc19f5dcfdf..bca1a1affc0d 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.22.0.87"; + version = "2.23.0.39"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-0nobn+YcvqakwvBdkoEJrzHoL+OGym2zJ806oUabYfo="; + sha256 = "sha256-LGg14KJ/hEnSaSrdTltY9YXv7Nekkfo66uLkxjMx8AI="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix new file mode 100644 index 000000000000..9afdee8cda16 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix @@ -0,0 +1,33 @@ +{ autoreconfHook +, fetchFromGitHub +, glib +, intltool +, lib +, libappindicator-gtk2 +, libtool +, pidgin +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "pidgin-indicator"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "philipl"; + repo = pname; + rev = version; + sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ glib intltool libappindicator-gtk2 libtool pidgin ]; + + meta = with lib; { + description = "An AppIndicator and KStatusNotifierItem Plugin for Pidgin"; + homepage = "https://github.com/philipl/pidgin-indicator"; + maintainers = with maintainers; [ imalison ]; + license = licenses.gpl2; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/science/biology/bedops/default.nix b/pkgs/applications/science/biology/bedops/default.nix index 407ed0c01f76..e7379ee382a4 100644 --- a/pkgs/applications/science/biology/bedops/default.nix +++ b/pkgs/applications/science/biology/bedops/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bedops"; - version = "2.4.39"; + version = "2.4.40"; src = fetchFromGitHub { owner = "bedops"; repo = "bedops"; rev = "v${version}"; - sha256 = "sha256-vPrut3uhZK1Eg9vPcyxVNWW4zKeypdsb28oM1xbbpJo="; + sha256 = "sha256-rJVl3KbzGblyQZ7FtJXeEv/wjQJmzYGNjzhvkoMoBWY="; }; buildInputs = [ zlib bzip2 jansson ]; diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index 6655b415d2ab..4c04b3c07368 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "finalfusion-utils"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "finalfusion"; repo = pname; rev = version; - sha256 = "0gxcjrhfa86kz5qmdf5h278ydc3nc0nfj61brnykb723mg45jj41"; + sha256 = "sha256-ME0qDSFD8G492+7ex7VQWh9P76a+tOCo+SJ9n9ZIYUI="; }; - cargoSha256 = "0dj3xpinzzdfgy06wkp336sp1nyqk7nnvd3hwhyysripmz9apdgg"; + cargoSha256 = "sha256-/rLv2/bcVsmWw+ZfyumDcj0ptHPQBCCYR9O/lVlV+G0="; # Enables build against a generic BLAS. cargoBuildFlags = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix index 89b2a5f23b05..66dc5ece90a8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "git-annex-remote-googledrive"; - version = "1.3.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "118w0fyy6pck8hyj925ym6ak0xxqhkaq2vharnpl9b97nab4mqg8"; + sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; propagatedBuildInputs = [ annexremote drivelib GitPython tenacity humanfriendly ]; diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index 784e0f7faf01..0230b6bcf2d0 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.20"; + version = "2.6.22"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "0g0pvfdmnd3frsd5sdckv3llwyjiw809rqy1slq3xj6i08xhcmd5"; + sha256 = "sha256-WSFbDuUgw0WHWb3ZZVavwpu1TizU9lMA5JAC5haR7c0="; }; extraNativeBuildInputs = [ gtest ]; diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index a9545757d792..5ee2c8c35e49 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchzip, fetchpatch, - pkg-config, bmake, - cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, - libucl, wayland, wayland-protocols, wlroots, mesa, - features ? { +{ lib, stdenv, fetchzip +, pkg-config, bmake +, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman +, libucl, wayland, wayland-protocols, wlroots, mesa +, features ? { gammacontrol = true; layershell = true; screencopy = true; @@ -10,17 +10,13 @@ } }: -let +stdenv.mkDerivation rec { pname = "hikari"; - version = "2.3.1"; -in - -stdenv.mkDerivation { - inherit pname version; + version = "2.3.2"; src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-o6YsUATcWHSuAEfU7WnwxKNxRNuBt069qCv0FKDWStg="; + sha256 = "sha256-At4b6mkArKe6knNWouLdZ9v8XhfHaUW+aB+CHyEBg8o="; }; nativeBuildInputs = [ pkg-config bmake ]; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 5d2f2f977a70..0674c88924e4 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -208,6 +208,7 @@ stdenv.mkDerivation { else if targetPlatform.isAlpha then "alpha" else if targetPlatform.isVc4 then "vc4" else if targetPlatform.isOr1k then "or1k" + else if targetPlatform.isM68k then "m68k" else if targetPlatform.isRiscV then "lriscv" else throw "unknown emulation for platform: ${targetPlatform.config}"; in if targetPlatform.useLLVM or false then "" diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 70e43efdb727..07fba382286a 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -110,7 +110,7 @@ in }; noto-fonts-emoji = let - version = "2020-09-16-unicode13_1"; + version = "2.028"; emojiPythonEnv = python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { @@ -121,7 +121,7 @@ in owner = "googlefonts"; repo = "noto-emoji"; rev = "v${version}"; - sha256 = "0659336dp0l2nkac153jpcb9yvp0p3dx1crcyxjd14i8cqkfi2hh"; + sha256 = "0dy7px7wfl6bqkfzz82jm4gvbjp338ddsx0mwfl6m7z48l7ng4v6"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index ac1acfe4b8f1..0050dd44b9a9 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { makeFlags = [ "PYTHON=python" ]; installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; - doCheck = true; + # Checks are broken on aarch64 darwin + # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Device Tree Compiler"; diff --git a/pkgs/development/interpreters/s9fes/default.nix b/pkgs/development/interpreters/s9fes/default.nix new file mode 100644 index 000000000000..a05dde8f1f51 --- /dev/null +++ b/pkgs/development/interpreters/s9fes/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchurl, ncurses, buildPackages }: + +let + isCrossCompiling = stdenv.hostPlatform != stdenv.buildPlatform; +in + +stdenv.mkDerivation rec { + pname = "s9fes"; + version = "20181205"; + + src = fetchurl { + url = "https://www.t3x.org/s9fes/s9fes-${version}.tgz"; + sha256 = "sha256-Lp/akaDy3q4FmIE6x0fj9ae/SOD7tdsmzy2xdcCh13o="; + }; + + # Fix cross-compilation + postPatch = '' + substituteInPlace Makefile \ + --replace 'ar q' '${stdenv.cc.targetPrefix}ar q' \ + --replace 'strip' '${stdenv.cc.targetPrefix}strip' + ${lib.optionalString isCrossCompiling "substituteInPlace Makefile --replace ./s9 '${buildPackages.s9fes}/bin/s9'"} + ''; + + buildInputs = [ ncurses ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; + enableParallelBuilding = true; + + meta = with lib; { + description = "Scheme 9 From Empty Space, an interpreter for R4RS Scheme"; + homepage = "http://www.t3x.org/s9fes/index.html"; + license = licenses.publicDomain; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 74bdf0b2135c..8e654444dd6a 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -13,6 +13,8 @@ mkDerivation rec { LC_ALL = "en_US.UTF-8"; + preConfigure = ''export AGDA_EXEC=agda''; + # The cubical library has several `Everything.agda` files, which are # compiled through the make file they provide. nativeBuildInputs = [ ghc glibcLocales ]; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 01b4bf16ff06..2b418ee4c6a9 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, openssl, lib -# miscellaneous -, brotli, c-ares -# databases +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib +# optional but of negligible size +, openssl, brotli, c-ares +# optional databases , sqliteSupport ? true, sqlite , postgresSupport ? false, postgresql , redisSupport ? false, hiredis @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "1.7.1"; src = fetchFromGitHub { - owner = "an-tao"; + owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; sha256 = "0rhwbz3m5x3vy5zllfs8r347wqprg29pff5q7i53f25bh8y0n49i"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional sqliteSupport sqlite ++ lib.optional postgresSupport postgresql ++ lib.optional redisSupport hiredis - # drogon uses mariadb for mysql (see https://github.com/an-tao/drogon/wiki/ENG-02-Installation#Library-Dependencies) + # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies) ++ lib.optional mysqlSupport [ libmysqlclient mariadb ]; patches = [ @@ -48,17 +48,16 @@ stdenv.mkDerivation rec { # modifying PATH here makes drogon_ctl visible to the test installCheckPhase = '' cd .. - patchShebangs test.sh - PATH=$PATH:$out/bin ./test.sh + PATH=$PATH:$out/bin bash test.sh ''; doInstallCheck = true; meta = with lib; { - homepage = "https://github.com/an-tao/drogon"; + homepage = "https://github.com/drogonframework/drogon"; description = "C++14/17 based HTTP web application framework"; license = licenses.mit; - maintainers = [ maintainers.urlordjames ]; + maintainers = with maintainers; [ urlordjames ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 98d8ef434e06..432fcdff9377 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -74,6 +74,7 @@ , libcaca ? null # Textual display (ASCII art) #, libcdio-paranoia ? null # Audio CD grabbing , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) +, libdrm ? null # libdrm support , libiconv ? null #, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) , libmfx ? null # Hardware acceleration vis libmfx @@ -348,6 +349,7 @@ stdenv.mkDerivation rec { #(enableFeature (libcaca != null) "libcaca") #(enableFeature (cdio-paranoia != null && gplLicensing) "libcdio") (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") + (enableFeature ((isLinux || isFreeBSD) && libdrm != null) "libdrm") (enableFeature (libiconv != null) "iconv") (enableFeature (libjack2 != null) "libjack") #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") @@ -432,6 +434,7 @@ stdenv.mkDerivation rec { ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva + ++ optional ((isLinux || isFreeBSD) && libdrm != null) libdrm ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index a86308ea3cef..d1c7233f0d48 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,29 +1,27 @@ { callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }: -rec { +{ gstreamer = callPackage ./core { inherit CoreServices; }; gstreamermm = callPackage ./gstreamermm { }; - gst-plugins-base = callPackage ./base { inherit gstreamer Cocoa OpenGL; }; + gst-plugins-base = callPackage ./base { inherit Cocoa OpenGL; }; - gst-plugins-good = callPackage ./good { inherit gst-plugins-base Cocoa; }; + gst-plugins-good = callPackage ./good { inherit Cocoa; }; - gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; }; + gst-plugins-bad = callPackage ./bad { inherit AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; }; - gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base CoreFoundation DiskArbitration IOKit; }; + gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; }; - gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; }; + gst-rtsp-server = callPackage ./rtsp-server { }; - gst-libav = callPackage ./libav { inherit gst-plugins-base; }; + gst-libav = callPackage ./libav { }; - gst-devtools = callPackage ./devtools { inherit gstreamer gst-plugins-base; }; + gst-devtools = callPackage ./devtools { }; - gst-editing-services = callPackage ./ges { inherit gst-plugins-base gst-plugins-bad gst-devtools; }; + gst-editing-services = callPackage ./ges { }; - gst-vaapi = callPackage ./vaapi { - inherit gst-plugins-base gstreamer gst-plugins-bad; - }; + gst-vaapi = callPackage ./vaapi { }; # note: gst-python is in ./python/default.nix - called under pythonPackages } diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix new file mode 100644 index 000000000000..cad69e8b4187 --- /dev/null +++ b/pkgs/development/libraries/hamlib/4.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchurl +, perl +, swig +, gd +, ncurses +, python3 +, libxml2 +, tcl +, libusb-compat-0_1 +, pkg-config +, boost +, libtool +, perlPackages +, pythonBindings ? true +, tclBindings ? true +, perlBindings ? true +}: + +stdenv.mkDerivation rec { + pname = "hamlib"; + version = "4.2"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1m8gb20i8ga6ndnnw187ry1h4z8wx27v1hl7c610r6ky60pv4072"; + }; + + nativeBuildInputs = [ + swig + pkg-config + libtool + ]; + + buildInputs = [ + gd + libxml2 + libusb-compat-0_1 + boost + ] ++ lib.optionals pythonBindings [ python3 ncurses ] + ++ lib.optionals tclBindings [ tcl ] + ++ lib.optionals perlBindings [ perl perlPackages.ExtUtilsMakeMaker ]; + + configureFlags = lib.optionals perlBindings [ "--with-perl-binding" ] + ++ lib.optionals tclBindings [ "--with-tcl-binding" "--with-tcl=${tcl}/lib/" ] + ++ lib.optionals pythonBindings [ "--with-python-binding" ]; + + meta = with lib; { + description = "Runtime library to control radio transceivers and receivers"; + longDescription = '' + Hamlib provides a standardized programming interface that applications + can use to send the appropriate commands to a radio. + + Also included in the package is a simple radio control program 'rigctl', + which lets one control a radio transceiver or receiver, either from + command line interface or in a text-oriented interactive interface. + ''; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + homepage = "http://hamlib.sourceforge.net"; + maintainers = with maintainers; [ relrod ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 98b494610057..cd56b04c0346 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,5 +1,22 @@ -{lib, stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkg-config, - boost, libtool, perlPackages }: +{ lib +, stdenv +, fetchurl +, perl +, swig +, gd +, ncurses +, python3 +, libxml2 +, tcl +, libusb-compat-0_1 +, pkg-config +, boost +, libtool +, perlPackages +, pythonBindings ? true +, tclBindings ? true +, perlBindings ? true +}: stdenv.mkDerivation rec { pname = "hamlib"; @@ -10,13 +27,26 @@ stdenv.mkDerivation rec { sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; - buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 - tcl libusb-compat-0_1 pkg-config boost libtool ]; + nativeBuildInputs = [ + swig + pkg-config + libtool + ]; - configureFlags = [ "--with-perl-binding" "--with-python-binding" - "--with-tcl-binding" "--with-rigmatrix" ]; + buildInputs = [ + gd + libxml2 + libusb-compat-0_1 + boost + ] ++ lib.optionals pythonBindings [ python3 ncurses ] + ++ lib.optionals tclBindings [ tcl ] + ++ lib.optionals perlBindings [ perl perlPackages.ExtUtilsMakeMaker ]; - meta = { + configureFlags = lib.optionals perlBindings [ "--with-perl-binding" ] + ++ lib.optionals tclBindings [ "--with-tcl-binding" "--with-tcl=${tcl}/lib/" ] + ++ lib.optionals pythonBindings [ "--with-python-binding" ]; + + meta = with lib; { description = "Runtime library to control radio transceivers and receivers"; longDescription = '' Hamlib provides a standardized programming interface that applications @@ -26,9 +56,9 @@ stdenv.mkDerivation rec { which lets one control a radio transceiver or receiver, either from command line interface or in a text-oriented interactive interface. ''; - license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; homepage = "http://hamlib.sourceforge.net"; - maintainers = with lib.maintainers; [ relrod ]; - platforms = with lib.platforms; unix; + maintainers = with maintainers; [ relrod ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix deleted file mode 100644 index 74dca4e30854..000000000000 --- a/pkgs/development/libraries/librsync/0.9.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "librsync-0.9.7"; - - src = fetchurl { - url = "mirror://sourceforge/librsync/librsync-0.9.7.tar.gz"; - sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"; - }; - - hardeningDisable = [ "format" ]; - - configureFlags = [ - (lib.enableFeature stdenv.isCygwin "static") - (lib.enableFeature (!stdenv.isCygwin) "shared") - ]; - - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - - meta = { - homepage = "http://librsync.sourceforge.net/"; - license = lib.licenses.lgpl2Plus; - description = "Implementation of the rsync remote-delta algorithm"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index dfeaeed8ca80..3681cb4ac5df 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.9"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "sha256-6MMQr0ynMmfZj+RFoKtLB/f1nTBfn9tcYpzyUwnfB3M="; + sha256 = "1bi8a1pj18836yfqsnmfp45nqhq2d9r2r7gzi2v1y0qyk9jh6xln"; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix index f75465e99a27..aa149d60e4d8 100644 --- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix +++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix @@ -1,32 +1,37 @@ -{ lib, buildDunePackage, fetchFromGitHub, alcotest, cppo -, ocaml-migrate-parsetree, ppx_tools_versioned, reason, yojson }: +{ lib, buildDunePackage, fetchFromGitHub, alcotest, reason +, ppxlib +, yojson }: buildDunePackage rec { pname = "graphql_ppx"; - version = "1.0.1"; + version = "1.2.0"; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "reasonml-community"; repo = "graphql-ppx"; rev = "v${version}"; - sha256 = "0lvmv1sb0ca9mja6di1dbmsgjqgj3w9var4amv1iz9nhwjjx4cpi"; + sha256 = "1fymmvk616wv5xkwfdmqibdgfl47ry6idc5wfh20a3mz9mpaa13s"; }; - propagatedBuildInputs = - [ cppo ocaml-migrate-parsetree ppx_tools_versioned reason yojson ]; + buildInputs = [ ppxlib ]; - checkInputs = lib.optional doCheck alcotest; + propagatedBuildInputs = [ + reason + yojson + ]; - doCheck = false; + checkInputs = [ alcotest ]; + + doCheck = true; useDune2 = true; meta = { homepage = "https://github.com/reasonml-community/graphql_ppx"; description = "GraphQL PPX rewriter for Bucklescript/ReasonML"; - license = lib.licenses.bsd3; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ Zimmi48 jtcoolen ]; }; } diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 673238843ff3..8d57e18dc814 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "fac7c032f472fb369378ad2d8fe77e7cd3b3c1c6a0d7bf59980b69528891b399"; + sha256 = "29c68c5001a727aaa7a6842d6204ffa3e24b3544fa4f6af2234cdbfa032f7fdf"; }; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index b0f73546eed9..7d6424564d2f 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml -, cppo, dune-configurator, ocaml-migrate-parsetree, ocplib-endian, result +, cppo, dune-configurator, ocplib-endian, result , mmap, seq , ocaml-syntax-shims }: @@ -18,7 +18,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cppo dune-configurator ocaml-migrate-parsetree ] + buildInputs = [ cppo dune-configurator ] ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index eda574e69cb8..bd3084ae91b5 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "GitPython"; - version = "3.1.18"; - disabled = isPy27; # no longer supported + version = "3.1.19"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b"; + sha256 = "0lqf5plm02aw9zl73kffk7aa4mp4girm3f2yfk27nmmmjsdh7x0q"; }; patches = [ @@ -30,12 +30,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ gitdb ddt - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; # Tests require a git repo doCheck = false; + pythonImportsCheck = [ "git" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index dea5776fb616..2d80b6a3984a 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -3,7 +3,6 @@ , python , buildPythonPackage , fetchFromGitHub -, writeText , alembic , argcomplete , attrs diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index f644c8c9c20f..d66b80d00c71 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.0.2"; + version = "1.1.0"; disabled = !isPy3k; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "b79cb9a00c5b8e44ff24ffcbec0ce5d3048dd1570c8592066344b6d2f2369fa2"; + sha256 = "370e8e44a0bac4ebbedb7e62570be3a75a7a3807a297d6e82a94301b4681fc22"; }; buildInputs = [ boost ]; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 0f5e708d0913..e50dc051361a 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -1,23 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi, - asgiref, django, daphne +{ lib +, buildPythonPackage +, fetchFromGitHub +, asgiref +, django +, daphne +, pytest-asyncio +, pytest-django +, pytestCheckHook }: + buildPythonPackage rec { pname = "channels"; - version = "3.0.3"; + version = "3.0.4"; - src = fetchPypi { - inherit pname version; - sha256 = "056b72e51080a517a0f33a0a30003e03833b551d75394d6636c885d4edb8188f"; + src = fetchFromGitHub { + owner = "django"; + repo = pname; + rev = version; + sha256 = "0jdylcb77n04rqyzg9v6qfzaxp1dnvdvnxddwh3x1qazw3csi5y2"; }; - # Files are missing in the distribution - doCheck = false; + propagatedBuildInputs = [ + asgiref + django + daphne + ]; + + checkInputs = [ + pytest-asyncio + pytest-django + pytestCheckHook + ]; - propagatedBuildInputs = [ asgiref django daphne ]; + pythonImportsCheck = [ "channels" ]; meta = with lib; { description = "Brings event-driven capabilities to Django with a channel system"; license = licenses.bsd3; homepage = "https://github.com/django/channels"; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 283682708840..9e821bf2dd1a 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , substituteAll , gdb , flask @@ -18,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - hash = "sha256-YGzc9mMIzPTmUgIXuZROLdYKjUm69x9SR+JtYRVpn24="; + hash = "sha256-W51Y9tZB1Uyp175+hWCpXChwL+MBpDWjudF87F1MRso="; }; patches = [ @@ -49,12 +48,6 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch - - # Fix tests with flask>=2.0 - (fetchpatch { - url = "https://github.com/microsoft/debugpy/commit/0a7f2cd67dda27ea4d38389b49a4e2a1899b834e.patch"; - sha256 = "1g070fn07n7jj01jaf5s570zn70akf6klkamigs3ix11gh736rpn"; - }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 780cb1aed1c4..8b87ec7bda7a 100644 --- a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,8 +1,8 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 6d031b4..ecf21f2 100644 +index 51017f2..46654ab 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -@@ -293,7 +293,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show +@@ -398,7 +398,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show is_debug = 0 # Note that the space in the beginning of each line in the multi-line is important! cmd = [ diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 155f3b6e8290..756d08726c11 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY="; + hash = "sha256-08hanzRnt6WuMriNNtOd+ZHycr2XBeIRav+5sgvT7Do="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index 3662116bc2a6..67ecdde0d5f1 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -7,22 +7,22 @@ , pytz , tornado , prometheus_client +, pytestCheckHook }: buildPythonPackage rec { pname = "flower"; - version = "0.9.7"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "cf27a254268bb06fd4972408d0518237fcd847f7da4b4cd8055e228150ace8f3"; + sha256 = "1gcczr04g7wx99h7pxxx1p9n50sbyi0zxrzy7f7m0sf5apxw85rf"; }; postPatch = '' # rely on using example programs (flowers/examples/tasks.py) which # are not part of the distribution rm tests/load.py - substituteInPlace requirements/default.txt --replace "prometheus_client==0.8.0" "prometheus_client>=0.8.0" ''; propagatedBuildInputs = [ @@ -33,7 +33,10 @@ buildPythonPackage rec { prometheus_client ]; - checkInputs = [ mock ]; + checkInputs = [ + mock + pytestCheckHook + ]; pythonImportsCheck = [ "flower" ]; @@ -41,7 +44,6 @@ buildPythonPackage rec { description = "Celery Flower"; homepage = "https://github.com/mher/flower"; license = licenses.bsdOriginal; - maintainers = [ maintainers.arnoldfarkas ]; - broken = (celery.version >= "5.0.2"); # currently broken with celery>=5.0 by https://github.com/mher/flower/pull/1021 + maintainers = with maintainers; [ arnoldfarkas ]; }; } diff --git a/pkgs/development/python-modules/frilouz/default.nix b/pkgs/development/python-modules/frilouz/default.nix new file mode 100644 index 000000000000..320912c7dd17 --- /dev/null +++ b/pkgs/development/python-modules/frilouz/default.nix @@ -0,0 +1,38 @@ +{ lib +, astunparse +, buildPythonPackage +, fetchFromGitHub +, isPy3k +}: + +buildPythonPackage rec { + pname = "frilouz"; + version = "0.0.2"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "QuantStack"; + repo = "frilouz"; + rev = version; + sha256 = "0w2qzi4zb10r9iw64151ay01vf0yzyhh0bsjkx1apxp8fs15cdiw"; + }; + + checkInputs = [ astunparse ]; + + preCheck = "cd test"; + + checkPhase = '' + runHook preCheck + python -m unittest + runHook postCheck + ''; + + pythonImportsCheck = [ "frilouz" ]; + + meta = with lib; { + homepage = "https://github.com/QuantStack/frilouz"; + description = "Python AST parser adapter with partial error recovery"; + license = licenses.bsd3; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index cba02387be5d..c48116776554 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -4,7 +4,6 @@ , cryptography , curve25519-donna , ecdsa -, ed25519 , fetchFromGitHub , h11 , pyqrcode @@ -17,15 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "3.5.1"; + version = "3.5.2"; disabled = pythonOlder "3.6"; - # pypi package does not include tests src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "sha256-ZHTqlb7LIDp8MFNW8MFg6jX7QwaxT40cLi3H13ONLCI="; + sha256 = "1irf4dcq9fcqvvjbijkymm63n2s7a19igs1zsbv7y8fa5a2yprhd"; }; propagatedBuildInputs = [ @@ -33,7 +31,6 @@ buildPythonPackage rec { cryptography curve25519-donna ecdsa - ed25519 h11 pyqrcode zeroconf diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 21e614d7d7c9..5f94d61c7fda 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.18.0"; + version = "1.19.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0xgp1wxdfa4y316dfkpmj38chlh68mndr8kqphckpnw16qxsl3d9"; + sha256 = "0k1qcwd2qdw8mcr8ywy3wi1x9j6i57axgcps5kmkbx773s8qf155"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index cea428a9ffd0..2acf0361bcbc 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"; + sha256 = "1237cd64c8f7ac3aa4b3f332c4d0fb4a8216f39eaa662ec904302d4d77de5a54"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 2c293b3b9c26..e9b74d02b070 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "4.3.10"; + version = "4.4.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1i34bk8bbc0dnizrlgj0yxnbzyvndkmnl6ryymxgcl9rv1abkfki"; + sha256 = "0kv832s2vyff30zz8yqypw5jifwdanvh5x56d2bzkvy94h4jlddy"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylzma/default.nix b/pkgs/development/python-modules/pylzma/default.nix new file mode 100644 index 000000000000..78bc24d35d46 --- /dev/null +++ b/pkgs/development/python-modules/pylzma/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pylzma"; + version = "0.5.0"; + + # This vendors an old LZMA SDK + # After some discussion, it seemed most reasonable to keep it that way + # xz, and uefi-firmware-parser also does this + src = fetchPypi { + inherit pname version; + sha256 = "074anvhyjgsv2iby2ql1ixfvjgmhnvcwjbdz8gk70xzkzcm1fx5q"; + }; + + pythonImportsCheck = [ "pylzma" ]; + + meta = with lib; { + homepage = "https://www.joachim-bauch.de/projects/pylzma/"; + description = "Platform independent python bindings for the LZMA compression library"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix index d3fed5dc4b58..b23f571dd39f 100644 --- a/pkgs/development/python-modules/pysyncthru/default.nix +++ b/pkgs/development/python-modules/pysyncthru/default.nix @@ -1,7 +1,7 @@ { lib , isPy27 , buildPythonPackage -, fetchPypi +, fetchFromGitHub , aiohttp , demjson , python @@ -9,14 +9,15 @@ buildPythonPackage rec { pname = "pysyncthru"; - version = "0.7.3"; + version = "0.7.5"; disabled = isPy27; - src = fetchPypi { - pname = "PySyncThru"; - inherit version; - sha256 = "13564018a7de4fe013e195e19d7bae92aa224e0f3a32373576682722d3dbee52"; + src = fetchFromGitHub { + owner = "nielstron"; + repo = "pysyncthru"; + rev = "release-${version}"; + sha256 = "122zxwqwx03vaxbhmp3cjibjnkirayz0w68gvslsdr7n9nqv3pgz"; }; propagatedBuildInputs = [ @@ -28,9 +29,6 @@ buildPythonPackage rec { ${python.interpreter} -m unittest ''; - # no tests on PyPI, no tags on GitHub - doCheck = false; - pythonImportsCheck = [ "pysyncthru" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index f98b68c13a0b..946e406c8bf6 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi -, pbr, requests -, pytest, waitress }: +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, requests +, pytestCheckHook +, waitress +}: buildPythonPackage rec { pname = "requests-unixsocket"; @@ -14,10 +19,10 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest waitress ]; - checkPhase = '' + checkInputs = [ pytestCheckHook waitress ]; + + preCheck = '' rm pytest.ini - py.test ''; meta = with lib; { diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index 517acd6f9cca..73a43be383b0 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , cryptography , fetchFromGitHub @@ -32,6 +33,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # https://github.com/jborean93/smbprotocol/issues/119 + "test_copymode_local_to_local_symlink_dont_follow" + "test_copystat_local_to_local_symlink_dont_follow_fail" + + # fail in sandbox due to networking + "test_small_recv" + "test_recv_" + ]; + pythonImportsCheck = [ "smbprotocol" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/synergy/default.nix b/pkgs/development/python-modules/synergy/default.nix new file mode 100644 index 000000000000..53af1552ac30 --- /dev/null +++ b/pkgs/development/python-modules/synergy/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, numpy +, scipy +, matplotlib +, plotly +, pandas +}: + +buildPythonPackage rec { + pname = "synergy"; + version = "0.5.1"; + disabled = pythonOlder "3.5"; + + # Pypi does not contain unit tests + src = fetchFromGitHub { + owner = "djwooten"; + repo = "synergy"; + rev = "v${version}"; + sha256 = "1c60dpvr72g4wjqg6bc601kssl5z55v9bg09xbyh9ahch58bi212"; + }; + + propagatedBuildInputs = [ + numpy + scipy + matplotlib + plotly + pandas + ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "synergy" ]; + + meta = with lib; { + description = "A Python library for calculating, analyzing, and visualizing drug combination synergy"; + homepage = "https://github.com/djwooten/synergy"; + maintainers = [ maintainers.ivar ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index f602f1b1813b..abd6a1b691ed 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.155.1"; + version = "0.156.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-tlnABN/mcUsR8tgqgrQT+t6joo6wJMeGKtcbjyiVbbE="; + sha256 = "sha256-aV5qcXxNLljeM3MrXg8ptAST8ARCb3kR83oy5G9fbak="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 9d87cb30520a..a1c7265e05dd 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -31,12 +31,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "23.0"; + version = "23.1"; slang = "Vanadium"; src = fetchurl { url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "0pdm3y2nfyjhpnicv1pg9j48llq86dmb591d2imnafp4xfqani0s"; + sha256 = "1rgkq9sg436smw005ag0j6y3xryhjn18a07m5wjfrfp0s1438nnj"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; diff --git a/pkgs/development/tools/apksigcopier/default.nix b/pkgs/development/tools/apksigcopier/default.nix index 16cfbad52a07..cc23081473af 100644 --- a/pkgs/development/tools/apksigcopier/default.nix +++ b/pkgs/development/tools/apksigcopier/default.nix @@ -4,10 +4,9 @@ , installShellFiles , bash , pandoc +, apksigner }: -# FIXME: how to "recommend" apksigner like the Debian package? - python3.pkgs.buildPythonApplication rec { pname = "apksigcopier"; version = "1.0.1"; @@ -22,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles pandoc ]; propagatedBuildInputs = with python3.pkgs; [ click ]; checkInputs = with python3.pkgs; [ flake8 mypy pylint ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ apksigner ]}" ]; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix new file mode 100644 index 000000000000..7b05479ea42f --- /dev/null +++ b/pkgs/development/tools/apksigner/default.nix @@ -0,0 +1,15 @@ +{ runCommand +, makeWrapper +, jre +, build-tools +}: +let + tools = builtins.head build-tools; +in +runCommand "apksigner" { + nativeBuildInputs = [ makeWrapper ]; +} '' + mkdir -p $out/bin + makeWrapper "${jre}/bin/java" "$out/bin/apksigner" \ + --add-flags "-jar ${tools}/libexec/android-sdk/build-tools/${tools.version}/lib/apksigner.jar" +'' diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 33721e60b0ed..a093dd31c109 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -18,13 +18,16 @@ stdenv.mkDerivation rec { sourceRoot = "."; - installPhase = '' - install -D ${src} "$out/libexec/apktool/apktool.jar" - mkdir -p "$out/bin" - makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ - --add-flags "-jar $out/libexec/apktool/apktool.jar" \ - --prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3" - ''; + installPhase = + let + tools = builtins.head build-tools; + in '' + install -D ${src} "$out/libexec/apktool/apktool.jar" + mkdir -p "$out/bin" + makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ + --add-flags "-jar $out/libexec/apktool/apktool.jar" \ + --prefix PATH : "${tools}/libexec/android-sdk/build-tools/${tools.version}" + ''; meta = with lib; { description = "A tool for reverse engineering Android apk files"; diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 6b3690de91b5..5977d0c28d17 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -1,7 +1,8 @@ -{ docker -, fetchFromGitLab +{ fetchFromGitLab , python -, lib }: +, lib +, apksigner +}: python.pkgs.buildPythonApplication rec { version = "2.0.3"; @@ -47,6 +48,8 @@ python.pkgs.buildPythonApplication rec { yamllint ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ apksigner ]}" ]; + # no tests doCheck = false; diff --git a/pkgs/development/tools/knightos/regenkfs/default.nix b/pkgs/development/tools/knightos/regenkfs/default.nix new file mode 100644 index 000000000000..1e8b992dfe09 --- /dev/null +++ b/pkgs/development/tools/knightos/regenkfs/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "regenkfs"; + version = "unstable-2020-10-17"; + + src = fetchFromGitHub { + owner = "siraben"; + repo = "regenkfs"; + rev = "652155445fc39bbe6628f6b9415b5cd6863f592f"; + sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y="; + }; + + cargoSha256 = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ="; + cargoBuildFlags = [ "--features=c-undef" ]; + + meta = with lib; { + description = "Reimplementation of genkfs in Rust"; + homepage = "https://github.com/siraben/regenkfs"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/tools/knightos/remkrom/default.nix b/pkgs/development/tools/knightos/remkrom/default.nix new file mode 100644 index 000000000000..837006d1bf8d --- /dev/null +++ b/pkgs/development/tools/knightos/remkrom/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "remkrom"; + version = "unstable-2020-10-17"; + + src = fetchFromGitHub { + owner = "siraben"; + repo = "remkrom"; + rev = "86a0b19c1d382a029ecaa96eeca7e9f76c8561d6"; + sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI="; + }; + + cargoSha256 = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM="; + + meta = with lib; { + description = "Reimplementation of mkrom in Rust"; + homepage = "https://github.com/siraben/remkrom"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix index 643e28e82b27..e5ed098af8e1 100644 --- a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix +++ b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, libarchive, python, file, which }: +{ lib, stdenv, fetchurl, libarchive, python3, file, which }: stdenv.mkDerivation rec { pname = "remarkable-toolchain"; - version = "1.8-23.9.2019"; + version = "3.1.2"; src = fetchurl { - url = "https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-zero-gravitas-${version}.sh"; - sha256 = "1rk1r80m5d18sw6hrybj6f78s8pna0wrsa40ax6j8jzfwahgzmfb"; + url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa9hf-neon-rm10x-toolchain-${version}.sh"; + sha256 = "sha256-ocODUUx2pgmqxMk8J+D+OvqlSHBSay6YzcqnxC9n59w="; executable = true; }; nativeBuildInputs = [ libarchive - python + python3 file which ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A toolchain for cross-compiling to reMarkable tablets"; homepage = "https://remarkable.engineering/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ nickhu siraben ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix index 7b4df5df1647..fe54390c7858 100644 --- a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix +++ b/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix @@ -1,32 +1,28 @@ -{ lib, stdenv, fetchurl, libarchive, python3, file }: +{ lib, stdenv, fetchurl, libarchive, python3, file, which }: stdenv.mkDerivation rec { pname = "remarkable2-toolchain"; - version = "2.5.2"; + version = "3.1.2"; src = fetchurl { - url = "https://storage.googleapis.com/codex-public-bucket/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh"; - sha256 = "1v410q1jn8flisdpkrymxd4pa1ylawd0rh3rljjpkqw1bp8a5vw1"; + url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh"; + sha256 = "sha256-JKMDRbkvoxwHiTm/o4JdLn3Mm2Ld1LyxTnCCwvnxk4c="; + executable = true; }; nativeBuildInputs = [ libarchive python3 file + which ]; - unpackCmd = '' - mkdir src - install $curSrc src/install-toolchain.sh - ''; - + dontUnpack = true; dontBuild = true; installPhase = '' - patchShebangs install-toolchain.sh - sed -i -e '3,9d' install-toolchain.sh # breaks PATH - sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh - ./install-toolchain.sh -D -y -d $out + mkdir -p $out + ENVCLEANED=1 $src -y -d $out ''; meta = with lib; { @@ -34,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://remarkable.engineering/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ tadfisher ]; - platforms = platforms.x86_64; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index c27d6e8a65f3..666087e4f225 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -17,21 +17,20 @@ let }; in stdenv.mkDerivation { - name = "${baseName}-${version}"; + pname = baseName; + inherit version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk deps ]; - doCheck = true; - - phases = [ "installPhase" "checkPhase" ]; + dontUnpack = true; installPhase = '' makeWrapper ${jre}/bin/java $out/bin/${baseName} \ --add-flags "-cp $CLASSPATH scalafix.cli.Cli" ''; - checkPhase = '' + installCheckPhase = '' $out/bin/${baseName} --version | grep -q "${version}" ''; diff --git a/pkgs/development/tools/turbogit/default.nix b/pkgs/development/tools/turbogit/default.nix index 7d3e88f6cb47..30ce29ffe665 100644 --- a/pkgs/development/tools/turbogit/default.nix +++ b/pkgs/development/tools/turbogit/default.nix @@ -1,16 +1,16 @@ { fetchFromGitHub, buildGoModule, lib, installShellFiles, libgit2, pkg-config }: buildGoModule rec { pname = "turbogit"; - version = "2.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "b4nst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UIPI1r6BnfD5ukk5yGg3VJHMyaMp30MXhJfOkoNT6vs="; + sha256 = "sha256-A1hVpapp6yIpUVnDQ1yLLHiYdLcQlr/JcTOmt5sr3Oo="; }; - vendorSha256 = "sha256-SX0VPENcfw8ysL+dDGPSJ/FNdyecjENx4+UHXdu71O8="; + vendorSha256 = "sha256-1AEcBq7wiENWQ5HZEEXpIgA6Bf2T28zm/MwYTke/f9s="; subPackages = [ "." ]; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index ee47a0ecdc21..e67506c10a83 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { chmod +x $out/bin/minecraft-server ''; - phases = "installPhase"; + dontUnpack = true; passthru = { tests = { inherit (nixosTests) minecraft-server; }; diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 93286058b49c..b2796225a6c7 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -10,7 +10,7 @@ tcl.mkTclDerivation rec { }; buildInputs = [ tcllib ]; - phases = "installPhase fixupPhase"; + dontUnpack = true; installPhase = '' mkdir -pv $out/bin diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b31924a9de42..4a7201c29066 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-21"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5ad4fdd583116ec253aaf43e2d457cd3e3aa5587"; - sha256 = "178c60ckgkr4ivgi1b21f1cndx9d64spydc8z75gcyz3r6lcbrmm"; + rev = "530b38de342a21cce330a32af0c1b66671d335c2"; + sha256 = "1qvdywgn79fvjdyk2bj7ym9fa65l96dcnp69yhravb9rinrawb5i"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-21"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f768ee24fd8b8b3ee6751361b9ac09f7c8f381d8"; - sha256 = "1rdfjz2l2v1hzsp8pfiv0c7kbmf7221a90pak7w7mncaabrzlnxr"; + rev = "139ca9bb8685a2d9b807d869a49a85fcd42811f7"; + sha256 = "1739vvb9rzlkyrq63lgadhf2azaszy2xhy52hw91rczg8xw7zfc5"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -533,12 +533,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-07-20"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "d3ddb34d124c2fce9afa56342e67732a267d6b42"; - sha256 = "1px4fny0m272jl4vvhhv317j4wh5kfb89rdlrrpqwg8dl2si24rq"; + rev = "b9b2b1c0991ab1a5d3b5822296c341815da00f6c"; + sha256 = "1f6g0vhd8x90j75f60j4k7ii1zi9y0nhzrahk5h04gr2qm9pnvsf"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -569,12 +569,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-20"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "576f3c972aa9c4458d3dbac2794bd8643ae16e4a"; - sha256 = "09cndvz8dcasn35bclhqc4i72dw93sczivvfi0zw9ncgsdl22r6g"; + rev = "479b4ac1d09cec838a232e49ad54b79f2217ad4c"; + sha256 = "0lxpcyvgii8xal6s16aw6y4430709xsba3kn1jwm1lbnrz5mhqwb"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -786,12 +786,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-07-19"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "c651b5af9e30b9d88290ca30b0374b064e1a278d"; - sha256 = "1qycvbkr6axl5vcwwf5m6svag511p97h2xzcbh68arqa1kqx208l"; + rev = "8dedf17ad815ce78122c22d25e93777e3f2d8cfe"; + sha256 = "0061x13jznqqvpci1f6x9r0qrn2bakvvp2ai1nbrb1ynvbgkh3mf"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1316,12 +1316,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-07-19"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "63d7052686732a910b7355761193fdb55a521cd3"; - sha256 = "13r743m9x2mbi0qvfgv8vqfjgxnrmvic09ps484m39bxsbdywzvv"; + rev = "dea0e244bca3a89479e9225b531a319cd812cd52"; + sha256 = "0gf1x10ix3p6ls1g1cbx57fxd5ln13p3abhv52wqy2gkdl3syvw4"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1437,12 +1437,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2021-04-25"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "95847fbae47aa5d49b6470568b8151a93e15307a"; - sha256 = "06qvnbhwm2gl8921hyq75dwxxfbkwfvvsn4pci89831qn6w3pa6f"; + rev = "03029f4ec49cd0dd1d16eb9561742f5c9f794e71"; + sha256 = "14gnndh40h8qlymsb9lkycn4w7jv8f7kk0yjxi4wzjvycg7mrplx"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -1486,12 +1486,12 @@ final: prev: falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-07-14"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "0a67fda0cb7908a43ea4d3c7b8d3d413e305c2be"; - sha256 = "1yjdj6n74z34lq7aayxnngkvyrcpgii9mh92l50jyq22mbqng4hj"; + rev = "f734d08b7d8c59be372f0364cbdbb2e3b8884574"; + sha256 = "1gfswql15fpndxmkqgw5l3c15kpv2892bhmcc8hg3wwi6d8c8g3i"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1510,24 +1510,24 @@ final: prev: fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2020-03-23"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "5872cbe9d921eb3ec79dce14a1f492f44c1cbaaf"; - sha256 = "07mls0yczg2cmia2jn0s2rvgwl07yxlm4hyvjd941p1knvn88x8q"; + rev = "b5977da87ab7725d5bd9f46fd691eca433503835"; + sha256 = "1j5b2nhmc4kq23dzhwsspwqx9shxpqp57175j0zr53phx01q3qcr"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; feline-nvim = buildVimPluginFrom2Nix { pname = "feline-nvim"; - version = "2021-07-11"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "4c04c967691d028b4056f726735db329039cdff2"; - sha256 = "18z9dl58mfmffysr8g5drd6iy79fwn463lagp629cdghrjxcq65c"; + rev = "fb51d6ba6363d10d6fc9e14d0fcef09fd402e431"; + sha256 = "1cpk0jyhgx93bvjpc76gjp671k53av8mj6d19j4zwm3xm5v1by2p"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1546,12 +1546,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-07-03"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "1b234d8ec0ffadf7fe3f4ddba13480dd4adeb7c7"; - sha256 = "1prl720r82mp89jfciw50pd2cygp97v46w7vq30b1m4v3016lh15"; + rev = "a4d4288a11d0e50214c4f5745da5f8ce39cb2a6d"; + sha256 = "1ldv2ar8dm2arawxkzi2r7r1c6wacl9g9dkmyib038bdmr4qfn1g"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1714,15 +1714,15 @@ final: prev: }; fzf-checkout-vim = buildVimPluginFrom2Nix { - name = "fzf-checkout.vim"; - version = "2021-07-21"; + pname = "fzf-checkout-vim"; + version = "2021-06-25"; src = fetchFromGitHub { owner = "stsewd"; repo = "fzf-checkout.vim"; rev = "4d5ecae74460de8fed4f743f6bd53c4c31d32797"; sha256 = "0mia7p2z8l3lrid0v8ml4i8y190gh4ll9898yyg4gcghhxp83zpm"; }; - meta.homepage = "https://github.com/stsewd/fzf-checkout.vim"; + meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; fzf-lsp-nvim = buildVimPluginFrom2Nix { @@ -1871,12 +1871,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-21"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "c3b63ec2ffedc7e7199265852eab13ec8c02b6e0"; - sha256 = "1l8yilf0fqi16lrgpp8i8irq3fb1a73j17gvhff7m6fyzilwahjj"; + rev = "22a1d6db29a2c6b485a48512d2c38ac84d6a78bb"; + sha256 = "1dxz6zjhf2z4n2pqdk95ifdj379fravfr55k401plgy223hmpkip"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2460,12 +2460,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-07-03"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "64a941e317fb9a432d8924eb3a124627c71c0d18"; - sha256 = "10d6fr2kasm13js7k85a9mm6q7ga6b3h6z9mys6wwaphzsm7vli1"; + rev = "321f1995211b05d5abd73732262432e70eba1218"; + sha256 = "1bg0vjf6pnbjmj76mzcbcrm7gdhsxqi040xspyizfykj72qjqyd4"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2722,6 +2722,18 @@ final: prev: meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; + lualine-lsp-progress = buildVimPluginFrom2Nix { + pname = "lualine-lsp-progress"; + version = "2021-07-10"; + src = fetchFromGitHub { + owner = "arkav"; + repo = "lualine-lsp-progress"; + rev = "7c024f40a3b26c8f7925745cdd2fe7acc96939c4"; + sha256 = "0flmd69d7kjzcnzclx6k2yxjfy9nmkwxjlrgl3sszw5qpffxjlk1"; + }; + meta.homepage = "https://github.com/arkav/lualine-lsp-progress/"; + }; + lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; version = "2021-05-27"; @@ -2736,12 +2748,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "d4ddebdb4f4bc44e731e808d794bd8c429dc9e07"; - sha256 = "01lsxak9hl2shhhzqjypdjpkasrppn6v8xlzxi28c7973c5jn629"; + rev = "726aac6f8f05c94418cd3e9d6c05705e8b1ae743"; + sha256 = "0v5lpcbmlghyfifwys51acihbhawg87bmapjay52g591cjzcd9ak"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3144,12 +3156,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "f9fa0e31f9e5c7aaa2ea2091ca64b28d84d485c0"; - sha256 = "1bv75ijvs63r88nghjk5ljjz06r6xbp3923r3c17p1d3ks2qsfxa"; + rev = "b676afbf57bd3fb256a7a45605cac06407eff5a1"; + sha256 = "1ln4sqj00xw2dnn3gwshxdzaq5gaknbs59cksrr7i7mj902lqr8v"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3252,12 +3264,12 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2021-05-26"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "cae4f19aeac40037039e914932da850443b7729f"; - sha256 = "0h3d36vj7sdx10f9gndplwkyqmjxq9frafyj9vmsjhj117nn8agh"; + rev = "a626942b2a87a865c73e1d62391ef7e85ddf8bce"; + sha256 = "0145gxpaq8zidrsksq1d40y5g3l2f1ac5z9n5p21b32x512d4diz"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -3420,12 +3432,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "994cb6b4efa481ac1a64aa3ac5c9e8cfea806783"; - sha256 = "1wssns3iwgfkf73vgln4msv8l5gw724wyalqzv8w8ckhf68dbz4j"; + rev = "b7209e7657dcc786b844a920894a517571da1317"; + sha256 = "1iaslrhq18myxwla41n3kllvwcn3hb5zcgfl3h6zw4ar8n9pvwdr"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3456,12 +3468,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-07-21"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "fa50b4ce297599dc22b1b4bb8550eff4d791f9e4"; - sha256 = "0fhp6qxwykb1hz4xgaj4sq1h1qlfdr855fyaigw171nz0p7ki7ws"; + rev = "52286ee4d11016b3366481935c12211c44d43777"; + sha256 = "0lf0d2b2yajjv39l9zy0h5cmrnah8ig7fk3ckmlpvcfhrlqry9j8"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3504,12 +3516,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-07-19"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "b0bbe8d9089cbb045fd15d217ac5a5ec0f4f5066"; - sha256 = "173nkjfkqklg8zk4vs69c0avrw0v6hngj0szxj7xs3yh2wfnhqnh"; + rev = "e3e105b11a3b34e93bdcee0c895801cf3ed2a835"; + sha256 = "0pgg4xvq0dxn4rzip7nzzy1sscm8v1fixkwlpr9jdbp86s9kkq87"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3552,12 +3564,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "47fc74b5b3aafd2e3028c69ab96cb215c5f6c8bc"; - sha256 = "0mr0dh8picgd8ghm9gvgyg08cihr4k1x8l2brfahpnxha6aghx58"; + rev = "789c204cbec3ec060eb345a8820c3788c0ac4335"; + sha256 = "14h1h47fijw4r76pdav6p3nrl4chhf6l4vmml89chill34lspdab"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3588,12 +3600,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-16"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "ef97a9b17c655d8b603c5fa9abf6fbb623a1dad4"; - sha256 = "0lrna8ryw391dpvi64x3q2gj484mf5s6wlqqg6a52a5s3ganh41n"; + rev = "73529ce61611c9ee3821e18ecc929c422416c462"; + sha256 = "1r55z5abg7ha3xh84ypbbnc3fs7a1718zqmypc49f3wa6ln2rjxz"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3612,24 +3624,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-20"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "e3e23d257c9a36e3d189d6b57e6c6b7e91bfa14f"; - sha256 = "09rk3s6swwng78cpj1f2rlww2vkqai9sx72sqihk09sc16prp6cc"; + rev = "b557bf8d503c966a4233a72449a80ebcaaed5415"; + sha256 = "0p6jq9a6xgbxpjcffm6bk88aicqg05cnk0an5j0cy60s7hp5vvv7"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-06-29"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "e32b33dae9d8d738f86f84699d4f978f8d9deb02"; - sha256 = "0sdx890gk79qyyjs946kq3anyq8yyxvkg9sfphiavq5xs9840ps1"; + rev = "10a57a6b6973661d7082589df3bafc949f004346"; + sha256 = "10w6wxn3gf3pn6xw9ws05pxqp4a4ssg252bq7bsq8xys9saf12gy"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3720,12 +3732,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-20"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4f72377143fc0961391fb0e42e751b9f677fca4e"; - sha256 = "1w9gjnv98gv8jwkkw1x5jsnc8366w1jcllipxlrij97z6hspqc8m"; + rev = "00028be5527abbc829ae8263cb3319dcae08e8ec"; + sha256 = "17vxq8b70v9kq7labi3di0r6rgdhf4vz4mkiw6ji26pa60bfxy8w"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3792,12 +3804,12 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-07-19"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "0e11e0322c1730559cb74f728300de2912bf9a61"; - sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh"; + rev = "895f8e2485267640ccd11fe3fbf1ab5fe178bc4c"; + sha256 = "1jmg13618r9yxidb2y6fs1y342qqnqa19m1srfkczsxgqr89wrsh"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3816,12 +3828,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "e473630fe0872cb0ed97cd7085e724aa58bc1c84"; - sha256 = "1l6cv9znpwnk4hmg3vh8gy26s8hvlbg03wmd7snjwxcpfyj6vi84"; + rev = "65a059b34d5bc77db01372c589f582b17524a2f9"; + sha256 = "1f0iig48frgd75ccan8yqlxh5j84ywb6im1qsmq17gyfjs4vbqbx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3876,12 +3888,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-19"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "038cda43f4b7e8819c230de2bbe943972ed2f37c"; - sha256 = "0kdzfi5dm1lm1bzagf60c8dd1a3zz0x4qp28nns6nhiv7kljj3zy"; + rev = "fabcc1ac8392cc9a5beae8020b6c80538a725077"; + sha256 = "1a3871n3kwvwgz40a74c74lyy5p2l4rih75asb6rnjrrknkk47fb"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4032,12 +4044,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-17"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "b6a904b341c56c5386bdd5c991439a834d061874"; - sha256 = "1ja6k5cw6v5nhi91s643r6c38a15rgi4n8cb0k5pc5q252q8km04"; + rev = "fdf005f5697742da121391d31ad42a47842264f9"; + sha256 = "15amdgzdiaf0srzzwy2pgk7d44bwls5pzj2088xf1206754znsas"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4189,12 +4201,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-07-09"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "080d24394b9abc93b6cd7635cb96c7d6601759a3"; - sha256 = "19xc61xfdyi21k9wbs63iynkfysqi3v28897bqig8myjr1mifbpb"; + rev = "a695e5d653e3a864e11a5ad777e1274eaae90494"; + sha256 = "0ahvklrll8wswzzhqqc6qqp1f023njrkqbry439l8s21zsnq63dh"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4369,12 +4381,12 @@ final: prev: Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2021-05-18"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "097b098e62d6499967e44091689c104165ad5e22"; - sha256 = "12qizfs7d0xh10vzm7spcqsi53k3iqvbfp5nhb3qh3xdsavzyp0m"; + rev = "48b6bc12b560d3013cd30c7959e235993374c24b"; + sha256 = "1ia2bv7yigcv944rkqy7jlrzi71m3k9kzj1hjhyrk0c2rg738r94"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; @@ -4429,12 +4441,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2021-05-19"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "dacb2ba386d982d4466aa469799376c38ddcfd2a"; - sha256 = "1b8zb6k92iwmvdny5g16d5y5zl8fc235vlgvxrnipcfj4m3ch0yy"; + rev = "6bd1b891ecf6c5c054442c6934965714d5ffe834"; + sha256 = "1a5dw5y359jbvd3yr9sjxjbjwqrgvmwdv9y1jifqk7s5p0y0b4jg"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -4477,12 +4489,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-21"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "11f232c7a82c3fd5d34654c6b02abae4f56ac5e6"; - sha256 = "1xyrf6s8szd1lpz70ng1whhysjvnn7pxi80knyrjrkqzkqpimiac"; + rev = "160aeb66e46e863802c2e4c5a772c3858bc02fd0"; + sha256 = "108nxkbybl1fvyawgq0mzbi2c5fadycxj0pnnnsw8alycyjln13f"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4561,12 +4573,12 @@ final: prev: semshi = buildVimPluginFrom2Nix { pname = "semshi"; - version = "2021-07-13"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "numirias"; repo = "semshi"; - rev = "39c7500032f35711aecb492affd989433b984f14"; - sha256 = "14hv67fhmq85m382grc6h07r5xs83mmx3j8nf94j60gwbybhlkdb"; + rev = "252f07fd5f0ae9eb19d02bae979fd7c9152c1ccf"; + sha256 = "0r1nrkhyhk08vfhf9hnbhjlnqy0imqhdqx31y301k2kb31hyiyq3"; }; meta.homepage = "https://github.com/numirias/semshi/"; }; @@ -4839,12 +4851,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "d313ed0f8f39a7fd09da65c4f02191368680387f"; - sha256 = "1z9r2x58g212jy2sl981s7f8pj2nbqfgjbfi471yqafbxlynfzdw"; + rev = "e47e911d4fba1c584cfb31dd710c1f2a03961561"; + sha256 = "0bb1bsswffp45g38fn41dcbr5dx2gfaz1xhr470h5ln7ywkwv2hi"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -4939,10 +4951,10 @@ final: prev: src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "7414f30365a342e1d89072d474a35913643b6eec"; - sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y"; + rev = "6a51c637dd8deb4c1e398932651b3a635d1694e2"; + sha256 = "1hxdklzbci1cxaq6mvy6f2zih8cxyp4s8y6yrnz9w2587pxh0c7j"; }; - meta.homepage = "https://github.com/simrat39/symbols-outline.nvim"; + meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; syntastic = buildVimPluginFrom2Nix { @@ -5165,12 +5177,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-20"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "664690029fdb302bee8d3f27a458383e8477add7"; - sha256 = "1aaq9lmfxxxpirkbj3py76qnyfd1qhsq9msfw689zgzjqahk7zhz"; + rev = "c0f1999b0280bb042bba01c930dd94a4bfdee363"; + sha256 = "13igy3nph7vg1pnq7hjvql71i0031xdxgkiyd1h38chcs7whvxzf"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5298,12 +5310,12 @@ final: prev: traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "896f2bed6b982ce5ca2c5bd454b8eb8af312e5a1"; - sha256 = "1pwlw8gq0vd8zc3xqmp8r2s2wka9m9i85w08av59rmwnizk6vkza"; + rev = "4b06ca24de8aeb8b512727a27f2d1b3ba7b20ff6"; + sha256 = "0lyqbwjyb0sczzqhfd7nmg3hzqn9pqxbrg14szg56a14mmm59mxf"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -5334,12 +5346,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble-nvim"; - version = "2021-07-16"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "059ea2b999171f50019291ee776dd496799fdf3a"; - sha256 = "06v2jvlw8rjlarx89kfb7ys8y0jkm1f7c4vnws60nfbqgp9c9k98"; + rev = "169b2ec3a4d0cac01f22cc8f7332f1d0a11f1fa4"; + sha256 = "08r1ivzw6v5bfyhd7cy6kysryd123f68aa3kpamzy168ixvihbii"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -5850,12 +5862,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-06-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "d616fcf8a747f86bd3b26004b83ea5b7c7526df1"; - sha256 = "1292613i7yi38jsl1sly5i9bdi7bzaw2pg67gkymq2ln7zcpvims"; + rev = "80ba8b13a9699db20754623a0933095be65fc203"; + sha256 = "0crlkxc55lk37vy52yxwpp84bc3rd7a5am71xj9zl29a4xap5mdp"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -6042,12 +6054,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "2e287bd7e73198408d73b7183e3019a3aff6c19b"; - sha256 = "1n1hipxim9d1shh9ch414yy15vdr8yc5ppgk7msv6zzgsw10qyaw"; + rev = "111ef624c0d39fe5fcf869fba01c16036e106fbd"; + sha256 = "0xgdvk362fk6491pk5dv46a2cg77gk57gk6dvhzf3ldi5zshckfj"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6822,12 +6834,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-17"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "de6495ae846b2c5913fa85d5464c036c0acdfa34"; - sha256 = "184cbh2jxwpp4zgvlfhs4qx1mr4vyq5vvv6lvk8lcng40dxfr9fg"; + rev = "75b2a9a8daf6589f9747ff4f2d068fdea54e92ea"; + sha256 = "1c265bq5a60y7ndpvwdn54kdzb6spdfnkfdaffp47rgq0y1pfphj"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7592,12 +7604,12 @@ final: prev: vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2020-07-01"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "94bd2ea1fd45cf0a21edc3433231e7fcb7791323"; - sha256 = "0r8lisyhbzyw2w9xzbashlhnag98vws78xwmh03dpd8kbpcdiz0w"; + rev = "447c69b59fadcf04f96d99873126953eae7aa235"; + sha256 = "0cglf4kfb07jwz1v14gl83rnfjm4c1b69nih3g7yj001ddyj5amx"; }; meta.homepage = "https://github.com/tpope/vim-liquid/"; }; @@ -7749,12 +7761,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-07-19"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "61802ad25f303dc37f575cbed9b902605353db49"; - sha256 = "15c8y5rfsnmx4dm01advvax8flkibkg60lbs8x0xgyzfcqjzhl14"; + rev = "8ae49bf65c960f6260f2d475b35b068bc6b822f2"; + sha256 = "1r0car7vbz57b5fq7kjibsdi6knw50n8az145dbfq8svkf7s1fvy"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8325,14 +8337,14 @@ final: prev: vim-prettier = buildVimPluginFrom2Nix { pname = "vim-prettier"; - version = "2021-07-21"; + version = "2021-06-29"; src = fetchFromGitHub { owner = "prettier"; repo = "vim-prettier"; rev = "0e61e4a5b55d2740aa118db91a6671dcb11307e8"; sha256 = "0d83lx6kfpsi3d4q9wz8zwsgdn0vn16psqyngml6wspjyibh6pnf"; }; - meta.homepage = "https://github.com/prettier/vim-prettier"; + meta.homepage = "https://github.com/prettier/vim-prettier/"; }; vim-prettyprint = buildVimPluginFrom2Nix { @@ -8565,12 +8577,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-07-18"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "482e2cec5a742920eddf644f2f1efcb15f03967c"; - sha256 = "18b3hhb1sfgip80dp7wicrsqs59narj49qlmpnfhsy29imsxzb72"; + rev = "5516e301a5c3cacac008342006a712f5fa80f6a1"; + sha256 = "0fwy02mj0gafgv01qpgfyi5n0i0lrfzy8nw93hrpqwc97pckh1pp"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -9310,12 +9322,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-07-18"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "06f965a62c32906f220c37e7b758a275d6a992f6"; - sha256 = "0zgpp6g29n1kb0qi6n84i1d540g0xhw5bzj8kp5xsh5wlvn9h4fk"; + rev = "54eaa1b19c924551e9988063926533583e41b24c"; + sha256 = "16d38yc4v0fy7w8qdrbx134f99xny4kfgwgazqa47cgj8nrb0n4g"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -9767,12 +9779,12 @@ final: prev: vimway-lsp-diag-nvim = buildVimPluginFrom2Nix { pname = "vimway-lsp-diag-nvim"; - version = "2021-07-21"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "onsails"; repo = "vimway-lsp-diag.nvim"; - rev = "dee2f59a45f72fb2ba0dd29cb06ed5357097ee07"; - sha256 = "16da94g367sb07d1xn55cvyi48zjgjv2c1p7mzabpidm9c7r99pm"; + rev = "28c23ed9dc499410b4bd0ac040e48c76560b18b7"; + sha256 = "1fdmg6xhhqdhk4hykhhxw55d11gcb932b2iz2sk7f4bps8c2lgg9"; }; meta.homepage = "https://github.com/onsails/vimway-lsp-diag.nvim/"; }; @@ -9972,12 +9984,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-07-05"; + version = "2021-07-23"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "c83c240e1397291bf1babcba173253d7f753a0b6"; - sha256 = "0lr2vl9rdjr2lgbs5vlbcjw3zrwv66w5bijlpk1xy45ccbrbq2nw"; + rev = "8411859f48c8066a3b6f29c1a8e3bfa2d0653551"; + sha256 = "0yx2aig7pk8f99d539p85q3csb3l7bf2575r24w3fvchwj8w2pqy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a63d05441281..60bd11803cad 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -643,7 +643,7 @@ self: super: { libiconv ]; - cargoSha256 = "046c5w47isnz5l23kpk8zkbw312yp5dz9wq9dc2kmpklai71fc1a"; + cargoSha256 = "sha256-J5BCLcwOPB+EfOmdITCHgec9XDkm2oCGfRo/sKjEOIg="; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3f1963101cec..e134963d453b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -28,6 +28,7 @@ antoinemadec/coc-fzf antoinemadec/FixCursorHold.nvim ap/vim-css-color arcticicestudio/nord-vim +arkav/lualine-lsp-progress arthurxavierx/vim-unicoder artur-shaik/vim-javacomplete2 autozimu/LanguageClient-neovim @@ -645,8 +646,8 @@ steelsojka/completion-buffers steelsojka/pears.nvim stefandtw/quickfix-reflector.vim stephpy/vim-yaml -stsewd/fzf-checkout.vim stevearc/aerial.nvim +stsewd/fzf-checkout.vim sunaku/vim-dasht sunjon/Shade.nvim svermeulen/vim-subversive diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 8c8ab911cc37..323359905343 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,6 @@ -{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck, moreutils, racket-minimal }: +{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq +, shellcheck, moreutils, racket-minimal, clojure-lsp +}: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -206,6 +208,23 @@ let }; }; + betterthantomorrow.calva = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "calva"; + publisher = "betterthantomorrow"; + version = "2.0.205"; + sha256 = "sha256-umnG1uLB42fUNKjANaKcABjVmqbdOQakd/6TPsEpF9c"; + }; + nativeBuildInputs = [ jq moreutils ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json + ''; + meta = with lib; { + license = licenses.mit; + }; + }; + bodil.file-browser = buildVscodeMarketplaceExtension { mktplcRef = { name = "file-browser"; diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index f4c257314a84..74d26f65453d 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { sha256 = "1gg4jcwvk4za6j4260dx1vz2dprrnqv8paqf6z86s7ka3y1nx1aj"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; - buildPhase = '' mv apache-tomcat/conf/server.xml apache-tomcat/conf/server.xml.dist ln -s /run/atlassian-crowd/server.xml apache-tomcat/conf/server.xml diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index f8a9875914da..c441771157ce 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.7"; + version = "5.9"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "sha256-pUPOYqgJKntQZRRodcyYeFNLCdxKhT8sK1bi3jl6b0s="; + sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY="; }; preConfigure = '' diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 81ec4a6c6bb2..564636f6db24 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mv $PWD $out find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}' diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index a324dcb58bdc..ccda9bcddb95 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.455"; + version = "0.18.459"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-qEuhgtDtdMCHJtUcUDUmKI8FT0ti7veleI7UhwTAUfE="; + sha256 = "sha256-KOdUMJ29bqJ7WyE4BxMDRsPdIKwZNRfrbIItdoeexUk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mastodon/update.nix b/pkgs/servers/mastodon/update.nix index 28c0ff235e74..d7423b3e66c8 100644 --- a/pkgs/servers/mastodon/update.nix +++ b/pkgs/servers/mastodon/update.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { patchShebangs $out/bin/update.sh wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} ''; - phases = [ "installPhase" ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ]; diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index 4c5ea3fe6c6c..8e04dcb1cb98 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -33,6 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ telotortium ]; platforms = platforms.unix; }; - - phases = ["unpackPhase" "installPhase"]; } diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index 2c08374ec736..459ddf01de3c 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' mkdir -p $out/libexec diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 03609e4d25a1..0ea67d61e067 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' substituteInPlace bin/riemann --replace '$top/lib/riemann.jar' "$out/share/java/riemann.jar" diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 1d527fb203c1..6bde2ed5a57c 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.5.4841-549599676"; + version = "1.23.5.4862-0f739d462"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "168aill68fcq3cv3a78yhqnfxziww8r80is179y9jxmhymnmzp9q"; + sha256 = "1qbv30ki8xw9vdvqw8fh56br8gkm1ndcw361sal7ahn62d4h85nq"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0cp2likx2dqy6j5icp5n07kg1md9qvq9vsh4818m86r2p015qlvb"; + sha256 = "1ac169197gfi78mnm46lhgvzlg2y9c0pzdm5a6031lfalqc7z9nc"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index cecdce5aa960..7a48a9b2478a 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.7.3"; + version = "2.7.5"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "1ig2vq19sb6n2x2w2zbf54izynaqay9l8xq1zds116v0z729wlkh"; + sha256 = "h4IRPUaqgb/AgqKJJEsHBydJOH2i//fpWzMFa0VM2ns="; }; installPhase = '' diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index af253ccd7e6a..c77aa5b82b62 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,21 +1,30 @@ -{ lib, stdenv, fetchurl, librsync }: +{ lib, stdenv, fetchurl, fetchpatch, librsync }: stdenv.mkDerivation rec { - name = "btar-1.1.1"; + pname = "btar"; + version = "1.1.1"; + src = fetchurl { - url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; + url = "https://vicerveza.homeunix.net/~viric/soft/btar/btar-${version}.tar.gz"; sha256 = "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"; }; + patches = [ + (fetchpatch { + url = "https://build.opensuse.org/public/source/openSUSE:Factory/btar/btar-librsync.patch?rev=2"; + sha256 = "1awqny9489vsfffav19s73xxg26m7zrhvsgf1wxb8c2izazwr785"; + }) + ]; + buildInputs = [ librsync ]; - installPhase = "make install PREFIX=$out"; + makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "Tar-compatible block-based archiver"; license = lib.licenses.gpl3Plus; - homepage = "http://viric.name/cgi-bin/btar"; - platforms = with lib.platforms; all; - maintainers = with lib.maintainers; [viric]; + homepage = "https://viric.name/cgi-bin/btar"; + platforms = platforms.all; + maintainers = with maintainers; [ viric ]; }; } diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index 702ea28a6975..1e102a950b9d 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "0xmjr8brjmkk13dsn3yvcl5ss6b214hpka0idk072n46qsyhg2wh"; + sha256 = "sha256-arb6wPoDlNdBxSQ+G0KyN4Pbd0nPhb+DbvRlbPaPtPI="; }; - cargoSha256 = "06d1h2c2abg56567znxh65d4ddpi6wvxip9rbzkmdnzgy3b3y2wl"; + cargoSha256 = "sha256-1hK6C10oM5b8anX+EofekR686AZR5LcpXyhVkmHcSwA="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 8cf35b36c0c1..10bd5d3edf49 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { gccStdenv.mkDerivation rec { pname = "astc-encoder"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-+vYEO2zS144ZuVN8b4/EpvTcakC9U0uc/eV4pB7lHiY="; + sha256 = "sha256-WWxk8F1MtFv1tWbSs45fmu4k9VCAAOjJP8zBz80zLTo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index 43d711588f8e..2296743694ee 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -34,13 +34,13 @@ let ''; in stdenv.mkDerivation rec { pname = "goverlay"; - version = "0.5.1"; + version = "0.6"; src = fetchFromGitHub { owner = "benjamimgois"; repo = pname; rev = version; - hash = "sha256-Zl1pq2MeGJsPdNlwUEpov5MHlsr9pSMkWHVprt8ImKs="; + hash = "sha256-E4SMUL9rpDSSdprX4fPyGCHCowdQavjhGIhV3r4jeiw="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch index 862e4c3903cb..51d4dcdc54ed 100644 --- a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch +++ b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch @@ -1,8 +1,8 @@ diff --git a/overlayunit.pas b/overlayunit.pas -index 59f6a81..a096543 100644 +index de8725f..005f171 100644 --- a/overlayunit.pas +++ b/overlayunit.pas -@@ -4871,7 +4871,7 @@ begin +@@ -5377,7 +5377,7 @@ begin //Determine Mangohud dependency status //locate MangoHud and store result in tmp folder @@ -11,7 +11,7 @@ index 59f6a81..a096543 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud'); -@@ -4880,7 +4880,7 @@ begin +@@ -5386,7 +5386,7 @@ begin CloseFile(mangohudVAR); // Read String and store value on mangohuddependencyVALUE based on result @@ -20,7 +20,7 @@ index 59f6a81..a096543 100644 mangohuddependencyVALUE := 1 else mangohuddependencyVALUE := 0; -@@ -4889,7 +4889,7 @@ begin +@@ -5395,7 +5395,7 @@ begin //Determine vkBasalt dependency staus //locate vkBasalt and store result in tmp folder @@ -29,7 +29,7 @@ index 59f6a81..a096543 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt'); -@@ -4898,7 +4898,7 @@ begin +@@ -5404,7 +5404,7 @@ begin CloseFile(vkbasaltVAR); // Read String and store value on vkbasaltdependencyVALUE based on result diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 88a9846e8352..629c8accfb9e 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man, installShellFiles -, abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc +{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles +, abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd @@ -7,13 +7,6 @@ }: # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! -let - apksigner = runCommand "apksigner" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - makeWrapper "${jdk}/bin/java" "$out/bin/apksigner" \ - --add-flags "-jar ${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3/lib/apksigner.jar" - ''; -in python3Packages.buildPythonApplication rec { pname = "diffoscope"; version = "178"; diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index ec181c17e9ea..734a751daf09 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "sha256-BxmoIGhuAt/uhHLNdMiSrNVWAoxAAMKPJ/NsXjf2ynk="; + sha256 = "sha256-/no8bRGoKibtcjaITUuzwAbX+gPHNJROSf79iuuRwe4="; }; subPackages = [ "cmd/grpcurl" ]; - vendorSha256 = "sha256-EnstvJk2kZ1Ft5xY1dO14wnmT//2K72OnDMZqeaOeQI="; + vendorSha256 = "sha256-nl8vKVhUMSO20qCDyhNkU5cghNy8vIFqSBvLk59nbWg="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 9509288b5819..ccb93c95f897 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-22"; + version = "2021-07-24"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-pmi1oKam3t4iKqbisFghdVlzp1Ozmc9Nmn19JLrsams="; + sha256 = "sha256-UMajZExQjrbXon/tNYt+xp9LM7QRVXefGHDYuu949AQ="; }; installPhase = '' diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 922fb412cad7..30e86f66a582 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, python3 }: -let version = "0.11.1"; in +let version = "0.11.2"; in python3.pkgs.buildPythonApplication { pname = "fail2ban"; @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "0kqvkxpb72y3kgmxf6g36w67499c6gcd2a9yyblagwx12y05f1sh"; + sha256 = "q4U9iWCa1zg8sA+6pPNejt6v/41WGIKN5wITJCrCqQE="; }; pythonPath = with python3.pkgs; diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/tools/security/minio-certgen/default.nix new file mode 100644 index 000000000000..f87fffc4f957 --- /dev/null +++ b/pkgs/tools/security/minio-certgen/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "minio-certgen"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "minio"; + repo = "certgen"; + rev = "v${version}"; + sha256 = "sha256-HtzcoEUMt3LpQNyT0wGcmc4Q70QqHx7QpjrDh4YSO/Q="; + }; + + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + meta = with lib; { + description = "A simple Minio tool to generate self-signed certificates, and provides SAN certificates with DNS and IP entries"; + downloadPage = "https://github.com/minio/certgen"; + license = licenses.bsd3; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/tools/typesetting/pdfchain/default.nix b/pkgs/tools/typesetting/pdfchain/default.nix new file mode 100644 index 000000000000..09122d60bc0d --- /dev/null +++ b/pkgs/tools/typesetting/pdfchain/default.nix @@ -0,0 +1,56 @@ +{ lib, stdenv, fetchurl, fetchpatch +, autoconf, gtkmm3, glib, pdftk, pkg-config, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pdfchain"; + version = "0.4.4.2"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; + sha256 = "sha256-Hu4Pk9voyc75+f5OwKEOCkXKjN5nzWzv+izmyEN1Lz0="; + }; + + nativeBuildInputs = [ + pkg-config wrapGAppsHook autoconf + ]; + + buildInputs = [ + gtkmm3 pdftk glib + ]; + + patches = let + fetchDebianPatch = {name, sha256}: fetchpatch { + url = "https://salsa.debian.org/debian/pdfchain/raw/2d29107756a3194fb522bdea8e9b9e393b15a8f3/debian/patches/${name}"; + inherit name sha256; + }; + in + [ + (fetchDebianPatch { + name = "fix_crash_on_startup"; + sha256 = "sha256-1UyMHHGrmUIFhY53ILdMMsyocSIbcV6CKQ7sLVNhNQw="; + }) + (fetchDebianPatch { + name = "fix_desktop_file"; + sha256 = "sha256-L6lhUs7GqVN1XOQO6bbz6BT29n4upsJtlHCAIGzk1Bw="; + }) + (fetchDebianPatch { + name = "fix_spelling"; + sha256 = "sha256-sOUUslPfcOo2K3zuaLcux+CNdgfWM0phsfe6g4GUFes="; + }) + ]; + + postPatch = '' + substituteInPlace src/constant.h \ + --replace '"pdftk"' '"${pdftk}/bin/pdftk"' \ + --replace "/usr/share" "$out/share" + ''; + + meta = with lib; { + description = "A graphical user interface for the PDF Toolkit (PDFtk)"; + homepage = "https://pdfchain.sourceforge.io"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hqurve ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index 6867869a0a9d..c48d684d3fcc 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.koral ]; platforms = lib.platforms.unix; - broken = true; knownVulnerabilities = [ "CVE-2017-10976" "CVE-2017-11096" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8ece1dde0766..a148788c35b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -101,6 +101,8 @@ mapAliases ({ buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 + buildkite-agent2 = throw "buildkite-agent2 has been discontinued. Please use buildkite-agent (v3.x)"; # added 2018-09-26 + buildkite-agent3 = buildkite-agent; # added 2018-09-26 bundler_HEAD = bundler; # added 2015-11-15 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 @@ -339,6 +341,7 @@ mapAliases ({ hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 ht-rust = xh; # added 2021-02-13 htmlTidy = html-tidy; # added 2014-12-06 + hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06 iana_etc = iana-etc; # added 2017-03-08 icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 @@ -384,11 +387,12 @@ mapAliases ({ kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25 krename-qt5 = krename; # added 2017-02-18 kerberos = libkrb5; # moved from top-level 2021-03-14 - keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 + keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # added 2019-12-10 kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23 kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; letsencrypt = certbot; # added 2016-05-16 + leksah = throw "To use leksah, refer to the instructions in https://github.com/leksah/leksah."; # added 2019-04-28 libaudit = audit; # added 2018-04-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 @@ -419,6 +423,7 @@ mapAliases ({ libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 + librsync_0_9 = throw "librsync_0_9 has been removed"; # added 2021-07-24 libseat = seatd; # added 2021-06-24 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 @@ -528,6 +533,7 @@ mapAliases ({ oauth2_proxy = oauth2-proxy; # added 2021-04-18 opencascade_oce = opencascade; # added 2018-04-25 oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 + octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24 ofp = throw "ofp is not compatible with odp-dpdk"; opencl-icd = ocl-icd; # added 2017-01-20 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 @@ -548,6 +554,7 @@ mapAliases ({ parity = openethereum; # added 2020-08-01 parquet-cpp = arrow-cpp; # added 2018-09-08 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 + pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22 pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03 perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 @@ -890,13 +897,16 @@ mapAliases ({ virtmanager-qt = virt-manager-qt; # added 2019-10-29 virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 vorbisTools = vorbis-tools; # added 2016-01-26 + way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13 webkit = webkitgtk; # added 2019-03-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 + winstone = throw "winstone is not supported anymore. Alternatives are Jetty or Tomcat."; # added 2019-05-14 winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 + wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 xp-pen-g430 = pentablet-driver; # added 2020-05-03 @@ -965,12 +975,9 @@ mapAliases ({ ocamlPackages_4_03 ocamlPackages_latest; - # added 2019-08-01 - mumble_git = pkgs.mumble; - murmur_git = pkgs.murmur; - - # added 2020-08-17 - zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; + mumble_git = pkgs.mumble; # added 2019-08-01 + murmur_git = pkgs.murmur; # added 2019-08-01 + zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; # added 2020-08-17 # added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; @@ -985,16 +992,10 @@ mapAliases ({ ocaml_4_03 = ocamlPackages_4_03.ocaml; }) // { - # added 2019-10-28 - gnatsd = nats-server; - - # added 2020-01-10 - tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; - # added 2020-01-10 - tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; - - # added 2020-02-09 - dina-font-pcf = dina-font; + gnatsd = nats-server; # added 2019-10-28 + tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 + tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 + dina-font-pcf = dina-font; # added 2020-02-09 # added 2019-04-13 # *-polly pointed to llvmPackages_latest @@ -1010,9 +1011,7 @@ mapAliases ({ dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02 sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04 - gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7."; - todolist = throw "todolist is now ultralist."; # added 2020-12-27 /* Cleanup before 21.05 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 066abf31ea47..f2a7e3c7af6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1105,6 +1105,10 @@ in apksigcopier = callPackage ../development/tools/apksigcopier { }; + apksigner = callPackage ../development/tools/apksigner { + inherit (androidenv.androidPkgs_9_0) build-tools; + }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -3543,9 +3547,7 @@ in bsdiff = callPackage ../tools/compression/bsdiff { }; - btar = callPackage ../tools/backup/btar { - librsync = librsync_0_9; - }; + btar = callPackage ../tools/backup/btar { }; bud = callPackage ../tools/networking/bud { }; @@ -4202,7 +4204,6 @@ in diff-so-fancy = callPackage ../applications/version-management/git-and-tools/diff-so-fancy { }; diffoscopeMinimal = callPackage ../tools/misc/diffoscope { - inherit (androidenv.androidPkgs_9_0) build-tools; jdk = jdk8; }; @@ -4429,6 +4430,8 @@ in rar2fs = callPackage ../tools/filesystems/rar2fs { }; + s9fes = callPackage ../development/interpreters/s9fes { }; + s-tar = callPackage ../tools/archivers/s-tar {}; sonota = callPackage ../tools/misc/sonota { }; @@ -5507,7 +5510,9 @@ in gpp = callPackage ../development/tools/gpp { }; - gpredict = callPackage ../applications/science/astronomy/gpredict { }; + gpredict = callPackage ../applications/science/astronomy/gpredict { + hamlib = hamlib_4; + }; gptfdisk = callPackage ../tools/system/gptfdisk { }; @@ -7073,6 +7078,8 @@ in minio-client = callPackage ../tools/networking/minio-client { }; + minio-certgen = callPackage ../tools/security/minio-certgen { }; + minissdpd = callPackage ../tools/networking/minissdpd { }; inherit (callPackage ../tools/networking/miniupnpc @@ -7945,8 +7952,6 @@ in pdfarranger = callPackage ../applications/misc/pdfarranger { }; - pdfread = throw "pdfread has been remove from nixpkgs, because it is unmaintained for years and the sources are no longer available"; - briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { }; @@ -11623,6 +11628,8 @@ in knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; + regenkfs = callPackage ../development/tools/knightos/regenkfs { }; + knightos-kcc = callPackage ../development/tools/knightos/kcc { }; knightos-kimg = callPackage ../development/tools/knightos/kimg { }; @@ -11631,6 +11638,8 @@ in knightos-mkrom = callPackage ../development/tools/knightos/mkrom { }; + remkrom = callPackage ../development/tools/knightos/remkrom { }; + knightos-patchrom = callPackage ../development/tools/knightos/patchrom { }; knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { }; @@ -12576,14 +12585,14 @@ in # Import PHP80 interpreter, extensions and packages php80 = callPackage ../development/interpreters/php/8.0.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; php80Extensions = recurseIntoAttrs php80.extensions; php80Packages = recurseIntoAttrs php80.packages; # Import PHP74 interpreter, extensions and packages php74 = callPackage ../development/interpreters/php/7.4.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; php74Extensions = recurseIntoAttrs php74.extensions; php74Packages = recurseIntoAttrs php74.packages; @@ -13222,9 +13231,7 @@ in buck = callPackage ../development/tools/build-managers/buck { }; - buildkite-agent = buildkite-agent3; - buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; - buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; @@ -15535,7 +15542,7 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope { libav = pkgs.ffmpeg; }; + callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg; }); inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox; }); @@ -15758,7 +15765,9 @@ in gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; - hamlib = callPackage ../development/libraries/hamlib { }; + hamlib = hamlib_3; + hamlib_3 = callPackage ../development/libraries/hamlib { }; + hamlib_4 = callPackage ../development/libraries/hamlib/4.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; @@ -15837,11 +15846,6 @@ in inherit (callPackage ../development/tools/misc/hydra { }) hydra-unstable; - hydra-flakes = throw '' - Flakes support has been merged into Hydra's master. Please use - `pkgs.hydra-unstable` now. - ''; - hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; @@ -17046,8 +17050,6 @@ in librsync = callPackage ../development/libraries/librsync { }; - librsync_0_9 = callPackage ../development/libraries/librsync/0.9.nix { }; - librttopo = callPackage ../development/libraries/librttopo { }; libs3 = callPackage ../development/libraries/libs3 { }; @@ -18188,9 +18190,6 @@ in lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { }; - leksah = throw ("To use leksah, refer to the instructions in " + - "https://github.com/leksah/leksah."); - libgme = callPackage ../development/libraries/audio/libgme { }; librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; @@ -20393,8 +20392,6 @@ in webhook = callPackage ../servers/http/webhook { }; - winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat."; - xinetd = callPackage ../servers/xinetd { }; zookeeper = callPackage ../servers/zookeeper { @@ -23523,7 +23520,9 @@ in python3Packages = python37Packages; }; - cqrlog = callPackage ../applications/radio/cqrlog { }; + cqrlog = callPackage ../applications/radio/cqrlog { + hamlib = hamlib_4; + }; crun = callPackage ../applications/virtualization/crun {}; @@ -23602,7 +23601,9 @@ in inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; - direwolf = callPackage ../applications/radio/direwolf { }; + direwolf = callPackage ../applications/radio/direwolf { + hamlib = hamlib_4; + }; dirt = callPackage ../applications/audio/dirt {}; @@ -23934,7 +23935,9 @@ in flexget = callPackage ../applications/networking/flexget { }; - fldigi = callPackage ../applications/radio/fldigi { }; + fldigi = callPackage ../applications/radio/fldigi { + hamlib = hamlib_4; + }; flink = callPackage ../applications/networking/cluster/flink { }; @@ -24189,8 +24192,6 @@ in }; wireshark-qt = wireshark; - # The GTK UI is deprecated by upstream. You probably want the QT version. - wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; wireshark-cli = wireshark.override { withQt = false; libpcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -26226,8 +26227,6 @@ in octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; - ocrad = callPackage ../applications/graphics/ocrad { }; offrss = callPackage ../applications/networking/offrss { }; @@ -26384,6 +26383,8 @@ in inherit (gnome2) libgnomecanvas; }; + pdfchain = callPackage ../tools/typesetting/pdfchain { }; + pdfcpu = callPackage ../applications/graphics/pdfcpu { }; pdftk = callPackage ../tools/typesetting/pdftk { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -26445,6 +26446,8 @@ in plugins = []; }; + pidgin-indicator = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator { }; + pidgin-latex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { texLive = texlive.combined.scheme-basic; }; @@ -26974,6 +26977,8 @@ in sniproxy = callPackage ../applications/networking/sniproxy { }; + snixembed = callPackage ../applications/misc/snixembed { }; + sooperlooper = callPackage ../applications/audio/sooperlooper { }; sops = callPackage ../tools/security/sops { }; @@ -27899,9 +27904,6 @@ in wapiti = callPackage ../tools/security/wapiti { }; - way-cooler = throw ("way-cooler is abandoned by its author: " + - "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"); - wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); inherit (wayfireApplications) wayfire wcm; wayfireApplications-unwrapped = recurseIntoAttrs ( @@ -31418,10 +31420,8 @@ in nix-repl = throw ( "nix-repl has been removed because it's not maintained anymore, " + - (lib.optionalString (! lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) - "ugrade your Nix installation to a newer version and ") + - "use `nix repl` instead. " + - "Also see https://github.com/NixOS/nixpkgs/pull/44903" + (lib.optionalString (!lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) "ugrade your Nix installation to a newer version and ") + + "use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903" ); nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2e8a4fa59d1e..200743944eeb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -623,9 +623,7 @@ let inherit (pkgs) file; }; - lwt = callPackage ../development/ocaml-modules/lwt { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; - }; + lwt = callPackage ../development/ocaml-modules/lwt { }; lwt-canceler = callPackage ../development/ocaml-modules/lwt-canceler { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80fec6354089..9708579cabc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2734,6 +2734,8 @@ in { freezegun = callPackage ../development/python-modules/freezegun { }; + frilouz = callPackage ../development/python-modules/frilouz { }; + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; fritzprofiles = callPackage ../development/python-modules/fritzprofiles { }; @@ -6215,6 +6217,8 @@ in { pylxd = callPackage ../development/python-modules/pylxd { }; + pylzma = callPackage ../development/python-modules/pylzma { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { }; @@ -8458,6 +8462,8 @@ in { syncer = callPackage ../development/python-modules/syncer { }; + synergy = callPackage ../development/python-modules/synergy { }; + synologydsm-api = callPackage ../development/python-modules/synologydsm-api { }; systembridge = callPackage ../development/python-modules/systembridge { }; |