diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:53:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 17:18:49 +0000 |
| commit | c3e005913d59b8ad64004e60888a71816688af1f (patch) | |
| tree | f65b32f0d16acaa40f2ee82ac736d150de4b6cf5 /nixpkgs/pkgs/desktops/arcan | |
| parent | 1c8034da05499ca3d999f57ba1f6b235e7711ee1 (diff) | |
| parent | db88608d8c811a93b74c99cfa1224952afc78200 (diff) | |
| download | nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.gz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.bz2 nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.lz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.xz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.zst nixlib-c3e005913d59b8ad64004e60888a71816688af1f.zip | |
Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'
Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl
Diffstat (limited to 'nixpkgs/pkgs/desktops/arcan')
| -rw-r--r-- | nixpkgs/pkgs/desktops/arcan/arcan.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/desktops/arcan/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/desktops/arcan/pipeworld.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/desktops/arcan/arcan.nix b/nixpkgs/pkgs/desktops/arcan/arcan.nix index 6cd31001fa76..a0d037725ed0 100644 --- a/nixpkgs/pkgs/desktops/arcan/arcan.nix +++ b/nixpkgs/pkgs/desktops/arcan/arcan.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "arcan"; - version = "0.6.1pre1+unstable=2021-07-30"; + version = "0.6.1pre1+unstable=2021-09-05"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = "885b2f0c9e031fd157af21302af2027ecbe3fe1f"; - hash = "sha256-tj5kPa5OWCGt7LTzo4ZYV1UjBpOrjQHER/K+ZfL3h+8="; + rev = "525521177e4458199d7a57f8e6d37d41c04a988d"; + hash = "sha256-RsvTHPIvF9TeOfjPGcArptIiF9g42BfZkVMCbjJcXnE="; }; postUnpack = '' diff --git a/nixpkgs/pkgs/desktops/arcan/default.nix b/nixpkgs/pkgs/desktops/arcan/default.nix index 874035c4801e..39d3e489c592 100644 --- a/nixpkgs/pkgs/desktops/arcan/default.nix +++ b/nixpkgs/pkgs/desktops/arcan/default.nix @@ -35,8 +35,8 @@ rec { # One Expression to SymlinkJoin Them All - everyone-wrapped = callPackage ./wrapper.nix { - name = "everyone-wrapped"; + all-wrapped = callPackage ./wrapper.nix { + name = "all-wrapped"; appls = [ durden pipeworld ]; }; } diff --git a/nixpkgs/pkgs/desktops/arcan/pipeworld.nix b/nixpkgs/pkgs/desktops/arcan/pipeworld.nix index a48ce5044ca0..78af4ee049ee 100644 --- a/nixpkgs/pkgs/desktops/arcan/pipeworld.nix +++ b/nixpkgs/pkgs/desktops/arcan/pipeworld.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pipeworld"; - version = "0.0.0+unstable=2021-05-27"; + version = "0.0.0+unstable=2021-08-01"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "c26df9ca0225ce2fd4f89e7ec59d4ab1f94a4c2e"; - hash = "sha256-RkDAbM1q4o61RGPLPLXHLvbvClp+bfjodlWgUGoODzA="; + rev = "311cc91946be63faab3b1578bc1d40668dd30f8c"; + hash = "sha256-iqcdVzEp4ST/f93+9fGSwvJMj7BznNtoEx4F3oMPCYk="; }; installPhase = '' |