diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
| commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
| tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/by-name/du | |
| parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
| parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
| download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/by-name/du')
| -rw-r--r-- | nixpkgs/pkgs/by-name/du/dublin-traceroute/package.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/du/dumbpipe/package.nix | 34 |
2 files changed, 38 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/by-name/du/dublin-traceroute/package.nix b/nixpkgs/pkgs/by-name/du/dublin-traceroute/package.nix index 5f559c4d97c4..5e797cf97b57 100644 --- a/nixpkgs/pkgs/by-name/du/dublin-traceroute/package.nix +++ b/nixpkgs/pkgs/by-name/du/dublin-traceroute/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "dublin-traceroute"; - version = "0.4.2-unstable-2024-01-09"; + version = "0.4.2-unstable-2024-04-11"; src = fetchFromGitHub { owner = "insomniacslk"; repo = "dublin-traceroute"; - rev = "b136db81cfbb30d5fd324dfccc97fca49a5ecee1"; - hash = "sha256-FsolpeQGaLDjDE5Yk58t2hFQJgM58zafIx6s5ejYKnY="; + rev = "a92118d93fd1fa7bdb827e741dd848b7f7083a1e"; + hash = "sha256-UJeFPVi3423Jh72fVk8QbLX1tTNAQ504xYs9HwVCkZc="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -37,5 +37,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ baloo ]; platforms = platforms.unix; mainProgram = "dublin-traceroute"; + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix b/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix new file mode 100644 index 000000000000..6f3074266947 --- /dev/null +++ b/nixpkgs/pkgs/by-name/du/dumbpipe/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "dumbpipe"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "n0-computer"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pvAB3kvnyNZ6N7bC8NIaSNUxcn9AfpEozYcczA+5zmc="; + }; + + cargoHash = "sha256-aHuRG1mLb18bra/iTddU3B4XjS5shheBqW1Hs+QMcJs="; + + buildInputs = lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; [ + SystemConfiguration + ] + ); + + meta = with lib; { + description = "Connect A to B - Send Data"; + homepage = "https://www.dumbpipe.dev/"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ cameronfyfe ]; + mainProgram = "dumbpipe"; + }; +} |