diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/skaware/build-skaware-package.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/amdvlk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/nsss/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/skalibs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/utmps/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/mdevd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/s6-linux-init/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 | ||||
-rwxr-xr-x | pkgs/servers/home-assistant/parse-requirements.py | 3 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/ucarp/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/misc/execline/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/s6-portable-utils/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/networking/s6-dns/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/s6-networking/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/s6-rc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/s6/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
18 files changed, 62 insertions, 36 deletions
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 7a5db942b2cb8..b27b65f48a59d 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation { inherit description platforms; license = lib.licenses.isc; maintainers = with lib.maintainers; - [ pmahoney Profpatsch ] ++ maintainers; + [ pmahoney Profpatsch qyliss ] ++ maintainers; }; } diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index e3bc04a6d2263..5d5277afcd3e1 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q2.4"; + version = "2021.Q2.5"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "KPWkwbD55BoztF6DPmvau9i1AMhR+5ad5VrrD8I2YyI="; + sha256 = "0NJoGk++SHt4dtoUj3UQeW4zFtwa7osczUr+vxi8DG8="; }; buildInputs = [ diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index 4e71c4d65e6eb..527e7d4898e19 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/libraries/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.1.0.0"; - sha256 = "15rxbwf16wm1la079yr2xn4bccjgd7m8dh6r7bpr6s57cj93i2mq"; + version = "0.1.0.1"; + sha256 = "1nair10m7fddp50mpqnwj0qiggnh5qmnffmyzxis5l1ixcav1ir0"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 3d90a8ebb21c0..09530db0532ce 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.10.0.2"; - sha256 = "03qyi77wgcw3nzy7i932wd98d6j7nnzxc8ddl973vf5sa1v3vflb"; + version = "2.10.0.3"; + sha256 = "0ka6n5rnxd5sn5lycarf596d5wlak5s535zqqlz0rnhdcnpb105p"; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index 107c23dcb59b1..be74748cb3697 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.1.0.0"; - sha256 = "09p0k2sgxr7jlsbrn66fzvzf9zxvpjp85y79xk10hxjglypszyml"; + version = "0.1.0.2"; + sha256 = "1vjza7m65ziq54q0sv46kb3lss9cmxkkv0n9h3i8505x0h2hlvlb"; description = "A secure utmpx and wtmp implementation"; diff --git a/pkgs/os-specific/linux/mdevd/default.nix b/pkgs/os-specific/linux/mdevd/default.nix index b88e3ad1e6f00..58299ba5e878b 100644 --- a/pkgs/os-specific/linux/mdevd/default.nix +++ b/pkgs/os-specific/linux/mdevd/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "mdevd"; - version = "0.1.3.0"; - sha256 = "0spvw27xxd0m6j8bl8xysmgsx18fl769smr6dsh25s2d5h3sp2dy"; + version = "0.1.4.0"; + sha256 = "1lnwk7qa6x7iia0v12i2jckg42ypi35hk3sa7cjm23ngnhiv5lzz"; description = "mdev-compatible Linux hotplug manager daemon"; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/s6-linux-init/default.nix b/pkgs/os-specific/linux/s6-linux-init/default.nix index 41790e5eb7813..5d6941259e1b3 100644 --- a/pkgs/os-specific/linux/s6-linux-init/default.nix +++ b/pkgs/os-specific/linux/s6-linux-init/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-init"; - version = "1.0.6.1"; - sha256 = "0sq8ya39a1qs61cdjns8ijwrvxnqd4snk2ab4j5wl9a87i7wixhn"; + version = "1.0.6.2"; + sha256 = "06xcmn2a89fvng056lcnnyrl2ak0y7cblkc90lj9a2liyhawy9dr"; description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel"; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 132a0b49574c3..3596ab23e72b3 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-utils"; - version = "2.5.1.4"; - sha256 = "02gxzc9igid2kf2rvm3v6kc9806mpjmdq7cpanv4cml0ip68vbfq"; + version = "2.5.1.5"; + sha256 = "1fj5ldlrc6bx40pphg29rp3byd6fal6869v85kw86c2kdgrxn063"; description = "A set of minimalistic Linux-specific system utilities"; platforms = lib.platforms.linux; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 5d8678a6267fa..2cdc44caaae9b 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -183,8 +183,7 @@ def main() -> None: if attr_path is not None: # Add attribute path without "python3Packages." prefix attr_paths.append(attr_path[len(PKG_SET + ".") :]) - # home-assistant-frontend is always in propagatedBuildInputs - elif name != 'home-assistant-frontend': + else: missing_reqs.append(name) else: build_inputs[component] = (attr_paths, missing_reqs) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 0fce998196715..c656273114399 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.35.1"; + version = "1.36.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MJ3RG60rWbcfQxhj34k99AFg8TsPd3ECEw/x2+xU1js="; + sha256 = "sha256-OMbSd64mD2+6GVUxGL4lvQlKAiBuen0PjvyVdk/ePbI="; }; patches = [ diff --git a/pkgs/servers/ucarp/default.nix b/pkgs/servers/ucarp/default.nix new file mode 100644 index 0000000000000..321a725cc89ad --- /dev/null +++ b/pkgs/servers/ucarp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchurl, libpcap }: + +stdenv.mkDerivation rec { + pname = "ucarp"; + version = "1.5.2"; + + src = fetchurl { + url = "https://download.pureftpd.org/pub/ucarp/ucarp-${version}.tar.bz2"; + sha256 = "0qidz5sr55nxlmnl8kcbjsrff2j97b44h9l1dmhvvjl46iji7q7j"; + }; + + buildInputs = [ libpcap ]; + + meta = with lib; { + description = "Userspace implementation of CARP"; + longDescription = '' + UCARP allows a couple of hosts to share common virtual IP addresses in + order to provide automatic failover. It is a portable userland + implementation of the secure and patent-free Common Address Redundancy + Protocol (CARP, OpenBSD's alternative to the patents-bloated VRRP). + + Warning: This package has not received any upstream updates for a long + time and can be considered as unmaintained. + ''; + license = with licenses; [ isc bsdOriginal bsd2 gpl2Plus ]; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 705a8a554c184..095e43b9d3ee7 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "execline"; - version = "2.8.0.0"; - sha256 = "0vbn4pdazy6x6213vn42k0khcij5bvkbrcfg7nw6inhf8154nx77"; + version = "2.8.0.1"; + sha256 = "1v9swmhw2rcrr9fmkmd7qh8qq0kslhmvxwz2a3bhan9ksabz8wx3"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 731f6c48785fa..d6f475a408ef8 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -2,13 +2,10 @@ with skawarePackages; -let +buildPackage { pname = "s6-portable-utils"; - -in buildPackage { - pname = pname; - version = "2.2.3.1"; - sha256 = "1ks1ch5v3p2z8y8wp5fmzzgjrqn2l5sj1sgfp8vv6wy8psd8mrj3"; + version = "2.2.3.2"; + sha256 = "173nmygkp7ky3093dg4rx3ahvyl7ll86z8qj6pl3jd96xb9s49v6"; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; @@ -28,7 +25,7 @@ in buildPackage { rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) rm seekablepipe - mv doc $doc/share/doc/${pname}/html + mv doc $doc/share/doc/s6-portable-utils/html ''; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 5036b1a87eaa5..a4ebf5beef9b4 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.5.0"; - sha256 = "0h5p5dbkkdadahrp4pqhc3x9ds758i6djy49k5zrn7mm5k4722wz"; + version = "2.3.5.1"; + sha256 = "0qsgqwdr5ms337fc9f2b4aa5cr7myvbzndvgkgswnrdwszjm078c"; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index be19656f1c2d4..e0c8eda9c7496 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.4.1.0"; - sha256 = "023wnayv1gddklnsh3qv7i5jfy2fisbp24wa0nzjg0nfq3p807yc"; + version = "2.4.1.1"; + sha256 = "0m55ibx7k2wgrqbpci1n667ij0h925ajzggxalq2pj65kmwcmyx3"; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 20c23e1505196..532575d16c888 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.2.1"; - sha256 = "02pszbi440wagx2qp8aqj9mv5wm2qisw9lkq7mbnbnxxw9azlhi8"; + version = "0.5.2.2"; + sha256 = "12bzc483jpd16xmhfsfrib84daj1k3kwy5s5nc18ap60apa1r39a"; description = "A service manager for s6-based systems"; platforms = lib.platforms.linux; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 16fd1be633940..e9d096a7ab0e7 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.10.0.2"; - sha256 = "08bcrp7ck1l3wmjyzxi3vgk6j0n2jfymxs4rjjw4if40f3lgqfmj"; + version = "2.10.0.3"; + sha256 = "0mw7blp8dwr09z58m9mrxwmmvvpnjzq9klcf1vgm0hbha4qkf88x"; description = "skarnet.org's small & secure supervision software suite"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e281fc49233e7..752644a41aa11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9403,6 +9403,8 @@ in ubertooth = callPackage ../applications/radio/ubertooth { }; + ucarp = callPackage ../servers/ucarp { }; + ucl = callPackage ../development/libraries/ucl { }; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; |